mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 19:59:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extend_for_templates include slideshow.tpl overides.

Browse source 
menubar.tpl is no longer supported by Extend_for_templates.
Titling_categories.tpl was in error (Wrong recent icon var)

git-svn-id: http://piwigo.org/svn/trunk@2549 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
vdigital 2008-09-18 21:26:33 +00:00
parent c502ebd43a
commit bff424f8d9
3 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/extend_for_templates.php
View file

@ -112,14 +112,13 @@ $eligible_templates = array(
'mainpage_categories.tpl' => 'index_category_thumbnails', 'mainpage_categories.tpl' => 'index_category_thumbnails',
'thumbnails.tpl' => 'index_thumbnails', 'thumbnails.tpl' => 'index_thumbnails',
'redirect.tpl' => 'redirect', 'redirect.tpl' => 'redirect',
'menubar.tpl' => 'menubar', // 'menubar.tpl' => 'menubar', // TODO by blocks
'header.tpl' => 'header', 'header.tpl' => 'header',
'footer.tpl' => 'tail', 'footer.tpl' => 'tail',
'index.tpl' => 'index', 'index.tpl' => 'index',
'nbm.tpl' => 'nbm', 'nbm.tpl' => 'nbm',
'notification.tpl' => 'notification', 'notification.tpl' => 'notification',
'picture_content.tpl' => 'default_content', 'picture_content.tpl' => 'default_content',
'slideshow.tpl' => 'picture', /* => slideshow is missing */
'picture.tpl' => 'picture', 'picture.tpl' => 'picture',
'popuphelp.tpl' => 'popuphelp', 'popuphelp.tpl' => 'popuphelp',
'profile.tpl' => 'profile', 'profile.tpl' => 'profile',
@ -127,6 +126,7 @@ $eligible_templates = array(
'register.tpl' => 'register', 'register.tpl' => 'register',
'search.tpl' => 'search', 'search.tpl' => 'search',
'search_rules.tpl' => 'search_rules', 'search_rules.tpl' => 'search_rules',
'slideshow.tpl' => 'slideshow',
'tags.tpl' => 'tags', 'tags.tpl' => 'tags',
'upload.tpl' => 'upload',); 'upload.tpl' => 'upload',);
$flip_templates = array_flip($eligible_templates); $flip_templates = array_flip($eligible_templates);

24
picture.php
View file

@ -550,13 +550,14 @@ else
{ {
$page['slideshow'] = false; $page['slideshow'] = false;
} }
if ($page['slideshow'] and $conf['light_slideshow'])
$template->set_filenames( {
array( $template->set_filenames( array('slideshow' => 'slideshow.tpl'));
'picture' => }
(($page['slideshow'] and $conf['light_slideshow']) ? 'slideshow.tpl' : 'picture.tpl'), else
)); {
$template->set_filenames( array('picture' => 'picture.tpl'));
}
$title = $picture['current']['name']; $title = $picture['current']['name'];
$title_nb = ($page['current_rank'] + 1).'/'.count($page['items']); $title_nb = ($page['current_rank'] + 1).'/'.count($page['items']);
@ -948,7 +949,14 @@ if ($metadata_showable and pwg_get_session_var('show_metadata') <> null )
include(PHPWG_ROOT_PATH.'include/page_header.php'); include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_picture'); trigger_action('loc_end_picture');
$template->pparse('picture'); if ($page['slideshow'] and $conf['light_slideshow'])
{
$template->pparse('slideshow');
}
else
{
$template->pparse('picture');
}
//------------------------------------------------------------ log informations //------------------------------------------------------------ log informations
pwg_log($picture['current']['id'], 'picture'); pwg_log($picture['current']['id'], 'picture');
include(PHPWG_ROOT_PATH.'include/page_tail.php'); include(PHPWG_ROOT_PATH.'include/page_tail.php');

2
template-extension/distributed/samples/titling_categories.tpl
View file

@ -16,7 +16,7 @@
{foreach from=$category_thumbnails item=cat} {foreach from=$category_thumbnails item=cat}
<div class="unbordered"> {* W3C HTML non conform *} <div class="unbordered"> {* W3C HTML non conform *}
<h3> {* 2nd difference: h3 is outside of description *} <h3> {* 2nd difference: h3 is outside of description *}
<a href="{$cat.URL}">{$cat.NAME}</a>{$cat.ICON} <a href="{$cat.URL}">{$cat.NAME}</a>{$cat.ICON_TS}
</h3> </h3>
<li> <li>
<div class="thumbnailCategory"> <div class="thumbnailCategory">