- improvement: long localized messages are in HTML files instead of $lang

  array. This is the case of admin/help and about pages.

- deletion: of unused functions (ts_to_mysqldt, is_image, TN_exists,
  check_date_format, date_convert, get_category_directories,
  get_used_metadata_list, array_remove, pwg_write_debug,
  get_group_restrictions, get_all_group_restrictions, is_group_allowed,
  style_select, deprecated_getAttribute).

- new: many new contextual help pages to replace descriptions previously
  included in pages.

- modification: reorganisation of language files. Deletion of unused
  language keys, alphabetical sort. No faq.lang.php anymore (replaced by
  help.html). Only done for en_UK.iso-8859-1.


git-svn-id: http://piwigo.org/svn/trunk@862 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 3 insertions, 6 deletions

diff --git a/admin/cat_options.php b/admin/cat_options.php
index 24e0687cd..f8ca7527b 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -150,6 +150,8 @@ $template->assign_vars(
   array(
     'L_SUBMIT'=>$lang['submit'],
     'L_RESET'=>$lang['reset'],
+
+    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_options',
     
     'F_ACTION'=>add_session_id($base_url.$page['section'])
    )
@@ -193,7 +195,6 @@ SELECT id,name,uppercats,global_rank
         'L_SECTION' => $lang['cat_upload_title'],
         'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
         'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_upload_info'],
         )
       );
     break;
@@ -215,7 +216,6 @@ SELECT id,name,uppercats,global_rank
         'L_SECTION' => $lang['cat_comments_title'],
         'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
         'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_comments_info'],
         )
       );
     break;
@@ -237,7 +237,6 @@ SELECT id,name,uppercats,global_rank
         'L_SECTION' => $lang['cat_lock_title'],
         'L_CAT_OPTIONS_TRUE' => $lang['unlocked'],
         'L_CAT_OPTIONS_FALSE' => $lang['locked'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_lock_info'],
         )
       );
     break;
@@ -259,7 +258,6 @@ SELECT id,name,uppercats,global_rank
         'L_SECTION' => $lang['cat_status_title'],
         'L_CAT_OPTIONS_TRUE' => $lang['cat_public'],
         'L_CAT_OPTIONS_FALSE' => $lang['cat_private'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_status_info'],
         )
       );
     break;
@@ -281,8 +279,7 @@ SELECT id,name,uppercats,global_rank
       array(
         'L_SECTION' => l10n('Representative'),
         'L_CAT_OPTIONS_TRUE' => l10n('singly represented'),
-        'L_CAT_OPTIONS_FALSE' => l10n('randomly represented'),
-        'L_CAT_OPTIONS_INFO' => l10n('')
+        'L_CAT_OPTIONS_FALSE' => l10n('randomly represented')
         )
       );
     break;