adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

index.tpl and thumbnails change: category description above thumbs and enclosing ul moved to index.tpl

Browse Source 
fix some combine_xxx

git-svn-id: http://piwigo.org/svn/trunk@8401 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-12-30 19:47:17 +00:00
parent 2ca0da39fb
commit ff36bf3b70
4 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.php
+15 -17
View File
@@ -26,13 +26,22 @@ define('PHPWG_ROOT_PATH','./');
include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
include(PHPWG_ROOT_PATH.'include/section_init.inc.php');
trigger_action('loc_begin_index');
// +-----------------------------------------------------------------------+
// | Check Access and exit when user status is not ok |
// +-----------------------------------------------------------------------+
// Check Access and exit when user status is not ok
check_status(ACCESS_GUEST);
if (!isset($page['start']))
{
$page['start'] = 0;
}
// access authorization check
if (isset($page['category']))
{
check_restrictions($page['category']['id']);
}
trigger_action('loc_begin_index');
//---------------------------------------------- change of image display order
if (isset($_GET['image_order']))
{
@@ -52,17 +61,6 @@ if (isset($_GET['image_order']))
);
}
//-------------------------------------------------------------- initialization
// detection of the start picture to display
if (!isset($page['start']))
{
$page['start'] = 0;
}
// access authorization check
if (isset($page['category']))
{
check_restrictions($page['category']['id']);
}
$page['navigation_bar'] = array();
if (count($page['items']) > $user['nb_image_page'])
@@ -255,7 +253,7 @@ if ( $conf['index_sort_order_input']
}
// category comment
if (isset($page['comment']) and $page['comment'] != '')
if ($page['start']==0 and !isset($page['chronology_field']) and !empty($page['comment']) )
{
$template->assign('CONTENT_DESCRIPTION', $page['comment'] );
}