diff --git a/modules/backend/controllers/groups/_list_toolbar.htm b/modules/backend/controllers/groups/_list_toolbar.htm index adf5fa8e7..5a25508df 100644 --- a/modules/backend/controllers/groups/_list_toolbar.htm +++ b/modules/backend/controllers/groups/_list_toolbar.htm @@ -1,3 +1,3 @@
- New Admin Group +
diff --git a/modules/backend/controllers/groups/create.htm b/modules/backend/controllers/groups/create.htm index 96b5a6141..11515d3bc 100644 --- a/modules/backend/controllers/groups/create.htm +++ b/modules/backend/controllers/groups/create.htm @@ -1,7 +1,7 @@ @@ -19,9 +19,9 @@ data-request="onSave" data-hotkey="ctrl+s" data-hotkey-mac="cmd+s" - data-load-indicator="Creating Group..." + data-load-indicator="" class="btn btn-primary"> - Create + @@ -40,5 +40,5 @@

fatalError) ?>

-

Return to the group list

+

\ No newline at end of file diff --git a/modules/backend/controllers/groups/index.htm b/modules/backend/controllers/groups/index.htm index 04b0f32ae..c3dccaf27 100644 --- a/modules/backend/controllers/groups/index.htm +++ b/modules/backend/controllers/groups/index.htm @@ -1,8 +1,8 @@ -
+ -
+ listRender() ?> diff --git a/modules/backend/controllers/groups/update.htm b/modules/backend/controllers/groups/update.htm index 63126567d..fc1b99ed2 100644 --- a/modules/backend/controllers/groups/update.htm +++ b/modules/backend/controllers/groups/update.htm @@ -1,7 +1,7 @@ @@ -20,9 +20,9 @@ data-request-data="redirect:0" data-hotkey="ctrl+s" data-hotkey-mac="cmd+s" - data-load-indicator="Saving Group..." + data-load-indicator="" class="btn btn-primary"> - Save + @@ -49,5 +49,5 @@

fatalError) ?>

-

Return to the group list

+

\ No newline at end of file diff --git a/modules/backend/controllers/users/_list_toolbar.htm b/modules/backend/controllers/users/_list_toolbar.htm index ab2166728..3563ce7ed 100644 --- a/modules/backend/controllers/users/_list_toolbar.htm +++ b/modules/backend/controllers/users/_list_toolbar.htm @@ -1,6 +1,6 @@
- New Admin - Manage Groups + + - or Cancel +
@@ -57,6 +57,6 @@

fatalError) ?>

-

Return to the administrator list

+

\ No newline at end of file diff --git a/modules/backend/controllers/users/mysettings.htm b/modules/backend/controllers/users/mysettings.htm index 15d42c366..e303b1f5f 100644 --- a/modules/backend/controllers/users/mysettings.htm +++ b/modules/backend/controllers/users/mysettings.htm @@ -1,6 +1,6 @@ @@ -20,9 +20,9 @@ data-request-data="redirect:0" data-hotkey="ctrl+s" data-hotkey-mac="cmd+s" - data-load-indicator="Saving Admin..." + data-load-indicator="" class="btn btn-primary"> - Save + @@ -54,6 +54,6 @@

fatalError) ?>

-

Return to the administrator list

+

\ No newline at end of file diff --git a/modules/backend/controllers/users/update.htm b/modules/backend/controllers/users/update.htm index 5d082b9f0..41f053dbd 100644 --- a/modules/backend/controllers/users/update.htm +++ b/modules/backend/controllers/users/update.htm @@ -1,6 +1,6 @@ @@ -20,9 +20,9 @@ data-request-data="redirect:0" data-hotkey="ctrl+s" data-hotkey-mac="cmd+s" - data-load-indicator="Saving Admin..." + data-load-indicator="" class="btn btn-primary"> - Save + - or Cancel + @@ -65,6 +65,6 @@

fatalError) ?>

-

Return to the administrator list

+

