From b56c103188ab4fb76fdcc42c4fbc3810d384b5aa Mon Sep 17 00:00:00 2001 From: mistic100 Date: Mon, 15 Sep 2014 15:18:17 +0000 Subject: use fontello for every checkbox on config screens + split configuration.tpl file git-svn-id: http://piwigo.org/svn/trunk@29539 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/clear/theme.css | 1 + admin/themes/default/js/common.js | 18 + admin/themes/default/template/configuration.tpl | 908 --------------------- .../default/template/configuration_comments.tpl | 151 ++++ .../default/template/configuration_default.tpl | 61 ++ .../default/template/configuration_display.tpl | 237 ++++++ .../themes/default/template/configuration_main.tpl | 216 +++++ .../default/template/configuration_sizes.tpl | 232 ++++++ .../default/template/configuration_watermark.tpl | 131 +++ admin/themes/default/theme.css | 13 + admin/themes/roma/theme.css | 6 +- 11 files changed, 1064 insertions(+), 910 deletions(-) delete mode 100644 admin/themes/default/template/configuration.tpl create mode 100644 admin/themes/default/template/configuration_comments.tpl create mode 100644 admin/themes/default/template/configuration_default.tpl create mode 100644 admin/themes/default/template/configuration_display.tpl create mode 100644 admin/themes/default/template/configuration_main.tpl create mode 100644 admin/themes/default/template/configuration_sizes.tpl create mode 100644 admin/themes/default/template/configuration_watermark.tpl (limited to 'admin/themes') diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index 0a814da2a..eff007248 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -381,3 +381,4 @@ table.dataTable thead th { box-shadow:inset 0px 1px 3px 0px rgba(255,255,255,0.4); } +.font-checkbox [class*=icon-check]:before { color:#444; } diff --git a/admin/themes/default/js/common.js b/admin/themes/default/js/common.js index 0f6435387..1f0594100 100644 --- a/admin/themes/default/js/common.js +++ b/admin/themes/default/js/common.js @@ -1,3 +1,21 @@ +jQuery.fn.fontCheckbox = function() { + this.find('input[type=checkbox], input[type=radio]').each(function() { + if (!jQuery(this).is(':checked')) { + jQuery(this).prev().toggleClass('icon-check icon-check-empty'); + } + }); + this.find('input[type=checkbox]').on('change', function() { + jQuery(this).prev().toggleClass('icon-check icon-check-empty'); + }); + this.find('input[type=radio]').on('change', function() { + jQuery(this).closest('.font-checkbox').find('input[type=radio][name='+ jQuery(this).attr('name') +']') + .prev().toggleClass('icon-check icon-check-empty'); + }); +}; + +// init fontChecbox everywhere +jQuery('.font-checkbox').fontCheckbox(); + function array_delete(arr, item) { var i = arr.indexOf(item); if (i != -1) arr.splice(i, 1); diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl deleted file mode 100644 index 0f0a80e20..000000000 --- a/admin/themes/default/template/configuration.tpl +++ /dev/null @@ -1,908 +0,0 @@ -{footer_script} -(function(){ - var targets = { - 'input[name="rate"]' : '#rate_anonymous', - 'input[name="allow_user_registration"]' : '#email_admin_on_new_user', - 'input[name="comments_validation"]' : '#email_admin_on_comment_validation', - 'input[name="user_can_edit_comment"]' : '#email_admin_on_comment_edition', - 'input[name="user_can_delete_comment"]' : '#email_admin_on_comment_deletion', - }; - - for (selector in targets) { - var target = targets[selector]; - - jQuery(target).toggle(jQuery(selector).is(':checked')); - - (function(target){ - jQuery(selector).on('change', function() { - jQuery(target).toggle($(this).is(':checked')); - }); - })(target); - }; -}()); -{/footer_script} - -

{'Piwigo configuration'|@translate} {$TABSHEET_TITLE}

