diff --git a/core/users/app_languages.php b/core/users/app_languages.php index ddef9e820a..404a36cc80 100644 --- a/core/users/app_languages.php +++ b/core/users/app_languages.php @@ -41,6 +41,28 @@ $text['title-user_edit']['ru-ru'] = ""; $text['title-user_edit']['sv-se'] = ""; $text['title-user_edit']['uk-ua'] = ""; +$text['title-user_import']['en-us'] = "User Import"; +$text['title-user_import']['ar-eg'] = ""; +$text['title-user_import']['de-at'] = "Importieren"; //copied from de-de +$text['title-user_import']['de-ch'] = "Importieren"; //copied from de-de +$text['title-user_import']['de-de'] = "Importieren"; +$text['title-user_import']['el-gr'] = "Εισαγωγή"; +$text['title-user_import']['es-cl'] = "Importar"; +$text['title-user_import']['es-mx'] = "Importar"; //copied from es-cl +$text['title-user_import']['fr-ca'] = "Importer"; //copied from fr-fr +$text['title-user_import']['fr-fr'] = "Importer"; +$text['title-user_import']['he-il'] = ""; +$text['title-user_import']['it-it'] = ""; +$text['title-user_import']['nl-nl'] = ""; +$text['title-user_import']['pl-pl'] = "Importuj"; +$text['title-user_import']['pt-br'] = "Importar"; +$text['title-user_import']['pt-pt'] = "Importat"; +$text['title-user_import']['ro-ro'] = ""; +$text['title-user_import']['ru-ru'] = "Импорт"; +$text['title-user_import']['sv-se'] = "Importera"; +$text['title-user_import']['uk-ua'] = ""; +$text['title-user_import']['tr-tr'] = "İçe Aktar"; + $text['description-users']['en-us'] = "Add, edit, delete, and search users. "; $text['description-users']['ar-eg'] = ""; $text['description-users']['de-at'] = "Benutzer anlegen, editieren, löschen und suchen."; //copied from de-de @@ -1522,6 +1544,28 @@ $text['header-user_add']['ru-ru'] = "Пользователь"; $text['header-user_add']['sv-se'] = "Användare"; $text['header-user_add']['uk-ua'] = "Користувач"; +$text['header-user_import']['en-us'] = "User Import"; +$text['header-user_import']['ar-eg'] = ""; +$text['header-user_import']['de-at'] = "Importieren"; //copied from de-de +$text['header-user_import']['de-ch'] = "Importieren"; //copied from de-de +$text['header-user_import']['de-de'] = "Importieren"; +$text['header-user_import']['el-gr'] = "Εισαγωγή"; +$text['header-user_import']['es-cl'] = "Importar"; +$text['header-user_import']['es-mx'] = "Importar"; //copied from es-cl +$text['header-user_import']['fr-ca'] = "Importer"; //copied from fr-fr +$text['header-user_import']['fr-fr'] = "Importer"; +$text['header-user_import']['he-il'] = ""; +$text['header-user_import']['it-it'] = ""; +$text['header-user_import']['nl-nl'] = ""; +$text['header-user_import']['pl-pl'] = "Importuj"; +$text['header-user_import']['pt-br'] = "Importar"; +$text['header-user_import']['pt-pt'] = "Importat"; +$text['header-user_import']['ro-ro'] = ""; +$text['header-user_import']['ru-ru'] = "Импорт"; +$text['header-user_import']['sv-se'] = "Importera"; +$text['header-user_import']['uk-ua'] = ""; +$text['header-user_import']['tr-tr'] = "İçe Aktar"; + $text['description-user_setting-edit']['en-us'] = "Edit a setting for this user."; $text['description-user_setting-edit']['ar-eg'] = ""; $text['description-user_setting-edit']['de-at'] = "Eine Einstellung für diesen Benutzer bearbeiten."; //copied from de-de diff --git a/core/users/user_imports.php b/core/users/user_imports.php index a18653acfe..a0a2f3e12d 100644 --- a/core/users/user_imports.php +++ b/core/users/user_imports.php @@ -133,6 +133,7 @@ if (strlen($delimiter) > 0 && file_exists($_SESSION['file']) && $action != 'import') { //form to match the fields to the column names + $document['title'] = $text['title-user_import']; require_once "resources/header.php"; echo "
\n"; @@ -140,7 +141,7 @@ echo " \n"; echo " \n"; - echo " ".$text['header-import']."
\n"; + echo " ".$text['header-user_import']."
\n"; echo " \n"; echo " \n"; echo " \n"; @@ -233,6 +234,7 @@ if (file_exists($_SESSION['file']) && $action == 'import') { //form to match the fields to the column names + //$document['title'] = $text['title-user_import']; //require_once "resources/header.php"; //user selected fields @@ -386,13 +388,14 @@ } //include the header + $document['title'] = $text['title-user_import']; require_once "resources/header.php"; //begin the content echo "\n"; echo " \n"; echo " \n"; echo "
\n"; - echo " ".$text['header-import']."
\n"; + echo " ".$text['header-user_import']."
\n"; echo " ".$text['description-import']."\n"; echo " 		\n"; diff --git a/core/users/users.php b/core/users/users.php index e8c36fba63..c27874debc 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -161,6 +161,7 @@ $token = $object->create($_SERVER['PHP_SELF']); //include the header + $document['title'] = $text['title-users']; require_once "resources/header.php"; //show the content @@ -168,6 +169,9 @@ echo "
".$text['title-users']." (".$num_rows.")
\n"; echo "
\n"; if (permission_exists('user_add')) { + if (!isset($id)) { + echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$_SESSION['theme']['button_icon_import'],'style'=>'margin-right: 15px;','link'=>'user_imports.php']); + } echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'link'=>'user_edit.php']); } if (permission_exists('user_add') && $users) { @@ -188,11 +192,6 @@ echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']); } } - - //add buttons - if (!isset($id)) { - echo " "; - } echo ""; echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]); echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'users.php','style'=>($search == '' ? 'display: none;' : null)]);