aboutsummaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2008-02-27 20:25:18 +0000
committerrub <rub@piwigo.org>2008-02-27 20:25:18 +0000
commitbf4012291a878c3f22fa318595e2ca7881c2978a (patch)
tree52d142b93c7c224e281b44a7530a30b77aaba348 /index.php
parent98d4b284e047f1fcb991935e689192c47fca457c (diff)
Resolved issue 0000807: New slideshow features
git-svn-id: http://piwigo.org/svn/trunk@2218 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'index.php')
-rw-r--r--index.php23
1 files changed, 19 insertions, 4 deletions
diff --git a/index.php b/index.php
index 3a084147e..815b9376c 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | file : $Id$
// | last update : $Date$
@@ -67,7 +67,7 @@ if (isset($page['category']))
check_restrictions($page['category']['id']);
}
-if ( count($page['items']) > $user['nb_image_page'])
+if (count($page['items']) > $user['nb_image_page'])
{
$page['navigation_bar'] = create_navigation_bar(
duplicate_index_url(array(), array('start')),
@@ -99,7 +99,7 @@ $page['body_id'] = 'theCategoryPage';
$template->set_filenames( array('index'=>'index.tpl') );
//-------------------------------------------------------------- category title
$template_title = $page['title'];
-if ( count($page['items']) > 0)
+if (count($page['items']) > 0)
{
$template_title.= ' ['.count($page['items']).']';
}
@@ -192,7 +192,7 @@ if (isset($page['category']) and is_admin())
);
}
-if (is_admin() and !empty($page['items']) )
+if (is_admin() and !empty($page['items']))
{
$template->assign_block_vars(
'caddie',
@@ -262,6 +262,21 @@ if ( !empty($page['items']) )
}
//------------------------------------------------------- category informations
+// slideshow
+// execute after init thumbs in order to have all picture informations
+if (!empty($page['cat_slideshow_url']))
+{
+ if (isset($_GET['slideshow']))
+ {
+ redirect($page['cat_slideshow_url']);
+ }
+ else
+ {
+ $template->assign_block_vars(
+ 'slideshow', array('URL' => $page['cat_slideshow_url']));
+ }
+}
+
// navigation bar
if ($page['navigation_bar'] != '')
{