From 5c2b7ffac0653a9d28c0197592381030e24907be Mon Sep 17 00:00:00 2001 From: Ivan Bochkarev Date: Thu, 26 Feb 2026 22:25:41 +0600 Subject: [PATCH] refactor(manager): remove main_nav_parent and user_nav_parent system settings Use fixed menu container names (topnav, usernav) in header controller. Remove settings from transport and all setting lexicons; add 3.3.0-pl upgrade script to delete existing DB records. Reduces confusion and matches menu configuration in Menu section. Resolves #15972 --- .../data/transport.core.system_settings.php | 18 ---------- core/lexicon/ar/setting.inc.php | 4 --- core/lexicon/az/setting.inc.php | 4 --- core/lexicon/be/setting.inc.php | 4 --- core/lexicon/bg/setting.inc.php | 4 --- core/lexicon/cs/setting.inc.php | 4 --- core/lexicon/da/setting.inc.php | 4 --- core/lexicon/de/setting.inc.php | 4 --- core/lexicon/el/setting.inc.php | 4 --- core/lexicon/en/setting.inc.php | 4 --- core/lexicon/es/setting.inc.php | 4 --- core/lexicon/et/setting.inc.php | 4 --- core/lexicon/fa/setting.inc.php | 4 --- core/lexicon/fi/setting.inc.php | 4 --- core/lexicon/fr/setting.inc.php | 4 --- core/lexicon/he/setting.inc.php | 4 --- core/lexicon/hi/setting.inc.php | 4 --- core/lexicon/hu/setting.inc.php | 4 --- core/lexicon/id/setting.inc.php | 4 --- core/lexicon/it/setting.inc.php | 4 --- core/lexicon/ja/setting.inc.php | 4 --- core/lexicon/nl/setting.inc.php | 4 --- core/lexicon/pl/setting.inc.php | 4 --- core/lexicon/pt/setting.inc.php | 4 --- core/lexicon/ro/setting.inc.php | 4 --- core/lexicon/ru/setting.inc.php | 4 --- core/lexicon/sl/setting.inc.php | 4 --- core/lexicon/sv/setting.inc.php | 4 --- core/lexicon/th/setting.inc.php | 4 --- core/lexicon/tr/setting.inc.php | 4 --- core/lexicon/uk/setting.inc.php | 4 --- core/lexicon/yo/setting.inc.php | 4 --- core/lexicon/zh/setting.inc.php | 4 --- manager/controllers/default/header.php | 4 +-- .../3.3.0-remove-nav-parent-settings.php | 36 +++++++++++++++++++ setup/includes/upgrades/mysql/3.3.0-pl.php | 10 ++++++ 36 files changed, 48 insertions(+), 148 deletions(-) create mode 100644 setup/includes/upgrades/common/3.3.0-remove-nav-parent-settings.php create mode 100644 setup/includes/upgrades/mysql/3.3.0-pl.php diff --git a/_build/data/transport.core.system_settings.php b/_build/data/transport.core.system_settings.php index 0d3fe29fc27..640c00ee27f 100644 --- a/_build/data/transport.core.system_settings.php +++ b/_build/data/transport.core.system_settings.php @@ -2068,24 +2068,6 @@ 'area' => 'manager', 'editedon' => null, ], '', true, true); -$settings['main_nav_parent'] = $xpdo->newObject(modSystemSetting::class); -$settings['main_nav_parent']->fromArray([ - 'key' => 'main_nav_parent', - 'value' => 'topnav', - 'xtype' => 'textfield', - 'namespace' => 'core', - 'area' => 'manager', - 'editedon' => null, -], '', true, true); -$settings['user_nav_parent'] = $xpdo->newObject(modSystemSetting::class); -$settings['user_nav_parent']->fromArray([ - 'key' => 'user_nav_parent', - 'value' => 'usernav', - 'xtype' => 'textfield', - 'namespace' => 'core', - 'area' => 'manager', - 'editedon' => null, -], '', true, true); $settings['auto_isfolder'] = $xpdo->newObject(modSystemSetting::class); $settings['auto_isfolder']->fromArray([ 'key' => 'auto_isfolder', diff --git a/core/lexicon/ar/setting.inc.php b/core/lexicon/ar/setting.inc.php index 38385a99740..0d6442bf0c2 100644 --- a/core/lexicon/ar/setting.inc.php +++ b/core/lexicon/ar/setting.inc.php @@ -434,8 +434,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'أصل القائمة الرئيسية'; -$_lang['setting_main_nav_parent_desc'] = 'الحاوية مستخدمة لسحب كافة السجلات للقائمة الرئيسية.'; $_lang['setting_manager_direction'] = 'اتجاه النص للمدير'; $_lang['setting_manager_direction_desc'] = 'اختر الاتجاه الذي سيتم إعادة رسم النص به في المدير، اليسار إلى اليمين أو اليمين إلى اليسار.'; @@ -801,8 +799,6 @@ $_lang['setting_use_weblink_target'] = 'استخدم هدف رابط الوب'; $_lang['setting_use_weblink_target_desc'] = 'اضبط إلى صحيح إذا كنت تريد أن تحصل على وسوم رابط مودكس وأن تقوم makeUrl() بتوليد روابط كـ URL هدف لروابط الوب. وإلا، سيتم توليد URL مودكس الداخلي بواسطة وسوم رابط والطريقة makeUrl().'; -$_lang['setting_user_nav_parent'] = 'أصل قائمة المستخدم'; -$_lang['setting_user_nav_parent_desc'] = 'الحاوية تستخدم لسحب كل السجلات لقائمة المستخدم .'; $_lang['setting_welcome_screen'] = 'عرض شاشة الترحيب'; $_lang['setting_welcome_screen_desc'] = 'إذا تم الضبط إلى صحيح، ستعرض شاشة الترحيب في التحميل الناجح التالي لصفحة الترحيب، وبعدها لن تظهر ثانية بعد ذلك.'; diff --git a/core/lexicon/az/setting.inc.php b/core/lexicon/az/setting.inc.php index b98e375f93d..2078e66b5ae 100644 --- a/core/lexicon/az/setting.inc.php +++ b/core/lexicon/az/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/be/setting.inc.php b/core/lexicon/be/setting.inc.php index 8aa13d21f4c..d1fe2cfff28 100644 --- a/core/lexicon/be/setting.inc.php +++ b/core/lexicon/be/setting.inc.php @@ -430,8 +430,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Бацькоўскі пункт для асноўнага меню'; -$_lang['setting_main_nav_parent_desc'] = 'Кантэйнер, які змяшчае ўсе запісы асноўнага меню.'; $_lang['setting_manager_direction'] = 'Напрамак тэксту ў сістэме кіравання'; $_lang['setting_manager_direction_desc'] = 'Выберыце напрамак, у якім будзе паказаны тэкст у сістэме кіравання, злева-направа ці справа-налева.'; @@ -798,8 +796,6 @@ $_lang['setting_use_weblink_target'] = 'Выкарыстоўваць мэтавую веб-спасылку'; $_lang['setting_use_weblink_target_desc'] = 'Калі выбрана «Так», тэгі спасылак MODX і выклік функцыі makeUrl() будуць генераваць канчатковыя спасылкі, названыя як мэтавыя URL для рэсурсаў тыпу «Спасылка». У адваротным выпадку, будзе згенеравана ўнутраная спасылка, перанакіроўваючая на мэтавы URL.'; -$_lang['setting_user_nav_parent'] = 'Бацькоўскі пункт для меню карыстальніка'; -$_lang['setting_user_nav_parent_desc'] = 'Кантэйнер, які змяшчае ўсе запісы меню карыстальніка.'; $_lang['setting_welcome_screen'] = 'Паказваць экран прывітання'; $_lang['setting_welcome_screen_desc'] = 'Калі выбрана «Так», экран прывітання будзе аднаразова адлюстраваны падчас наступнай загрузкі старонкі прывітання.'; diff --git a/core/lexicon/bg/setting.inc.php b/core/lexicon/bg/setting.inc.php index 4aa868e853a..096f1bff499 100644 --- a/core/lexicon/bg/setting.inc.php +++ b/core/lexicon/bg/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/cs/setting.inc.php b/core/lexicon/cs/setting.inc.php index bbd029061ef..64b865e132b 100644 --- a/core/lexicon/cs/setting.inc.php +++ b/core/lexicon/cs/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Složka hlavního menu'; -$_lang['setting_main_nav_parent_desc'] = 'Složka pro načítání všech položek hlavního menu.'; $_lang['setting_manager_direction'] = 'Směr zobrazení textu ve správci obsahu'; $_lang['setting_manager_direction_desc'] = 'Zvolte směr textu, kterým bude zobrazen obsah správce obsahu, zleva do prava nebo zprava do leva.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Použít cíl jako webový odkaz'; $_lang['setting_use_weblink_target_desc'] = 'Nastavte na "Ano" pokud chcete, aby MODX tagy odkazů a makeUrl() generovali odkazy jako cílové URL pro webové odkazy. Nastavením "Ne" budou generovány interní MODX URL.'; -$_lang['setting_user_nav_parent'] = 'Složka uživatelského menu'; -$_lang['setting_user_nav_parent_desc'] = 'Složka pro načítání všech položek uživatelského menu.'; $_lang['setting_welcome_screen'] = 'Zobrazit uvítací obrazovku'; $_lang['setting_welcome_screen_desc'] = 'Je-li nastaveno na "Ano", uvítací obrazovka se zobrazí při dalším načtení úvodní stránky a pak se již nezobrazí.'; diff --git a/core/lexicon/da/setting.inc.php b/core/lexicon/da/setting.inc.php index e2bdad53cb2..fc9fd6c5fea 100644 --- a/core/lexicon/da/setting.inc.php +++ b/core/lexicon/da/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/de/setting.inc.php b/core/lexicon/de/setting.inc.php index 76650cc1f0f..74a3533f6db 100644 --- a/core/lexicon/de/setting.inc.php +++ b/core/lexicon/de/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: <style> Tags entfernen'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'Nach dem Style-Inlining werden alle <style> Tags entfernt. Warnung: Dies kann Probleme mit responsiven E-Mail-Templates verursachen.'; -$_lang['setting_main_nav_parent'] = 'Eltern-Element des Hauptmenüs'; -$_lang['setting_main_nav_parent_desc'] = 'Der Container, der genutzt wird, um die Einträge für das Hauptmenü zu erstellen.'; $_lang['setting_manager_direction'] = 'Textrichtung im MODX-Manager'; $_lang['setting_manager_direction_desc'] = 'Geben Sie an, ob der Text im MODX-Manager von links nach rechts (Eingabe: "ltr") oder von rechts nach links (Eingabe: "rtl") ausgegeben werden soll.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'WebLink-Ziel verwenden'; $_lang['setting_use_weblink_target_desc'] = 'Setzen Sie diese Einstellung auf "Ja", wenn Sie möchten, dass mittels MODX-Link-Tags ([[~RessourcenID]]) oder der Methode makeUrl() generierte Weblink-URLs aus der in der Weblink-Ressource eingegebenen URL bestehen. Anderenfalls bestehen diese aus der internen MODX-URL. Ein Beispiel: Es existieren ein Dokument mit der Ressourcen-ID 5 und dem Alias "mein-dokument" und ein Weblink mit der Ressourcen-ID 12, in dessen URL-Feld mit der Bezeichnung "Weblink" nur die Ressourcen-ID des Dokuments (5) engetragen wurde; suchmaschinenfreundliche URLs bzw. Aliase sind aktiviert. In einem HTML-Link wird nun ein MODX-Link-Tag mit der Ressourcen-ID des Weblinks verwendet: <a href="[[~12]]">Link auf den Weblink</a>. Steht diese Einstellung auf "Ja", so enthält die generierte URL nur genau das, was in das URL-Feld des Weblinks eingegeben wurde, nämlich die Ressourcen-ID des Dokuments, also "5". Steht diese Einstellung auf "Nein", so enthält die generierte URL den Alias des verlinkten Dokuments plus die ggf. zugeordnete Endung, im Normalfall also "mein-dokument.html".'; -$_lang['setting_user_nav_parent'] = 'Eltern-Element des Benutzer-Menüs'; -$_lang['setting_user_nav_parent_desc'] = 'Der Container, der genutzt wird, um die Einträge für das Benutzer-Menü zu erstellen.'; $_lang['setting_welcome_screen'] = 'Willkommens-Bildschirm anzeigen'; $_lang['setting_welcome_screen_desc'] = 'Wenn diese Einstellung auf "Ja" gesetzt ist, wird der Willkommens-Bildschirm beim nächsten erfolgreichen Laden der Manager-Startseite einmalig angezeigt, danach nicht mehr.'; diff --git a/core/lexicon/el/setting.inc.php b/core/lexicon/el/setting.inc.php index 2fcbe71bc2d..c681a34384e 100644 --- a/core/lexicon/el/setting.inc.php +++ b/core/lexicon/el/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/en/setting.inc.php b/core/lexicon/en/setting.inc.php index b98e375f93d..2078e66b5ae 100644 --- a/core/lexicon/en/setting.inc.php +++ b/core/lexicon/en/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/es/setting.inc.php b/core/lexicon/es/setting.inc.php index 84394713517..e2c9749e8ce 100644 --- a/core/lexicon/es/setting.inc.php +++ b/core/lexicon/es/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Padre del Menú principal'; -$_lang['setting_main_nav_parent_desc'] = 'El contenedor utilizado para meter todos los registros del menú principal.'; $_lang['setting_manager_direction'] = 'Dirección del Texto en el Panel de Administración'; $_lang['setting_manager_direction_desc'] = 'Elige la dirección en la cual será mostrado el texto en el Panel de Administración, izquierda a derecha o derecha a izquierda.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Usar el Destino del Weblink'; $_lang['setting_use_weblink_target_desc'] = 'Activar para que las etiquetas de enlaces de MODX utilicen como valor la URL de destino. Si no se activa, se utilizarán las etiquetas y direcciones internas de MODX.'; -$_lang['setting_user_nav_parent'] = 'Padre del Menú de usuario '; -$_lang['setting_user_nav_parent_desc'] = 'El contenedor utilizado para meter todos los registros del menú de usuario.'; $_lang['setting_welcome_screen'] = 'Mostrar la Página de Bienvenida'; $_lang['setting_welcome_screen_desc'] = 'Si se activa, se mostrará la página de bienvenida la próxima vez que se cargue el sitio.'; diff --git a/core/lexicon/et/setting.inc.php b/core/lexicon/et/setting.inc.php index 67591078726..38726e2cd13 100644 --- a/core/lexicon/et/setting.inc.php +++ b/core/lexicon/et/setting.inc.php @@ -430,8 +430,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manageri Teksi Suund'; $_lang['setting_manager_direction_desc'] = 'Valige suund, kuidas teksti rendrerdatakse Manageris: left to right või right to left.'; @@ -797,8 +795,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Näita Tervitus Ekraani'; $_lang['setting_welcome_screen_desc'] = 'Kui on true, tervitus ekraan ilmub järgmise eduka laadimise avaleheküljele ja siis ei näidata pärast seda.'; diff --git a/core/lexicon/fa/setting.inc.php b/core/lexicon/fa/setting.inc.php index b9d9d3d1c0b..b0cf1cd3398 100644 --- a/core/lexicon/fa/setting.inc.php +++ b/core/lexicon/fa/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/fi/setting.inc.php b/core/lexicon/fi/setting.inc.php index 3ede6a4793e..b15c2621fe2 100644 --- a/core/lexicon/fi/setting.inc.php +++ b/core/lexicon/fi/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/fr/setting.inc.php b/core/lexicon/fr/setting.inc.php index 52c404e7dcf..c03fcaf1afa 100755 --- a/core/lexicon/fr/setting.inc.php +++ b/core/lexicon/fr/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Conteneur du menu principal'; -$_lang['setting_main_nav_parent_desc'] = 'Le conteneur utilisé pour générer le contenu du menu principal.'; $_lang['setting_manager_direction'] = 'Orientation du texte du manager'; $_lang['setting_manager_direction_desc'] = 'Choisissez l\'orientation d\'affichage du texte dans le manager, de gauche à droite (ltr) ou de droite à gauche (rtl).'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Utiliser le lien de destination'; $_lang['setting_use_weblink_target_desc'] = 'Activez cette option si vous désirez que les liens MODX et makeUrl() utilisent la destination du lien pour générer le lien. Par défaut, MODX utilisera le système interne d\'URL et la méthode makeUrl().'; -$_lang['setting_user_nav_parent'] = 'Conteneur du menu utilisateur'; -$_lang['setting_user_nav_parent_desc'] = 'Le conteneur utilisé pour générer le contenu du menu utilisateur.'; $_lang['setting_welcome_screen'] = 'Afficher l\'écran de bienvenue'; $_lang['setting_welcome_screen_desc'] = 'Coché, l\'écran de bienvenue sera affiché au prochain chargement de la page et ne s\'affichera plus par la suite.'; diff --git a/core/lexicon/he/setting.inc.php b/core/lexicon/he/setting.inc.php index 064d26f5a89..e31a07f11b0 100644 --- a/core/lexicon/he/setting.inc.php +++ b/core/lexicon/he/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/hi/setting.inc.php b/core/lexicon/hi/setting.inc.php index 52dc7db75a3..85d74433484 100644 --- a/core/lexicon/hi/setting.inc.php +++ b/core/lexicon/hi/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'मुख्य मेनू parent'; -$_lang['setting_main_nav_parent_desc'] = 'मुख्य मेनू के लिए सभी रिकॉर्ड खींच करने के लिए इस्तेमाल किया कंटेनर।'; $_lang['setting_manager_direction'] = 'प्रबंधक पाठ दिशा'; $_lang['setting_manager_direction_desc'] = 'पाठ सही है या छोड़ दिया करने के लिए सही करने के लिए छोड़ दिया, manager में प्रदान किया जाएगा कि दिशा चुनें।'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'WebLink लक्ष्य का उपयोग करें'; $_lang['setting_use_weblink_target_desc'] = 'आप () ModX कड़ी टैग और makeUrl है weblinks के लिए लक्ष्य URL के रूप में लिंक उत्पन्न करना चाहते हैं तो सही नियत करें। अन्यथा, आंतरिक ModX यूआरएल लिंक टैग और makeUrl () विधि द्वारा उत्पन्न हो जाएगा।'; -$_lang['setting_user_nav_parent'] = 'उपयोगकर्ता मेनू parent'; -$_lang['setting_user_nav_parent_desc'] = 'उपयोगकर्ता मेनू के लिए सभी रिकॉर्ड खींच करने के लिए इस्तेमाल किया कंटेनर।'; $_lang['setting_welcome_screen'] = 'स्वागत स्क्रीन दिखाएँ'; $_lang['setting_welcome_screen_desc'] = 'यदि सेट करने के लिए true, स्वागत स्क्रीन स्वागत पेज की अगली सफल लोडिंग पर दिखा करेंगे, और फिर उसके बाद नहीं दिखाएँ।'; diff --git a/core/lexicon/hu/setting.inc.php b/core/lexicon/hu/setting.inc.php index 31447c9ac36..dc14b7d63a1 100644 --- a/core/lexicon/hu/setting.inc.php +++ b/core/lexicon/hu/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Főmenü szülője'; -$_lang['setting_main_nav_parent_desc'] = 'A főmenü összes bejegyzésének tárolója.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'Felhasználói menü szülője'; -$_lang['setting_user_nav_parent_desc'] = 'A felhasználói menü összes bejegyzésének tárolója.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/id/setting.inc.php b/core/lexicon/id/setting.inc.php index b8be71add87..4fdd537e4fb 100644 --- a/core/lexicon/id/setting.inc.php +++ b/core/lexicon/id/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Menu utama'; -$_lang['setting_main_nav_parent_desc'] = 'Wadah digunakan untuk menarik semua catatan untuk menu utama.'; $_lang['setting_manager_direction'] = 'Arah manajer teks'; $_lang['setting_manager_direction_desc'] = 'Memilih arah yang teks yang akan diterjemahkan dalam manajer, kiri ke kanan atau kanan ke kiri.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Gunakan tujuan link pencarian'; $_lang['setting_use_weblink_target_desc'] = 'Atur ke benar jika Anda ingin memiliki tagar tautan MODX dan makeUrl() menghasilkan tautan sebagai URL tujuan untuk WebLinks. Jika tidak, URL MODX internal akan dihasilkan oleh tagar tautan dan metode makeUrl().'; -$_lang['setting_user_nav_parent'] = 'Menu user induk'; -$_lang['setting_user_nav_parent_desc'] = 'Wadah yang digunakan untuk menarik semua catatan untuk menu pengguna.'; $_lang['setting_welcome_screen'] = 'Tampilkan Layar Selamat Datang'; $_lang['setting_welcome_screen_desc'] = 'Apabila aturan ke benar, layar selamat datang akan tampil pada pemuatan halaman selamat datang berikutnya, dan kemudian tidak muncul setelah itu.'; diff --git a/core/lexicon/it/setting.inc.php b/core/lexicon/it/setting.inc.php index ddecfa5e40e..dc97dd4003d 100644 --- a/core/lexicon/it/setting.inc.php +++ b/core/lexicon/it/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Genitore (parent) del menu principale'; -$_lang['setting_main_nav_parent_desc'] = 'Il contenitore utilizzata per prendere tutti i record per il menu principale.'; $_lang['setting_manager_direction'] = 'Direzione Testo Manager'; $_lang['setting_manager_direction_desc'] = 'Scegli la direzione con cui sarà mostrato il testo, da sinistra a destra "ltr" o da destra a sinistra "rtl".'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Usa WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Imposta su "SI" se vuoi che i tags link di MODX e makeUrl() generino links come URL bersagli per WebLinks. Altrimenti l\'URL interno di MODX sara\' generato dal metodo tags link e makeUrl().'; -$_lang['setting_user_nav_parent'] = 'Genitore menu utente'; -$_lang['setting_user_nav_parent_desc'] = 'Il contenitore usato per prendere tutti i records per il menu utente.'; $_lang['setting_welcome_screen'] = 'Mostra Schermata Benvenuto'; $_lang['setting_welcome_screen_desc'] = 'Se impostato su \'SI\', la schermata di benvenuto verrà mostrata al prossimo caricamento della pagina di benvenuto, e non verrà mostrato successivamente.'; diff --git a/core/lexicon/ja/setting.inc.php b/core/lexicon/ja/setting.inc.php index 927ba3fc3ee..256aa69e3e5 100644 --- a/core/lexicon/ja/setting.inc.php +++ b/core/lexicon/ja/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'テキストの方向'; $_lang['setting_manager_direction_desc'] = '管理画面でのテキストの流れる方向を指定します。「ltr」は、左から右。「rtl」は、右から左です。
主にアラビア語圏などで利用する設定です。'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'WebLinkターゲットの使用'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl（） generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl（） method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'ようこそ画面の表示'; $_lang['setting_welcome_screen_desc'] = '「はい」を選択すると、読み込み完了後ようこそ画面を表示します。そしてそれ以降は表示しません。'; diff --git a/core/lexicon/nl/setting.inc.php b/core/lexicon/nl/setting.inc.php index cb185be27db..9383b48b870 100755 --- a/core/lexicon/nl/setting.inc.php +++ b/core/lexicon/nl/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Bovenliggend hoofdmenu'; -$_lang['setting_main_nav_parent_desc'] = 'De container gebruikt om de records op te halen voor het belangrijkste menu.'; $_lang['setting_manager_direction'] = 'Manager tekstrichting'; $_lang['setting_manager_direction_desc'] = 'Kies de richting waarin de tekst getoond moet worden in de manager, van links naar rechts of van rechts naar links.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Gebruik WebLink doel'; $_lang['setting_use_weblink_target_desc'] = 'Stel in als Ja als je wilt dat MODX link tags en makeUrl() links genereren moet voor Weblinks. Anders wordt de interne MODX URL gegenereerd door link tags en de makeUrl() methode.'; -$_lang['setting_user_nav_parent'] = 'Gebruikersmenu parent'; -$_lang['setting_user_nav_parent_desc'] = 'De menu container welke gebruikt wordt om het gebruikersmenu te tonen. '; $_lang['setting_welcome_screen'] = 'Toon welkomstscherm'; $_lang['setting_welcome_screen_desc'] = 'Indien op waar gezet, dan wordt het welkomstscherm wordt getoond bij het laden van de welkomstpagina en daarna niet meer.'; diff --git a/core/lexicon/pl/setting.inc.php b/core/lexicon/pl/setting.inc.php index c093c8c9538..77d18b4fd9a 100644 --- a/core/lexicon/pl/setting.inc.php +++ b/core/lexicon/pl/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/pt/setting.inc.php b/core/lexicon/pt/setting.inc.php index 9b612f748d0..7e00f297c50 100644 --- a/core/lexicon/pt/setting.inc.php +++ b/core/lexicon/pt/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Pai do menu principal'; -$_lang['setting_main_nav_parent_desc'] = 'O recipiente usado para puxar todos os registros para o menu principal.'; $_lang['setting_manager_direction'] = 'Direção do texto do Gerenciador'; $_lang['setting_manager_direction_desc'] = 'Escolha a direção que o texto será processado no Gerenciador, à esquerda para a direita ou da direita para a esquerda.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'Pai do menu de usuário'; -$_lang['setting_user_nav_parent_desc'] = 'O recipiente usado para puxar todos os registros para o menu de usuário.'; $_lang['setting_welcome_screen'] = 'Mostrar tela de Boas Vindas'; $_lang['setting_welcome_screen_desc'] = 'Se definido como true, a tela de boas-vindas será exibida no próximo carregamento sucesso da página de boas-vindas, e depois não vai aparecer depois disso.'; diff --git a/core/lexicon/ro/setting.inc.php b/core/lexicon/ro/setting.inc.php index e7d52a30758..079ef2225f4 100644 --- a/core/lexicon/ro/setting.inc.php +++ b/core/lexicon/ro/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/ru/setting.inc.php b/core/lexicon/ru/setting.inc.php index d46a79d31ec..a00dd3db8b8 100644 --- a/core/lexicon/ru/setting.inc.php +++ b/core/lexicon/ru/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Родительский элемент для основного меню'; -$_lang['setting_main_nav_parent_desc'] = 'Контейнер, содержащий все записи основного меню.'; $_lang['setting_manager_direction'] = 'Направление текста в системе управления'; $_lang['setting_manager_direction_desc'] = 'Выберите направление в котором будет генерироваться текст в системе управления (слева-направо или справа-налево).'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Использовать целевую веб-ссылку'; $_lang['setting_use_weblink_target_desc'] = 'Если выбрано «Да», MODX теги ссылок и makeUrl() API вызов будут генерировать конечные ссылки, указанные как целевые URL для ресурсов типа «ссылка». В противном случае, будет сгенерирована внутренняя ссылка, перенаправляющая на целевой URL.'; -$_lang['setting_user_nav_parent'] = 'Родительский элемент для пользовательского меню'; -$_lang['setting_user_nav_parent_desc'] = 'Контейнер, содержащий все записи меню пользователя.'; $_lang['setting_welcome_screen'] = 'Показывать окно приветствия'; $_lang['setting_welcome_screen_desc'] = 'Если выбрано «Да», всплывающее окно приветствия будет однократно отображено при следующей загрузке начального экрана.'; diff --git a/core/lexicon/sl/setting.inc.php b/core/lexicon/sl/setting.inc.php index b98e375f93d..2078e66b5ae 100644 --- a/core/lexicon/sl/setting.inc.php +++ b/core/lexicon/sl/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/sv/setting.inc.php b/core/lexicon/sv/setting.inc.php index 4bac7c0edb9..97b276964f7 100644 --- a/core/lexicon/sv/setting.inc.php +++ b/core/lexicon/sv/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'Inline-style: Ta bort <style>-taggar'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'Alla <style>-taggar kommer att tas bort. Varning: Det här kan skapa problem i responsiva e-postmallar.'; -$_lang['setting_main_nav_parent'] = 'Huvudmenyns förälder'; -$_lang['setting_main_nav_parent_desc'] = 'Den behållare som används för att hämta alla uppgifter till huvudmenyn.'; $_lang['setting_manager_direction'] = 'Textriktning i hanteraren'; $_lang['setting_manager_direction_desc'] = 'Välj textriktning i hanteraren: antingen vänster-till-höger eller höger-till-vänster.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Använd webblänkmål'; $_lang['setting_use_weblink_target_desc'] = 'Om du aktiverar den här inställningen kommer länkar för webblänkresurser att renderas som målets URL istället för den interna MODX-URL:en. Det här gäller oavsett om du använder länktaggar eller API-metoden modX::makeUrl().'; -$_lang['setting_user_nav_parent'] = 'Användarmenyns förälder'; -$_lang['setting_user_nav_parent_desc'] = 'Den behållare som används för att hämta alla uppgifter till användarmenyn.'; $_lang['setting_welcome_screen'] = 'Visa välkomstmeddelande'; $_lang['setting_welcome_screen_desc'] = 'Om denna sätts till "Ja" kommer ett välkomstmeddelande att visas vid nästa laddning av välkomstsidan och sedan inte visas mer efter det.'; diff --git a/core/lexicon/th/setting.inc.php b/core/lexicon/th/setting.inc.php index 7269c1efb29..dd75278f07d 100644 --- a/core/lexicon/th/setting.inc.php +++ b/core/lexicon/th/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'ทิศทางข้อความของเมเนเจอร์'; $_lang['setting_manager_direction_desc'] = 'เลือกทิศทางที่ข้อความจะถูกแสดงผลในเมเนเจอร์ ซ้ายไปขวาหรือขวาไปซ้าย'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'ใช้เป้าหมายของ WebLink'; $_lang['setting_use_weblink_target_desc'] = 'ตั้งให้เป็นจริงถ้าคุณต้องการให้มีแท็กลิงก์ของ MODX และ makeUrl() สร้างลิงก์เป็น URL เป้าหมายสำหรับ WebLinks มิฉะนั้น URL ภายในของ MODX จะถูกสร้างโดยแท็กลิงก์และวิธีการ makeUrl()'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'แสดงหน้าจอต้อนรับ'; $_lang['setting_welcome_screen_desc'] = 'ถ้าตั้งไว้เป็นจริง หน้าจอต้อนรับจะแสดงตอนการเรียกสำเร็จครั้งต่อไปของหน้าต้อนรับ และจะไม่แสดงอีกหลังจากนั้น'; diff --git a/core/lexicon/tr/setting.inc.php b/core/lexicon/tr/setting.inc.php index 8d46c7e0eea..d2752140aa3 100644 --- a/core/lexicon/tr/setting.inc.php +++ b/core/lexicon/tr/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Ana menü temeli'; -$_lang['setting_main_nav_parent_desc'] = 'Tüm kayıtları ana menüye çekmek için konteyner kullanılır.'; $_lang['setting_manager_direction'] = 'Yönetici Metin Yönü'; $_lang['setting_manager_direction_desc'] = 'Yöneticide metnin soldan sağa veya sağdan sola döndürüleceğinin yönünü seçin.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'WebLink Hedefi Kullan'; $_lang['setting_use_weblink_target_desc'] = 'MODX bağlantı etiketlerine sahip olmak ve makeUrl () bağlantılarını WebLinks için hedef URL olarak oluşturmak istiyorsanız true değerine ayarlayın. Aksi takdirde, dahili MODX URL\'si bağlantı etiketleri ve makeUrl () yöntemi ile oluşturulur.'; -$_lang['setting_user_nav_parent'] = 'Kullanıcı Ana menüsü'; -$_lang['setting_user_nav_parent_desc'] = 'Kullanıcı menüsü için tüm kayıtları çekmek için kullanılan kapsayıcı.'; $_lang['setting_welcome_screen'] = 'Karşılama Ekranını Göster'; $_lang['setting_welcome_screen_desc'] = 'True olarak ayarlanırsa, hoş geldiniz ekranı karşılama sayfasının bir sonraki başarılı yüklenişinde gösterilir ve bundan sonra gösterilmez.'; diff --git a/core/lexicon/uk/setting.inc.php b/core/lexicon/uk/setting.inc.php index 0b3452c7356..d0a3ecded59 100644 --- a/core/lexicon/uk/setting.inc.php +++ b/core/lexicon/uk/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Батьківський елемент для основного меню'; -$_lang['setting_main_nav_parent_desc'] = 'Контейнер містить всі записи основного меню.'; $_lang['setting_manager_direction'] = 'Напрямок тексту у Менеджері'; $_lang['setting_manager_direction_desc'] = 'Виберіть напрямок тексту у панелі керування (зліва-направо або зправа-наліво).'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Використовувати цільове веб-посилання'; $_lang['setting_use_weblink_target_desc'] = 'Якщо вибрано "Так", MODX теги посилань і makeUrl() API виклик будуть генерувати кінцеві посилання, вказані як цільові URL-адреси для ресурсів типу "посилання". В іншому випадку, буде згенеровано внутрішнє посилання, що перенаправляє на цільову URL-адресу.'; -$_lang['setting_user_nav_parent'] = 'Батьківський елемент для меню користувача'; -$_lang['setting_user_nav_parent_desc'] = 'Контейнер містить всі записи меню користувача.'; $_lang['setting_welcome_screen'] = 'Показати заставку'; $_lang['setting_welcome_screen_desc'] = 'Якщо вибрано «Так», спливаюче вікно привітання буде відображатися одноразово під час наступного завантаження початкового екрана.'; diff --git a/core/lexicon/yo/setting.inc.php b/core/lexicon/yo/setting.inc.php index b98e375f93d..2078e66b5ae 100644 --- a/core/lexicon/yo/setting.inc.php +++ b/core/lexicon/yo/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/core/lexicon/zh/setting.inc.php b/core/lexicon/zh/setting.inc.php index 1e0674dd1c8..781e3a92cf5 100644 --- a/core/lexicon/zh/setting.inc.php +++ b/core/lexicon/zh/setting.inc.php @@ -429,8 +429,6 @@ $_lang['mail_inlinestyle_remove_style_tags'] = 'InlineStyle: Remove <style> tags'; $_lang['mail_inlinestyle_remove_style_tags_desc'] = 'After inlining styles, all <style> tags will be removed. Warning: This can cause issues with responsive email templates.'; -$_lang['setting_main_nav_parent'] = 'Main menu parent'; -$_lang['setting_main_nav_parent_desc'] = 'The container used to pull all records for the main menu.'; $_lang['setting_manager_direction'] = 'Manager Text Direction'; $_lang['setting_manager_direction_desc'] = 'Choose the direction that the text will be rendered in the Manager, left to right or right to left.'; @@ -796,8 +794,6 @@ $_lang['setting_use_weblink_target'] = 'Use WebLink Target'; $_lang['setting_use_weblink_target_desc'] = 'Set to true if you want to have MODX link tags and makeUrl() generate links as the target URL for WebLinks. Otherwise, the internal MODX URL will be generated by link tags and the makeUrl() method.'; -$_lang['setting_user_nav_parent'] = 'User menu parent'; -$_lang['setting_user_nav_parent_desc'] = 'The container used to pull all records for the user menu.'; $_lang['setting_welcome_screen'] = 'Show Welcome Screen'; $_lang['setting_welcome_screen_desc'] = 'If set to true, the welcome screen will show on the next successful loading of the welcome page, and then not show after that.'; diff --git a/manager/controllers/default/header.php b/manager/controllers/default/header.php index 43e4ead5f11..800b62928e6 100644 --- a/manager/controllers/default/header.php +++ b/manager/controllers/default/header.php @@ -83,14 +83,14 @@ public function render() $mainNav = $this->modx->smarty->getTemplateVars('navb'); if (empty($mainNav)) { $this->buildMenu( - $this->modx->getOption('main_nav_parent', null, 'topnav', true), + 'topnav', 'navb' ); } $userNav = $this->modx->smarty->getTemplateVars('userNav'); if (empty($userNav)) { $this->buildMenu( - $this->modx->getOption('user_nav_parent', null, 'usernav', true), + 'usernav', 'userNav' ); } diff --git a/setup/includes/upgrades/common/3.3.0-remove-nav-parent-settings.php b/setup/includes/upgrades/common/3.3.0-remove-nav-parent-settings.php new file mode 100644 index 00000000000..61c000282e1 --- /dev/null +++ b/setup/includes/upgrades/common/3.3.0-remove-nav-parent-settings.php @@ -0,0 +1,36 @@ +%s

'; + +foreach ($settings as $key) { + /** @var modSystemSetting $setting */ + $setting = $modx->getObject(modSystemSetting::class, ['key' => $key]); + if ($setting instanceof modSystemSetting) { + if ($setting->remove()) { + $msg = $this->install->lexicon('system_setting_cleanup_success', ['key' => $key]); + $this->runner->addResult( + modInstallRunner::RESULT_SUCCESS, + sprintf($messageTemplate, 'ok', $msg) + ); + } else { + $msg = $this->install->lexicon('system_setting_cleanup_failure', ['key' => $key]); + $this->runner->addResult( + modInstallRunner::RESULT_WARNING, + sprintf($messageTemplate, 'warning', $msg) + ); + } + } +} diff --git a/setup/includes/upgrades/mysql/3.3.0-pl.php b/setup/includes/upgrades/mysql/3.3.0-pl.php new file mode 100644 index 00000000000..8142143bc14 --- /dev/null +++ b/setup/includes/upgrades/mysql/3.3.0-pl.php @@ -0,0 +1,10 @@ +