From c47c262fe64962ad3969151620e56b2ae8a77481 Mon Sep 17 00:00:00 2001 From: Matthieu Leproux Date: Mon, 2 Aug 2021 16:27:50 +0200 Subject: [PATCH] related to #1455 adjustments in sync page site_url moved, title and btn. --- admin/include/add_core_tabs.inc.php | 2 +- .../default/template/batch_manager_global.tpl | 2 +- admin/themes/default/template/site_update.tpl | 8 ++++++-- admin/themes/default/theme.css | 18 +++++++++++++++++- language/en_UK/admin.lang.php | 2 +- language/fr_FR/admin.lang.php | 2 +- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php index b6c852d42..fe1b8d799 100644 --- a/admin/include/add_core_tabs.inc.php +++ b/admin/include/add_core_tabs.inc.php @@ -157,7 +157,7 @@ function add_core_tabs($sheets, $tab_id) break; case 'site_update': global $my_base_url; - $sheets['synchronization'] = array('caption' => l10n('Synchronization settings'), 'url' => $my_base_url.'site_update&site=1'); + $sheets['synchronization'] = array('caption' => l10n('Synchronization'), 'url' => $my_base_url.'site_update&site=1'); $sheets['site_maager'] = array('caption' => l10n('Site manager'), 'url' => $my_base_url.'site_manager'); break; case 'maintenance': diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index 0673ad019..57d69a680 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -399,7 +399,7 @@ var sliders = { {'based on'|translate} - + diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl index 568d52fa9..0cfb0ed67 100644 --- a/admin/themes/default/template/site_update.tpl +++ b/admin/themes/default/template/site_update.tpl @@ -10,7 +10,11 @@ $('#syncFiles label').click(function () { {/footer_script}
-

{'Synchronize'|@translate}{$SITE_URL}

+

{'Synchronize'|@translate}

+
+ +
+ {$SITE_URL}
{if isset($update_result)} @@ -114,7 +118,7 @@ $('#syncFiles label').click(function () {

- +

{/if}{*isset $introduction*} diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index e70f9f56d..934f6253d 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -4673,13 +4673,18 @@ fieldset#environment legend i[class*="icon-"] { } .buttonGradient { - padding: 8px 10px; margin-left: 5px; + padding: 8px 10px; + margin-left: 5px; background: linear-gradient(135deg, rgb(255, 119, 0) 0%, rgb(249, 76, 93) 25%, rgb(201, 74, 140) 50%, rgb(249, 76, 93) 100%); transition: 0.3s ease; cursor: pointer; color: white !important; background-size: 200% 100%; } +.syncBtn .buttonGradient { + padding:13px 20px; +} + .buttonGradient:hover {background-position-x: 100%;} #cboxLoadedContent input[type="submit"] {margin-bottom: 20px; float: none;} @@ -5293,3 +5298,14 @@ color:#FF7B00; background-color:white; border: solid 2px #D4D4D4; } + +.site-url-path { + justify-content: flex-start; + display: flex; + width: max-content; + padding-left: 25px; +} + +.site-url-path span { + margin-top: -10px; +} diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 3614a1e87..3aa25b32c 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -1231,6 +1231,6 @@ $lang['Restored'] = 'Restored'; $lang['right now'] = 'right now'; $lang['never calculated'] = 'never calculated'; $lang['Filters'] = 'Filters'; -$lang['Synchronization settings'] = 'Synchronization settings'; +$lang['Synchronization'] = 'Synchronization'; $lang['Activated plugin list'] = 'Activated plugin list'; $lang['No plugin activated'] = 'No plugin activated'; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 12d48268c..7e7de7807 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1233,6 +1233,6 @@ $lang['Restored'] = 'Restoré'; $lang['right now'] = 'à l\'instant'; $lang['never calculated'] = 'jamais calculé'; $lang['Filters'] = 'Filtres'; -$lang['Synchronization settings'] = 'Paramètres de synchronisation'; +$lang['Synchronization'] = 'Synchronisation'; $lang['Activated plugin list'] = 'Liste des plugins activés'; $lang['No plugin activated'] = 'Aucun plugin activé';