aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-07-22 01:29:38 +0000
committerrvelices <rv-github@modusoptimus.com>2008-07-22 01:29:38 +0000
commitb62eb188a2506fa35121a3a7d120d8ae163584dc (patch)
tree6741a8f762ff1af7f251c96c3891ffe86f819577
parent60b7843d3a9117694ae5803d5c77e7cb1232183c (diff)
- remove admin :hover css rule (bouncing thumbnails in caddie FF)
- move some code from notification.php to notification.tpl - remove some unused variables from picture.php - make random.php work even if top_number is a lot (some issues solved with url length) git-svn-id: http://piwigo.org/svn/trunk@2446 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/template/yoga/theme/admin/theme.css4
-rw-r--r--notification.php5
-rw-r--r--picture.php7
-rw-r--r--random.php2
-rw-r--r--template/yoga/notification.tpl4
5 files changed, 8 insertions, 14 deletions
diff --git a/admin/template/yoga/theme/admin/theme.css b/admin/template/yoga/theme/admin/theme.css
index 1a7114d32..6569dc95c 100644
--- a/admin/template/yoga/theme/admin/theme.css
+++ b/admin/template/yoga/theme/admin/theme.css
@@ -64,10 +64,6 @@ INPUT, SELECT, TEXTAREA { border-left: 2px solid #696969; }
border: 1px solid #aaaaaa; /* thumbnails border color and style */
border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */
}
-.content UL.thumbnails SPAN.wrap2:hover {
- margin: 0 2px; width: auto; padding: 0; text-indent: 0;
- list-style: none; text-align: center; float: left; }
-
label { cursor:pointer }
.virtual_cat { background: #222 !important; }
a.Piwigo {
diff --git a/notification.php b/notification.php
index 6271fd004..8106ba79c 100644
--- a/notification.php
+++ b/notification.php
@@ -68,9 +68,6 @@ $title = l10n('Notification');
$page['body_id'] = 'theNotificationPage';
$page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
-$template->append('head_elements',
- '<link rel="alternate" type="application/rss+xml" href="'.$feed_url.'">'
- );
$template->set_filenames(array('notification'=>'notification.tpl'));
@@ -85,7 +82,7 @@ $template->assign(
// | html code display |
// +-----------------------------------------------------------------------+
include(PHPWG_ROOT_PATH.'include/page_header.php');
-$template->parse('notification');
+$template->pparse('notification');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?> \ No newline at end of file
diff --git a/picture.php b/picture.php
index d4cde5ed7..6126a307e 100644
--- a/picture.php
+++ b/picture.php
@@ -42,7 +42,7 @@ $page['rank_of'] = array_flip($page['items']);
if ( !isset($page['rank_of'][$page['image_id']]) )
{
$query = '
-SELECT id, file, level
+SELECT id, file, level
FROM '.IMAGES_TABLE.'
WHERE ';
if ($page['image_id']>0)
@@ -68,7 +68,7 @@ SELECT id, file, level
if ( !isset($page['rank_of'][$page['image_id']]) )
{// the image can still be non accessible (filter/cat perm) and/or not in the set
global $filter;
- if ( !empty($filter['visible_images']) and
+ if ( !empty($filter['visible_images']) and
!in_array($page['image_id'], explode(',',$filter['visible_images']) ) )
{
page_not_found( 'The requested image is filtered',
@@ -779,7 +779,6 @@ SELECT COUNT(*) AS nb_fav
}
//--------------------------------------------------------- picture information
-$header_infos = array(); //for html header use
// legend
if (isset($picture['current']['comment'])
and !empty($picture['current']['comment']))
@@ -789,7 +788,6 @@ if (isset($picture['current']['comment'])
trigger_event('render_element_description',
$picture['current']['comment'])
);
- $header_infos['COMMENT'] = strip_tags($picture['current']['comment']);
}
$infos = array();
@@ -806,7 +804,6 @@ if (!empty($picture['current']['author']))
// '&amp;search=author:'.$picture['current']['author']
// .'">'.$picture['current']['author'].'</a>';
$picture['current']['author'];
- $header_infos['INFO_AUTHOR'] = $picture['current']['author'];
}
// creation date
diff --git a/random.php b/random.php
index 7b0deaeb3..e3f3ebf38 100644
--- a/random.php
+++ b/random.php
@@ -52,7 +52,7 @@ SELECT DISTINCT(id)
'WHERE'
).'
ORDER BY RAND(NOW())
- LIMIT 0, '.$conf['top_number'].'
+ LIMIT 0, '.min(50, $conf['top_number'],$user['nb_image_page']).'
;';
// +-----------------------------------------------------------------------+
diff --git a/template/yoga/notification.tpl b/template/yoga/notification.tpl
index b62db4bc0..de8185e58 100644
--- a/template/yoga/notification.tpl
+++ b/template/yoga/notification.tpl
@@ -1,4 +1,8 @@
{* $Id$ *}
+{html_head}
+<link rel="alternate" type="application/rss+xml" title="{'Image only RSS feed'|@translate}" href="{$U_FEED_IMAGE_ONLY}">
+<link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed'|@translate}" href="{$U_FEED}">
+{/html_head}
<div id="content" class="content">
<div class="titrePage">