- -{if !isset($default)} -
-{/if} - -
-{if isset($main)} -
- {'Basic settings'|translate} -
    -
  • - -
    - -
    • - -
  • - -
    - -
    • - -
  • - - - {foreach from=$main.order_by item=order} - - - {'delete'|@translate} - - {/foreach} - - {if !isset($ORDER_BY_IS_CUSTOM)} - {'Add a criteria'|@translate} - {else} - {'You can\'t define a default photo order because you have a custom setting in your local configuration.'|@translate} - {/if} -
    • -
- -{if !isset($ORDER_BY_IS_CUSTOM)} -{footer_script require='jquery'} -(function(){ -var max_fields = Math.ceil({$main.order_by_options|@count}/2); - -function updateFilters() { - var $selects = jQuery('#order_filters select'); - - jQuery('#order_filters .addFilter').toggle($selects.length <= max_fields); - jQuery('#order_filters .removeFilter').css('display', '').filter(':first').css('display', 'none'); - - $selects.find('option').removeAttr('disabled'); - $selects.each(function() { - $selects.not(this).find('option[value="'+ jQuery(this).val() +'"]').attr('disabled', 'disabled'); - }); -} - -jQuery('#order_filters').on('click', '.removeFilter', function() { - jQuery(this).parent('span.filter').remove(); - updateFilters(); -}); - -jQuery('#order_filters').on('change', 'select', updateFilters); - -jQuery('#order_filters .addFilter').click(function() { - jQuery(this).prev('span.filter').clone().insertBefore(jQuery(this)); - jQuery(this).prev('span.filter').children('select').val(''); - updateFilters(); -}); - -updateFilters(); -}()); -{/footer_script} -{/if} -
- -
- {'Permissions'|translate} -
    -
  • - - - -
    • - -
  • - - - -
    • - -
  • - -
    • - -
  • - -
    • -
- -{footer_script require='jquery'} -jQuery("#activate_comments").change(function(){ - if ($(this).is(':checked')) { - jQuery("#comments_param_warp").show(); - } else { - jQuery("#comments_param_warp").hide(); - } -}); -{/footer_script} -
- -
- {'Miscellaneous'|translate} -
    -
  • - -
    • - -
  • - {'Save visits in history for'|@translate} - - - - - - -
    • - -
  • - - -
    - {foreach from=$main.mail_theme_options item=name key=theme} -
    - - {'Preview'|translate} -
    - {/foreach} -
    -
    • - -{include file='include/colorbox.inc.tpl'} -{footer_script require='jquery'} -jQuery(".themeBoxes a").colorbox(); - -jQuery("input[name='mail_theme']").change(function() { - jQuery("input[name='mail_theme']").parents(".themeBox").removeClass("themeDefault"); - jQuery(this).parents(".themeBox").addClass("themeDefault"); -}); -{/footer_script} -
-
-{/if} - -{if isset($comments)} -
- -
    -
  • - -
    • -
