diff --git a/src/controllers/components/AccountaccessComponent.php b/src/controllers/components/AccountaccessComponent.php index 02d5ea56c..46f4e3a08 100644 --- a/src/controllers/components/AccountaccessComponent.php +++ b/src/controllers/components/AccountaccessComponent.php @@ -935,7 +935,7 @@ class AccountaccessComponent extends Component } } $data['AVAILABLE_ACTIVITIES'][-1] = - tl('accountaccess_component_select_activityname'); + tl('accountaccess_component_add_roleactivity'); foreach ($available_activities as $activity) { $data['AVAILABLE_ACTIVITIES'][$activity['ACTIVITY_ID']] = $activity['ACTIVITY_NAME']; diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php index f37ea50df..d414b747f 100644 --- a/src/controllers/components/SocialComponent.php +++ b/src/controllers/components/SocialComponent.php @@ -573,6 +573,10 @@ class SocialComponent extends Component implements CrawlConstants $_SESSION['USER_ID'] != C\ROOT_ID)) { break; } + if (!empty($_REQUEST['context']) && + $_REQUEST['context']=='search') { + $data['context'] = 'search'; + }; $data['FORM_TYPE'] = "graphstats"; $data['INCLUDE_SCRIPTS'][] = "chart"; $impression_model = $parent->model("impression"); @@ -713,7 +717,13 @@ class SocialComponent extends Component implements CrawlConstants break; case "statistics": if (!$group_id || (!$is_owner && - $_SESSION['USER_ID'] != C\ROOT_ID)) { break;} + $_SESSION['USER_ID'] != C\ROOT_ID)) { + break; + } + if (!empty($_REQUEST['context']) && + $_REQUEST['context']=='search') { + $data['context'] = 'search'; + }; $data['FORM_TYPE'] = "statistics"; $impression_model = $parent->model("impression"); $periods = [C\ONE_HOUR, C\ONE_DAY, C\ONE_MONTH, C\ONE_YEAR, diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index da2c57abd..27f3af166 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "أدوار حذف" accountaccess_component_group_deleted = "المجموعة المحذوفة" accountaccess_component_groups_deleted = "مجموعات حذف" accountaccess_component_userstatus_updated = "حالة المستخدم تحديث" -accountaccess_component_select_activityname = "حدد النشاط" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "وأضاف النشاط" accountaccess_component_rolename_exists = "دور الاسم موجود" accountaccess_component_rolename_blank = "دور اسم فارغ!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "إحصاءات الزحف سبق الم ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "مرحبا %s" groupmenu_element_welcome = "مرحبا بك" groupmenu_element_signin = "تسجيل الدخول" -groupmenu_element_manage_account = "إدارة الحساب" -groupmenu_element_manage_groups = "إدارة المجموعات" -groupmenu_element_signout = "تسجيل الخروج" groupmenu_element_create_account = "إنشاء حساب" groupmenu_element_page_places = "%s صفحة %s المجموعة الأماكن" groupmenu_element_read_page = "%s صفحة %s المجموعة" @@ -1704,11 +1700,8 @@ scrapers_element_name = "اسم" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "مرحبا %s" searchmenu_element_welcome = "مرحبا بك" searchmenu_element_signin = "تسجيل الدخول" -searchmenu_element_admin = "المشرف" -searchmenu_element_signout = "تسجيل الخروج" searchmenu_element_create_account = "إنشاء حساب" searchmenu_element_categories = "فئات" searchmenu_element_searchsettings = "الإعدادات" diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 681464d03..7b6aa1dbe 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "ভূমিকা মুছে ফ accountaccess_component_group_deleted = "গ্রুপ মুছে ফেলা" accountaccess_component_groups_deleted = "গ্রুপ মুছে ফেলা" accountaccess_component_userstatus_updated = "ব্যবহারকারীর স্ট্যাটাস আপডেট" -accountaccess_component_select_activityname = "নির্বাচন কার্যকলাপ" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "কার্যকলাপ যোগ করা হয়েছে" accountaccess_component_rolename_exists = "ভূমিকা নাম বিদ্যমান" accountaccess_component_rolename_blank = "ভূমিকা নাম ফাঁকা!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "হামাগুড়ি পরিস ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "স্বাগতম %s" groupmenu_element_welcome = "স্বাগতম" groupmenu_element_signin = "সাইন ইন" -groupmenu_element_manage_account = "অ্যাকাউন্ট পরিচালনা" -groupmenu_element_manage_groups = "গ্রুপ পরিচালনা" -groupmenu_element_signout = "সাইন আউট" groupmenu_element_create_account = "অ্যাকাউন্ট তৈরি করুন" groupmenu_element_page_places = "%s পৃষ্ঠার এ %s গ্রুপ জায়গা" groupmenu_element_read_page = "%s পৃষ্ঠার এ %s গ্রুপ" @@ -1704,11 +1700,8 @@ scrapers_element_name = "নাম" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "স্বাগতম %s" searchmenu_element_welcome = "স্বাগতম" searchmenu_element_signin = "সাইন ইন" -searchmenu_element_admin = "অ্যাডমিন" -searchmenu_element_signout = "সাইন আউট" searchmenu_element_create_account = "অ্যাকাউন্ট তৈরি করুন" searchmenu_element_categories = "বিভাগ" searchmenu_element_searchsettings = "সেটিংস" diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index 82a972158..70e392a8f 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Rollen Gelöscht" accountaccess_component_group_deleted = "Gruppe Gelöscht" accountaccess_component_groups_deleted = "Gruppen Gelöscht" accountaccess_component_userstatus_updated = "Benutzer-Status Aktualisiert" -accountaccess_component_select_activityname = "Wählen Sie Aktivität" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Aktivität Hinzugefügt" accountaccess_component_rolename_exists = "Rolle Namen Existiert" accountaccess_component_rolename_blank = "Rolle Name Leer!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Crawl Statistiken, die bereits geplant s ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Willkommen, %s" groupmenu_element_welcome = "Willkommen" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "Konto Verwalten" -groupmenu_element_manage_groups = "Gruppen Verwalten" -groupmenu_element_signout = "Melden Sie Sich" groupmenu_element_create_account = "Konto Erstellen" groupmenu_element_page_places = "%s Seite %s Gruppe Stellen" groupmenu_element_read_page = "%s Seite %s Gruppe" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Name" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Willkommen, %s" searchmenu_element_welcome = "Willkommen" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Melden Sie Sich" searchmenu_element_create_account = "Konto Erstellen" searchmenu_element_categories = "Kategorien" searchmenu_element_searchsettings = "Einstellungen" diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index 2f6983ddf..29556746b 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Roles Deleted" accountaccess_component_group_deleted = "Group Deleted" accountaccess_component_groups_deleted = "Groups Deleted" accountaccess_component_userstatus_updated = "User Status Updated" -accountaccess_component_select_activityname = "Select Activity" +accountaccess_component_add_roleactivity = "Add Activity Role" accountaccess_component_activity_added = "Activity Added" accountaccess_component_rolename_exists = "Role Name Exists" accountaccess_component_rolename_blank = "Role Name Blank!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Crawl statistics have already been sched ; ; GroupmenuElement.php groupmenu_element_admin_menu = "Admin Menu" -groupmenu_element_welcome_user = "Welcome, %s" groupmenu_element_welcome = "Welcome" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "Manage Account" -groupmenu_element_manage_groups = "Manage Groups" -groupmenu_element_signout = "Sign Out" groupmenu_element_create_account = "Create Account" groupmenu_element_page_places = "%s Page at %s Group Places" groupmenu_element_read_page = "%s Page at %s Group" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Name" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "Admin Menu" -searchmenu_element_welcome_user = "Welcome, %s" searchmenu_element_welcome = "Welcome" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Sign Out" searchmenu_element_create_account = "Create Account" searchmenu_element_categories = "Categories" searchmenu_element_searchsettings = "Settings" diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index 5a68d0d9f..5e303db42 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Funciones Eliminado" accountaccess_component_group_deleted = "Grupo De Eliminados" accountaccess_component_groups_deleted = "Los Grupos Eliminados" accountaccess_component_userstatus_updated = "La Condición De Usuario Actualizada" -accountaccess_component_select_activityname = "Seleccione La Actividad" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Actividad Agregada" accountaccess_component_rolename_exists = "Nombre De Función Existe" accountaccess_component_rolename_blank = "Nombre De La Función En Blanco!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Rastreo estadísticas ya han sido ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Bienvenido, %s" groupmenu_element_welcome = "Bienvenido" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "Administrar La Cuenta" -groupmenu_element_manage_groups = "Administrar Grupos" -groupmenu_element_signout = "Sesión" groupmenu_element_create_account = "Crear Cuenta" groupmenu_element_page_places = "%s Página en %s Lugares del Grupo" groupmenu_element_read_page = "%s Página %s Grupo" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Nombre" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Bienvenido, %s" searchmenu_element_welcome = "Bienvenido" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Sesión" searchmenu_element_create_account = "Crear Cuenta" searchmenu_element_categories = "Categorías" searchmenu_element_searchsettings = "Configuración" diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index 0dc6f9936..63c467598 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "نقش های حذف شده" accountaccess_component_group_deleted = "گروه حذف شده" accountaccess_component_groups_deleted = "گروه های حذف شده" accountaccess_component_userstatus_updated = "وضعیت کاربر به روز شده" -accountaccess_component_select_activityname = "یک فعالیت انتخاب کنید" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "فعالیت اضافه شد" accountaccess_component_rolename_exists = "این نقش وجود دارد" accountaccess_component_rolename_blank = "نقش نام خالی!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "آمار خزیدن در حال حاضر ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "خوش آمدید %s" groupmenu_element_welcome = "خوش آمدید" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "مدیریت حساب" -groupmenu_element_manage_groups = "مدیریت گروه" -groupmenu_element_signout = "ثبت نام" groupmenu_element_create_account = "ایجاد حساب کاربری" groupmenu_element_page_places = "%s صفحه %s گروه" groupmenu_element_read_page = "%s صفحه %s گروه" @@ -1704,11 +1700,8 @@ scrapers_element_name = "نام" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "خوش آمدید %s" searchmenu_element_welcome = "خوش آمدید" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "ثبت نام" searchmenu_element_create_account = "ایجاد حساب کاربری" searchmenu_element_categories = "دسته بندی ها" searchmenu_element_searchsettings = "تنظیمات" diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index 829f27789..7353e863c 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Les rôles supprimé" accountaccess_component_group_deleted = "Groupe supprimé" accountaccess_component_groups_deleted = "Groupes supprimés" accountaccess_component_userstatus_updated = "Statut de l'utilisateur mis à jour" -accountaccess_component_select_activityname = "Sélectionnez l'activité" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "L'activité ajoutée" accountaccess_component_rolename_exists = "Rôle nom existe" accountaccess_component_rolename_blank = "Le nom du rôle est vide!!!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Analyse des statistiques ont déj& ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Bienvenue, %s" groupmenu_element_welcome = "Bienvenue" groupmenu_element_signin = "Connexion" -groupmenu_element_manage_account = "Gérer le compte" -groupmenu_element_manage_groups = "Gérer les groupes" -groupmenu_element_signout = "Signe" groupmenu_element_create_account = "Créer un compte" groupmenu_element_page_places = "%s page %s groupe lieux" groupmenu_element_read_page = "%s page %s groupe" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Nom" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Bienvenue, %s" searchmenu_element_welcome = "Bienvenue" searchmenu_element_signin = "Connexion" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Déconnexion" searchmenu_element_create_account = "Créer un compte" searchmenu_element_categories = "Catégories" searchmenu_element_searchsettings = "Paramètres" diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index 598262f8a..04ed24dcb 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "תפקידים שנמחקו" accountaccess_component_group_deleted = "קבוצת שנמחקו" accountaccess_component_groups_deleted = "קבוצות שנמחקו" accountaccess_component_userstatus_updated = "מצב משתמש מעודכן" -accountaccess_component_select_activityname = "בחר פעילות" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "פעילות הוסיף" accountaccess_component_rolename_exists = "שם תפקיד קיים במערכת" accountaccess_component_rolename_blank = "תפקיד שם ריק!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "לזחול הסטטיסטיקה כבר ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "ברוך הבא, %s" groupmenu_element_welcome = "ברוך הבא" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "ניהול חשבון" -groupmenu_element_manage_groups = "ניהול קבוצות" -groupmenu_element_signout = "השלט" groupmenu_element_create_account = "צור חשבון" groupmenu_element_page_places = "%s עמוד %s קבוצה מקומות" groupmenu_element_read_page = "%s עמוד %s קבוצה" @@ -1704,11 +1700,8 @@ scrapers_element_name = "שם" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "ברוך הבא, %s" searchmenu_element_welcome = "ברוך הבא" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "השלט" searchmenu_element_create_account = "צור חשבון" searchmenu_element_categories = "קטגוריות" searchmenu_element_searchsettings = "הגדרות" diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index 299214c4a..9a6035209 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "भूमिकाओं नष् accountaccess_component_group_deleted = "समूह हटाए गए" accountaccess_component_groups_deleted = "समूहों को नष्ट कर दिया" accountaccess_component_userstatus_updated = "उपयोगकर्ता की स्थिति अद्यतन" -accountaccess_component_select_activityname = "गतिविधि का चयन करें" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "गतिविधि जोड़ा गया" accountaccess_component_rolename_exists = "भूमिका का नाम मौजूद है" accountaccess_component_rolename_blank = "भूमिका का नाम खाली है!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "क्रॉल आँकड़े प ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "आपका स्वागत है, %s" groupmenu_element_welcome = "आपका स्वागत है" groupmenu_element_signin = "साइन इन" -groupmenu_element_manage_account = "खाते का प्रबंधन" -groupmenu_element_manage_groups = "समूहों का प्रबंधन" -groupmenu_element_signout = "साइन आउट करें" groupmenu_element_create_account = "खाता बनाएँ" groupmenu_element_page_places = "%s पृष्ठ पर %s समूह स्थानों" groupmenu_element_read_page = "%s पृष्ठ पर %s समूह" @@ -1704,11 +1700,8 @@ scrapers_element_name = "नाम" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "आपका स्वागत है, %s" searchmenu_element_welcome = "आपका स्वागत है" searchmenu_element_signin = "साइन इन" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "साइन आउट करें" searchmenu_element_create_account = "खाता बनाएँ" searchmenu_element_categories = "श्रेणियाँ" searchmenu_element_searchsettings = "सेटिंग्स" diff --git a/src/locale/id/configure.ini b/src/locale/id/configure.ini index e4002ade1..7156fe0e1 100755 --- a/src/locale/id/configure.ini +++ b/src/locale/id/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Peran Dihapus" accountaccess_component_group_deleted = "Kelompok Dihapus" accountaccess_component_groups_deleted = "Kelompok Dihapus" accountaccess_component_userstatus_updated = "Status Pengguna Diperbarui" -accountaccess_component_select_activityname = "Pilih name aktivitas" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Aktivitas telah ditambah" accountaccess_component_rolename_exists = "Rolename ditemukan" accountaccess_component_rolename_blank = "Peran Nama Kosong!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Merangkak statistik telah dijadwalkan ak ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Selamat datang, %s" groupmenu_element_welcome = "Selamat datang" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "Kelola Akun" -groupmenu_element_manage_groups = "Mengelola Grup" -groupmenu_element_signout = "Sign Out" groupmenu_element_create_account = "Buat Akun" groupmenu_element_page_places = "%s Halaman %s Kelompok Tempat" groupmenu_element_read_page = "%s Halaman %s Group" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Nama" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Selamat datang, %s" searchmenu_element_welcome = "Selamat datang" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Sign Out" searchmenu_element_create_account = "Buat Akun" searchmenu_element_categories = "Kategori" searchmenu_element_searchsettings = "Pengaturan" diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index a20f170ae..392690092 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Ruoli Eliminato" accountaccess_component_group_deleted = "Gruppo Eliminato" accountaccess_component_groups_deleted = "Gruppi Cancellati" accountaccess_component_userstatus_updated = "Lo Stato Dell'Utente Aggiornato" -accountaccess_component_select_activityname = "Seleziona Attività" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Attività aggiunta" accountaccess_component_rolename_exists = "Nome Ruolo esistente" accountaccess_component_rolename_blank = "Nome Ruolo Vuota!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Ricerca per indicizzazione statistiche s ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Benvenuto, %s" groupmenu_element_welcome = "Benvenuto" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "Gestisci Account" -groupmenu_element_manage_groups = "Gestione Di Gruppi" -groupmenu_element_signout = "Sign Out" groupmenu_element_create_account = "Crea Un Account" groupmenu_element_page_places = "%s Pagina %s di Gruppo Posti" groupmenu_element_read_page = "%s Pagina %s di Gruppo" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Nome" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Benvenuto, %s" searchmenu_element_welcome = "Benvenuto" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Sign Out" searchmenu_element_create_account = "Crea Un Account" searchmenu_element_categories = "Categorie" searchmenu_element_searchsettings = "Impostazioni" diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index e214b278a..544d42359 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "役職の削除" accountaccess_component_group_deleted = "グループの削除" accountaccess_component_groups_deleted = "群削除" accountaccess_component_userstatus_updated = "ユーザの状況を更新" -accountaccess_component_select_activityname = "選択アクティビティ名" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "アクティビティが追加しました" accountaccess_component_rolename_exists = "役割が存在します" accountaccess_component_rolename_blank = "役割名前空!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "這うように統計が既に予定さ ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "ようこそ、%s" groupmenu_element_welcome = "歓迎" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "アカウント管理" -groupmenu_element_manage_groups = "管理グループ" -groupmenu_element_signout = "書き換わってしまう可能性もあり" groupmenu_element_create_account = "アカウントを作成する" groupmenu_element_page_places = "%sページでのグループでは%s" groupmenu_element_read_page = "%sページでのグループ%s" @@ -1704,11 +1700,8 @@ scrapers_element_name = "名称" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "ようこそ、%s" searchmenu_element_welcome = "歓迎" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "書き換わってしまう可能性もあり" searchmenu_element_create_account = "アカウントを作成する" searchmenu_element_categories = "カテゴリ" searchmenu_element_searchsettings = "設定" diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index 954404725..bde2069cc 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "ಪಾತ್ರಗಳನ್ನು accountaccess_component_group_deleted = "ಗುಂಪು ಅಳಿಸಲಾಗಿದೆ" accountaccess_component_groups_deleted = "ಗುಂಪುಗಳು ಅಳಿಸಲಾಗಿದೆ" accountaccess_component_userstatus_updated = "ಬಳಕೆದಾರ ಸ್ಥಿತಿ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ" -accountaccess_component_select_activityname = "ಚಟುವಟಿಕೆ ಆಯ್ಕೆ ಮಾಡಿ" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "ಈ ಚಟುವಟಿಕೆಯನ್ನು ಸೇರಿಸಲಾಗಿದೆ" accountaccess_component_rolename_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇದೆ" accountaccess_component_rolename_blank = "ಪಾತ್ರ ಹೆಸರು ಖಾಲಿ!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "ಕ್ರಾಲ್ ಅಂಕಿಅಂಶ ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "ಸ್ವಾಗತ, %s" groupmenu_element_welcome = "ಸ್ವಾಗತ" groupmenu_element_signin = "ಸೈನ್ ಇನ್" -groupmenu_element_manage_account = "ಖಾತೆ ನಿರ್ವಹಣೆ" -groupmenu_element_manage_groups = "ಗುಂಪುಗಳು ನಿರ್ವಹಿಸಿ" -groupmenu_element_signout = "ಸೈನ್ ಔಟ್" groupmenu_element_create_account = "ಖಾತೆಯನ್ನು ರಚಿಸಿ" groupmenu_element_page_places = "%s ಪುಟ ನಲ್ಲಿ %s ಗುಂಪು ಸ್ಥಳಗಳು" groupmenu_element_read_page = "%s ಪುಟ ನಲ್ಲಿ %s ಗುಂಪು" @@ -1704,11 +1700,8 @@ scrapers_element_name = "ಹೆಸರು" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "ಸ್ವಾಗತ, %s" searchmenu_element_welcome = "ಸ್ವಾಗತ" searchmenu_element_signin = "ಸೈನ್ ಇನ್" -searchmenu_element_admin = "ನಿರ್ವಹಣೆ" -searchmenu_element_signout = "ಸೈನ್ ಔಟ್" searchmenu_element_create_account = "ಖಾತೆಯನ್ನು ರಚಿಸಿ" searchmenu_element_categories = "ವಿಭಾಗಗಳು" searchmenu_element_searchsettings = "ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು" diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index d8c11e352..bf8c857c3 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "역할 삭제" accountaccess_component_group_deleted = "그룹 삭제" accountaccess_component_groups_deleted = "그룹 삭제" accountaccess_component_userstatus_updated = "사용자 상태를 업데이트" -accountaccess_component_select_activityname = "엑티비티 이름을 선택해 주십시요." +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "엑티비티를 추가했습니다." accountaccess_component_rolename_exists = "동일 권한 이름이 존재 합니다." accountaccess_component_rolename_blank = "역할 이름을 공백!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "크롤 통계는 이 예약을 계산할 ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "환 %s" groupmenu_element_welcome = "영" groupmenu_element_signin = "로그인" -groupmenu_element_manage_account = "계정 관리" -groupmenu_element_manage_groups = "그룹 관리" -groupmenu_element_signout = "로그아웃" groupmenu_element_create_account = "계정 만들기" groupmenu_element_page_places = "%s 페이지에 %s 그룹소" groupmenu_element_read_page = "%s 페이지에 그룹 %s" @@ -1704,11 +1700,8 @@ scrapers_element_name = "이름" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "환 %s" searchmenu_element_welcome = "영" searchmenu_element_signin = "로그인" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "로그아웃" searchmenu_element_create_account = "계정 만들기" searchmenu_element_categories = "카테고리" searchmenu_element_searchsettings = "설정" diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 678f7780c..862f219f4 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Rollen Gewist" accountaccess_component_group_deleted = "groep Deleted" accountaccess_component_groups_deleted = "Groepen Verwijderd" accountaccess_component_userstatus_updated = "Gebruiker Status Bijgewerkt" -accountaccess_component_select_activityname = "Kies een activiteit" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "activiteit Toegevoegd" accountaccess_component_rolename_exists = "Rol naam bestaat" accountaccess_component_rolename_blank = "Rol Naam Blanco!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Crawl statistieken hebben al gepland om ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Welkom, %s" groupmenu_element_welcome = "Welkom" groupmenu_element_signin = "Aanmelden" -groupmenu_element_manage_account = "Account Beheren" -groupmenu_element_manage_groups = "Groepen Beheren" -groupmenu_element_signout = "Afmelden" groupmenu_element_create_account = "Account Aanmaken" groupmenu_element_page_places = "%s Pagina %s Groep Plaatsen" groupmenu_element_read_page = "%s Pagina %s Groep" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Naam" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Welkom, %s" searchmenu_element_welcome = "Welkom" searchmenu_element_signin = "Aanmelden" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Afmelden" searchmenu_element_create_account = "Account Aanmaken" searchmenu_element_categories = "Categorieën" searchmenu_element_searchsettings = "Instellingen" diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index e925826ac..d0fd82176 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Rola Usunięte" accountaccess_component_group_deleted = "Grupa Została Usunięta" accountaccess_component_groups_deleted = "Usunięte Grupy" accountaccess_component_userstatus_updated = "Status Użytkownika Jest Aktualizowany" -accountaccess_component_select_activityname = "Wybierz Akcję" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Aktywność Dodano" accountaccess_component_rolename_exists = "Nazwa Roli" accountaccess_component_rolename_blank = "Nazwa Roli Pusty!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Statystyki indeksowania już planuje by ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Witamy, %s" groupmenu_element_welcome = "Witamy" groupmenu_element_signin = "Zalogować się" -groupmenu_element_manage_account = "Zarządzanie Kontem" -groupmenu_element_manage_groups = "Zarządzanie Grupami" -groupmenu_element_signout = "Wyjście" groupmenu_element_create_account = "Utwórz Konto" groupmenu_element_page_places = "%s strona %s grupy" groupmenu_element_read_page = "%s strona %s grupie" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Nazwa" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Witamy, %s" searchmenu_element_welcome = "Witamy" searchmenu_element_signin = "Zalogować się" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Wyjście" searchmenu_element_create_account = "Utwórz Konto" searchmenu_element_categories = "Kategorie" searchmenu_element_searchsettings = "Parametry" diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index bb18210d1..e9c3a0f12 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Funções Excluí accountaccess_component_group_deleted = "Grupo De Excluídos" accountaccess_component_groups_deleted = "Grupos Excluídos" accountaccess_component_userstatus_updated = "Status Do Usuário Atualizada" -accountaccess_component_select_activityname = "Escolha A Atividade" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Atividade Adicionados" accountaccess_component_rolename_exists = "Nome Da Função Existe" accountaccess_component_rolename_blank = "Nome De Função Em Branco!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Rastreamento de estatísticas de j ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Bem-vindo, %s" groupmenu_element_welcome = "Bem-vindo" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "Gerenciar Conta" -groupmenu_element_manage_groups = "Gerir Grupos" -groupmenu_element_signout = "Terminar Sessão" groupmenu_element_create_account = "Criar Conta" groupmenu_element_page_places = "%s Página %s Grupo Lugares" groupmenu_element_read_page = "%s Página %s de Grupo" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Nome" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Bem-vindo, %s" searchmenu_element_welcome = "Bem-vindo" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Terminar Sessão" searchmenu_element_create_account = "Criar Conta" searchmenu_element_categories = "Categorias" searchmenu_element_searchsettings = "Definições" diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index e6603eec6..acd530790 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Роли Удален" accountaccess_component_group_deleted = "Группа Удалена" accountaccess_component_groups_deleted = "Удаленные Группы" accountaccess_component_userstatus_updated = "Статус Пользователя Обновляется" -accountaccess_component_select_activityname = "Выберите Действие" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Активность Добавлено" accountaccess_component_rolename_exists = "Название Роли" accountaccess_component_rolename_blank = "Имя Роли Пустой!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Статистика ползать уж ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Добро пожаловать, %s" groupmenu_element_welcome = "Добро пожаловать" groupmenu_element_signin = "Авторизоваться" -groupmenu_element_manage_account = "Управление Аккаунтом" -groupmenu_element_manage_groups = "Управление Группами" -groupmenu_element_signout = "Выход" groupmenu_element_create_account = "Создать Учетную Запись" groupmenu_element_page_places = "%s страница на %s группы" groupmenu_element_read_page = "%s страница в %s группе" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Название" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Добро пожаловать, %s" searchmenu_element_welcome = "Добро пожаловать" searchmenu_element_signin = "Авторизоваться" -searchmenu_element_admin = "Админ" -searchmenu_element_signout = "Выход" searchmenu_element_create_account = "Создать Учетную Запись" searchmenu_element_categories = "Категории" searchmenu_element_searchsettings = "Параметры" diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 6f43916be..15884d044 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "పాత్రలు Deleted" accountaccess_component_group_deleted = "గ్రూప్ తీసి వేయబడినది" accountaccess_component_groups_deleted = "సమూహాలు Deleted" accountaccess_component_userstatus_updated = "యూజర్ స్టేటస్ అప్డేట్ అయినది" -accountaccess_component_select_activityname = "యాక్టివిటి ఎంచుకోండి" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "యాక్టివిటి జోడించారు" accountaccess_component_rolename_exists = "రోల్ పేరు ఇదివరకే ఉన్నది" accountaccess_component_rolename_blank = "రోల్ పేరు ఖాళీగా వున్నది!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "క్రాల్ గణాంకాల ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "స్వాగతం, %s" groupmenu_element_welcome = "స్వాగతం" groupmenu_element_signin = "సైన్ఇన్" -groupmenu_element_manage_account = "ఖాతా నిర్వహించు" -groupmenu_element_manage_groups = "సమూహాలు నిర్వహించండి" -groupmenu_element_signout = "సైన్ అవుట్" groupmenu_element_create_account = "ఖాతా సృష్టించుకోండి" groupmenu_element_page_places = "%s పేజీ వద్ద %s గ్రూప్ ప్రదేశాలు" groupmenu_element_read_page = "%s పేజీ వద్ద %s గ్రూప్" @@ -1704,11 +1700,8 @@ scrapers_element_name = "పేరు" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "స్వాగతం, %s" searchmenu_element_welcome = "స్వాగతం" searchmenu_element_signin = "సైన్ఇన్" -searchmenu_element_admin = "అడ్మిన్" -searchmenu_element_signout = "సైన్ అవుట్" searchmenu_element_create_account = "ఖాతా సృష్టించుకోండి" searchmenu_element_categories = "కేటగిరీలు" searchmenu_element_searchsettings = "సెట్టింగులు" diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index dc9ffe3b6..f28cb072e 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "บทกลบออกไป" accountaccess_component_group_deleted = "กลุ่มกลบออกไป" accountaccess_component_groups_deleted = "กลุ่มกลบออกไป" accountaccess_component_userstatus_updated = "ของผู้ใช้สถานะปรับปรุง" -accountaccess_component_select_activityname = "เลือกกิจกรรม" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "เพิ่มกิจกรรม" accountaccess_component_rolename_exists = "บทบาทมีชื่อนี้อยู่แล้ว" accountaccess_component_rolename_blank = "บทชื่อว่างเปล่า!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "คลาสถิติไปแล้ ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "ยินดีต้อนรับทั้งหมด %s" groupmenu_element_welcome = "ยินดีต้อนรั" groupmenu_element_signin = "Signin" -groupmenu_element_manage_account = "จัดการบัญชีผู้ใช้" -groupmenu_element_manage_groups = "จัดการกลุ่ม" -groupmenu_element_signout = "เซ็นชื่ออกไป" groupmenu_element_create_account = "สร้างบัญชีผู้ใช้" groupmenu_element_page_places = "ทั้งหมด %s หน้าที่ %s องกลุ่มที่" groupmenu_element_read_page = "ทั้งหมด %s หน้าที่ %s องกลุ่ม" @@ -1704,11 +1700,8 @@ scrapers_element_name = "ชื่อ" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "ยินดีต้อนรับทั้งหมด %s" searchmenu_element_welcome = "ยินดีต้อนรั" searchmenu_element_signin = "Signin" -searchmenu_element_admin = "แอดมิ" -searchmenu_element_signout = "เซ็นชื่ออกไป" searchmenu_element_create_account = "สร้างบัญชีผู้ใช้" searchmenu_element_categories = "หมวดหมู่" searchmenu_element_searchsettings = "การตั้งค่า" diff --git a/src/locale/tl/configure.ini b/src/locale/tl/configure.ini index 7325d97cd..d1f3cac6e 100644 --- a/src/locale/tl/configure.ini +++ b/src/locale/tl/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Tungkulin Tinanggal" accountaccess_component_group_deleted = "Grupo Tinanggal" accountaccess_component_groups_deleted = "Grupo Tinanggal" accountaccess_component_userstatus_updated = "User-Update Ng Katayuan" -accountaccess_component_select_activityname = "Pumili Ng Mga Aktibidad" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Aktibidad Idinagdag" accountaccess_component_rolename_exists = "Pangalan Ng Tungkulin Umiiral" accountaccess_component_rolename_blank = "Pangalan Ng Tungkulin Blangko!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "I-Crawl ang mga istatistika ay nai-isked ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Maligayang pagdating, %s" groupmenu_element_welcome = "Maligayang pagdating" groupmenu_element_signin = "Pag-Signin" -groupmenu_element_manage_account = "Pamahalaan Ang Mga Account" -groupmenu_element_manage_groups = "Pamahalaan Ang Mga Pangkat" -groupmenu_element_signout = "Mag-Sign Out" groupmenu_element_create_account = "Lumikha Ng Account" groupmenu_element_page_places = "%s Pahina sa %s Grupo na Lugar" groupmenu_element_read_page = "%s Pahina sa %s Grupo" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Pangalan" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Maligayang pagdating, %s" searchmenu_element_welcome = "Maligayang pagdating" searchmenu_element_signin = "Pag-Signin" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Mag-Sign Out" searchmenu_element_create_account = "Lumikha Ng Account" searchmenu_element_categories = "Mga kategorya" searchmenu_element_searchsettings = "Mga setting" diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index 4612a4ebf..9ab9dfcc4 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Roller Silinmiş" accountaccess_component_group_deleted = "Grup Silinmiş" accountaccess_component_groups_deleted = "Gruplar Silinmiş" accountaccess_component_userstatus_updated = "Kullanıcı Durum Güncellendi" -accountaccess_component_select_activityname = "Seçin Faaliyet" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Etkinlik Ekledi" accountaccess_component_rolename_exists = "Rol Adı Var" accountaccess_component_rolename_blank = "Rol Adı Boş!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Gezinme istatistikleri zaten bir dahaki ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Hoş geldiniz, %s" groupmenu_element_welcome = "Hoşgeldiniz" groupmenu_element_signin = "İmzalıyorum" -groupmenu_element_manage_account = "Hesabı Yönet " -groupmenu_element_manage_groups = "Grupları Yönet" -groupmenu_element_signout = "Oturumu" groupmenu_element_create_account = "Hesap Oluştur " groupmenu_element_page_places = "%s Grup %s Sayfaya Yerleştirir" groupmenu_element_read_page = "%s Grup %s Sayfa " @@ -1704,11 +1700,8 @@ scrapers_element_name = "Adı" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Hoş geldiniz, %s" searchmenu_element_welcome = "Hoşgeldiniz" searchmenu_element_signin = "İmzalıyorum" -searchmenu_element_admin = "Admin" -searchmenu_element_signout = "Oturumu" searchmenu_element_create_account = "Hesap Oluştur " searchmenu_element_categories = "Kategori" searchmenu_element_searchsettings = "Ayarları" diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index 344ee5ac9..a072d822b 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "Vai Trò Xóa" accountaccess_component_group_deleted = "Nhóm Xóa" accountaccess_component_groups_deleted = "Nhóm Xóa" accountaccess_component_userstatus_updated = "Dùng Tình Trạng Cập Nhật" -accountaccess_component_select_activityname = "Lựa chọn họat động" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "Bổ sung tên hoạt động " accountaccess_component_rolename_exists = "Chức vụ đã đựơc dùng" accountaccess_component_rolename_blank = "Tên Vai Trò Trống!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "Thu thập thông tin số liệu thốn ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "Chào mừng, %s" groupmenu_element_welcome = "Chào mừng" groupmenu_element_signin = "Đăng nhập" -groupmenu_element_manage_account = "Quản Lý Tài Khoản" -groupmenu_element_manage_groups = "Quản Lý Các Nhóm" -groupmenu_element_signout = "Đừng Ra" groupmenu_element_create_account = "Tạo Tài Khoản" groupmenu_element_page_places = "%s Trang tại %s Nhóm Nơi" groupmenu_element_read_page = "%s Trang tại %s Nhóm" @@ -1704,11 +1700,8 @@ scrapers_element_name = "Tên" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "Chào mừng, %s" searchmenu_element_welcome = "Chào mừng" searchmenu_element_signin = "Đăng nhập" -searchmenu_element_admin = "Quản trị" -searchmenu_element_signout = "Đừng Ra" searchmenu_element_create_account = "Tạo Tài Khoản" searchmenu_element_categories = "Loại" searchmenu_element_searchsettings = "Cài đặt" diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index 1875be9a8..5c309eafd 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -543,7 +543,7 @@ accountaccess_component_rolenames_deleted = "角色删除" accountaccess_component_group_deleted = "小组已删除" accountaccess_component_groups_deleted = "组已删除" accountaccess_component_userstatus_updated = "用户状况更新" -accountaccess_component_select_activityname = "選擇活動名稱" +accountaccess_component_add_roleactivity = "" accountaccess_component_activity_added = "活動名稱已加入" accountaccess_component_rolename_exists = "此暱稱已存在" accountaccess_component_rolename_blank = "角色名称是空白的!" @@ -1414,12 +1414,8 @@ statistics_element_already_scheduled = "爬统计已计划于计算下一次Medi ; ; GroupmenuElement.php groupmenu_element_admin_menu = "" -groupmenu_element_welcome_user = "欢迎，%s" groupmenu_element_welcome = "欢迎光临" groupmenu_element_signin = "签到" -groupmenu_element_manage_account = "管理帐户" -groupmenu_element_manage_groups = "管理集团" -groupmenu_element_signout = "登出" groupmenu_element_create_account = "创建的帐户" groupmenu_element_page_places = "%s页至%s团的地方" groupmenu_element_read_page = "%s页至%s组" @@ -1704,11 +1700,8 @@ scrapers_element_name = "名称" ; ; SearchmenuElement.php searchmenu_element_admin_menu = "" -searchmenu_element_welcome_user = "欢迎，%s" searchmenu_element_welcome = "欢迎光临" searchmenu_element_signin = "签到" -searchmenu_element_admin = "管理员" -searchmenu_element_signout = "登出" searchmenu_element_create_account = "创建的帐户" searchmenu_element_categories = "类别" searchmenu_element_searchsettings = "设置" diff --git a/src/views/elements/ManagegroupsElement.php b/src/views/elements/ManagegroupsElement.php index 1666c038b..692a23a79 100755 --- a/src/views/elements/ManagegroupsElement.php +++ b/src/views/elements/ManagegroupsElement.php @@ -57,9 +57,11 @@ class ManagegroupsElement extends Element <div class="current-activity" > <?php $context = ""; + $arg_context = ""; if ($data['FORM_TYPE'] == 'search' || !empty($data['context']) && $data['context'] == 'search') { $context = 'context=search&'; + $arg_context = "&arg=search"; } $group_url = $admin_url . $token_string ; $base_url = $group_url . "&{$context}a=manageGroups"; @@ -87,6 +89,44 @@ class ManagegroupsElement extends Element || (!empty($data['browse']) && $data['browse'] == 'true')) { $data['DISABLE_ADD_TOGGLE'] = true; } + if ($data['FORM_TYPE'] != 'addgroup' && + $data['FORM_TYPE'] != 'search') { + ?> + <div class="float-opposite">[<a href="<?=$base_url . + $arg_context?>">X</a>]</div> + <?php + switch ($data['FORM_TYPE']) { + case "changeowner": + $this->renderChangeOwnerForm($data); + break; + case "inviteusers": + $this->renderInviteUsersForm($data); + break; + case "statistics": + if (!C\GROUP_ANALYTICS_MODE || + C\GROUP_ANALYTICS_MODE == "0") { + break; + } + $this->renderGroupStatistics($data); + if ($_SERVER["MOBILE"]) { ?> + <div class="clear"> </div><?php + } + break; + case "graphstats": + if (!C\GROUP_ANALYTICS_MODE || + C\GROUP_ANALYTICS_MODE == "0") { + break; + } + $this->renderGraphStats($data); + if ($_SERVER["MOBILE"]) { ?> + <div class="clear"> </div><?php + } + break; + default: + $this->renderGroupsForm($data); + } + return; + } ?> <table class="admin-table"> <tr><td class="no-border" colspan="<?= @@ -174,15 +214,8 @@ class ManagegroupsElement extends Element $group['STATUS'] != C\ACTIVE_STATUS) { continue; } - $td_style = (in_array($data['FORM_TYPE'], ['editgroup', - 'changeowner', 'graphstats', 'inviteusers', - 'statistics']) && ($data['FORM_TYPE'] != - 'editgroup' || $col_name != 'owner') && - $data['CURRENT_GROUP']['name'] == $group['GROUP_NAME'])? - " class='admin-edit-row' " : - ""; if (in_array($col_name, $dropdown_columns)) { - ?><td <?=$td_style?> > + ?><td> <?php $choice_array = $choice_arrays[$col_name][0]; $arg_name = $choice_arrays[$col_name][1]; @@ -236,12 +269,6 @@ class ManagegroupsElement extends Element </td> <?php } else if ($col_name == 'OWNER') { - if (in_array($data['FORM_TYPE'], ['changeowner', - 'graphstats', 'statistics']) && - $data['CURRENT_GROUP']['name'] == - $group['GROUP_NAME']) { - $td_style = " class='admin-edit-row-field' "; - } if ($group['GROUP_ID'] != C\PUBLIC_GROUP_ID && (($is_root && empty($data['browse'])) || $group["OWNER_ID"] == $_SESSION['USER_ID'])) { @@ -250,12 +277,12 @@ class ManagegroupsElement extends Element $group['GROUP_NAME']) ? $base_url : $transfer_url . "group_id=" . $group['GROUP_ID']; - e("<td $td_style><b><a href='" . $out_url. + e("<td><b><a href='" . $out_url. "'>$group_column". "</a></b><br />[". tl('managegroups_element_num_users', $group['NUM_MEMBERS'])."]"); } else { - e("<td $td_style><b>$group_column</b><br />[". + e("<td><b>$group_column</b><br />[". tl('managegroups_element_num_users', $group['NUM_MEMBERS'])."]"); } @@ -269,7 +296,10 @@ class ManagegroupsElement extends Element $group['GROUP_NAME']) ? $base_url : $statistics_url . 'group_id='. $group['GROUP_ID'] . '&user_id=' . - $_SESSION['USER_ID'] + $_SESSION['USER_ID']; + if (!empty($data['context'])) { + $out_url .= "&context=" . $data['context']; + } ?><br />[<a href="<?=$out_url ?>"><?= tl('managegroups_element_statistics') ?></a>]<?php @@ -282,7 +312,7 @@ class ManagegroupsElement extends Element ($group['MEMBER_ACCESS'] != C\GROUP_PRIVATE || $group["OWNER_ID"] == $_SESSION['USER_ID'] || $is_root)){ - e("<td $td_style><a href='". + e("<td><a href='". htmlentities(B\feedsUrl("group", $group['GROUP_ID'], true)) . $token_string . "' >". $group_column . "</a> [<a href=\"" @@ -292,20 +322,20 @@ class ManagegroupsElement extends Element . (tl('managegroups_element_group_wiki')) . "</a>]</td>"); } else { - e("<td $td_style>$group_column</td>"); + e("<td>$group_column</td>"); } } if ($group['OWNER_ID'] != $_SESSION['USER_ID'] || $group['GROUP_NAME'] == 'Public') { if (isset($group['STATUS']) && $group['STATUS'] == C\INVITED_STATUS) { - ?><td <?=$td_style?>><a href="<?= $join_url . + ?><td><a href="<?= $join_url . 'group_id=' . $group['GROUP_ID'].'&user_id=' . $_SESSION['USER_ID'] ?>"><?= tl('managegroups_element_join') ?></a></td><?php } else { - e("<td $td_style><span class='gray'>". + e("<td><span class='gray'>". tl('managegroups_element_edit').'</span></td>'); } } else if (!in_array($data['FORM_TYPE'], ['editgroup', @@ -313,7 +343,7 @@ class ManagegroupsElement extends Element $data['CURRENT_GROUP']['name'] != $group['GROUP_NAME']) { ?> - <td <?=$td_style?>><a href="<?= $edit_url . 'group_id='. + <td><a href="<?= $edit_url . 'group_id='. $group['GROUP_ID'] ?>"><?= tl('managegroups_element_edit') ?></a></td><?php } else { ?> @@ -321,91 +351,54 @@ class ManagegroupsElement extends Element <a href="<?= $base_url; ?>"><b><?= tl('managegroups_element_edit') ?></b></a></td><?php }?> - <td <?=$td_style?>><?php - if ($group['GROUP_NAME'] == 'Public') { + <td><?php + if ($group['GROUP_NAME'] == 'Public') { + e('<span class="gray">'. + tl('managegroups_element_delete').'</span>'); + } else if (isset($data['browse']) && + $data['browse'] == 'true') { + if ( $group['REGISTER_TYPE'] == C\NO_JOIN && + $_SESSION['USER_ID'] != C\ROOT_ID) { e('<span class="gray">'. - tl('managegroups_element_delete').'</span>'); - } else if (isset($data['browse']) && - $data['browse'] == 'true') { - if ( $group['REGISTER_TYPE'] == C\NO_JOIN && - $_SESSION['USER_ID'] != C\ROOT_ID) { - e('<span class="gray">'. - tl('managegroups_element_join') . '</span>'); + tl('managegroups_element_join') . '</span>'); + } else { + $has_fee = ($group['REGISTER_TYPE'] >= + C\LOW_JOIN_FEE); + $confirm = ($has_fee) ? ' onclick="javascript:'. + 'return confirm(\''. + tl('managegroups_element_fee_warning', + $group['REGISTER_TYPE']).'\')" ' + : ""; + ?><a <?=$confirm ?> href="<?= $add_url . 'name='. + urlencode($group['GROUP_NAME']).'&user_id='. + $_SESSION['USER_ID'] ?>"><?= + tl('managegroups_element_join') + ?></a><?php + if ($has_fee) { + e('<br /><span class="gray">'. + tl('managegroups_element_num_credits', + $group['REGISTER_TYPE']) . '</span>'); + } + } + } else if ($_SESSION['USER_ID']!=$group['OWNER_ID']) {?> + <a href="<?= $unsubscribe_url . 'group_id='. + $group['GROUP_ID'].'&user_id=' . + $_SESSION['USER_ID'] ?>"><?php + if (isset($group['STATUS']) && + $group['STATUS'] == C\INVITED_STATUS) { + e(tl('managegroups_element_decline')); } else { - $has_fee = ($group['REGISTER_TYPE'] >= - C\LOW_JOIN_FEE); - $confirm = ($has_fee) ? ' onclick="javascript:'. - 'return confirm(\''. - tl('managegroups_element_fee_warning', - $group['REGISTER_TYPE']).'\')" ' - : ""; - ?><a <?=$confirm ?> href="<?= $add_url . 'name='. - urlencode($group['GROUP_NAME']).'&user_id='. - $_SESSION['USER_ID'] ?>"><?= - tl('managegroups_element_join') - ?></a><?php - if ($has_fee) { - e('<br /><span class="gray">'. - tl('managegroups_element_num_credits', - $group['REGISTER_TYPE']) . '</span>'); - } + e(tl('managegroups_element_unsubscribe')); } - } else if ($_SESSION['USER_ID']!=$group['OWNER_ID']) {?> - <a href="<?= $unsubscribe_url . 'group_id='. - $group['GROUP_ID'].'&user_id=' . - $_SESSION['USER_ID'] ?>"><?php - if (isset($group['STATUS']) && - $group['STATUS'] == C\INVITED_STATUS) { - e(tl('managegroups_element_decline')); - } else { - e(tl('managegroups_element_unsubscribe')); - } - ?></a></td><?php - } else {?> - <a onclick='javascript:return confirm("<?= - tl('managegroups_element_delete_operation') ?>");' - href="<?= $delete_url . 'group_id='. - $group['GROUP_ID'] ?>"><?= - tl('managegroups_element_delete')?></a><?php - }?></td> + ?></a></td><?php + } else {?> + <a onclick='javascript:return confirm("<?= + tl('managegroups_element_delete_operation') ?>");' + href="<?= $delete_url . 'group_id='. + $group['GROUP_ID'] ?>"><?= + tl('managegroups_element_delete')?></a><?php + }?></td> </tr><?php - if ($data['FORM_TYPE'] != 'addgroup' && - $data['FORM_TYPE'] != 'search' && - $data['CURRENT_GROUP']['name'] == $group['GROUP_NAME']) { - ?><tr><td colspan='<?=$num_columns; ?>' - class='admin-edit-form'><?php - switch ($data['FORM_TYPE']) { - case "changeowner": - $this->renderChangeOwnerForm($data); - break; - case "inviteusers": - $this->renderInviteUsersForm($data); - break; - case "statistics": - if (!C\GROUP_ANALYTICS_MODE || - C\GROUP_ANALYTICS_MODE == "0") { - break; - } - $this->renderGroupStatistics($data); - if ($_SERVER["MOBILE"]) { ?> - <div class="clear"> </div><?php - } - break; - case "graphstats": - if (!C\GROUP_ANALYTICS_MODE || - C\GROUP_ANALYTICS_MODE == "0") { - break; - } - $this->renderGraphStats($data); - if ($_SERVER["MOBILE"]) { ?> - <div class="clear"> </div><?php - } - break; - default: - $this->renderGroupsForm($data); - } ?> - </td></tr><?php - } } ?> </table> diff --git a/src/views/elements/ManagelocalesElement.php b/src/views/elements/ManagelocalesElement.php index 3f64d90d0..0f11b4384 100644 --- a/src/views/elements/ManagelocalesElement.php +++ b/src/views/elements/ManagelocalesElement.php @@ -53,9 +53,11 @@ class ManagelocalesElement extends Element { $admin_url = htmlentities(B\controllerUrl('admin', true)); $context = ""; + $arg_context = ""; if ($data['FORM_TYPE'] == 'search' || !empty($data['context']) && $data['context'] == 'search') { $context = 'context=search&'; + $arg_context= "&arg=search"; } ?> <div class="current-activity"> @@ -68,6 +70,15 @@ class ManagelocalesElement extends Element if (in_array($data['FORM_TYPE'], ['search'])) { $data['DISABLE_ADD_TOGGLE'] = true; } + $base_url = $admin_url . 'a=manageLocales&'. $context . + C\CSRF_TOKEN . "=". $data[C\CSRF_TOKEN]; + if ($data['FORM_TYPE'] == 'editlocale') { ?> + <div class="float-opposite">[<a href="<?=$base_url . + $arg_context?>">X</a>]</div> + <?php + $this->renderLocaleForm($data); + return; + } ?> <table class="admin-table"> <tr><td class="no-border" colspan="<?= @@ -97,68 +108,40 @@ class ManagelocalesElement extends Element <th colspan="2"><?= tl('managelocales_element_actions') ?></th> </tr> <?php - $base_url = $admin_url . 'a=manageLocales&'. $context . - C\CSRF_TOKEN . "=". $data[C\CSRF_TOKEN]; if (isset($data['START_ROW'])) { $base_url .= "&start_row=".$data['START_ROW']. "&end_row=".$data['END_ROW']. "&num_show=".$data['NUM_SHOW']; } foreach ($data['LOCALES'] as $locale) { - $td_style = ($data['FORM_TYPE'] == 'editlocale' && - $data['CURRENT_LOCALE']['localename'] == - $locale['LOCALE_NAME']) ? " class='admin-edit-row' " : ""; - $align_style = (empty($td_style)) ? " class='align-right' " : - " class='admin-edit-row align-right' "; + $align_style = " class='align-right' " ?> - <tr><td <?=$td_style ?>><a href='<?=$base_url . + <tr><td><a href='<?=$base_url . "&arg=editstrings&selectlocale=".$locale['LOCALE_TAG'] ?>' ><?= $locale['LOCALE_NAME']?></a></td><?php if (!$_SERVER["MOBILE"]) { ?> - <td <?=$td_style?>><?=$locale['LOCALE_TAG']?></td> - <td <?=$td_style?>><?=$locale['WRITING_MODE']?></td><?php - if (empty($td_style)) { - $gr_class = ($locale['ACTIVE']) ? " class='green' " : - " class='red' "; - } else { - $gr_class = ($locale['ACTIVE']) ? - " class='admin-edit-row green' " : - " class='admin-edit-row red' "; - } + <td><?=$locale['LOCALE_TAG']?></td> + <td><?=$locale['WRITING_MODE']?></td><?php + $gr_class = ($locale['ACTIVE']) ? " class='green' " : + " class='red' "; ?> <td <?=$gr_class?> ><?= ($locale['ACTIVE'] ? tl('managelocales_element_true') : tl('managelocales_element_false'))?></td><?php } ?> <td <?=$align_style ?>><?= - $locale['PERCENT_WITH_STRINGS']?></td><?php - if ($data['FORM_TYPE'] != 'editlocale' || - $data['CURRENT_LOCALE']['localename'] != - $locale['LOCALE_NAME']) { ?> - <td <?=$td_style?>><a href='<?=$base_url . - "&arg=editlocale&selectlocale=". - $locale['LOCALE_TAG']?>' ><?= - tl('managelocales_element_edit')?></a></td><?php - } else { ?> - <td class='admin-edit-row-field'> - <a href="<?= $base_url; ?>"><b><?= - tl('managelocales_element_edit') ?></b></a></td><?php - } ?> - <td <?=$td_style?>><a href='<?=$base_url + $locale['PERCENT_WITH_STRINGS']?></td> + <td><a href='<?=$base_url . + "&arg=editlocale&selectlocale=". + $locale['LOCALE_TAG']?>' ><?= + tl('managelocales_element_edit')?></a></td> + <td><a href='<?=$base_url ."&arg=deletelocale&selectlocale=". $locale['LOCALE_TAG']?>' onclick='javascript:return confirm("<?= tl('managelocales_confirm_delete')?>");' ><?= tl('managelocales_element_delete')?></a></td> </tr><?php - if ($data['FORM_TYPE'] == 'editlocale' && - $data['CURRENT_LOCALE']['localename'] == - $locale['LOCALE_NAME']) { - ?><tr><td colspan='<?=$num_columns; ?>' - class='admin-edit-form'><?php - $this->renderLocaleForm($data); ?> - </td></tr><?php - } } ?> </table> </div> @@ -216,6 +199,11 @@ class ManagelocalesElement extends Element <td><input type="text" id="locale-tag" name="localetag" maxlength="<?= C\NAME_LEN ?>" value="<?= $data['CURRENT_LOCALE']['localetag'] ?>" + <?php + if ($editlocale) { + e(' disabled="disabled" '); + } + ?> class="narrow-field"/></td> </tr> <tr><th><?=tl('managelocales_element_writingmodelabel')?></th> diff --git a/src/views/elements/ManagerolesElement.php b/src/views/elements/ManagerolesElement.php index cedc33621..bea8b7002 100644 --- a/src/views/elements/ManagerolesElement.php +++ b/src/views/elements/ManagerolesElement.php @@ -68,7 +68,23 @@ class ManagerolesElement extends Element if (in_array($data['FORM_TYPE'], ['editrole', 'search'])) { $data['DISABLE_ADD_TOGGLE'] = true; } - ?> + $admin_url = htmlentities(B\controllerUrl('admin', true)); + $base_url = $admin_url . C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN]. + "&a=manageRoles"; + $context = ""; + $arg_context = ""; + if ($data['FORM_TYPE'] == 'search' || + !empty($data['context']) && $data['context'] == 'search') { + $context = 'context=search&'; + $arg_context = "&arg=search"; + } + if ($data['FORM_TYPE'] == 'editrole') {?> + <div class="float-opposite">[<a href="<?=$base_url . + $arg_context?>">X</a>]</div> + <?php + $this->renderRoleForm($data); + return; + }?> <table class="admin-table"> <tr><td class="no-border" colspan="3"><?=$this->view->helper( "pagingtable")->render($data); ?><?php @@ -86,48 +102,27 @@ class ManagerolesElement extends Element <th><?= tl('manageroles_element_rolename')?></th> <th colspan='2'><?= tl('manageroles_element_actions') ?></th> </tr><?php - $admin_url = htmlentities(B\controllerUrl('admin', true)); - $base_url = $admin_url . C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN]. - "&a=manageRoles"; if (isset($data['START_ROW'])) { $base_url .= "&start_row=".$data['START_ROW']. "&end_row=".$data['END_ROW']. "&num_show=".$data['NUM_SHOW']; } - $context = ""; - if ($data['FORM_TYPE'] == 'search' || - !empty($data['context']) && $data['context'] == 'search') { - $context = 'context=search&'; - } $delete_url = $base_url . "&arg=deleterole&$context"; $edit_url = $base_url . "&arg=editrole&$context"; $stretch = ($_SERVER["MOBILE"]) ? 1 :2; foreach ($data['ROLES'] as $role) {?> <tr><?php - $td_style = ($data['FORM_TYPE'] == 'editrole' && - $data['CURRENT_ROLE']['name'] == - $role['NAME']) ? - " class='admin-edit-row' " : - ""; foreach ($role as $colname => $role_column) { if (strlen($role_column) > $stretch * C\NAME_TRUNCATE_LEN) { $role_column = wordwrap($role_column, $stretch * C\NAME_TRUNCATE_LEN, "\n", true); } - e("<td $td_style>$role_column</td>"); - } - if ($data['CURRENT_ROLE']['name'] != $role['NAME']) { - ?> - <td><a href="<?php e($edit_url . 'name='. - urlencode($role['NAME'])); ?>"><?= - tl('manageroles_element_edit') ?></a></td><?php - } else { ?> - <td class='admin-edit-row-field'> - <a href="<?= $base_url; ?>"><b><?= - tl('manageroles_element_edit') ?></b></a></td><?php - } - ?> - <td <?=$td_style?> ><?php + e("<td>$role_column</td>"); + }?> + <td><a href="<?php e($edit_url . 'name='. + urlencode($role['NAME'])); ?>"><?= + tl('manageroles_element_edit') ?></a></td> + <td><?php if (in_array($role['NAME'], ['Admin', 'User', 'Bot User', 'Business User'])) { e('<span class="gray">'. @@ -141,15 +136,7 @@ class ManagerolesElement extends Element e(tl('manageroles_element_delete')."</a>"); }?></td> </tr><?php - if ($data['FORM_TYPE'] == 'editrole' && - $data['CURRENT_ROLE']['name'] == $role['NAME']) { - ?><tr><td colspan='3' - class='admin-edit-form'><?php - $this->renderRoleForm($data); ?> - </td></tr><?php - } - } - ?> + }?> </table> <?php if ($_SERVER["MOBILE"]) { ?> <div class="clear"> </div> @@ -248,15 +235,12 @@ class ManagerolesElement extends Element $this->view->helper("options")->render( "add-roleactivity", "selectactivity", $data['AVAILABLE_ACTIVITIES'], - $data['SELECT_ACTIVITY']); + $data['SELECT_ACTIVITY'], true);?><?php } ?> </div> </td></tr><?php } ?> - <tr><td></td><td class="center"><button class="button-box" <?php - if ($data['FORM_TYPE'] == 'editrole') {?> - id='focus-button' <?php - } ?> + <tr><td></td><td class="center"><button class="button-box" type="submit"><?= tl('manageroles_element_save') ?></button></td> </tr> </table> diff --git a/src/views/elements/ManageusersElement.php b/src/views/elements/ManageusersElement.php index 11581ac34..573809eef 100644 --- a/src/views/elements/ManageusersElement.php +++ b/src/views/elements/ManageusersElement.php @@ -78,6 +78,27 @@ class ManageusersElement extends Element if (in_array($data['FORM_TYPE'], ['edituser', 'search'])) { $data['DISABLE_ADD_TOGGLE'] = true; } + $base_url = htmlentities(B\controllerUrl('admin', true)) . + C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN] . "&a=manageUsers"; + if (isset($data['START_ROW'])) { + $base_url .= "&start_row=".$data['START_ROW']. + "&end_row=".$data['END_ROW']. + "&num_show=".$data['NUM_SHOW']; + } + $context = ""; + $arg_context= ""; + if ($data['FORM_TYPE'] == 'search' || + !empty($data['context']) && $data['context'] == 'search') { + $context = 'context=search'; + $arg_context= "&arg=search"; + } + if ($data['FORM_TYPE'] == 'edituser') {?> + <div class="float-opposite">[<a href="<?=$base_url . + $arg_context?>">X</a>]</div> + <?php + $this->renderUserForm($data); + return; + } ?> <table class="admin-table"> <tr><td class="no-border" colspan="<?= @@ -104,18 +125,6 @@ class ManageusersElement extends Element <th><?= tl('manageusers_element_status') ?></th> <th colspan='2'><?= tl('manageusers_element_actions') ?></th> </tr><?php - $base_url = htmlentities(B\controllerUrl('admin', true)) . - C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN] . "&a=manageUsers"; - if (isset($data['START_ROW'])) { - $base_url .= "&start_row=".$data['START_ROW']. - "&end_row=".$data['END_ROW']. - "&num_show=".$data['NUM_SHOW']; - } - $context = ""; - if ($data['FORM_TYPE'] == 'search' || - !empty($data['context']) && $data['context'] == 'search') { - $context = 'context=search'; - } $delete_url = $base_url . "&arg=deleteuser&$context"; $edit_url = $base_url . "&arg=edituser&$context"; $mobile_columns = ['USER_NAME', 'STATUS']; @@ -130,13 +139,8 @@ class ManageusersElement extends Element !in_array($colname, $mobile_columns))) { continue; } - $td_style = ($data['FORM_TYPE'] == 'edituser' && - $data['CURRENT_USER']['user_name'] == - $user['USER_NAME']) ? - " class='admin-edit-row' " : - ""; if (strcmp($colname, "STATUS") == 0) { - ?><td <?=$td_style?>> + ?><td> <?php if (in_array($user['USER_ID'], $default_accounts)) { e("<span class='gray'> ". @@ -171,25 +175,19 @@ class ManageusersElement extends Element </td> <?php } else { - echo "<td $td_style>$user_column</td>"; + echo "<td>$user_column</td>"; } } if ($user['USER_ID'] == C\PUBLIC_USER_ID) { - e("<td $td_style><span class='gray'>". + e("<td><span class='gray'>". tl('manageusers_element_edit').'</span></td>'); - } else if ($data['FORM_TYPE'] != 'edituser' || - $data['CURRENT_USER']['user_name'] != - $user['USER_NAME']) { + } else { ?> <td><a href="<?php e($edit_url . '&user_name=' . $user['USER_NAME']); ?>"><?= tl('manageusers_element_edit') ?></a></td><?php - } else { ?> - <td class='admin-edit-row-field' > - <a href="<?= $base_url; ?>"><b><?= - tl('manageusers_element_edit') ?></b></a></td><?php - } ?> - <td <?=$td_style?> ><?php + }?> + <td><?php if (in_array($user['USER_ID'], $default_accounts)) { e('<span class="gray">'. tl('manageusers_element_delete').'</span>'); @@ -203,13 +201,6 @@ class ManageusersElement extends Element </a><?php }?></td> </tr><?php - if ($data['FORM_TYPE'] == 'edituser' && - $data['CURRENT_USER']['user_name'] == $user['USER_NAME']) { - ?><tr><td colspan='<?=$num_columns; ?>' - class='admin-edit-form'><?php - $this->renderUserForm($data); ?> - </td></tr><?php - } } ?> </table> </div><?php