Changeset 13115

Timestamp:

Feb 12, 2012, 11:02:59 AM (12 years ago)

Author:

rvelices

Message:

improvement of picture title on picture page, drop boxes on index page ...
sharpening uses a zider scale range

Location:

trunk

Files:

• admin/include/image.class.php (modified) (1 diff)
• include/category_default.inc.php (modified) (3 diffs)
• include/config_default.inc.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• template-extension/distributed/samples/my-picture.tpl (modified) (1 diff)
• themes/default/template/index.tpl (modified) (2 diffs)
• themes/default/template/picture.tpl (modified) (1 diff)
• themes/default/template/slideshow.tpl (modified) (1 diff)
• themes/default/theme.css (modified) (4 diffs)

trunk/admin/include/image.class.php

@@ -266 +266 @@
   static function get_sharpen_matrix($amount)
   {
-                // Amount should be in the range of 18-10
-                $amount = round(abs(-18 + ($amount * 0.08)), 2);
+                // Amount should be in the range of 24-10
+                $amount = round(abs(-24 + ($amount * 0.14)), 2);
 
                 $matrix = array

trunk/include/category_default.inc.php

@@ -38 +38 @@
 if (count($selection) > 0)
 {
-  $rank_of = array_flip($page['items']);
+  $rank_of = array_flip($selection);
 
   $query = '
@@ -49 +49 @@
   {
     $row['rank'] = $rank_of[ $row['id'] ];
-
-    array_push($pictures, $row);
+    $pictures[] = $row;
   }
 
@@ -114 +113 @@
 
   $tpl_var = array_merge( $row, array(
-    'TN_SRC' => DerivativeImage::thumb_url($row),
     'TN_ALT' => htmlspecialchars(strip_tags($name)),
     'TN_TITLE' => get_thumbnail_title($row, $name, $desc),

trunk/include/config_default.inc.php

@@ -193 +193 @@
 // 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;
 
 // display_fromto: display the date creation bounds of a

trunk/picture.php

@@ -718 +718 @@
     'SECTION_TITLE' => $page['title'],
     'PHOTO' => $title_nb,
-    'SHOW_PICTURE_NAME_ON_TITLE' => $conf['show_picture_name_on_title'],
     'IS_HOME' => ('categories'==$page['section'] and !isset($page['category']) ),
 

trunk/template-extension/distributed/samples/my-picture.tpl

@@ -27 +27 @@
   </div>
   <div class="imageNumber">{$PHOTO}</div>
-  {if $SHOW_PICTURE_NAME_ON_TITLE }
   <h2>{$current.TITLE}</h2>
-  {/if}
 </div>
 

trunk/themes/default/template/index.tpl

@@ -9 +9 @@
                 </a>
                 <div id="sortOrderBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()">
-                        {'Sort order'|@translate}:
-                        {foreach from=$image_orders item=image_order}<br>
+                        {'Sort order'|@translate}<hr>
+                        {foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
                         {if $image_order.SELECTED}
                         <span>{$image_order.DISPLAY}</span>
@@ -40 +40 @@
                 </a>
                 <div id="derivativeSwitchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()">
-                        {foreach from=$image_derivatives item=image_derivative name=deriv_loop}{if !$smarty.foreach.deriv_loop.first}<br>{/if}
+                        {'Photo sizes'|@translate}<hr>
+                        {foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
                         {if $image_derivative.SELECTED}
                         <span>{$image_derivative.DISPLAY}</span>

trunk/themes/default/template/picture.tpl

@@ -13 +13 @@
 <div id="imageHeaderBar">
         <div class="browsePath">
-                {$SECTION_TITLE} {$LEVEL_SEPARATOR}{$current.TITLE}
+                {$SECTION_TITLE} {$LEVEL_SEPARATOR} <h2>{$current.TITLE}</h2>
         </div>
         <div class="imageNumber">{$PHOTO}</div>
-        {if $SHOW_PICTURE_NAME_ON_TITLE}
-        <h2>{$current.TITLE}</h2>
-        {/if}
 </div>
 

trunk/themes/default/template/slideshow.tpl

@@ -4 +4 @@
     [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
     {/if}
+                <h2 class="showtitle">{$current.TITLE}</h2>
   </div>
   <div class="imageNumber">{$PHOTO}</div>
-  {if $SHOW_PICTURE_NAME_ON_TITLE }
-  <h2 class="showtitle">{$current.TITLE}</h2>
-  {/if}
 </div>
 

trunk/themes/default/theme.css

@@ -321 +321 @@
 
 #imageHeaderBar H2 {
-        text-align: center;
-        padding: 0;
-        clear: both;
+        display: inline;
+        text-align: center;
+        padding: 0;
 }
 
@@ -343 +343 @@
         position: absolute;
         left: 5px;
-        top: 10%;
+        top: 12%;
 }
 
@@ -356 +356 @@
         text-align: center;
         position: relative; /*so that the drivative switch link is positioned relative to us*/
-}
-
-#theImage>IMG {
-        display: block;
-        margin: 0 auto;
-        border: 0;
 }
 
@@ -464 +458 @@
 A.pwg-state-default:hover {
         border-bottom: 0; /*reset above for icons*/
-}
-
-IMG {
-        border: 0;
 }