Changeset 803

Timestamp:

Jul 17, 2005, 4:58:42 PM (19 years ago)

Author:

plg

Message:

• new configuration parameter : hide thumbnail captions on main page with $confshow_thumbnail_caption

• new configuration parameter : hide picture name in title on picture presentation page with $confshow_picture_name_on_title

• template : new CSS classes to manage picture.php title

Location:

trunk

Files:

• doc/ChangeLog (modified) (1 diff)
• include/category_default.inc.php (modified) (2 diffs)
• include/config_default.inc.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• template/default/default.css (modified) (1 diff)
• template/default/picture.tpl (modified) (1 diff)

trunk/doc/ChangeLog

@@ +1 @@
+2005-07-17 Pierrick LE GALL
+
+        * new configuration parameter : hide thumbnail captions on main
+        page with $conf['show_thumbnail_caption']
+
+        * new configuration parameter : hide picture name in title on
+        picture presentation page with $conf['show_picture_name_on_title']
+
+        * template : new CSS classes to manage picture.php title
+        
 2005-07-16 Pierrick LE GALL
 

trunk/include/category_default.inc.php

@@ -62 +62 @@
 while ($row = mysql_fetch_array($result))
 {
-  // name of the picture
-  if (isset($row['name']) and $row['name'] != '')
-  {
-    $name = $row['name'];
-  }
-  else
-  {
-    $name = str_replace('_', ' ', get_filename_wo_extension($row['file']));
-  }
-  if ($page['cat'] == 'best_rated')
-  {
-    $name = '('.$row['average_rate'].') '.$name;
-  }
-
-  if ($page['cat'] == 'search')
-  {
-    $name = replace_search($name, $_GET['search']);
-  }
-  
   $thumbnail_url = get_thumbnail_src($row['path'], @$row['tn_ext']);
   
@@ -112 +93 @@
       )
     );
+
+  if ($conf['show_thumbnail_caption'])
+  {
+    // name of the picture
+    if (isset($row['name']) and $row['name'] != '')
+    {
+      $name = $row['name'];
+    }
+    else
+    {
+      $name = str_replace('_', ' ', get_filename_wo_extension($row['file']));
+    }
+    if ($page['cat'] == 'best_rated')
+    {
+      $name = '('.$row['average_rate'].') '.$name;
+    }
+    
+    if ($page['cat'] == 'search')
+    {
+      $name = replace_search($name, $_GET['search']);
+    }
   
-  $template->assign_block_vars(
-    'thumbnails.line.thumbnail.element_name',
-    array(
-      'NAME' => $name
-      )
-    );
+    $template->assign_block_vars(
+      'thumbnails.line.thumbnail.element_name',
+      array(
+        'NAME' => $name
+        )
+      );
+  }
     
   if ($user['show_nb_comments']

trunk/include/config_default.inc.php

@@ -217 +217 @@
 // "hour", "half day", "day", "week", "month".
 $conf['feed_period'] = 'week';
+
+// show_thumbnail_caption : on thumbnails page, show thumbnail captions ?
+$conf['show_thumbnail_caption'] = true;
+
+// show_picture_name_on_title : on picture presentation page, show picture
+// name ?
+$conf['show_picture_name_on_title'] = true;
 ?>

trunk/picture.php

@@ -587 +587 @@
   )
 );
+
+if ($conf['show_picture_name_on_title'])
+{
+  $template->assign_block_vars('title', array());
+}
+
 //------------------------------------------------------- upper menu management
 // download link if file is not a picture

trunk/template/default/default.css

@@ -100 +100 @@
 
 /* POSITION */
+
+div#pictureTitle {
+  float:left;
+  text-align:left;
+}
+
+div#pictureNumber {
+  float:right;
+  text-align:right;
+}
 
 #gauche,#droite

trunk/template/default/picture.tpl

@@ -2 +2 @@
 <div class="information">{information.INFORMATION}</div>
 <!-- END information -->
+
 <div class="titrePage">
-  <div id="gauche"><a href="{U_HOME}">{L_HOME}</a>{LEVEL_SEPARATOR}{CATEGORY}</div>
-  <div id="centre" class="nameImage">{TITLE}</div>
-  <div id="droite">{PHOTO}</div>
+  <div id="pictureTitle">
+    <a href="{U_HOME}">{L_HOME}</a>{LEVEL_SEPARATOR}{CATEGORY}
+    <!-- BEGIN title -->
+    {LEVEL_SEPARATOR}{TITLE}
+    <!-- END title -->
+  </div>
+  <div id="pictureNumber">{PHOTO}</div>
 </div>