diff options
author | rvelices <rv-github@modusoptimus.com> | 2010-06-28 19:42:37 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2010-06-28 19:42:37 +0000 |
commit | b735fef251f30b252a4978958376e1ac64cb6582 (patch) | |
tree | 18dd4adf786f0fecbc13bec232d2725007d86185 | |
parent | 20752c742f10b455d7393c2d4597c02def4aa859 (diff) |
favorite image icon is not taken from php but left to the theme (still in the php for the branch for theme compatibility)
git-svn-id: http://piwigo.org/svn/branches/2.1@6614 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | picture.php | 71 | ||||
-rw-r--r-- | themes/default/template/index.tpl | 2 | ||||
-rw-r--r-- | themes/default/template/picture.tpl | 2 |
3 files changed, 29 insertions, 46 deletions
diff --git a/picture.php b/picture.php index 9b94d8c73..2a3e994f4 100644 --- a/picture.php +++ b/picture.php @@ -312,13 +312,13 @@ UPDATE '.CATEGORIES_TABLE.' case 'edit_comment' : { check_pwg_token(); - + include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php'); check_input_parameter('comment_to_edit', $_GET, false, PATTERN_ID); $author_id = get_comment_author_id($_GET['comment_to_edit']); - + if (can_manage_comment('edit', $author_id)) { if (!empty($_POST['content'])) @@ -331,7 +331,7 @@ UPDATE '.CATEGORIES_TABLE.' ), $_POST['key'] ); - + redirect($url_self); } else @@ -344,35 +344,35 @@ UPDATE '.CATEGORIES_TABLE.' case 'delete_comment' : { check_pwg_token(); - + include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php'); - + check_input_parameter('comment_to_delete', $_GET, false, PATTERN_ID); $author_id = get_comment_author_id($_GET['comment_to_delete']); - + if (can_manage_comment('delete', $author_id)) { delete_user_comment($_GET['comment_to_delete']); } - + redirect($url_self); } case 'validate_comment' : { check_pwg_token(); - + include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php'); check_input_parameter('comment_to_validate', $_GET, false, PATTERN_ID); - + $author_id = get_comment_author_id($_GET['comment_to_validate']); - + if (can_manage_comment('validate', $author_id)) { validate_user_comment($_GET['comment_to_validate']); } - + redirect($url_self); } @@ -796,39 +796,22 @@ SELECT COUNT(*) AS nb_fav WHERE image_id = '.$page['image_id'].' AND user_id = '.$user['id'].' ;'; - $result = pwg_query($query); - $row = pwg_db_fetch_assoc($result); + $row = pwg_db_fetch_assoc( pwg_query($query) ); + $is_favorite = $row['nb_fav'] != 0; - if ($row['nb_fav'] == 0) - { - $template->assign( - 'favorite', - array( - 'FAVORITE_IMG' => - get_root_url().get_themeconf('icon_dir').'/favorite.png', - 'FAVORITE_HINT' => l10n('add this image to your favorites'), - 'U_FAVORITE' => add_url_params( - $url_self, - array('action'=>'add_to_favorites') - ), - ) - ); - } - else - { - $template->assign( - 'favorite', - array( - 'FAVORITE_IMG' => - get_root_url().get_themeconf('icon_dir').'/del_favorite.png', - 'FAVORITE_HINT' => l10n('delete this image from your favorites'), - 'U_FAVORITE' => add_url_params( - $url_self, - array('action'=>'remove_from_favorites') - ), - ) - ); - } + $template->assign( + 'favorite', + array( + 'IS_FAVORITE' => $is_favorite, + 'FAVORITE_IMG' => + get_root_url().get_themeconf('icon_dir').(!$is_favorite ? '/favorite.png' : '/del_favorite.png' ), + 'FAVORITE_HINT' => l10n( !$is_favorite ? 'add this image to your favorites' : 'delete this image from your favorites'), + 'U_FAVORITE' => add_url_params( + $url_self, + array('action'=> !$is_favorite ? 'add_to_favorites' : 'remove_from_favorites' ) + ), + ) + ); } //--------------------------------------------------------- picture information @@ -1017,4 +1000,4 @@ else //------------------------------------------------------------ log informations pwg_log($picture['current']['id'], 'picture'); include(PHPWG_ROOT_PATH.'include/page_tail.php'); -?> +?>
\ No newline at end of file diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 522113bc7..febc64abb 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -15,7 +15,7 @@ {/if} {if isset($favorite) } - <li><a href="{$favorite.U_FAVORITE}" title="{'delete all images from your favorites'|@translate}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{'delete all images from your favorites'|@translate}"></a></li> + <li><a href="{$favorite.U_FAVORITE}" title="{'delete all images from your favorites'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/del_all_favorites.png" class="button" alt="favorite" title="{'delete all images from your favorites'|@translate}"></a></li> {/if} {if isset($U_CADDIE) } diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 7e9a796ea..70eeb0fb8 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -50,7 +50,7 @@ {/if} {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} {if isset($favorite) } - <a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{$favorite.FAVORITE_HINT}"></a> + <a href="{$favorite.U_FAVORITE}" title="{if $favorite.IS_FAVORITE}{'delete this image from your favorites'|@translate}{else}{'add this image to your favorites'|@translate}{/if}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/{if $favorite.IS_FAVORITE}del_favorite{else}favorite{/if}.png" class="button" alt="favorite" title="{if $favorite.IS_FAVORITE}{'delete this image from your favorites'|@translate}{else}{'add this image to your favorites'|@translate}{/if}"></a> {/if} {if !empty($U_SET_AS_REPRESENTATIVE) } <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a> |