aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2009-03-07 21:34:55 +0000
committerpatdenice <patdenice@piwigo.org>2009-03-07 21:34:55 +0000
commit1cfe916db25a47ce3a61881be1eb756a77792857 (patch)
tree45b33bccd246767dea7609f9a3f98e5477905ccf
parente0ea9fb92f467a3b2a24555e58981455eedd127d (diff)
Re-order templates extension alphabetically.
Allow to use template extension for navigation bar. git-svn-id: http://piwigo.org/svn/trunk@3182 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/extend_for_templates.php13
-rw-r--r--admin/template/goto/element_set_global.tpl2
-rw-r--r--admin/template/goto/element_set_unit.tpl2
-rw-r--r--admin/template/goto/history.tpl4
-rw-r--r--admin/template/goto/rating.tpl4
-rw-r--r--admin/template/goto/user_list.tpl2
-rw-r--r--plugins/LocalFilesEditor/admin.php13
-rw-r--r--template/yoga/comments.tpl2
-rw-r--r--template/yoga/index.tpl2
-rw-r--r--template/yoga/picture.tpl2
10 files changed, 24 insertions, 22 deletions
diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php
index 22bfea36a..2f3bbc92b 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,21 @@ $eligible_templates = array(
'menubar_menu.tpl' => 'mbMenu',
'menubar_specials.tpl' => 'mbSpecials',
'menubar_tags.tpl' => 'mbTags',
- 'header.tpl' => 'header',
- 'footer.tpl' => 'tail',
- 'index.tpl' => 'index',
+ 'navigation_bar.tpl' => 'navbar',
'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/admin/template/goto/element_set_global.tpl b/admin/template/goto/element_set_global.tpl
index cd12410bc..a9c5173f0 100644
--- a/admin/template/goto/element_set_global.tpl
+++ b/admin/template/goto/element_set_global.tpl
@@ -37,7 +37,7 @@
<legend>{'Elements'|@translate}</legend>
- {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+ {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
{if !empty($thumbnails)}
<ul class="thumbnails">
diff --git a/admin/template/goto/element_set_unit.tpl b/admin/template/goto/element_set_unit.tpl
index 1c9d99ae2..cb374e9d9 100644
--- a/admin/template/goto/element_set_unit.tpl
+++ b/admin/template/goto/element_set_unit.tpl
@@ -24,7 +24,7 @@
</fieldset>
-{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
{if !empty($elements) }
<input type="hidden" name="element_ids" value="{$ELEMENT_IDS}" />
diff --git a/admin/template/goto/history.tpl b/admin/template/goto/history.tpl
index 9291f4a36..ea9583e6a 100644
--- a/admin/template/goto/history.tpl
+++ b/admin/template/goto/history.tpl
@@ -102,7 +102,7 @@
</fieldset>
{/if}
-{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
<table class="table2" id="detailedStats">
<tr class="throw">
@@ -133,4 +133,4 @@
{/if}
</table>
-{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
diff --git a/admin/template/goto/rating.tpl b/admin/template/goto/rating.tpl
index 0ff212bf5..cfad377c5 100644
--- a/admin/template/goto/rating.tpl
+++ b/admin/template/goto/rating.tpl
@@ -32,7 +32,7 @@
</fieldset>
</form>
-{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
<table width="99%">
<tr class="throw">
@@ -65,4 +65,4 @@
{/foreach} {*images*}
</table>
-{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
diff --git a/admin/template/goto/user_list.tpl b/admin/template/goto/user_list.tpl
index e6c4373ac..06e1a9062 100644
--- a/admin/template/goto/user_list.tpl
+++ b/admin/template/goto/user_list.tpl
@@ -91,7 +91,7 @@
{/foreach}
</table>
-{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
{* delete the selected users ? *}
<fieldset>
diff --git a/plugins/LocalFilesEditor/admin.php b/plugins/LocalFilesEditor/admin.php
index 6ac5fc6a1..3edd1ae50 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,21 @@ switch ($page['tab'])
'menubar_menu.tpl',
'menubar_specials.tpl',
'menubar_tags.tpl',
- 'header.tpl',
- 'footer.tpl',
- 'index.tpl',
+ 'navigation_bar.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');
diff --git a/template/yoga/comments.tpl b/template/yoga/comments.tpl
index 1475b1810..13994c0a7 100644
--- a/template/yoga/comments.tpl
+++ b/template/yoga/comments.tpl
@@ -65,7 +65,7 @@
</form>
-{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
{if isset($comments)}
<div id="comments">
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index cc882d9d1..c270fc891 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -103,7 +103,7 @@
{if !empty($CATEGORIES) }{$CATEGORIES}{/if}
{if !empty($THUMBNAILS) }{$THUMBNAILS}{/if}
-{if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
{if !empty($CONTENT_DESCRIPTION) }
<div class="additional_info">
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index a6c9eda06..b670a0388 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -255,7 +255,7 @@ y.callService(
{if $COMMENT_COUNT > 0}
<h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
{/if}
- {if !empty($navbar) }{include file='navigation_bar.tpl'}{/if}
+ {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
{if isset($comments)}
{include file='comment_list.tpl' comment_separator=true}