Changeset 25372
- Timestamp:
- Nov 7, 2013, 4:30:59 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 4 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/configuration.php
r25018 r25372 135 135 ); 136 136 137 $mail_themes = array( 138 'clear' => 'Clear', 139 'dark' => 'Dark', 140 ); 137 141 138 142 //------------------------------ verification and registration of modifications … … 348 352 ), 349 353 'week_starts_on_options_selected' => $conf['week_starts_on'], 354 'mail_theme' => $conf['mail_theme'], 355 'mail_theme_options' => $mail_themes, 350 356 'order_by' => $order_by, 351 357 'order_by_options' => $sort_fields, -
trunk/admin/include/add_core_tabs.inc.php
r25237 r25372 69 69 case 'configuration': 70 70 global $conf_link; 71 $sheets['main'] = array('caption' => l10n(' Main'), 'url' => $conf_link.'main');71 $sheets['main'] = array('caption' => l10n('General'), 'url' => $conf_link.'main'); 72 72 $sheets['sizes'] = array('caption' => l10n('Photo sizes'), 'url' => $conf_link.'sizes'); 73 73 $sheets['watermark'] = array('caption' => l10n('Watermark'), 'url' => $conf_link.'watermark'); -
trunk/admin/themes/default/template/configuration.tpl
r25005 r25372 1 {footer_script}{literal} 2 jQuery(document).ready(function(){ 3 jQuery("#activate_comments").change(function(){ 4 if ($(this).is(':checked')) { 5 jQuery("#comments_param_warp").show(); 6 } else { 7 jQuery("#comments_param_warp").hide(); 8 } 9 }); 10 1 {footer_script} 2 (function(){ 11 3 var targets = { 12 4 'input[name="rate"]' : '#rate_anonymous', … … 23 15 24 16 (function(target){ 25 jQuery(selector). bind('change', function() {17 jQuery(selector).on('change', function() { 26 18 jQuery(target).toggle($(this).is(':checked')); 27 19 }); 28 20 })(target); 29 21 }; 30 } );31 {/ literal}{/footer_script}22 }()); 23 {/footer_script} 32 24 33 25 <h2>{'Piwigo configuration'|@translate} {$TABSHEET_TITLE}</h2> … … 36 28 <form method="post" action="{$F_ACTION}" class="properties"{if isset($watermark)} enctype="multipart/form-data"{/if}> 37 29 {/if} 30 38 31 <div id="configContent"> 39 32 {if isset($main)} 40 <fieldset id="mainConf">41 <legend> </legend>33 <fieldset class="mainConf"> 34 <legend>{'Basic settings'|translate}</legend> 42 35 <ul> 43 36 <li> 44 45 <label for="gallery_title">{'Gallery title'|@translate}</label> 37 <label for="gallery_title">{'Gallery title'|@translate}</label> 46 38 <br> 47 39 <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{$main.CONF_GALLERY_TITLE}"> … … 49 41 50 42 <li> 51 52 <label for="page_banner">{'Page banner'|@translate}</label> 43 <label for="page_banner">{'Page banner'|@translate}</label> 53 44 <br> 54 45 <textarea rows="5" cols="50" class="description" name="page_banner" id="page_banner">{$main.CONF_PAGE_BANNER}</textarea> 55 46 </li> 56 57 <li> 58 <label> 59 <input type="checkbox" name="rate" {if ($main.rate)}checked="checked"{/if}> 60 {'Allow rating'|@translate} 61 </label> 62 </li> 63 64 <li id="rate_anonymous"> 65 <label> 66 <input type="checkbox" name="rate_anonymous" {if ($main.rate_anonymous)}checked="checked"{/if}> 67 {'Rating by guests'|@translate} 68 </label> 69 </li> 70 71 <li> 72 <label> 73 <input type="checkbox" name="allow_user_registration" {if ($main.allow_user_registration)}checked="checked"{/if}> 74 {'Allow user registration'|@translate} 75 </label> 76 </li> 77 78 <li id="email_admin_on_new_user"> 79 <label> 80 <input type="checkbox" name="email_admin_on_new_user" {if ($main.email_admin_on_new_user)}checked="checked"{/if}> 81 {'Email admins when a new user registers'|@translate} 82 </label> 83 </li> 84 85 <li> 86 <label> 87 <input type="checkbox" name="allow_user_customization" {if ($main.allow_user_customization)}checked="checked"{/if}> 88 {'Allow user customization'|@translate} 89 </label> 90 </li> 91 92 <li> 93 <label> 94 <input type="checkbox" name="obligatory_user_mail_address" {if ($main.obligatory_user_mail_address)}checked="checked"{/if}> 95 {'Mail address is obligatory for all users'|@translate} 96 </label> 97 </li> 98 99 <li> 100 <label>{'Week starts on'|@translate} 101 {html_options name="week_starts_on" options=$main.week_starts_on_options selected=$main.week_starts_on_options_selected}</label> 102 </li> 103 104 <li> 105 <label>{'Default photos order'|@translate}</label> 106 107 {foreach from=$main.order_by item=order} 108 <span class="filter {if isset($ORDER_BY_IS_CUSTOM)}transparent{/if}"> 109 <select name="order_by[]" {if isset($ORDER_BY_IS_CUSTOM)}disabled{/if}> 110 {html_options options=$main.order_by_options selected=$order} 111 </select> 112 <a class="removeFilter">{'delete'|@translate}</a> 113 </span> 114 {/foreach} 115 116 {if !isset($ORDER_BY_IS_CUSTOM)} 117 <a class="addFilter">{'Add a criteria'|@translate}</a> 118 {else} 119 <span class="order_by_is_custom">{'You can\'t define a default photo order because you have a custom setting in your local configuration.'|@translate}</span> 120 {/if} 121 </li> 122 47 48 <li id="order_filters"> 49 <label>{'Default photos order'|@translate}</label> 50 51 {foreach from=$main.order_by item=order} 52 <span class="filter {if isset($ORDER_BY_IS_CUSTOM)}transparent{/if}"> 53 <select name="order_by[]" {if isset($ORDER_BY_IS_CUSTOM)}disabled{/if}> 54 {html_options options=$main.order_by_options selected=$order} 55 </select> 56 <a class="removeFilter">{'delete'|@translate}</a> 57 </span> 58 {/foreach} 59 60 {if !isset($ORDER_BY_IS_CUSTOM)} 61 <a class="addFilter">{'Add a criteria'|@translate}</a> 62 {else} 63 <span class="order_by_is_custom">{'You can\'t define a default photo order because you have a custom setting in your local configuration.'|@translate}</span> 64 {/if} 65 </li> 66 </ul> 67 123 68 {if !isset($ORDER_BY_IS_CUSTOM)} 124 69 {footer_script require='jquery'} 70 (function(){ 125 71 // counters for displaying of addFilter link 126 fields = {$main.order_by|@count}; max_fields = Math.ceil({$main.order_by_options|@count}/2); 127 128 {literal} 72 var fields = {$main.order_by|@count}, 73 max_fields = Math.ceil({$main.order_by_options|@count}/2); 74 129 75 function updateAddFilterLink() { 130 76 if (fields >= max_fields) { 131 $('.addFilter').css('display', 'none');77 jQuery('.addFilter').css('display', 'none'); 132 78 } else { 133 $('.addFilter').css('display', '');79 jQuery('.addFilter').css('display', ''); 134 80 } 135 81 } 136 82 137 83 function updateRemoveFilterTrigger() { 138 $(".removeFilter").click(function() {139 $(this).parent('span.filter').remove();84 jQuery(".removeFilter").click(function() { 85 jQuery(this).parent('span.filter').remove(); 140 86 fields--; 141 87 updateAddFilterLink(); 142 88 }); 143 89 144 $(".removeFilter").css('display', '');145 $(".filter:first .removeFilter").css('display', 'none');90 jQuery(".removeFilter").css('display', ''); 91 jQuery(".filter:first .removeFilter").css('display', 'none'); 146 92 } 147 93 148 jQuery(document).ready(function () { 149 $('.addFilter').click(function() { 150 $(this).prev('span.filter').clone().insertBefore($(this)); 151 $(this).prev('span.filter').children('select[name="order_by[]"]').val(''); 152 153 fields++; 154 updateRemoveFilterTrigger(); 155 updateAddFilterLink(); 156 }); 157 94 95 jQuery('.addFilter').click(function() { 96 jQuery(this).prev('span.filter').clone().insertBefore($(this)); 97 jQuery(this).prev('span.filter').children('select[name="order_by[]"]').val(''); 98 99 fields++; 158 100 updateRemoveFilterTrigger(); 159 101 updateAddFilterLink(); 160 102 }); 161 {/literal} 103 104 updateRemoveFilterTrigger(); 105 updateAddFilterLink(); 106 }()); 162 107 {/footer_script} 163 108 {/if} 109 </fieldset> 110 111 <fieldset class="mainConf"> 112 <legend>{'Permissions'|translate}</legend> 113 <ul> 114 <li> 115 <label> 116 <input type="checkbox" name="rate" {if ($main.rate)}checked="checked"{/if}> 117 {'Allow rating'|@translate} 118 </label> 119 120 <label id="rate_anonymous" class="no-bold"> 121 <input type="checkbox" name="rate_anonymous" {if ($main.rate_anonymous)}checked="checked"{/if}> 122 {'Rating by guests'|@translate} 123 </label> 124 </li> 125 126 <li> 127 <label> 128 <input type="checkbox" name="allow_user_registration" {if ($main.allow_user_registration)}checked="checked"{/if}> 129 {'Allow user registration'|@translate} 130 </label> 131 132 <label id="email_admin_on_new_user" class="no-bold"> 133 <input type="checkbox" name="email_admin_on_new_user" {if ($main.email_admin_on_new_user)}checked="checked"{/if}> 134 {'Email admins when a new user registers'|@translate} 135 </label> 136 </li> 137 138 <li> 139 <label> 140 <input type="checkbox" name="allow_user_customization" {if ($main.allow_user_customization)}checked="checked"{/if}> 141 {'Allow user customization'|@translate} 142 </label> 143 </li> 144 145 <li> 146 <label> 147 <input type="checkbox" name="obligatory_user_mail_address" {if ($main.obligatory_user_mail_address)}checked="checked"{/if}> 148 {'Mail address is obligatory for all users'|@translate} 149 </label> 150 </li> 151 </ul> 152 153 {footer_script require='jquery'} 154 jQuery("#activate_comments").change(function(){ 155 if ($(this).is(':checked')) { 156 jQuery("#comments_param_warp").show(); 157 } else { 158 jQuery("#comments_param_warp").hide(); 159 } 160 }); 161 {/footer_script} 162 </fieldset> 163 164 <fieldset class="mainConf"> 165 <legend>{'Miscellaneous'|translate}</legend> 166 <ul> 167 <li> 168 <label>{'Week starts on'|@translate} 169 {html_options name="week_starts_on" options=$main.week_starts_on_options selected=$main.week_starts_on_options_selected}</label> 170 </li> 164 171 165 172 <li> 166 173 <strong>{'Save visits in history for'|@translate}</strong> 167 174 168 <label >175 <label class="no-bold"> 169 176 <input type="checkbox" name="history_guest" {if ($main.history_guest)}checked="checked"{/if}> 170 177 {'simple visitors'|@translate} 171 178 </label> 172 179 173 <label >180 <label class="no-bold"> 174 181 <input type="checkbox" name="log" {if ($main.log)}checked="checked"{/if}> 175 182 {'registered users'|@translate} 176 183 </label> 177 184 178 <label >185 <label class="no-bold"> 179 186 <input type="checkbox" name="history_admin" {if ($main.history_admin)}checked="checked"{/if}> 180 187 {'administrators'|@translate} 181 188 </label> 182 183 </li> 189 </li> 190 191 <li> 192 <label>{'Mail theme'|@translate}</label> 193 194 <div class="themeBoxes"> 195 {foreach from=$main.mail_theme_options item=name key=theme} 196 <div class="themeBox {if $main.mail_theme==$theme}themeDefault{/if}"> 197 <label> 198 <div class="themeName"> 199 <input type="radio" name="mail_theme" value="{$theme}" {if $main.mail_theme==$theme}checked{/if}> 200 {$name} 201 </div> 202 <div class="themeShot"> 203 <img src="{$ROOT_URL}themes/default/template/mail/screenshot-{$theme}.png" width="150"/> 204 </div> 205 </label> 206 <a href="{$ROOT_URL}themes/default/template/mail/screenshot-{$theme}.png">{'Preview'|translate}</a> 207 </div> 208 {/foreach} 209 </div> 210 </li> 211 212 {include file='include/colorbox.inc.tpl'} 213 {footer_script require='jquery'} 214 jQuery(".themeBoxes a").colorbox(); 215 216 jQuery("input[name='mail_theme']").change(function() { 217 jQuery("input[name='mail_theme']").parents(".themeBox").removeClass("themeDefault"); 218 jQuery(this).parents(".themeBox").addClass("themeDefault"); 219 }); 220 {/footer_script} 184 221 </ul> 185 222 </fieldset> … … 187 224 188 225 {if isset($comments)} 189 <fieldset id="commentsConf" >226 <fieldset id="commentsConf" class="no-border"> 190 227 <legend></legend> 191 228 <ul> … … 249 286 </label> 250 287 </li> 288 251 289 <li> 252 290 <label> … … 259 297 <strong>{'Notify administrators when a comment is'|@translate}</strong> 260 298 261 <label id="email_admin_on_comment_validation" >299 <label id="email_admin_on_comment_validation" class="no-bold"> 262 300 <input type="checkbox" name="email_admin_on_comment_validation" {if ($comments.email_admin_on_comment_validation)}checked="checked"{/if}> {'pending validation'|@translate} 263 301 </label> 264 302 265 <label >303 <label class="no-bold"> 266 304 <input type="checkbox" name="email_admin_on_comment" {if ($comments.email_admin_on_comment)}checked="checked"{/if}> {'added'|@translate} 267 305 </label> 268 306 269 <label id="email_admin_on_comment_edition" >307 <label id="email_admin_on_comment_edition" class="no-bold"> 270 308 <input type="checkbox" name="email_admin_on_comment_edition" {if ($comments.email_admin_on_comment_edition)}checked="checked"{/if}> {'modified'|@translate} 271 309 </label> 272 310 273 <label id="email_admin_on_comment_deletion" >311 <label id="email_admin_on_comment_deletion" class="no-bold"> 274 312 <input type="checkbox" name="email_admin_on_comment_deletion" {if ($comments.email_admin_on_comment_deletion)}checked="checked"{/if}> {'deleted'|@translate} 275 313 </label> … … 282 320 283 321 {footer_script} 284 var labelMaxWidth = "{'Maximum width'|@translate}"; 285 var labelWidth = "{'Width'|@translate}"; 286 287 var labelMaxHeight = "{'Maximum height'|@translate}"; 288 var labelHeight = "{'Height'|@translate}"; 289 {literal} 290 jQuery(document).ready(function(){ 322 (function(){ 323 var labelMaxWidth = "{'Maximum width'|@translate}", 324 labelWidth = "{'Width'|@translate}", 325 labelMaxHeight = "{'Maximum height'|@translate}", 326 labelHeight = "{'Height'|@translate}"; 327 291 328 function toggleResizeFields(size) { 292 329 var checkbox = jQuery("#original_resize"); … … 302 339 303 340 toggleResizeFields("original"); 304 jQuery("#original_resize").click(function () {toggleResizeFields("original")}); 341 jQuery("#original_resize").click(function () { 342 toggleResizeFields("original"); 343 }); 305 344 306 345 jQuery("a[id^='sizeEditOpen-']").click(function(){ … … 330 369 return false; 331 370 }); 332 333 }); 334 {/literal}{/footer_script} 371 }()); 372 {/footer_script} 335 373 336 374 {html_style}{literal} … … 348 386 {if $is_gd} 349 387 <div> 350 <label> 351 {'Resize after upload disabled due to the use of GD as graphic library'|@translate} 352 <input type="checkbox" name="original_resize" id="original_resize" disabled="disabled" style="visibility: hidden"> 353 <input type="hidden" name="original_resize_maxwidth" value="{$sizes.original_resize_maxwidth}"> 354 <input type="hidden" name="original_resize_maxheight" value="{$sizes.original_resize_maxheight}"> 355 <input type="hidden" name="original_resize_quality" value="{$sizes.original_resize_quality}"> 356 </label> 388 {'Resize after upload disabled due to the use of GD as graphic library'|@translate} 389 <input type="checkbox" name="original_resize" id="original_resize" disabled="disabled" style="visibility: hidden"> 390 <input type="hidden" name="original_resize_maxwidth" value="{$sizes.original_resize_maxwidth}"> 391 <input type="hidden" name="original_resize_maxheight" value="{$sizes.original_resize_maxheight}"> 392 <input type="hidden" name="original_resize_quality" value="{$sizes.original_resize_quality}"> 357 393 </div> 358 394 {else} … … 393 429 <legend>{'Multiple Size'|@translate}</legend> 394 430 395 <div class="showDetails"> 396 <a href="#" id="showDetails"{if isset($ferrors)} style="display:none"{/if}>{'show details'|@translate}</a> 397 </div> 398 399 <table style="margin:0"> 400 {foreach from=$derivatives item=d key=type} 401 <tr> 402 <td> 403 <label> 404 <span class="sizeEnable"> 405 {if $d.must_enable} 406 ✔ 407 {else} 408 <input type="checkbox" name="d[{$type}][enabled]" {if $d.enabled}checked="checked"{/if}> 409 {/if} 431 <div class="showDetails"> 432 <a href="#" id="showDetails"{if isset($ferrors)} style="display:none"{/if}>{'show details'|@translate}</a> 433 </div> 434 435 <table style="margin:0"> 436 {foreach from=$derivatives item=d key=type} 437 <tr> 438 <td> 439 <label> 440 <span class="sizeEnable"> 441 {if $d.must_enable} 442 ✔ 443 {else} 444 <input type="checkbox" name="d[{$type}][enabled]" {if $d.enabled}checked="checked"{/if}> 445 {/if} 446 </span> 447 {$type|@translate} 448 </label> 449 </td> 450 451 <td> 452 <span class="sizeDetails"{if isset($ferrors)} style="display:inline"{/if}>{$d.w} x {$d.h} {'pixels'|@translate}{if $d.crop}, {'Crop'|@translate|lower}{/if}</span> 453 </td> 454 455 <td> 456 <span class="sizeDetails"{if isset($ferrors) and !isset($ferrors.$type)} style="display:inline"{/if}> 457 <a href="#" id="sizeEditOpen-{$type}" class="sizeEditOpen">{'edit'|@translate}</a> 410 458 </span> 411 {$type|@translate} 412 </label> 413 </td> 414 415 <td> 416 <span class="sizeDetails"{if isset($ferrors)} style="display:inline"{/if}>{$d.w} x {$d.h} {'pixels'|@translate}{if $d.crop}, {'Crop'|@translate|lower}{/if}</span> 417 </td> 418 419 <td> 420 <span class="sizeDetails"{if isset($ferrors) and !isset($ferrors.$type)} style="display:inline"{/if}> 421 <a href="#" id="sizeEditOpen-{$type}" class="sizeEditOpen">{'edit'|@translate}</a> 422 </span> 423 </td> 424 </tr> 425 426 <tr id="sizeEdit-{$type}" class="sizeEdit" {if isset($ferrors.$type)} style="display:block"{/if}> 427 <td colspan="3"> 428 <table class="sizeEditForm"> 429 {if !$d.must_square} 430 <tr> 431 <td colspan="2"> 432 <label> 433 <input type="checkbox" class="cropToggle" name="d[{$type}][crop]" {if $d.crop}checked="checked"{/if}> 434 {'Crop'|@translate} 435 </label> 459 </td> 460 </tr> 461 462 <tr id="sizeEdit-{$type}" class="sizeEdit" {if isset($ferrors.$type)} style="display:block"{/if}> 463 <td colspan="3"> 464 <table class="sizeEditForm"> 465 {if !$d.must_square} 466 <tr> 467 <td colspan="2"> 468 <label> 469 <input type="checkbox" class="cropToggle" name="d[{$type}][crop]" {if $d.crop}checked="checked"{/if}> 470 {'Crop'|@translate} 471 </label> 472 </td> 473 </tr> 474 {/if} 475 476 <tr> 477 <td class="sizeEditWidth">{if $d.must_square or $d.crop}{'Width'|@translate}{else}{'Maximum width'|@translate}{/if}</td> 478 <td> 479 <input type="text" name="d[{$type}][w]" maxlength="4" size="4" value="{$d.w}"{if isset($ferrors.$type.w)} class="dError"{/if}> 480 {'pixels'|@translate} 481 {if isset($ferrors.$type.w)}<span class="dErrorDesc" title="{$ferrors.$type.w}">!</span>{/if} 482 </td> 483 </tr> 484 485 {if !$d.must_square} 486 <tr> 487 <td class="sizeEditHeight">{if $d.crop}{'Height'|@translate}{else}{'Maximum height'|@translate}{/if}</td> 488 <td> 489 <input type="text" name="d[{$type}][h]" maxlength="4" size="4" value="{$d.h}"{if isset($ferrors.$type.h)} class="dError"{/if}> 490 {'pixels'|@translate} 491 {if isset($ferrors.$type.h)}<span class="dErrorDesc" title="{$ferrors.$type.h}">!</span>{/if} 492 </td> 493 </tr> 494 {/if} 495 <tr> 496 <td>{'Sharpen'|@translate}</td> 497 <td> 498 <input type="text" name="d[{$type}][sharpen]" maxlength="4" size="4" value="{$d.sharpen}"{if isset($ferrors.$type.sharpen)} class="dError"{/if}> 499 % 500 {if isset($ferrors.$type.sharpen)}<span class="dErrorDesc" title="{$ferrors.$type.sharpen}">!</span>{/if} 436 501 </td> 437 </tr> 438 {/if} 439 440 <tr> 441 <td class="sizeEditWidth">{if $d.must_square or $d.crop}{'Width'|@translate}{else}{'Maximum width'|@translate}{/if}</td> 442 <td> 443 <input type="text" name="d[{$type}][w]" maxlength="4" size="4" value="{$d.w}"{if isset($ferrors.$type.w)} class="dError"{/if}> 444 {'pixels'|@translate} 445 {if isset($ferrors.$type.w)}<span class="dErrorDesc" title="{$ferrors.$type.w}">!</span>{/if} 446 </td> 447 </tr> 448 449 {if !$d.must_square} 450 <tr> 451 <td class="sizeEditHeight">{if $d.crop}{'Height'|@translate}{else}{'Maximum height'|@translate}{/if}</td> 452 <td> 453 <input type="text" name="d[{$type}][h]" maxlength="4" size="4" value="{$d.h}"{if isset($ferrors.$type.h)} class="dError"{/if}> 454 {'pixels'|@translate} 455 {if isset($ferrors.$type.h)}<span class="dErrorDesc" title="{$ferrors.$type.h}">!</span>{/if} 456 </td> 457 </tr> 458 {/if} 459 <tr> 460 <td>{'Sharpen'|@translate}</td> 461 <td> 462 <input type="text" name="d[{$type}][sharpen]" maxlength="4" size="4" value="{$d.sharpen}"{if isset($ferrors.$type.sharpen)} class="dError"{/if}> 463 % 464 {if isset($ferrors.$type.sharpen)}<span class="dErrorDesc" title="{$ferrors.$type.sharpen}">!</span>{/if} 465 </td> 466 </tr> 467 </table> {* #sizeEdit *} 468 </td> 469 </tr> 470 {/foreach} 471 </table> 472 473 <p style="margin:10px 0 0 0;{if isset($ferrors)} display:block;{/if}" class="sizeDetails"> 474 {'Image Quality'|@translate} 475 <input type="text" name="resize_quality" value="{$resize_quality}" size="3" maxlength="3"{if isset($ferrors.resize_quality)} class="dError"{/if}> % 476 {if isset($ferrors.resize_quality)}<span class="dErrorDesc" title="{$ferrors.resize_quality}">!</span>{/if} 477 </p> 478 <p style="margin:10px 0 0 0;{if isset($ferrors)} display:block;{/if}" class="sizeDetails"> 479 <a href="{$F_ACTION}&action=restore_settings" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'Reset to default values'|@translate}</a> 480 </p> 502 </tr> 503 </table> {* #sizeEdit *} 504 </td> 505 </tr> 506 {/foreach} 507 </table> 508 509 <p style="margin:10px 0 0 0;{if isset($ferrors)} display:block;{/if}" class="sizeDetails"> 510 {'Image Quality'|@translate} 511 <input type="text" name="resize_quality" value="{$resize_quality}" size="3" maxlength="3"{if isset($ferrors.resize_quality)} class="dError"{/if}> % 512 {if isset($ferrors.resize_quality)}<span class="dErrorDesc" title="{$ferrors.resize_quality}">!</span>{/if} 513 </p> 514 <p style="margin:10px 0 0 0;{if isset($ferrors)} display:block;{/if}" class="sizeDetails"> 515 <a href="{$F_ACTION}&action=restore_settings" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'Reset to default values'|@translate}</a> 516 </p> 481 517 482 518 {if !empty($custom_derivatives)} 483 <fieldset class="sizeDetails"><legend>{'custom'|@translate}</legend><table style="margin:0"> 484 {foreach from=$custom_derivatives item=time key=custom} 485 <tr><td><label><input type="checkbox" name="delete_custom_derivative_{$custom}"> {'Delete'|@translate} {$custom} ({'Last hit'|@translate}: {$time})</label></td></tr> 486 {/foreach} 487 </table></fieldset> 519 <fieldset class="sizeDetails"> 520 <legend>{'custom'|@translate}</legend> 521 <table style="margin:0"> 522 {foreach from=$custom_derivatives item=time key=custom} 523 <tr><td><label><input type="checkbox" name="delete_custom_derivative_{$custom}"> {'Delete'|@translate} {$custom} ({'Last hit'|@translate}: {$time})</label></td></tr> 524 {/foreach} 525 </table> 526 </fieldset> 488 527 {/if} 489 528 … … 493 532 {if isset($watermark)} 494 533 495 {footer_script}{literal} 496 jQuery(document).ready(function() { 497 534 {footer_script} 535 (function(){ 498 536 function onWatermarkChange() { 499 537 var val = jQuery("#wSelect").val(); 500 538 if (val.length) { 501 jQuery("#wImg").attr('src', {/literal}'{$ROOT_URL}'{literal}+val).show();539 jQuery("#wImg").attr('src', '{$ROOT_URL}'+val).show(); 502 540 } 503 541 else { … … 527 565 return false; 528 566 }); 529 } );530 {/ literal}{/footer_script}531 532 <fieldset id="watermarkConf" >567 }()); 568 {/footer_script} 569 570 <fieldset id="watermarkConf" class="no-border"> 533 571 <legend></legend> 534 572 <ul> … … 536 574 <span id="selectWatermark"{if isset($ferrors.watermarkImage)} style="display:none"{/if}><label>{'Select a file'|@translate}</label> 537 575 <select name="w[file]" id="wSelect"> 538 576 {html_options options=$watermark_files selected=$watermark.file} 539 577 </select> 540 578 {'... or '|@translate}<a href="#" class="addWatermarkOpen">{'add a new watermark'|@translate}</a> 541 <br><img id="wImg"></img></span>{* #selectWatermark *} 579 <br> 580 <img id="wImg"></img></span>{* #selectWatermark *} 542 581 <span id="addWatermark"{if isset($ferrors.watermarkImage)} style="display:inline"{/if}> 543 582 {'add a new watermark'|@translate} {'... or '|@translate}<a href="#" class="addWatermarkOpen">{'Select a file'|@translate}</a> 544 <br><input type="file" size="60" id="watermarkImage" name="watermarkImage"{if isset($ferrors.watermarkImage)} class="dError"{/if}> (png) 583 <br> 584 <input type="file" size="60" id="watermarkImage" name="watermarkImage"{if isset($ferrors.watermarkImage)} class="dError"{/if}> (png) 545 585 {if isset($ferrors.watermarkImage)}<span class="dErrorDesc" title="{$ferrors.watermarkImage|@htmlspecialchars}">!</span>{/if} 546 586 </span>{* #addWatermark *} … … 558 598 <label> 559 599 {'Apply watermark if height is bigger than'|@translate} 560 600 <input size="4" maxlength="4" type="text" name="w[minh]" value="{$watermark.minh}"{if isset($ferrors.watermark.minh)} class="dError"{/if}> 561 601 </label> 562 602 {'pixels'|@translate} … … 573 613 <label><input name="w[position]" type="radio" value="bottomleft"{if $watermark.position eq 'bottomleft'} checked="checked"{/if}> {'bottom left corner'|@translate}</label> 574 614 </div> 615 575 616 <label style="display:block;margin-top:10px;font-weight:normal;"><input name="w[position]" type="radio" value="custom"{if $watermark.position eq 'custom'} checked="checked"{/if}> {'custom'|@translate}</label> 576 617 <div id="positionCustomDetails"> 577 618 <label>{'X Position'|@translate} 578 619 <input size="3" maxlength="3" type="text" name="w[xpos]" value="{$watermark.xpos}"{if isset($ferrors.watermark.xpos)} class="dError"{/if}>% 579 620 {if isset($ferrors.watermark.xpos)}<span class="dErrorDesc" title="{$ferrors.watermark.xpos}">!</span>{/if} 580 621 </label> … … 813 854 814 855 {if isset($default)} 856 <div id="configContent"> 815 857 {$PROFILE_CONTENT} 816 {/if} 858 </div> 859 {/if} -
trunk/admin/themes/default/theme.css
r25085 r25372 470 470 } 471 471 472 #mainConf, #historyConf, #commentsConf, #watermarkConf {border:none} 473 474 #configContent label { 472 #configContent fieldset { 473 border:none; 474 padding-left:20px; 475 } 476 #configContent fieldset:not(.no-border) { 477 border-top:1px solid #bbb; 478 } 479 #configContent legend { 480 padding-left:0; 481 margin-left:-20px; 482 } 483 #configContent label:not(.no-bold) { 475 484 font-weight: bold; 476 485 } … … 478 487 #notifyAdmin label { 479 488 white-space:nowrap; 480 }481 482 #mainConf li {483 margin-bottom: 1em;484 489 } 485 490 … … 976 981 #batchManagerGlobal #filter_dimension .ui-slider-horizontal {width:650px;margin:5px 0 10px 0;} 977 982 978 # mainConfa.addFilter {font-weight:normal;margin-left:20px;}979 # mainConfa.removeFilter {font-weight:normal;}980 # mainConfspan.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */981 # mainConfspan.filter {display:block;margin-left:20px;}982 # mainConf.transparent {opacity:0.5;filter:alpha(opacity=50);}983 # mainConf.order_by_is_custom {display:block;font-weight:normal;font-style:italic;margin-left:20px;}983 #order_filters a.addFilter {font-weight:normal;margin-left:20px;} 984 #order_filters a.removeFilter {font-weight:normal;} 985 #order_filters span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */ 986 #order_filters span.filter {display:block;margin-left:20px;} 987 #order_filters .transparent {opacity:0.5;filter:alpha(opacity=50);} 988 #order_filters .order_by_is_custom {display:block;font-weight:normal;font-style:italic;margin-left:20px;} 984 989 985 990 /* Upload Form */ -
trunk/admin/themes/roma/theme.css
r23426 r25372 307 307 background-color:#ccc; 308 308 } 309 310 #configContent fieldset:not(.no-border) { 311 border-top-color:#444; 312 } -
trunk/include/config_default.inc.php
r25357 r25372 287 287 // set true to allow text/html emails 288 288 $conf['mail_allow_html'] = true; 289 290 // 'clear' or 'dark'291 $conf['mail_theme'] = 'clear';292 289 293 290 // smtp configuration (work if fsockopen function is allowed for smtp port) -
trunk/include/functions_mail.inc.php
r25361 r25372 681 681 if ($template->smarty->template_exists('global-mail-css.tpl')) 682 682 { 683 $template->set_filename(' css', 'global-mail-css.tpl');684 $template->assign_var_from_handle('GLOBAL_MAIL_CSS', ' css');683 $template->set_filename('global-css', 'global-mail-css.tpl'); 684 $template->assign_var_from_handle('GLOBAL_MAIL_CSS', 'global-css'); 685 685 } 686 686 -
trunk/language/en_UK/admin.lang.php
r24523 r25372 206 206 $lang['Average rate'] = "Average rate"; 207 207 $lang['average time'] = "average time"; 208 $lang['Basic settings'] = 'Basic settings'; 208 209 $lang['Batch Manager'] = 'Batch Manager'; 209 210 $lang['between'] = "between"; … … 365 366 $lang['GD library is missing'] = "GD library is missing"; 366 367 $lang['GD version'] = "GD version"; 368 $lang['General'] = "General"; 367 369 $lang['General statistics'] = "General statistics"; 368 370 $lang['Generate multiple size images']='Generate multiple size images'; … … 464 466 $lang['Mail content'] = "Mail content"; 465 467 $lang['Mail sent to %s [%s].'] = "Mail sent to %s [%s]."; 468 $lang['Mail theme'] = 'Mail theme'; 466 469 $lang['Main "guest" user does not exist'] = "The main \"guest\" user does not exist"; 467 470 $lang['Main "guest" user status is incorrect'] = "The main \"guest\" user status is incorrect"; … … 469 472 $lang['Main "webmaster" user status is incorrect'] = "The main \"webmaster\" user status is incorrect"; 470 473 $lang['Main Page'] = 'Main page'; 471 $lang['Main'] = "Main";472 474 $lang['Maintenance'] = "Maintenance"; 473 475 $lang['Make this language available to users'] = 'Make this language available to users'; -
trunk/language/fr_FR/admin.lang.php
r24539 r25372 195 195 $lang['Default display'] = "Affichage par défaut"; 196 196 $lang['The gallery URL is not valid.'] = "L'adresse de la galerie n'est pas valide."; 197 $lang[' Main'] = "Principale";197 $lang['General'] = "Général"; 198 198 $lang['The number of comments a page must be between 5 and 50 included.'] = "Le nombre de commentaires d'utilisateurs par page doit être compris entre 5 et 50."; 199 199 $lang['Configuration'] = "Configuration"; … … 952 952 $lang['Purge user cache'] = 'Purger le cache utilisateur'; 953 953 $lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'La tailles des images sera réduite à %dx%d pixels.'; 954 954 $lang['Mail theme'] = 'Thème des mails'; 955 955 $lang['Select at least one tag'] = 'Sélectionnez au moins un tag'; 956 $lang['Basic settings'] = 'Paramètres de base'; 956 957 ?> -
trunk/themes/default/template/mail/text/html/mail-css-dark.tpl
r25357 r25372 17 17 background-image:radial-gradient(ellipse at center, #555, #333); 18 18 border:1px solid #000; 19 border-top:4px solid #f 70;19 border-top:4px solid #f36; 20 20 text-align:center; 21 21 text-shadow:1px 1px 0px #000; … … 25 25 } 26 26 #header #subtitle { 27 color:# e06900;27 color:#C9224C; 28 28 } 29 29 #content { … … 37 37 background:#333; 38 38 border:1px solid #000; 39 border-bottom:2px solid #f 70;39 border-bottom:2px solid #f36; 40 40 } 41 41 42 42 /* links */ 43 43 a { 44 color:#f 70;44 color:#f36; 45 45 text-decoration:none; 46 46 }
Note: See TracChangeset
for help on using the changeset viewer.