From bf22f7ec699f19cab10552a10cd19cf45dc80db8 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Fri, 20 Apr 2007 01:41:58 +0000
Subject: merge r1964 from trunk to branch-1_7 - added rel nofollow for help
 link in search.tpl - added {PLUGIN_PICTURE_ACTIONS} in picture.tpl

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@1965 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 template/yoga/picture.tpl | 13 +++++++------
 template/yoga/search.tpl  |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'template')

diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 542f8e952..9c1217af2 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -19,15 +19,16 @@
 <div class="randomButtons">
   <a href="{U_SLIDESHOW}" title="{lang:slideshow}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/slideshow.png" class="button" alt="{lang:slideshow}"></a>
   <a href="{U_METADATA}" title="{lang:picture_show_metadata}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/metadata.png" class="button" alt="{lang:picture_show_metadata}"></a>
-<!-- BEGIN representative -->
-  <a href="{representative.URL}" title="{lang:set as category representative}"><img src="{pwg_root}{themeconf:icon_dir}/representative.png" class="button" alt="{lang:representative}"></a>
-<!-- END representative -->
-<!-- BEGIN favorite -->
-  <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}"><img src="{favorite.FAVORITE_IMG}" class="button" alt="{favorite.FAVORITE_ALT}"></a>
-<!-- END favorite -->
 <!-- BEGIN download -->
   <a href="{download.U_DOWNLOAD}" title="{lang:download_hint}"><img src="{pwg_root}{themeconf:icon_dir}/save.png" class="button" alt="{lang:download}"></a>
 <!-- END download -->
+  {PLUGIN_PICTURE_ACTIONS}
+<!-- BEGIN favorite -->
+  <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}"><img src="{favorite.FAVORITE_IMG}" class="button" alt="{favorite.FAVORITE_ALT}"></a>
+<!-- END favorite -->
+<!-- BEGIN representative -->
+  <a href="{representative.URL}" title="{lang:set as category representative}"><img src="{pwg_root}{themeconf:icon_dir}/representative.png" class="button" alt="{lang:representative}"></a>
+<!-- END representative -->
 <!-- BEGIN admin -->
   <a href="{U_ADMIN}" title="{lang:link_info_image}"><img src="{pwg_root}{themeconf:icon_dir}/preferences.png" class="button" alt="{lang:link_info_image}"></a>
 <!-- END admin -->
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index b13189f9b..2821a013b 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -3,7 +3,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+      <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}" rel="nofollow"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
       <li><a href="{U_HOME}" title="{lang:return to homepage}" rel="home"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
     </ul>
     <h2>{lang:Search}</h2>
-- 
cgit v1.2.3