diff --git a/admin/configuration.php b/admin/configuration.php index e03d84fb0..61975c2c7 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -52,18 +52,15 @@ $main_checkboxes = array( 'rate_anonymous', 'email_admin_on_new_user', 'allow_user_customization', + 'log', + 'history_admin', + 'history_guest', ); $sizes_checkboxes = array( 'original_resize', ); -$history_checkboxes = array( - 'log', - 'history_admin', - 'history_guest' - ); - $comments_checkboxes = array( 'activate_comments', 'comments_forall', @@ -207,14 +204,6 @@ if (isset($_POST['submit'])) break; } - case 'history' : - { - foreach( $history_checkboxes as $checkbox) - { - $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true'; - } - break; - } case 'comments' : { // the number of comments per page must be an integer between 5 and 50 @@ -295,7 +284,6 @@ $tabsheet = new tabsheet(); $tabsheet->add('main', l10n('Main'), $conf_link.'main'); $tabsheet->add('sizes', l10n('Photo Sizes'), $conf_link.'sizes'); $tabsheet->add('display', l10n('Display'), $conf_link.'display'); -$tabsheet->add('history', l10n('History'), $conf_link.'history'); $tabsheet->add('comments', l10n('Comments'), $conf_link.'comments'); $tabsheet->add('default', l10n('Guest Settings'), $conf_link.'default'); // TabSheet selection @@ -387,21 +375,6 @@ switch ($page['section']) } break; } - case 'history' : - { - //Necessary for merge_block_vars - foreach ($history_checkboxes as $checkbox) - { - $template->append( - 'history', - array( - $checkbox => $conf[$checkbox] - ), - true - ); - } - break; - } case 'comments' : { $template->assign( diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl index ea4e32fab..f880bea05 100644 --- a/admin/themes/default/template/configuration.tpl +++ b/admin/themes/default/template/configuration.tpl @@ -14,78 +14,106 @@ - -
- - -
{/if} -{if isset($history)} -
- -
{/if} @@ -176,8 +204,8 @@ jQuery(document).ready(function () { @@ -185,71 +213,66 @@ jQuery(document).ready(function () { {footer_script}{literal} @@ -261,12 +284,61 @@ jQuery(document).ready(function(){ jQuery("#comments_param_warp").hide(); } }); + + /* notify on validation checkbox */ + if (jQuery('input[name="comments_validation"]').is(':checked')) { + jQuery('#email_admin_on_comment_validation').show(); + } + else { + jQuery('#email_admin_on_comment_validation').hide(); + } + + jQuery('input[name="comments_validation"]').change(function(){ + if ($(this).is(':checked')) { + jQuery('#email_admin_on_comment_validation').show(); + } + else { + jQuery('#email_admin_on_comment_validation').hide(); + } + }); + + /* notify on edition checkbox */ + if (jQuery('input[name="user_can_edit_comment"]').is(':checked')) { + jQuery('#email_admin_on_comment_edition').show(); + } + else { + jQuery('#email_admin_on_comment_edition').hide(); + } + + jQuery('input[name="user_can_edit_comment"]').change(function(){ + if ($(this).is(':checked')) { + jQuery('#email_admin_on_comment_edition').show(); + } + else { + jQuery('#email_admin_on_comment_edition').hide(); + } + }); + + /* notify on deletion checkbox */ + if (jQuery('input[name="user_can_delete_comment"]').is(':checked')) { + jQuery('#email_admin_on_comment_deletion').show(); + } + else { + jQuery('#email_admin_on_comment_deletion').hide(); + } + + jQuery('input[name="user_can_delete_comment"]').change(function(){ + if ($(this).is(':checked')) { + jQuery('#email_admin_on_comment_deletion').show(); + } + else { + jQuery('#email_admin_on_comment_deletion').hide(); + } + }); }); {/literal}{/footer_script} {/if} - - {if isset($sizes)} {footer_script}{literal} @@ -313,60 +385,56 @@ jQuery(document).ready(function(){ {/if} -{if isset($default)} -{$PROFILE_CONTENT} -{/if} - {if isset($display)}
{'Main Page'|@translate} @@ -377,50 +445,50 @@ jQuery(document).ready(function(){ @@ -431,78 +499,78 @@ jQuery(document).ready(function(){ @@ -516,3 +584,9 @@ jQuery(document).ready(function(){

{/if} + + + +{if isset($default)} +{$PROFILE_CONTENT} +{/if} diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 072319bf0..5f732ca9b 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -245,63 +245,6 @@ FORM#categoryPermissions LI { white-space: nowrap; } -FIELDSET#mainConfCheck SPAN.property, -FIELDSET#historyConf SPAN.property, -FIELDSET#commentsConf SPAN.property, -FIELDSET#uploadConf SPAN.property, -FIELDSET#indexDisplayConf SPAN.property, -FIELDSET#pictureDisplayConf SPAN.property, -FIELDSET#pictureInfoConf SPAN.property { - float: right; - text-align: left; -} -FIELDSET#mainConfCheck INPUT, -FIELDSET#historyConf INPUT, -FIELDSET#commentsConf INPUT, -FIELDSET#uploadConf INPUT, -FIELDSET#indexDisplayConf INPUT, -FIELDSET#pictureDisplayConf INPUT, -FIELDSET#pictureInfoConf INPUT { - float: none; -} - -FIELDSET#mainConf SPAN.property { - width: 25%; -} -FIELDSET#mainConf TEXTAREA.description { - width: 70%; -} - -FIELDSET#mainConfCheck SPAN.property, -FIELDSET#historyConf SPAN.property, -FIELDSET#indexDisplayConf SPAN.property, -FIELDSET#pictureDisplayConf SPAN.property, -FIELDSET#pictureInfoConf SPAN.property { - width: 90%; -} -FIELDSET#mainConfCheck INPUT, -FIELDSET#historyConf INPUT, -FIELDSET#commentsConf INPUT, -FIELDSET#indexDisplayConf INPUT, -FIELDSET#pictureDisplayConf INPUT, -FIELDSET#pictureInfoConf INPUT { - margin-left: 5%; -} -FIELDSET#uploadConf SELECT { - float: right; - margin: 2px 10px 0px; -} -FIELDSET#uploadConf INPUT { - float: right; - margin: 5px 10px 0px; -} -FIELDSET#uploadConf SPAN.property { - width: 65%; -} -FIELDSET#commentsConf SPAN.property { - width: 85%; -} - .statBar { height: 10px; background-color: #ff7700; @@ -528,6 +471,16 @@ FORM.properties SPAN.property { padding: 0 0.5em 0 0; } +#mainConf, #historyConf, #commentsConf {border:none} + +#configContent label { + font-weight: bold; +} + +#mainConf li { + margin-bottom: 1em; +} + #theHeader H1 { margin-bottom: 0.5em; } @@ -843,7 +796,7 @@ h2:lang(en) { text-transform:capitalize; } #helpContent LI, #ftpPage LI {margin-top:10px;} #helpContent P.nextStepLink {text-align:center; font-weight:bold; margin-bottom:20px;} -#configContent FIELDSET, #availablePlugins FIELDSET {border:none;} +#availablePlugins FIELDSET {border:none;} /** * Informations box in administration @@ -1050,12 +1003,12 @@ div.token-input-dropdown ul li.token-input-dropdown-item2 {background-color: #ff div.token-input-dropdown ul li em {font-weight: bold;font-style: normal;} div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-color: #3b5998;color: #fff;} -#mainConfCheck a.addFilter {font-weight:normal;margin-left:20px;} -#mainConfCheck a.removeFilter {font-weight:normal;} -#mainConfCheck span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */ -#mainConfCheck span.filter {display:block;margin-left:20px;} -#mainConfCheck .transparent {opacity:0.5;filter:alpha(opacity=50);} -#mainConfCheck .order_by_is_custom {display:block;font-weight:normal;font-style:italic;margin-left:20px;} +#mainConf a.addFilter {font-weight:normal;margin-left:20px;} +#mainConf a.removeFilter {font-weight:normal;} +#mainConf span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */ +#mainConf span.filter {display:block;margin-left:20px;} +#mainConf .transparent {opacity:0.5;filter:alpha(opacity=50);} +#mainConf .order_by_is_custom {display:block;font-weight:normal;font-style:italic;margin-left:20px;} /* Upload Form */ #uploadBoxes .file {margin-bottom:5px;text-align:left;} diff --git a/install/config.sql b/install/config.sql index e121fb2cd..10be8a188 100644 --- a/install/config.sql +++ b/install/config.sql @@ -26,7 +26,7 @@ INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_complementary_mail_ INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_recent_post_dates','true','Send recent post by dates for notification by mail'); INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_new_user','false','Send an email to theadministrators when a user registers'); INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_comment','false','Send an email to the administrators when a valid comment is entered'); -INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_comment_validation','false','Send an email to the administrators when a comment requires validation'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_comment_validation','true','Send an email to the administrators when a comment requires validation'); INSERT INTO piwigo_config (param,value,comment) VALUES ('obligatory_user_mail_address','false','Mail address is obligatory for users'); INSERT INTO piwigo_config (param,value,comment) VALUES ('c13y_ignore',null,'List of ignored anomalies'); INSERT INTO piwigo_config (param,value,comment) VALUES ('extents_for_templates','a:0:{}','Actived template-extension(s)'); diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index c1b5f3db9..4965a4a5e 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -835,4 +835,12 @@ $lang['Original Size'] = 'Original Size'; $lang['A locked gallery is only visible to administrators'] = 'A locked gallery is only visible to administrators'; $lang['Unlock gallery'] = 'Unlock gallery'; $lang['Gallery unlocked'] = 'Gallery unlocked'; +$lang['Notify administrators when a comment is'] = 'Notify administrators when a comment is'; +$lang['modified'] = 'modified'; +$lang['deleted'] = 'deleted'; +$lang['pending validation'] = 'pending validation'; +$lang['Save visits in history for'] = 'Save visits in history for'; +$lang['simple visitors'] = 'simple visitors'; +$lang['registered users'] = 'registered users'; +$lang['administrators'] = 'administrators'; ?> \ No newline at end of file diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 7766df892..9c85d12c3 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -848,4 +848,12 @@ $lang['Default comments order'] = 'Ordre par défaut des commentaires'; $lang['A locked gallery is only visible to administrators'] = 'Une galerie verrouillée n\'est visible que des administrateurs'; $lang['Unlock gallery'] = 'Déverouiller la galerie'; $lang['Gallery unlocked'] = 'Galerie déverouillée'; +$lang['Notify administrators when a comment is'] = 'Notifier les administrateurs lorsqu\'un commentaire est'; +$lang['modified'] = 'modifié'; +$lang['deleted'] = 'supprimé'; +$lang['pending validation'] = 'en attente de validation'; +$lang['Save visits in history for'] = 'Historiser les visites des '; +$lang['simple visitors'] = 'simple visiteurs'; +$lang['registered users'] = 'utilisateurs enregistrés'; +$lang['administrators'] = 'administrateurs'; ?> \ No newline at end of file