diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php index 74cae9ca3..b6c852d42 100644 --- a/admin/include/add_core_tabs.inc.php +++ b/admin/include/add_core_tabs.inc.php @@ -157,7 +157,8 @@ function add_core_tabs($sheets, $tab_id) break; case 'site_update': global $my_base_url; - $sheets['synchronization'] = array('caption' => l10n('Database synchronization with files'), 'url' => $my_base_url.'site_update&site=1'); + $sheets['synchronization'] = array('caption' => l10n('Synchronization settings'), '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': global $my_base_url; diff --git a/admin/site_manager.php b/admin/site_manager.php index ae9e2b6af..d0248ed51 100644 --- a/admin/site_manager.php +++ b/admin/site_manager.php @@ -34,6 +34,18 @@ if (!empty($_POST) or isset($_GET['action'])) // +-----------------------------------------------------------------------+ $template->set_filenames(array('site_manager'=>'site_manager.tpl')); +// +-----------------------------------------------------------------------+ +// | tabs | +// +-----------------------------------------------------------------------+ + +include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); +$my_base_url = get_root_url().'admin.php?page='; + +$tabsheet = new tabsheet(); +$tabsheet->set_id('site_update'); +$tabsheet->select('site_maager'); +$tabsheet->assign(); + // +-----------------------------------------------------------------------+ // | new site creation form | // +-----------------------------------------------------------------------+ diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl index 53ca6f5c1..568d52fa9 100644 --- a/admin/themes/default/template/site_update.tpl +++ b/admin/themes/default/template/site_update.tpl @@ -64,7 +64,6 @@ $('#syncFiles label').click(function () { {/if} {if isset($introduction)} -

{'Choose an option'|@translate}

@@ -119,5 +118,3 @@ $('#syncFiles label').click(function () {

{/if}{*isset $introduction*} - -

{'Site manager'|@translate}

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 892550a2a..6f3c9c398 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -1230,4 +1230,5 @@ $lang['Deactivated'] = 'Deactivated'; $lang['Restored'] = 'Restored'; $lang['right now'] = 'right now'; $lang['never calculated'] = 'never calculated'; -$lang['Filters'] = 'Filters'; \ No newline at end of file +$lang['Filters'] = 'Filters'; +$lang['Synchronization settings'] = 'Synchronization settings'; \ No newline at end of file diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index dbd5561e7..eaae5976a 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1232,4 +1232,5 @@ $lang['Deactivated'] = 'Désactivé'; $lang['Restored'] = 'Restoré'; $lang['right now'] = 'à l\'instant'; $lang['never calculated'] = 'jamais calculé'; -$lang['Filters'] = 'Filtres'; \ No newline at end of file +$lang['Filters'] = 'Filtres'; +$lang['Synchronization settings'] = 'Paramètres de synchronisation'; \ No newline at end of file