Changeset 13115
- Timestamp:
- Feb 12, 2012, 11:02:59 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/image.class.php
r13035 r13115 266 266 static function get_sharpen_matrix($amount) 267 267 { 268 // Amount should be in the range of 18-10269 $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); 270 270 271 271 $matrix = array -
trunk/include/category_default.inc.php
r12920 r13115 38 38 if (count($selection) > 0) 39 39 { 40 $rank_of = array_flip($ page['items']);40 $rank_of = array_flip($selection); 41 41 42 42 $query = ' … … 49 49 { 50 50 $row['rank'] = $rank_of[ $row['id'] ]; 51 52 array_push($pictures, $row); 51 $pictures[] = $row; 53 52 } 54 53 … … 114 113 115 114 $tpl_var = array_merge( $row, array( 116 'TN_SRC' => DerivativeImage::thumb_url($row),117 115 'TN_ALT' => htmlspecialchars(strip_tags($name)), 118 116 'TN_TITLE' => get_thumbnail_title($row, $name, $desc), -
trunk/include/config_default.inc.php
r12908 r13115 193 193 // show_thumbnail_caption : on thumbnails page, show thumbnail captions ? 194 194 $conf['show_thumbnail_caption'] = true; 195 196 // show_picture_name_on_title : on picture presentation page, show picture197 // name ?198 $conf['show_picture_name_on_title'] = true;199 195 200 196 // display_fromto: display the date creation bounds of a -
trunk/picture.php
r13077 r13115 718 718 'SECTION_TITLE' => $page['title'], 719 719 'PHOTO' => $title_nb, 720 'SHOW_PICTURE_NAME_ON_TITLE' => $conf['show_picture_name_on_title'],721 720 'IS_HOME' => ('categories'==$page['section'] and !isset($page['category']) ), 722 721 -
trunk/template-extension/distributed/samples/my-picture.tpl
r12881 r13115 27 27 </div> 28 28 <div class="imageNumber">{$PHOTO}</div> 29 {if $SHOW_PICTURE_NAME_ON_TITLE }30 29 <h2>{$current.TITLE}</h2> 31 {/if}32 30 </div> 33 31 -
trunk/themes/default/template/index.tpl
r13074 r13115 9 9 </a> 10 10 <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} 13 13 {if $image_order.SELECTED} 14 14 <span>{$image_order.DISPLAY}</span> … … 40 40 </a> 41 41 <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} 43 44 {if $image_derivative.SELECTED} 44 45 <span>{$image_derivative.DISPLAY}</span> -
trunk/themes/default/template/picture.tpl
r13074 r13115 13 13 <div id="imageHeaderBar"> 14 14 <div class="browsePath"> 15 {$SECTION_TITLE} {$LEVEL_SEPARATOR} {$current.TITLE}15 {$SECTION_TITLE} {$LEVEL_SEPARATOR} <h2>{$current.TITLE}</h2> 16 16 </div> 17 17 <div class="imageNumber">{$PHOTO}</div> 18 {if $SHOW_PICTURE_NAME_ON_TITLE}19 <h2>{$current.TITLE}</h2>20 {/if}21 18 </div> 22 19 -
trunk/themes/default/template/slideshow.tpl
r12881 r13115 4 4 [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ] 5 5 {/if} 6 <h2 class="showtitle">{$current.TITLE}</h2> 6 7 </div> 7 8 <div class="imageNumber">{$PHOTO}</div> 8 {if $SHOW_PICTURE_NAME_ON_TITLE }9 <h2 class="showtitle">{$current.TITLE}</h2>10 {/if}11 9 </div> 12 10 -
trunk/themes/default/theme.css
r12930 r13115 321 321 322 322 #imageHeaderBar H2 { 323 text-align: center;324 padding: 0;325 clear: both;323 display: inline; 324 text-align: center; 325 padding: 0; 326 326 } 327 327 … … 343 343 position: absolute; 344 344 left: 5px; 345 top: 1 0%;345 top: 12%; 346 346 } 347 347 … … 356 356 text-align: center; 357 357 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;364 358 } 365 359 … … 464 458 A.pwg-state-default:hover { 465 459 border-bottom: 0; /*reset above for icons*/ 466 }467 468 IMG {469 border: 0;470 460 } 471 461
Note: See TracChangeset
for help on using the changeset viewer.