- - -
-{/if} - -{if isset($sizes)} - -{footer_script} -(function(){ - var labelMaxWidth = "{'Maximum width'|@translate}", - labelWidth = "{'Width'|@translate}", - labelMaxHeight = "{'Maximum height'|@translate}", - labelHeight = "{'Height'|@translate}"; - - function toggleResizeFields(size) { - var checkbox = jQuery("#original_resize"); - var needToggle = jQuery("#sizeEdit-original"); - - if (jQuery(checkbox).is(':checked')) { - needToggle.show(); - } - else { - needToggle.hide(); - } - } - - toggleResizeFields("original"); - jQuery("#original_resize").click(function () { - toggleResizeFields("original"); - }); - - jQuery("a[id^='sizeEditOpen-']").click(function(){ - var sizeName = jQuery(this).attr("id").split("-")[1]; - jQuery("#sizeEdit-"+sizeName).toggle(); - jQuery(this).hide(); - return false; - }); - - jQuery(".cropToggle").click(function() { - var labelBoxWidth = jQuery(this).parents('table.sizeEditForm').find('td.sizeEditWidth'); - var labelBoxHeight = jQuery(this).parents('table.sizeEditForm').find('td.sizeEditHeight'); - - if (jQuery(this).is(':checked')) { - jQuery(labelBoxWidth).html(labelWidth); - jQuery(labelBoxHeight).html(labelHeight); - } - else { - jQuery(labelBoxWidth).html(labelMaxWidth); - jQuery(labelBoxHeight).html(labelMaxHeight); - } - }); - - jQuery("#showDetails").click(function() { - jQuery(".sizeDetails").show(); - jQuery(this).css("visibility", "hidden"); - return false; - }); -}()); -{/footer_script} - -{html_style}{literal} -.sizeEnable {width:50px;} -.sizeEditForm {margin:0 0 10px 20px;} -.sizeEdit {display:none;} -#sizesConf table {margin:0;} -.showDetails {padding:0;} -.sizeDetails {display:none;margin-left:10px;} -.sizeEditOpen {margin-left:10px;} -{/literal}{/html_style} - -
- {'Original Size'|@translate} -{if $is_gd} -
- {'Resize after upload disabled due to the use of GD as graphic library'|@translate} - - - - -
-{else} -
- -
- - - - - - - - - - - - - - -
{'Maximum width'|@translate} - {'pixels'|@translate} - {if isset($ferrors.original_resize_maxwidth)}!{/if} -
{'Maximum height'|@translate} - {'pixels'|@translate} - {if isset($ferrors.original_resize_maxheight)}!{/if} -
{'Image Quality'|@translate} - % - {if isset($ferrors.original_resize_quality)}!{/if} -
-{/if} -
- -
- {'Multiple Size'|@translate} - -
- -
- - - {foreach from=$derivatives item=d key=type} - - - - - - - - - - - - {/foreach} -
- - - {$d.w} x {$d.h} {'pixels'|@translate}{if $d.crop}, {'Crop'|@translate|lower}{/if} - - - {'edit'|@translate} - -
- - {if !$d.must_square} - - - - {/if} - - - - - - - {if !$d.must_square} - - - - - {/if} - - - - -
- -
{if $d.must_square or $d.crop}{'Width'|@translate}{else}{'Maximum width'|@translate}{/if} - - {'pixels'|@translate} - {if isset($ferrors.$type.w)}!{/if} -
{if $d.crop}{'Height'|@translate}{else}{'Maximum height'|@translate}{/if} - - {'pixels'|@translate} - {if isset($ferrors.$type.h)}!{/if} -
{'Sharpen'|@translate} - - % - {if isset($ferrors.$type.sharpen)}!{/if} -
{* #sizeEdit *} -
- -

- {'Image Quality'|@translate} - % - {if isset($ferrors.resize_quality)}!{/if} -

-

- {'Reset to default values'|@translate} -

- -{if !empty($custom_derivatives)} -
- {'custom'|@translate} - - {foreach from=$custom_derivatives item=time key=custom} - - {/foreach} -
-
-{/if} - -
-{/if} - -{if isset($watermark)} - -{footer_script} -(function(){ - function onWatermarkChange() { - var val = jQuery("#wSelect").val(); - if (val.length) { - jQuery("#wImg").attr('src', '{$ROOT_URL}'+val).show(); - } - else { - jQuery("#wImg").hide(); - } - } - - onWatermarkChange(); - - jQuery("#wSelect").bind("change", onWatermarkChange); - - if (jQuery("input[name='w[position]']:checked").val() == 'custom') { - jQuery("#positionCustomDetails").show(); - } - - jQuery("input[name='w[position]']").change(function(){ - if (jQuery(this).val() == 'custom') { - jQuery("#positionCustomDetails").show(); - } - else { - jQuery("#positionCustomDetails").hide(); - } - }); - - jQuery(".addWatermarkOpen").click(function(){ - jQuery("#addWatermark, #selectWatermark").toggle(); - return false; - }); -}()); -{/footer_script} - -
- -
    -
  • - {* #selectWatermark *} - - {'add a new watermark'|@translate} {'... or '|@translate}{'Select a file'|@translate} -
    - (png) - {if isset($ferrors.watermarkImage)}!{/if} -     {* #addWatermark *} -
    • - -
  • - - {'pixels'|@translate} -
    • - -
  • - - {'pixels'|@translate} -
    • - -
  • - -
    -
    - - - - - -
    - - -
    - - -
    - - -
    - -
    -
    • - -
  • - - % - {if isset($ferrors.watermark.opacity)}!{/if} -
    • -
-
- -{/if} {* end of watermark section *} - -{if isset($display)} -
- {'Main Page'|@translate} -
    -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • -
-
- -
- {'Photo Page'|@translate} -
    -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • -
-
- -
- {'Photo Properties'|@translate} -
    -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • -
-
-{/if} - -
- -{if !isset($default)} -

- -

-
-{/if} - -{if isset($default)} -
-
- -{if $GUEST_USERNAME!='guest'} -
- {'The settings for the guest are from the %s user'|@translate:$GUEST_USERNAME} -
-{/if} - -
- {'Preferences'|@translate} - - -
    -
  • - - - - -
    • -
  • - - - - -
    • -
  • - {'Expand all albums'|@translate} - {html_radios name='expand' options=$radio_options selected=$GUEST_EXPAND} -
    • - {if $GUEST_ACTIVATE_COMMENTS} -
  • - {'Show number of comments'|@translate} - {html_radios name='show_nb_comments' options=$radio_options selected=$GUEST_NB_COMMENTS} -
    • - {/if} -
  • - {'Show number of hits'|@translate} - {html_radios name='show_nb_hits' options=$radio_options selected=$GUEST_NB_HITS} -
    • -
-
- -

- - - -

- -
- -
-{/if} diff --git a/admin/themes/default/template/configuration_comments.tpl b/admin/themes/default/template/configuration_comments.tpl new file mode 100644 index 000000000..db227a28c --- /dev/null +++ b/admin/themes/default/template/configuration_comments.tpl @@ -0,0 +1,151 @@ +{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} + +{footer_script} +(function(){ + var targets = { + 'input[name="comments_validation"]' : '#email_admin_on_comment_validation', + 'input[name="user_can_edit_comment"]' : '#email_admin_on_comment_edition', + 'input[name="user_can_delete_comment"]' : '#email_admin_on_comment_deletion' + }; + + for (selector in targets) { + var target = targets[selector]; + + jQuery(target).toggle(jQuery(selector).is(':checked')); + + (function(target){ + jQuery(selector).on('change', function() { + jQuery(target).toggle($(this).is(':checked')); + }); + })(target); + }; +}()); +{/footer_script} + +

{'Piwigo configuration'|translate} {$TABSHEET_TITLE}

+ +
+ +
+ +
+
    +
  • + +
    • +
+ + +
+ +
+ +

+ +

+ +
\ No newline at end of file diff --git a/admin/themes/default/template/configuration_default.tpl b/admin/themes/default/template/configuration_default.tpl new file mode 100644 index 000000000..789d89734 --- /dev/null +++ b/admin/themes/default/template/configuration_default.tpl @@ -0,0 +1,61 @@ +{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} + +

{'Piwigo configuration'|translate} {$TABSHEET_TITLE}

+ +
+ +
+ +{if $GUEST_USERNAME!='guest'} +
+ {'The settings for the guest are from the %s user'|translate:$GUEST_USERNAME} +
+{/if} + +
+ {'Preferences'|translate} + + +
    +
  • + + + + +
    • + +
  • + + + + +
    • + +
  • + {'Expand all albums'|translate} + {html_radios name='expand' options=$radio_options selected=$GUEST_EXPAND} +
    • + + {if $GUEST_ACTIVATE_COMMENTS} +
  • + {'Show number of comments'|translate} + {html_radios name='show_nb_comments' options=$radio_options selected=$GUEST_NB_COMMENTS} +
    • + {/if} + +
  • + {'Show number of hits'|translate} + {html_radios name='show_nb_hits' options=$radio_options selected=$GUEST_NB_HITS} +
    • +
+
+ +

+ + + +

+ +
+ +
\ No newline at end of file diff --git a/admin/themes/default/template/configuration_display.tpl b/admin/themes/default/template/configuration_display.tpl new file mode 100644 index 000000000..ff077dc34 --- /dev/null +++ b/admin/themes/default/template/configuration_display.tpl @@ -0,0 +1,237 @@ +{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} + +

{'Piwigo configuration'|translate} {$TABSHEET_TITLE}

+ +
+ +
+ +
+ {'Main Page'|translate} +
    +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • +
+
+ +
+ {'Photo Page'|translate} +
    +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • +
+
+ +
+ {'Photo Properties'|translate} +
    +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • +
+
+ +
+ +

+ +

+ +
\ No newline at end of file diff --git a/admin/themes/default/template/configuration_main.tpl b/admin/themes/default/template/configuration_main.tpl new file mode 100644 index 000000000..adf99e59e --- /dev/null +++ b/admin/themes/default/template/configuration_main.tpl @@ -0,0 +1,216 @@ +{include file='include/colorbox.inc.tpl'} +{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} + +{footer_script require='jquery'} +(function(){ + var targets = { + 'input[name="rate"]' : '#rate_anonymous', + 'input[name="allow_user_registration"]' : '#email_admin_on_new_user' + }; + + for (selector in targets) { + var target = targets[selector]; + + jQuery(target).toggle(jQuery(selector).is(':checked')); + + (function(target){ + jQuery(selector).on('change', function() { + jQuery(target).toggle($(this).is(':checked')); + }); + })(target); + }; +}()); + +{if !isset($ORDER_BY_IS_CUSTOM)} +(function(){ + var max_fields = Math.ceil({$main.order_by_options|@count}/2); + + function updateFilters() { + var $selects = jQuery('#order_filters select'); + + jQuery('#order_filters .addFilter').toggle($selects.length <= max_fields); + jQuery('#order_filters .removeFilter').css('display', '').filter(':first').css('display', 'none'); + + $selects.find('option').removeAttr('disabled'); + $selects.each(function() { + $selects.not(this).find('option[value="'+ jQuery(this).val() +'"]').attr('disabled', 'disabled'); + }); + } + + jQuery('#order_filters').on('click', '.removeFilter', function() { + jQuery(this).parent('span.filter').remove(); + updateFilters(); + }); + + jQuery('#order_filters').on('change', 'select', updateFilters); + + jQuery('#order_filters .addFilter').click(function() { + jQuery(this).prev('span.filter').clone().insertBefore(jQuery(this)); + jQuery(this).prev('span.filter').children('select').val(''); + updateFilters(); + }); + + updateFilters(); +}()); +{/if} + +jQuery(".themeBoxes a").colorbox(); + +jQuery("input[name='mail_theme']").change(function() { + jQuery("input[name='mail_theme']").parents(".themeBox").removeClass("themeDefault"); + jQuery(this).parents(".themeBox").addClass("themeDefault"); +}); +{/footer_script} + +

{'Piwigo configuration'|translate} {$TABSHEET_TITLE}

+ +
+ +
+ +
+ {'Basic settings'|translate} +
    +
  • + +
    + +
    • + +
  • + +
    + +
    • + +
  • + + + {foreach from=$main.order_by item=order} + + + {'delete'|translate} + + {/foreach} + + {if !isset($ORDER_BY_IS_CUSTOM)} + {'Add a criteria'|translate} + {else} + {'You can\'t define a default photo order because you have a custom setting in your local configuration.'|translate} + {/if} +
    • +
+
+ +
+ {'Permissions'|translate} +
    +
  • + + + +
    • + +
  • + + + +
    • + +
  • + +
    • + +
  • + +
    • +
+
+ +
+ {'Miscellaneous'|translate} +
    +
  • + +
    • + +
  • + {'Save visits in history for'|translate} + + + + + + +
    • + +
  • + + +
    + {foreach from=$main.mail_theme_options item=name key=theme} +
    + + {'Preview'|translate} +
    + {/foreach} +
    +
    • +
+
+ +
+ +

+ +

+ +
\ No newline at end of file diff --git a/admin/themes/default/template/configuration_sizes.tpl b/admin/themes/default/template/configuration_sizes.tpl new file mode 100644 index 000000000..ff03d377a --- /dev/null +++ b/admin/themes/default/template/configuration_sizes.tpl @@ -0,0 +1,232 @@ +{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} + +{footer_script} +(function(){ + var labelMaxWidth = "{'Maximum width'|translate}", + labelWidth = "{'Width'|translate}", + labelMaxHeight = "{'Maximum height'|translate}", + labelHeight = "{'Height'|translate}"; + + function toggleResizeFields(size) { + var checkbox = jQuery("[name=original_resize]"); + var needToggle = jQuery("#sizeEdit-original"); + + if (jQuery(checkbox).is(':checked')) { + needToggle.show(); + } + else { + needToggle.hide(); + } + } + + toggleResizeFields("original"); + jQuery("[name=original_resize]").click(function () { + toggleResizeFields("original"); + }); + + jQuery("a[id^='sizeEditOpen-']").click(function(){ + var sizeName = jQuery(this).attr("id").split("-")[1]; + jQuery("#sizeEdit-"+sizeName).toggle(); + jQuery(this).hide(); + return false; + }); + + jQuery(".cropToggle").click(function() { + var labelBoxWidth = jQuery(this).parents('table.sizeEditForm').find('td.sizeEditWidth'); + var labelBoxHeight = jQuery(this).parents('table.sizeEditForm').find('td.sizeEditHeight'); + + if (jQuery(this).is(':checked')) { + jQuery(labelBoxWidth).html(labelWidth); + jQuery(labelBoxHeight).html(labelHeight); + } + else { + jQuery(labelBoxWidth).html(labelMaxWidth); + jQuery(labelBoxHeight).html(labelMaxHeight); + } + }); + + jQuery("#showDetails").click(function() { + jQuery(".sizeDetails").show(); + jQuery(this).css("visibility", "hidden"); + return false; + }); +}()); +{/footer_script} + +{html_style} +.sizeEnable { width:50px; } +.sizeEnable .mustEnable { display:inline-block; width:13px; margin:0 3px; } +.sizeEditForm { margin:0 0 10px 20px; } +.sizeEdit { display:none; } +#sizesConf table { margin:0; } +.showDetails { padding:0; } +.sizeDetails { display:none;margin-left:10px; } +.sizeEditOpen { margin-left:10px; } +{/html_style} + +

{'Piwigo configuration'|translate} {$TABSHEET_TITLE}

+ +
+ +
+ +
+ {'Original Size'|translate} + {if $is_gd} +
+ {'Resize after upload disabled due to the use of GD as graphic library'|translate} + + + + +
+ {else} +
+ +
+ + + + + + + + + + + + + + +
{'Maximum width'|translate} + {'pixels'|translate} + {if isset($ferrors.original_resize_maxwidth)}!{/if} +
{'Maximum height'|translate} + {'pixels'|translate} + {if isset($ferrors.original_resize_maxheight)}!{/if} +
{'Image Quality'|translate} + % + {if isset($ferrors.original_resize_quality)}!{/if} +
+ {/if} +
+ +
+ {'Multiple Size'|translate} + +
+ +
+ + + {foreach from=$derivatives item=d key=type} + + + + + + + + + + + + {/foreach} +
+ + + {$d.w} x {$d.h} {'pixels'|translate}{if $d.crop}, {'Crop'|translate|lower}{/if} + + + {'edit'|translate} + +
+ + {if !$d.must_square} + + + + {/if} + + + + + {if !$d.must_square} + + + + + {/if} + + + + +
+ +
{if $d.must_square or $d.crop}{'Width'|translate}{else}{'Maximum width'|translate}{/if} + {'pixels'|translate} + {if isset($ferrors.$type.w)}!{/if} +
{if $d.crop}{'Height'|translate}{else}{'Maximum height'|translate}{/if} + {'pixels'|translate} + {if isset($ferrors.$type.h)}!{/if} +
{'Sharpen'|translate} + % + {if isset($ferrors.$type.sharpen)}!{/if} +
{* #sizeEdit *} +
+ +

+ {'Image Quality'|translate} + % + {if isset($ferrors.resize_quality)}!{/if} +

+

+ {'Reset to default values'|translate} +

+ + {if !empty($custom_derivatives)} +
+ {'custom'|translate} + + + {foreach from=$custom_derivatives item=time key=custom} + + {/foreach} +
+ +
+
+ {/if} + +
+ +
+ +

+ +

+ +
\ No newline at end of file diff --git a/admin/themes/default/template/configuration_watermark.tpl b/admin/themes/default/template/configuration_watermark.tpl new file mode 100644 index 000000000..11343057d --- /dev/null +++ b/admin/themes/default/template/configuration_watermark.tpl @@ -0,0 +1,131 @@ +{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} + +{footer_script} +(function(){ + function onWatermarkChange() { + var val = jQuery("#wSelect").val(); + if (val.length) { + jQuery("#wImg").attr('src', '{$ROOT_URL}'+val).show(); + } + else { + jQuery("#wImg").hide(); + } + } + + onWatermarkChange(); + + jQuery("#wSelect").bind("change", onWatermarkChange); + + if (jQuery("input[name='w[position]']:checked").val() == 'custom') { + jQuery("#positionCustomDetails").show(); + } + + jQuery("input[name='w[position]']").change(function(){ + if (jQuery(this).val() == 'custom') { + jQuery("#positionCustomDetails").show(); + } + else { + jQuery("#positionCustomDetails").hide(); + } + }); + + jQuery(".addWatermarkOpen").click(function(){ + jQuery("#addWatermark, #selectWatermark").toggle(); + return false; + }); +}()); +{/footer_script} + +

{'Piwigo configuration'|translate} {$TABSHEET_TITLE}

+ +
+ +
+ +
+ +
    +
  • + + + + {'add a new watermark'|translate} {'... or '|translate}{'Select a file'|translate} + +
    + (png) + {if isset($ferrors.watermarkImage)}!{/if} +     +
    • + +
  • + + {'pixels'|translate} +
    • + +
  • + + {'pixels'|translate} +
    • + +
  • + +
    +
    + + + + + +
    + + + +
    + + +
    + + +
    + +
    +
    • + +
  • + + % + {if isset($ferrors.watermark.opacity)}!{/if} +
    • +
+
+ +
+ +

+ +

+ +
\ No newline at end of file diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index a483a0485..9cc01fd6a 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -1267,3 +1267,16 @@ table.qsearch_help_table td { padding:5px; vertical-align:top; } + +.font-checkbox [class*=icon-check]:before { + font-size:16px; + line-height:16px; + margin-right:0; +} +.font-checkbox .icon-check-empty { + position:relative; + left:-1px; +} +.font-checkbox input[type=checkbox], .font-checkbox input[type=radio] { + display:none; +} diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index 088d18912..c436bd25b 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -16,7 +16,7 @@ */ /* text color */ body, h3, dt, .throw, .content, label, LEGEND { - color:#666; + color:#777; } INPUT, select, textarea { color:#999; background-color: #444; } @@ -356,4 +356,6 @@ table.dataTable thead th { table.qsearch_help_table td { border-color: #444; -} \ No newline at end of file +} + +.font-checkbox [class*=icon-check]:before { color:#aaa; } \ No newline at end of file -- cgit v1.2.3