\ No newline at end of file diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index 7f1fef0ef..06ad0d334 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -45,6 +45,7 @@ return [ 'name' => 'Administrator', 'menu_label' => 'Administrators', 'list_title' => 'Manage Administrators', + 'new' => 'New Administrator', 'login' => "Login", 'first_name' => "First Name", 'last_name' => "Last Name", @@ -59,11 +60,21 @@ return [ 'superuser_comment' => "Check this box to allow this person to access all areas.", 'send_invite' => 'Send invitation by email', 'send_invite_comment' => 'Use this checkbox to send an invitation to the user by email', + 'creating' => 'Creating Administrator...', + 'saving' => 'Saving Administrator...', + 'deleting' => 'Deleting Administrator...', + 'delete_confirm' => 'Do you really want to delete this administrator?', + 'return' => 'Return to the administrator list', 'group' => [ 'name' => 'Group', 'name_field' => 'Name', 'menu_label' => 'Groups', 'list_title' => 'Manage Groups', + 'new' => 'New Administrator Group', + 'creating' => 'Creating Group...', + 'saving' => 'Saving Group...', + 'deleting' => 'Deleting Group...', + 'return' => 'Return to the group list', ], 'preferences' => [ 'not_authenticated' => 'There is no an authenticated user to load or save preferences for.' @@ -90,6 +101,8 @@ return [ 'missing_model' => 'Form behavior used in :class does not have a model defined.', 'missing_definition' => "Form behavior does not contain a field for ':field'.", 'not_found' => 'Form record with an ID of :id could not be found.', + 'create' => 'Create', + 'create_and_close' => 'Create and close', 'save' => 'Save', 'save_and_close' => 'Save and close', 'saving' => 'Saving...', @@ -101,6 +114,7 @@ return [ 'close' => 'Close', 'delete' => 'Delete', 'ok' => 'OK', + 'or' => 'or', 'confirm_tab_close' => 'Do you really want to close the tab? Unsaved changes will be lost.', 'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.', ], diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php index 5ef91b7ef..54e35f9e8 100644 --- a/modules/backend/lang/nl/lang.php +++ b/modules/backend/lang/nl/lang.php @@ -44,7 +44,8 @@ return [ 'user' => [ 'name' => 'Beheerder', 'menu_label' => 'Beheerders', - 'list_title' => 'Beheerders beheren', + 'list_title' => 'Beheer Beheerders', + 'new' => 'Nieuwe Beheerder', 'login' => "Gebruikersnaam", 'first_name' => "Voornaam", 'last_name' => "Achternaam", @@ -59,11 +60,21 @@ return [ 'superuser_comment' => "Vink deze optie aan om de gebruiker volledige rechten tot het systeem te geven.", 'send_invite' => 'Stuur uitnodiging per e-mail', 'send_invite_comment' => 'Vink deze optie aan om de gebruiker een uitnodiging per e-mail te sturen', + 'creating' => 'Administrator aanmaken...', + 'saving' => 'Administrator opslaan...', + 'deleting' => 'Groep verwijderen...', + 'delete_confirm' => 'Weet je zeker dat je deze beheerder wilt verwijderen?', + 'return' => 'Terug naar beheerdersoverzicht', 'group' => [ 'name' => 'Groep', 'name_field' => 'Naam', 'menu_label' => 'Groepen', 'list_title' => 'Beheer Groepen', + 'new' => 'Nieuwe Beheerdersgroep', + 'creating' => 'Groep aanmaken...', + 'saving' => 'Groep opslaan...', + 'deleting' => 'Groep verwijderen...', + 'return' => 'Terug naar groepenoverzicht', ], 'preferences' => [ 'not_authenticated' => 'Er is geen geauthenticeerde gebruiker om gegevens voor te laden of op te slaan.' @@ -90,6 +101,8 @@ return [ 'missing_model' => 'Geen model opgegeven voor het gedrag (behavior) van het formulier gebruikt in :class.', 'missing_definition' => "Het gedrag (behavior) van het formulier bevat geen kolom voor ':field'.", 'not_found' => 'Het formulier met record ID :id is niet gevonden.', + 'create' => 'Maken', + 'create_and_close' => 'Maken en sluiten', 'save' => 'Opslaan', 'save_and_close' => 'Opslaan en sluiten', 'saving' => 'Opslaan...', @@ -101,6 +114,7 @@ return [ 'close' => 'Sluiten', 'delete' => 'Verwijderen', 'ok' => 'OK', + 'or' => 'of', 'confirm_tab_close' => 'Weet je zeker dat je dit tabblad wilt sluiten? Niet opgeslagen wijzigingen gaan verloren.', 'behavior_not_ready' => 'Gedrag (behavior) van het formulier is niet geladen. Controleer of initForm() in de controller is aangeroepen.', ],