merge part of r3182 from trunk to branch 2.0.

Re-order templates extension alphabetically.

git-svn-id: http://piwigo.org/svn/branches/2.0@3183 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 12 insertions, 12 deletions

diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php
index 22bfea36a..38c2723fc 100644
--- a/admin/extend_for_templates.php
+++ b/admin/extend_for_templates.php
@@ -75,10 +75,11 @@ $relevant_parameters = array_merge($relevant_parameters, $permalinks);
 $eligible_templates = array(
     '----------'                 => 'N/A',
     'about.tpl'                  => 'about',
+    'footer.tpl'                 => 'tail',
+    'header.tpl'                 => 'header',
     'identification.tpl'         => 'identification',
+    'index.tpl'                  => 'index',
     'mainpage_categories.tpl'    => 'index_category_thumbnails',
-    'thumbnails.tpl'             => 'index_thumbnails',
-    'redirect.tpl'               => 'redirect',
     'menubar.tpl'                => 'menubar',
     'menubar_categories.tpl'     => 'mbCategories',
     'menubar_identification.tpl' => 'mbIdentification',
@@ -86,21 +87,20 @@ $eligible_templates = array(
     'menubar_menu.tpl'           => 'mbMenu',
     'menubar_specials.tpl'       => 'mbSpecials',
     'menubar_tags.tpl'           => 'mbTags',
-    'header.tpl'                 => 'header',
-    'footer.tpl'                 => 'tail',
-    'index.tpl'                  => 'index',
     'nbm.tpl'                    => 'nbm',
     'notification.tpl'           => 'notification',
-    'picture_content.tpl'        => 'default_content',
     'picture.tpl'                => 'picture',
+    'picture_content.tpl'        => 'default_content',
     'popuphelp.tpl'              => 'popuphelp',
     'profile.tpl'                => 'profile',
     'profile_content.tpl'        => 'profile_content',
+    'redirect.tpl'               => 'redirect',
     'register.tpl'               => 'register',
     'search.tpl'                 => 'search',
     'search_rules.tpl'           => 'search_rules',
     'slideshow.tpl'              => 'slideshow',
     'tags.tpl'                   => 'tags',
+    'thumbnails.tpl'             => 'index_thumbnails',
     'upload.tpl'                 => 'upload',);
 
 $flip_templates = array_flip($eligible_templates);
diff --git a/plugins/LocalFilesEditor/admin.php b/plugins/LocalFilesEditor/admin.php
index 6ac5fc6a1..0cc8f8321 100644
--- a/plugins/LocalFilesEditor/admin.php
+++ b/plugins/LocalFilesEditor/admin.php
@@ -185,10 +185,11 @@ switch ($page['tab'])
       // Model list
       $eligible_templates = array(
           'about.tpl',
+          'footer.tpl',
+          'header.tpl',
           'identification.tpl',
+          'index.tpl',
           'mainpage_categories.tpl',
-          'thumbnails.tpl',
-          'redirect.tpl',
           'menubar.tpl',
           'menubar_categories.tpl',
           'menubar_identification.tpl',
@@ -196,21 +197,20 @@ switch ($page['tab'])
           'menubar_menu.tpl',
           'menubar_specials.tpl',
           'menubar_tags.tpl',
-          'header.tpl',
-          'footer.tpl',
-          'index.tpl',
           'nbm.tpl',
           'notification.tpl',
-          'picture_content.tpl',
           'picture.tpl',
+          'picture_content.tpl',
           'popuphelp.tpl',
           'profile.tpl',
           'profile_content.tpl',
+          'redirect.tpl',
           'register.tpl',
           'search.tpl',
           'search_rules.tpl',
           'slideshow.tpl',
           'tags.tpl',
+          'thumbnails.tpl',
           'upload.tpl');
 
       $options['model'][] = l10n('locfiledit_empty_page');