Changeset 13115


Ignore:
Timestamp:
Feb 12, 2012, 11:02:59 AM (8 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:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/image.class.php

    r13035 r13115  
    266266  static function get_sharpen_matrix($amount)
    267267  {
    268                 // Amount should be in the range of 18-10
    269                 $amount = round(abs(-18 + ($amount * 0.08)), 2);
     268                // Amount should be in the range of 24-10
     269                $amount = round(abs(-24 + ($amount * 0.14)), 2);
    270270
    271271                $matrix = array
  • trunk/include/category_default.inc.php

    r12920 r13115  
    3838if (count($selection) > 0)
    3939{
    40   $rank_of = array_flip($page['items']);
     40  $rank_of = array_flip($selection);
    4141
    4242  $query = '
     
    4949  {
    5050    $row['rank'] = $rank_of[ $row['id'] ];
    51 
    52     array_push($pictures, $row);
     51    $pictures[] = $row;
    5352  }
    5453
     
    114113
    115114  $tpl_var = array_merge( $row, array(
    116     'TN_SRC' => DerivativeImage::thumb_url($row),
    117115    'TN_ALT' => htmlspecialchars(strip_tags($name)),
    118116    'TN_TITLE' => get_thumbnail_title($row, $name, $desc),
  • trunk/include/config_default.inc.php

    r12908 r13115  
    193193// show_thumbnail_caption : on thumbnails page, show thumbnail captions ?
    194194$conf['show_thumbnail_caption'] = true;
    195 
    196 // show_picture_name_on_title : on picture presentation page, show picture
    197 // name ?
    198 $conf['show_picture_name_on_title'] = true;
    199195
    200196// display_fromto: display the date creation bounds of a
  • trunk/picture.php

    r13077 r13115  
    718718    'SECTION_TITLE' => $page['title'],
    719719    'PHOTO' => $title_nb,
    720     'SHOW_PICTURE_NAME_ON_TITLE' => $conf['show_picture_name_on_title'],
    721720    'IS_HOME' => ('categories'==$page['section'] and !isset($page['category']) ),
    722721
  • trunk/template-extension/distributed/samples/my-picture.tpl

    r12881 r13115  
    2727  </div>
    2828  <div class="imageNumber">{$PHOTO}</div>
    29   {if $SHOW_PICTURE_NAME_ON_TITLE }
    3029  <h2>{$current.TITLE}</h2>
    31   {/if}
    3230</div>
    3331
  • trunk/themes/default/template/index.tpl

    r13074 r13115  
    99                </a>
    1010                <div id="sortOrderBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()">
    11                         {'Sort order'|@translate}:
    12                         {foreach from=$image_orders item=image_order}<br>
     11                        {'Sort order'|@translate}<hr>
     12                        {foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
    1313                        {if $image_order.SELECTED}
    1414                        <span>{$image_order.DISPLAY}</span>
     
    4040                </a>
    4141                <div id="derivativeSwitchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()">
    42                         {foreach from=$image_derivatives item=image_derivative name=deriv_loop}{if !$smarty.foreach.deriv_loop.first}<br>{/if}
     42                        {'Photo sizes'|@translate}<hr>
     43                        {foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
    4344                        {if $image_derivative.SELECTED}
    4445                        <span>{$image_derivative.DISPLAY}</span>
  • trunk/themes/default/template/picture.tpl

    r13074 r13115  
    1313<div id="imageHeaderBar">
    1414        <div class="browsePath">
    15                 {$SECTION_TITLE} {$LEVEL_SEPARATOR}{$current.TITLE}
     15                {$SECTION_TITLE} {$LEVEL_SEPARATOR} <h2>{$current.TITLE}</h2>
    1616        </div>
    1717        <div class="imageNumber">{$PHOTO}</div>
    18         {if $SHOW_PICTURE_NAME_ON_TITLE}
    19         <h2>{$current.TITLE}</h2>
    20         {/if}
    2118</div>
    2219
  • trunk/themes/default/template/slideshow.tpl

    r12881 r13115  
    44    [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
    55    {/if}
     6                <h2 class="showtitle">{$current.TITLE}</h2>
    67  </div>
    78  <div class="imageNumber">{$PHOTO}</div>
    8   {if $SHOW_PICTURE_NAME_ON_TITLE }
    9   <h2 class="showtitle">{$current.TITLE}</h2>
    10   {/if}
    119</div>
    1210
  • trunk/themes/default/theme.css

    r12930 r13115  
    321321
    322322#imageHeaderBar H2 {
    323         text-align: center;
    324         padding: 0;
    325         clear: both;
     323        display: inline;
     324        text-align: center;
     325        padding: 0;
    326326}
    327327
     
    343343        position: absolute;
    344344        left: 5px;
    345         top: 10%;
     345        top: 12%;
    346346}
    347347
     
    356356        text-align: center;
    357357        position: relative; /*so that the drivative switch link is positioned relative to us*/
    358 }
    359 
    360 #theImage>IMG {
    361         display: block;
    362         margin: 0 auto;
    363         border: 0;
    364358}
    365359
     
    464458A.pwg-state-default:hover {
    465459        border-bottom: 0; /*reset above for icons*/
    466 }
    467 
    468 IMG {
    469         border: 0;
    470460}
    471461
Note: See TracChangeset for help on using the changeset viewer.