From 3c8775b25255a2be4f561b1c0ede275cbae3f73b Mon Sep 17 00:00:00 2001 From: plegall Date: Wed, 7 Feb 2007 21:23:33 +0000 Subject: [PATCH] Feature 638 added: "Fixed navigation bar" extension integration. git-svn-id: http://piwigo.org/svn/trunk@1787 68402e56-0260-453c-a942-63ccdbb3a9ee --- picture.php | 90 +++++++++++++++++--------- template/yoga/icon/first_unactive.png | Bin 0 -> 1573 bytes template/yoga/icon/last_unactive.png | Bin 0 -> 1556 bytes template/yoga/icon/left_unactive.png | Bin 0 -> 1574 bytes template/yoga/icon/right_unactive.png | Bin 0 -> 1556 bytes template/yoga/picture.tpl | 18 +++++- 6 files changed, 74 insertions(+), 34 deletions(-) create mode 100644 template/yoga/icon/first_unactive.png create mode 100644 template/yoga/icon/last_unactive.png create mode 100644 template/yoga/icon/left_unactive.png create mode 100644 template/yoga/icon/right_unactive.png diff --git a/picture.php b/picture.php index a177b9b47..1200e4c33 100644 --- a/picture.php +++ b/picture.php @@ -43,13 +43,19 @@ if (isset($page['category'])) // displayed, and execution is stopped if (!in_array($page['image_id'], $page['items'])) { - page_not_found('The requested image does not belong to this image set', - duplicate_index_url() ); + page_not_found( + 'The requested image does not belong to this image set', + duplicate_index_url() + ); } // add default event handler for rendering element content -add_event_handler('render_element_content', 'default_picture_content', - EVENT_HANDLER_PRIORITY_NEUTRAL, 2); +add_event_handler( + 'render_element_content', + 'default_picture_content', + EVENT_HANDLER_PRIORITY_NEUTRAL, + 2 + ); trigger_action('loc_begin_picture'); // this is the default handler that generates the display for the element @@ -63,10 +69,16 @@ function default_picture_content($content, $element_info) { // nothing to do return $content; } + global $user; - $my_template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], - $user['theme'] ); - $my_template->set_filenames( array('default_content'=>'picture_content.tpl') ); + + $my_template = new Template( + PHPWG_ROOT_PATH.'template/'.$user['template'], + $user['theme'] + ); + $my_template->set_filenames( + array('default_content'=>'picture_content.tpl') + ); if (isset($element_info['high_url'])) { @@ -89,8 +101,6 @@ function default_picture_content($content, $element_info) return $my_template->parse( 'default_content', true); } - - // +-----------------------------------------------------------------------+ // | initialization | // +-----------------------------------------------------------------------+ @@ -211,8 +221,10 @@ UPDATE '.CATEGORIES_TABLE.' case 'rate' : { include_once(PHPWG_ROOT_PATH.'include/functions_rate.inc.php'); - rate_picture($page['image_id'], - isset($_POST['rate']) ? $_POST['rate'] : $_GET['rate'] ); + rate_picture( + $page['image_id'], + isset($_POST['rate']) ? $_POST['rate'] : $_GET['rate'] + ); redirect($url_self); } case 'delete_comment' : @@ -395,8 +407,10 @@ if (empty($picture['current']['width'])) if (!empty($picture['current']['width'])) { - list($picture['current']['scaled_width'],$picture['current']['scaled_height']) = - get_picture_size( + list( + $picture['current']['scaled_width'], + $picture['current']['scaled_height'] + ) = get_picture_size( $picture['current']['width'], $picture['current']['height'], @$user['maxwidth'], @@ -419,8 +433,8 @@ $title = $picture['current']['name']; $refresh = 0; if ( isset( $_GET['slideshow'] ) and isset($page['next_item']) ) { - // $redirect_msg, $refresh, $url_link and $title are required for creating an automated - // refresh page in header.tpl + // $redirect_msg, $refresh, $url_link and $title are required for creating + // an automated refresh page in header.tpl $refresh= $_GET['slideshow']; $url_link = add_url_params( $picture['next']['url'], @@ -436,12 +450,15 @@ $title_nb = ($page['current_rank'] + 1).'/'.$page['cat_nb_images']; $url_metadata = duplicate_picture_url(); // do we have a plugin that can show metadata for something else than images? -$metadata_showable = trigger_event('get_element_metadata_available', - ( - ($conf['show_exif'] or $conf['show_iptc']) - and isset($picture['current']['image_path']) +$metadata_showable = trigger_event( + 'get_element_metadata_available', + ( + ($conf['show_exif'] or $conf['show_iptc']) + and isset($picture['current']['image_path']) ), - $picture['current']['path'] ); + $picture['current']['path'] + ); + if ($metadata_showable) { if ( !isset($_GET['metadata']) ) @@ -471,26 +488,30 @@ else { $page['display_tpl'] = 'picture.tpl'; $page['slideshow'] = false; } -// maybe someone wants a special display (call it before page_header so that they -// can add stylesheets) -$element_content = trigger_event('render_element_content', - '', $picture['current'] ); -if ( isset($picture['next']['image_url']) - and isset($picture['next']['is_picture']) ) +// maybe someone wants a special display (call it before page_header so that +// they can add stylesheets) +$element_content = trigger_event( + 'render_element_content', + '', + $picture['current'] + ); + +if (isset($picture['next']['image_url']) + and isset($picture['next']['is_picture'])) { - $template->assign_block_vars( 'prefetch', + $template->assign_block_vars( + 'prefetch', array ( 'URL' => $picture['next']['image_url'] - ) - ); + ) + ); } $template->set_filenames(array( 'picture' => $page['display_tpl'] )); - //------------------------------------------------------- navigation management -foreach ( array('first','previous','next','last') as $which_image ) +foreach (array('first','previous','next','last') as $which_image) { if (isset($picture[$which_image])) { @@ -503,6 +524,13 @@ foreach ( array('first','previous','next','last') as $which_image ) ) ); } + else + { + $template->assign_block_vars( + $which_image.'_unactive', + array() + ); + } } $template->assign_vars( diff --git a/template/yoga/icon/first_unactive.png b/template/yoga/icon/first_unactive.png new file mode 100644 index 0000000000000000000000000000000000000000..f0c0364f2530e3382e82b6367b1973cf982689fb GIT binary patch literal 1573 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 Ye}n{KYMbONXaE2J07*qoM6N<$f}VxxkpKVy literal 0 HcmV?d00001 diff --git a/template/yoga/icon/right_unactive.png b/template/yoga/icon/right_unactive.png new file mode 100644 index 0000000000000000000000000000000000000000..cf2f9614caae06c8324562cb7c3afdd0b9d10c87 GIT binary patch literal 1556 zcmV+v2J88WP)mm;<;=G1a3OL1ANG%0nOy2@|Q`#!s_hx5wW*kBJl=lyu@kL$kg>%QNk zHf-1+N~vV6^*xD>j(+Rat5>?VwpLqs(|+T|4H+335d|@2S=Kj>;~bFNw{JT*)u&FK za;%}DA>nFkYjcbk?j7jqiHQj{KR++Wjvecuf-FM<#;*AI_>3b*j(Ct=W!ttC z6cosnD_4x*)YO#J)YKSxiHV7kojZ53?sE3**%Ias+i|a1Sy?@oFJD%rrKOfJ?$*wq zDF-nXwvM0!~|xEuq<^lIloVkDk_lKbMgf%2EiElF}>7%a=+;2Gz#QXS67$x z_4S!}P&{2xQQ?DrBg^Fp4-aPp-a>DG7!(v_uUofHp}iCcr%7}4pbz**5%}xNm9DF+ zvtZeK{P^+TP~q2HDiAy9U4%xiId|@yCJ_U<k&z?NnQCPASQ3h}E}ty%&am7AN(FkQoJ70upaGCBN^V7tA&orxq_I&s|t zxv}M_0?6Hj!(Hj==}TwMoC$&hP3j?UrflqVHY%A$0wFRp9*{dtwqdp@aC#AiVYFXj ze@x(J>SA@kcvf+7vAuiuZVOXDtzNyFQ_L8oAvOtl?=BXIJqx397%p z-$5iPa56;Ry-Q=Msi}&_X^6^ff&a5$&}`O$5wQ<3-sJi7=RD45Crt1TOxN(LiIy{t zVgK9uulJ0OX=KE#mw$~beBkyVito_K&dHM}O;MRkrh&zEHw_crzJ2@tW*9j)^}(Ix@jDFs3G{h)?%eT#MIPjn(I`ekL`)k#rm}bM-etpAuU?g#H*cDD zrgQ2b3Wbif{j@)T{S#T__CN+4wE#)@rcIlCKH~Lqs6C} z{jdaQL3lp^**76FV#ESE*;7_lW+OGJ_%zo(d-g1yj`0oUpmgAj6Iamz=Ln{h9v&XH zn0F$Mjg7r^`0(Km?%usSj6VXbE&q;)!U1zC;$}?ngUBvtlz#!N*jh@$b@P${0000 + + + - + - {lang:home} + + + + {L_UP_ALT} - + + + + + + +