- "add to caddie" link is visible only when categories contains

  elements. Only admin users can see this link

- elements batch management : impossible to create a link between category
  and element that already exists

- logical separation of category name under thumbnail and element name


git-svn-id: http://piwigo.org/svn/trunk@760 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 21 insertions, 8 deletions

diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index a99873bc1..030d12240 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -106,13 +106,18 @@ while ($row = mysql_fetch_array($result))
       'IMAGE'              => $thumbnail_url,
       'IMAGE_ALT'          => $row['file'],
       'IMAGE_TITLE'        => $thumbnail_title,
-      'IMAGE_NAME'         => $name,
       'IMAGE_TS'           => get_icon($row['date_available']),
-      'IMAGE_STYLE'        => 'thumb_picture',
       
       'U_IMG_LINK'         => add_session_id($url_link)
       )
     );
+  
+  $template->assign_block_vars(
+    'thumbnails.line.thumbnail.element_name',
+    array(
+      'NAME' => $name
+      )
+    );
     
   if ($user['show_nb_comments']
       and is_numeric($page['cat'])
diff --git a/include/category_recent_cats.inc.php b/include/category_recent_cats.inc.php
index 5eaf62a37..1b3e84f1e 100644
--- a/include/category_recent_cats.inc.php
+++ b/include/category_recent_cats.inc.php
@@ -77,14 +77,18 @@ while ( $row = mysql_fetch_array( $result ) )
       'IMAGE'                   => $thumbnail_src,
       'IMAGE_ALT'               => $row['file'],
       'IMAGE_TITLE'             => $lang['hint_category'],
-      'IMAGE_NAME'              => '['.$name.']',
-      'IMAGE_STYLE'             => 'thumb_category',
         
       'U_IMG_LINK'              => add_session_id($url_link)
       )
     );
-  $template->assign_block_vars('thumbnails.line.thumbnail.bullet',array());
 
+  $template->assign_block_vars(
+    'thumbnails.line.thumbnail.category_name',
+    array(
+      'NAME' => $name
+      )
+    );
+  
   // create a new line ?
   if (++$row_number == $user['nb_image_line'])
   {
diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index 38b69297b..5132172b9 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -100,14 +100,18 @@ SELECT path, tn_ext
       'IMAGE'                 => $thumbnail_link,
       'IMAGE_ALT'             => $row['name'],
       'IMAGE_TITLE'           => $thumbnail_title,
-      'IMAGE_NAME'            => '['.$row['name'].']',
       'IMAGE_TS'              => get_icon(@$row['date_last']),
-      'IMAGE_STYLE'           => 'thumb_category',
         
       'U_IMG_LINK'            => add_session_id($url_link)
      )
    );
-  $template->assign_block_vars('thumbnails.line.thumbnail.bullet',array());
+
+  $template->assign_block_vars(
+    'thumbnails.line.thumbnail.category_name',
+    array(
+      'NAME' => $row['name']
+      )
+    );
 
   // create a new line ?
   if (++$row_number == $user['nb_image_line'])