From 8a4b177c7bd713a1045d66bf992d9d211ab8285d Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 9 Apr 2010 21:38:16 +0000 Subject: feature 1587: move advanced features screen into maintenance screen. git-svn-id: http://piwigo.org/svn/trunk@5745 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin.php | 1 - admin/advanced_feature.php | 108 --------------------- admin/include/functions.php | 1 - admin/maintenance.php | 30 ++++++ admin/themes/default/template/admin.tpl | 1 - admin/themes/default/template/advanced_feature.tpl | 9 -- admin/themes/default/template/maintenance.tpl | 6 ++ language/de_DE/help/advanced_feature.html | 16 --- language/de_DE/help/maintenance.html | 15 ++- language/en_UK/help/advanced_feature.html | 16 --- language/en_UK/help/maintenance.html | 13 +++ language/es_ES/help/advanced_feature.html | 16 --- language/es_ES/help/maintenance.html | 13 +++ language/fr_FR/help/advanced_feature.html | 16 --- language/fr_FR/help/maintenance.html | 13 +++ language/hr_HR/help/advanced_feature.html | 16 --- language/hr_HR/help/maintenance.html | 13 +++ language/hu_HU/help/advanced_feature.html | 16 --- language/hu_HU/help/maintenance.html | 12 +++ language/it_IT/help/advanced_feature.html | 16 --- language/it_IT/help/maintenance.html | 15 ++- language/ja_JP/help/advanced_feature.html | 16 --- language/ja_JP/help/maintenance.html | 15 ++- language/nl_NL/help/advanced_feature.html | 16 --- language/nl_NL/help/maintenance.html | 13 +++ language/pl_PL/help/advanced_feature.html | 16 --- language/pl_PL/help/maintenance.html | 13 +++ language/ru_RU/help/advanced_feature.html | 16 --- language/ru_RU/help/maintenance.html | 13 +++ 29 files changed, 181 insertions(+), 299 deletions(-) delete mode 100644 admin/advanced_feature.php delete mode 100644 admin/themes/default/template/advanced_feature.tpl delete mode 100644 language/de_DE/help/advanced_feature.html delete mode 100644 language/en_UK/help/advanced_feature.html delete mode 100644 language/es_ES/help/advanced_feature.html delete mode 100644 language/fr_FR/help/advanced_feature.html delete mode 100644 language/hr_HR/help/advanced_feature.html delete mode 100644 language/hu_HU/help/advanced_feature.html create mode 100644 language/hu_HU/help/maintenance.html delete mode 100644 language/it_IT/help/advanced_feature.html delete mode 100644 language/ja_JP/help/advanced_feature.html delete mode 100644 language/nl_NL/help/advanced_feature.html delete mode 100644 language/pl_PL/help/advanced_feature.html delete mode 100644 language/ru_RU/help/advanced_feature.html diff --git a/admin.php b/admin.php index b08343f24..ff5398616 100644 --- a/admin.php +++ b/admin.php @@ -106,7 +106,6 @@ $template->assign( 'U_SITES'=> $link_start.'remote_site', 'U_MAINTENANCE'=> $link_start.'maintenance', 'U_NOTIFICATION_BY_MAIL'=> $link_start.'notification_by_mail', - 'U_ADVANCED_FEATURE'=> $link_start.'advanced_feature', 'U_CONFIG_GENERAL'=> $link_start.'configuration', 'U_CONFIG_DISPLAY'=> $conf_link.'default', 'U_CONFIG_EXTENTS'=> $link_start.'extend_for_templates', diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php deleted file mode 100644 index df88f970d..000000000 --- a/admin/advanced_feature.php +++ /dev/null @@ -1,108 +0,0 @@ - l10n('???'), - 'URL' => $start_url.'???' - ));*/ - -array_push($advanced_features, - array - ( - 'CAPTION' => l10n('Not linked elements'), - 'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked' - )); - -array_push($advanced_features, - array - ( - 'CAPTION' => l10n('Files with same name in more than one physical category'), - 'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates' - )); - -//$advanced_features is array of array composed of CAPTION & URL -$advanced_features = - trigger_event('get_admin_advanced_features_links', $advanced_features); - -// +-----------------------------------------------------------------------+ -// | Template init | -// +-----------------------------------------------------------------------+ - -$template->set_filename('advanced_feature', 'advanced_feature.tpl'); - -$start_url = get_root_url().'admin.php?page=advanced_feature&action='; - -$template->assign( - array - ( - 'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature', - 'U_ACTIVE_MENU' => 5 - )); - -// advanced_features -$template->assign('advanced_features', $advanced_features); - -// +-----------------------------------------------------------------------+ -// | Sending html code | -// +-----------------------------------------------------------------------+ - -$template->assign_var_from_handle('ADMIN_CONTENT', 'advanced_feature'); - -?> diff --git a/admin/include/functions.php b/admin/include/functions.php index 42ed056b6..618c65b99 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1940,7 +1940,6 @@ function get_active_menu($menu_page) case 'stats': case 'history': case 'maintenance': - case 'advanced_feature': case 'thumbnail': return 4; diff --git a/admin/maintenance.php b/admin/maintenance.php index 78ac844bd..06dc67474 100644 --- a/admin/maintenance.php +++ b/admin/maintenance.php @@ -144,6 +144,36 @@ $template->assign( ) ); +// +-----------------------------------------------------------------------+ +// | Define advanced features | +// +-----------------------------------------------------------------------+ + +$advanced_features = array(); + +array_push( + $advanced_features, + array( + 'CAPTION' => l10n('Not linked elements'), + 'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked' + ) + ); + +array_push( + $advanced_features, + array( + 'CAPTION' => l10n('Files with same name in more than one physical category'), + 'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates' + ) + ); + +//$advanced_features is array of array composed of CAPTION & URL +$advanced_features = trigger_event( + 'get_admin_advanced_features_links', + $advanced_features + ); + +$template->assign('advanced_features', $advanced_features); + // +-----------------------------------------------------------------------+ // | sending html code | // +-----------------------------------------------------------------------+ diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 9f2bde9e0..380248870 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -73,7 +73,6 @@ jQuery().ready(function(){ldelim}
  • {'History'|@translate}
  • {'Thumbnails'|@translate}
  • {'Maintenance'|@translate}
    • -
  • {'Advanced features'|@translate}
    • diff --git a/admin/themes/default/template/advanced_feature.tpl b/admin/themes/default/template/advanced_feature.tpl deleted file mode 100644 index 76209387c..000000000 --- a/admin/themes/default/template/advanced_feature.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
    -

    {'Advanced features'|@translate}

    -
    - - diff --git a/admin/themes/default/template/maintenance.tpl b/admin/themes/default/template/maintenance.tpl index 2208b5baa..0ac001156 100644 --- a/admin/themes/default/template/maintenance.tpl +++ b/admin/themes/default/template/maintenance.tpl @@ -2,6 +2,12 @@

    {'Maintenance'|@translate}

    + + diff --git a/language/en_UK/help/advanced_feature.html b/language/en_UK/help/advanced_feature.html deleted file mode 100644 index 7851e48c5..000000000 --- a/language/en_UK/help/advanced_feature.html +++ /dev/null @@ -1,16 +0,0 @@ -

    Advanced features

    - -

    List special functionnalities for expert Piwigo administrators:

    - - diff --git a/language/en_UK/help/maintenance.html b/language/en_UK/help/maintenance.html index e70558e8d..040bad8aa 100644 --- a/language/en_UK/help/maintenance.html +++ b/language/en_UK/help/maintenance.html @@ -9,6 +9,19 @@ sometimes an error can occur and cached information becomes wrong.

    Some information become useless with time going by. Deleting this useless information from database make you save disk space.

    + +