Changeset 13004


Ignore:
Timestamp:
Jan 31, 2012, 4:19:09 PM (8 years ago)
Author:
plg
Message:

feature 2559: minor redesign on configuration screens

  • hide "rate_anonymous" when "rate" is deactivated
  • hide "email_admin_on_new_user" when "allow_user_registration" is deactivated
  • move history settings on main tab
  • turn the 3 lines for history into a single line with 3 checkboxes
  • for comments, turn the "notify admin" settings into a single line with 4 checkboxes

TODO: remove obsolete language keys

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/configuration.php

    r13001 r13004  
    5353    'email_admin_on_new_user',
    5454    'allow_user_customization',
     55    'log',
     56    'history_admin',
     57    'history_guest',
    5558   );
    5659
     
    5861    'original_resize',
    5962  );
    60 
    61 $history_checkboxes = array(
    62     'log',
    63     'history_admin',
    64     'history_guest'
    65    );
    6663
    6764$comments_checkboxes = array(
     
    208205      break;
    209206    }
    210     case 'history' :
    211     {
    212       foreach( $history_checkboxes as $checkbox)
    213       {
    214         $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
    215       }
    216       break;
    217     }
    218207    case 'comments' :
    219208    {
     
    296285$tabsheet->add('sizes', l10n('Photo Sizes'), $conf_link.'sizes');
    297286$tabsheet->add('display', l10n('Display'), $conf_link.'display');
    298 $tabsheet->add('history', l10n('History'), $conf_link.'history');
    299287$tabsheet->add('comments', l10n('Comments'), $conf_link.'comments');
    300288$tabsheet->add('default', l10n('Guest Settings'), $conf_link.'default');
     
    388376    break;
    389377  }
    390   case 'history' :
    391   {
    392     //Necessary for merge_block_vars
    393     foreach ($history_checkboxes as $checkbox)
    394     {
    395       $template->append(
    396           'history',
    397           array(
    398             $checkbox => $conf[$checkbox]
    399             ),
    400           true
    401         );
    402     }
    403     break;
    404   }
    405378  case 'comments' :
    406379  {
  • trunk/admin/themes/default/template/configuration.tpl

    r13001 r13004  
    1515  <ul>
    1616    <li>
    17       <span class="property">
     17     
    1818        <label for="gallery_title">{'Gallery title'|@translate}</label>
    19       </span>
     19      <br>
    2020      <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{$main.CONF_GALLERY_TITLE}">
    2121    </li>
    2222
    2323    <li>
    24       <span class="property">
     24     
    2525        <label for="page_banner">{'Page banner'|@translate}</label>
    26       </span>
     26      <br>
    2727      <textarea rows="5" cols="50" class="description" name="page_banner" id="page_banner">{$main.CONF_PAGE_BANNER}</textarea>
    2828    </li>
    29   </ul>
    30 </fieldset>
    31 
    32 <fieldset id="mainConfCheck">
    33   <legend></legend>
    34   <ul>
    35     <li>
    36       <label>
    37         <span class="property">{'Allow rating'|@translate}</span>
     29
     30    <li>
     31      <label>
    3832        <input type="checkbox" name="rate" {if ($main.rate)}checked="checked"{/if}>
    39       </label>
    40     </li>
    41 
    42     <li>
    43       <label>
    44         <span class="property">{'Rating by guests'|@translate}</span>
     33        {'Allow rating'|@translate}
     34      </label>
     35    </li>
     36
     37    <li id="rate_anonymous">
     38      <label>
    4539        <input type="checkbox" name="rate_anonymous" {if ($main.rate_anonymous)}checked="checked"{/if}>
    46       </label>
    47     </li>
    48 
    49     <li>
    50       <label>
    51         <span class="property">{'Allow user registration'|@translate}</span>
     40        {'Rating by guests'|@translate}
     41      </label>
     42    </li>
     43
     44    <li>
     45      <label>
    5246        <input type="checkbox" name="allow_user_registration" {if ($main.allow_user_registration)}checked="checked"{/if}>
    53       </label>
    54     </li>
    55 
    56     <li>
    57       <label>
    58         <span class="property">{'Allow user customization'|@translate}</span>
     47        {'Allow user registration'|@translate}
     48      </label>
     49    </li>
     50
     51    <li id="email_admin_on_new_user">
     52      <label>
     53        <input type="checkbox" name="email_admin_on_new_user" {if ($main.email_admin_on_new_user)}checked="checked"{/if}>
     54        {'Email admins when a new user registers'|@translate}
     55      </label>
     56    </li>
     57
     58    <li>
     59      <label>
    5960        <input type="checkbox" name="allow_user_customization" {if ($main.allow_user_customization)}checked="checked"{/if}>
    60       </label>
    61     </li>
    62 
    63     <li>
    64       <label>
    65         <span class="property">{'Mail address is obligatory for all users'|@translate}</span>
     61        {'Allow user customization'|@translate}
     62      </label>
     63    </li>
     64
     65    <li>
     66      <label>
    6667        <input type="checkbox" name="obligatory_user_mail_address" {if ($main.obligatory_user_mail_address)}checked="checked"{/if}>
    67       </label>
    68     </li>
    69 
    70     <li>
    71       <label>
    72         <span class="property">{'Email admins when a new user registers'|@translate}</span>
    73         <input type="checkbox" name="email_admin_on_new_user" {if ($main.email_admin_on_new_user)}checked="checked"{/if}>
    74       </label>
    75     </li>
    76 
    77     <li>
    78       &nbsp;
    79       <span class="property">
    80         {'Week starts on'|@translate}
    81         {html_options name="week_starts_on" options=$main.week_starts_on_options selected=$main.week_starts_on_options_selected}
    82       </span>
     68        {'Mail address is obligatory for all users'|@translate}
     69      </label>
     70    </li>
     71
     72    <li>
     73      <label>{'Week starts on'|@translate}
     74      {html_options name="week_starts_on" options=$main.week_starts_on_options selected=$main.week_starts_on_options_selected}</label>
    8375    </li>
    8476   
    85     <li>
    86       &nbsp;
    87       <span class="property">
    88         {'Default photos order'|@translate}
     77{footer_script}{literal}
     78jQuery(document).ready(function(){
     79  /* rate_anonymous visible only if rate is permitted */
     80  if (jQuery('input[name="rate"]').is(':checked')) {
     81    jQuery('#rate_anonymous').show();
     82  }
     83  else {
     84    jQuery('#rate_anonymous').hide();
     85  }
     86
     87  jQuery('input[name="rate"]').change(function(){
     88    if ($(this).is(':checked')) {
     89      jQuery('#rate_anonymous').show();
     90    }
     91    else {
     92      jQuery('#rate_anonymous').hide();
     93    }
     94  });
     95
     96  /* email_admin_on_new_user checkbox only if allow_user_registration */
     97  if (jQuery('input[name="allow_user_registration"]').is(':checked')) {
     98    jQuery('#email_admin_on_new_user').show();
     99  }
     100  else {
     101    jQuery('#email_admin_on_new_user').hide();
     102  }
     103
     104  jQuery('input[name="allow_user_registration"]').change(function(){
     105    if ($(this).is(':checked')) {
     106      jQuery('#email_admin_on_new_user').show();
     107    }
     108    else {
     109      jQuery('#email_admin_on_new_user').hide();
     110    }
     111  });
     112});
     113{/literal}{/footer_script}
     114
     115    <li>
     116        <label>{'Default photos order'|@translate}</label>
    89117       
    90118        {foreach from=$main.order_by item=order}
     
    105133          <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>
    106134        {/if}
    107       </span>
    108135    </li>
    109136   
     
    148175{/footer_script}
    149176{/if}
    150   </ul>
    151 </fieldset>
    152 {/if}
    153 
    154 {if isset($history)}
    155 <fieldset id="historyConf">
    156   <legend></legend>
    157   <ul>
    158       <li>
    159         <label><span class="property">{'Save page visits by guests'|@translate}</span><input type="checkbox" name="history_guest" {if ($history.history_guest)}checked="checked"{/if}></label>
    160       </li>
    161 
    162       <li>
    163         <label><span class="property">{'Save page visits by users'|@translate}</span><input type="checkbox" name="log" {if ($history.log)}checked="checked"{/if}></label>
    164       </li>
    165 
    166       <li>
    167         <label><span class="property">{'Save page visits by administrators'|@translate}</span><input type="checkbox" name="history_admin" {if ($history.history_admin)}checked="checked"{/if}></label>
    168       </li>
     177
     178    <li>
     179      <strong>{'Save visits in history for'|@translate}</strong>
     180
     181      <label>
     182        <input type="checkbox" name="history_guest" {if ($main.history_guest)}checked="checked"{/if}>
     183        {'simple visitors'|@translate}
     184      </label>
     185
     186      <label>
     187        <input type="checkbox" name="log" {if ($main.log)}checked="checked"{/if}>
     188        {'registered users'|@translate}
     189      </label>
     190
     191      <label>
     192        <input type="checkbox" name="history_admin" {if ($main.history_admin)}checked="checked"{/if}>
     193        {'administrators'|@translate}
     194      </label>
     195
     196    </li>
    169197  </ul>
    170198</fieldset>
     
    177205    <li>
    178206      <label>
    179         <span class="property">{'Activate comments'|@translate}</span>
    180207        <input type="checkbox" name="activate_comments" id="activate_comments"{if ($comments.activate_comments)}checked="checked"{/if}>
     208        {'Activate comments'|@translate}
    181209      </label>
    182210    </li>
     
    186214    <li>
    187215      <label>
    188         <span class="property">{'Comments for all'|@translate}</span>
    189216        <input type="checkbox" name="comments_forall" {if ($comments.comments_forall)}checked="checked"{/if}>
    190       </label>
    191     </li>
    192 
    193     <li>
    194       <span class="property">
    195         <label for="nb_comment_page">{'Number of comments per page'|@translate}</label>
    196       </span>
    197       <input type="text" size="3" maxlength="4" name="nb_comment_page" id="nb_comment_page" value="{$comments.NB_COMMENTS_PAGE}">
     217        {'Comments for all'|@translate}
     218      </label>
     219    </li>
     220
     221    <li>
     222      <label>
     223        {'Number of comments per page'|@translate}
     224        <input type="text" size="3" maxlength="4" name="nb_comment_page" id="nb_comment_page" value="{$comments.NB_COMMENTS_PAGE}">
     225      </label>
    198226    </li>
    199227   
    200228    <li>
    201       <span class="property">{'Default comments order'|@translate}</span>
    202       <select name="comments_order">
    203         {html_options options=$comments.comments_order_options selected=$comments.comments_order}
    204       </select>
    205     </li>
    206 
    207     <li>
    208       <label>
    209         <span class="property">{'Validation'|@translate}</span>
     229      <label>
     230        {'Default comments order'|@translate}
     231        <select name="comments_order">
     232          {html_options options=$comments.comments_order_options selected=$comments.comments_order}
     233        </select>
     234      </label>
     235    </li>
     236
     237    <li>
     238      <label>
    210239        <input type="checkbox" name="comments_validation" {if ($comments.comments_validation)}checked="checked"{/if}>
    211       </label>
    212     </li>
    213 
    214     <li>
    215       <label>
    216         <span class="property">{'Email admins when a valid comment is entered'|@translate}</span>
    217         <input type="checkbox" name="email_admin_on_comment" {if ($comments.email_admin_on_comment)}checked="checked"{/if}>
    218       </label>
    219     </li>
    220 
    221     <li>
    222       <label>
    223         <span class="property">{'Email admins when a comment requires validation'|@translate}</span>
    224         <input type="checkbox" name="email_admin_on_comment_validation" {if ($comments.email_admin_on_comment_validation)}checked="checked"{/if}>
    225       </label>
    226     </li>
    227 
    228     <li>
    229       <label>
    230         <span class="property">{'Allow users to edit their own comments'|@translate}</span>
     240        {'Validation'|@translate}
     241      </label>
     242    </li>
     243
     244    <li>
     245      <label>
    231246        <input type="checkbox" name="user_can_edit_comment" {if ($comments.user_can_edit_comment)}checked="checked"{/if}>
    232       </label>
    233     </li>
    234     <li>
    235       <label>
    236         <span class="property">{'Allow users to delete their own comments'|@translate}</span>
     247        {'Allow users to edit their own comments'|@translate}
     248      </label>
     249    </li>
     250    <li>
     251      <label>
    237252        <input type="checkbox" name="user_can_delete_comment" {if ($comments.user_can_delete_comment)}checked="checked"{/if}>
    238       </label>
    239     </li>
    240     <li>
    241       <label>
    242         <span class="property">{'Email administrators when a comment is modified'|@translate}</span>
    243         <input type="checkbox" name="email_admin_on_comment_edition" {if ($comments.email_admin_on_comment_edition)}checked="checked"{/if}>
    244       </label>
    245     </li>
    246     <li>
    247       <label>
    248         <span class="property">{'Email administrators when a comment is deleted'|@translate}</span>
    249         <input type="checkbox" name="email_admin_on_comment_deletion" {if ($comments.email_admin_on_comment_deletion)}checked="checked"{/if}>
    250       </label>
    251     </li>
    252 
     253        {'Allow users to delete their own comments'|@translate}
     254      </label>
     255    </li>
     256
     257    <li>
     258      <strong>{'Notify administrators when a comment is'|@translate}</strong>
     259
     260      <label id="email_admin_on_comment_validation">
     261        <input type="checkbox" name="email_admin_on_comment_validation" {if ($comments.email_admin_on_comment_validation)}checked="checked"{/if}> {'pending validation'|@translate}
     262      </label>
     263
     264      <label>
     265        <input type="checkbox" name="email_admin_on_comment" {if ($comments.email_admin_on_comment)}checked="checked"{/if}> {'added'|@translate}
     266      </label>
     267
     268      <label id="email_admin_on_comment_edition">
     269        <input type="checkbox" name="email_admin_on_comment_edition" {if ($comments.email_admin_on_comment_edition)}checked="checked"{/if}> {'modified'|@translate}
     270      </label>
     271
     272      <label id="email_admin_on_comment_deletion">
     273        <input type="checkbox" name="email_admin_on_comment_deletion" {if ($comments.email_admin_on_comment_deletion)}checked="checked"{/if}> {'deleted'|@translate}
     274      </label>
     275    </li>
    253276  </ul>
    254277</fieldset>
     
    262285    }
    263286  });
     287
     288  /* notify on validation checkbox */
     289  if (jQuery('input[name="comments_validation"]').is(':checked')) {
     290    jQuery('#email_admin_on_comment_validation').show();
     291  }
     292  else {
     293    jQuery('#email_admin_on_comment_validation').hide();
     294  }
     295
     296  jQuery('input[name="comments_validation"]').change(function(){
     297    if ($(this).is(':checked')) {
     298      jQuery('#email_admin_on_comment_validation').show();
     299    }
     300    else {
     301      jQuery('#email_admin_on_comment_validation').hide();
     302    }
     303  });
     304
     305  /* notify on edition checkbox */
     306  if (jQuery('input[name="user_can_edit_comment"]').is(':checked')) {
     307    jQuery('#email_admin_on_comment_edition').show();
     308  }
     309  else {
     310    jQuery('#email_admin_on_comment_edition').hide();
     311  }
     312
     313  jQuery('input[name="user_can_edit_comment"]').change(function(){
     314    if ($(this).is(':checked')) {
     315      jQuery('#email_admin_on_comment_edition').show();
     316    }
     317    else {
     318      jQuery('#email_admin_on_comment_edition').hide();
     319    }
     320  });
     321 
     322  /* notify on deletion checkbox */
     323  if (jQuery('input[name="user_can_delete_comment"]').is(':checked')) {
     324    jQuery('#email_admin_on_comment_deletion').show();
     325  }
     326  else {
     327    jQuery('#email_admin_on_comment_deletion').hide();
     328  }
     329
     330  jQuery('input[name="user_can_delete_comment"]').change(function(){
     331    if ($(this).is(':checked')) {
     332      jQuery('#email_admin_on_comment_deletion').show();
     333    }
     334    else {
     335      jQuery('#email_admin_on_comment_deletion').hide();
     336    }
     337  });
    264338});
    265339{/literal}{/footer_script}
    266340{/if}
    267 
    268 </div> <!-- configContent -->
    269341
    270342{if isset($sizes)}
     
    314386{/if}
    315387
    316 {if isset($default)}
    317 {$PROFILE_CONTENT}
    318 {/if}
    319 
    320388{if isset($display)}
    321389<fieldset id="indexDisplayConf">
     
    324392    <li>
    325393      <label>
    326         <span class="property">{'display only recently posted photos'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
    327394        <input type="checkbox" name="menubar_filter_icon" {if ($display.menubar_filter_icon)}checked="checked"{/if}>
     395        {'display only recently posted photos'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}
    328396      </label>
    329397    </li>   
     
    331399    <li>
    332400      <label>
    333         <span class="property">{'Activate icon "new" next to albums and pictures'|@translate}</span>
    334401        <input type="checkbox" name="index_new_icon" {if ($display.index_new_icon)}checked="checked"{/if}>
    335       </label>
    336     </li>
    337 
    338     <li>
    339       <label>
    340         <span class="property">{'Sort order'|@translate|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
     402        {'Activate icon "new" next to albums and pictures'|@translate}
     403      </label>
     404    </li>
     405
     406    <li>
     407      <label>
    341408        <input type="checkbox" name="index_sort_order_input" {if ($display.index_sort_order_input)}checked="checked"{/if}>
    342       </label>
    343     </li>
    344 
    345     <li>
    346       <label>
    347         <span class="property">{'display all photos in all sub-albums'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
     409        {'Sort order'|@translate|@string_format:$pwg->l10n('Activate icon "%s"')}
     410      </label>
     411    </li>
     412
     413    <li>
     414      <label>
    348415        <input type="checkbox" name="index_flat_icon" {if ($display.index_flat_icon)}checked="checked"{/if}>
    349       </label>
    350     </li>
    351 
    352     <li>
    353       <label>
    354         <span class="property">{'display a calendar by posted date'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
     416        {'display all photos in all sub-albums'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}
     417      </label>
     418    </li>
     419
     420    <li>
     421      <label>
    355422        <input type="checkbox" name="index_posted_date_icon" {if ($display.index_posted_date_icon)}checked="checked"{/if}>
    356       </label>
    357     </li>
    358 
    359     <li>
    360       <label>
    361         <span class="property">{'display a calendar by creation date'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
     423        {'display a calendar by posted date'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}
     424      </label>
     425    </li>
     426
     427    <li>
     428      <label>
    362429        <input type="checkbox" name="index_created_date_icon" {if ($display.index_created_date_icon)}checked="checked"{/if}>
    363       </label>
    364     </li>
    365 
    366     <li>
    367       <label>
    368         <span class="property">{'slideshow'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
     430        {'display a calendar by creation date'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}
     431      </label>
     432    </li>
     433
     434    <li>
     435      <label>
    369436        <input type="checkbox" name="index_slideshow_icon" {if ($display.index_slideshow_icon)}checked="checked"{/if}>
     437        {'slideshow'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}
    370438      </label>
    371439    </li>
     
    378446    <li>
    379447      <label>
    380         <span class="property">{'slideshow'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
    381448        <input type="checkbox" name="picture_slideshow_icon" {if ($display.picture_slideshow_icon)}checked="checked"{/if}>
    382       </label>
    383     </li>
    384 
    385     <li>
    386       <label>
    387         <span class="property">{'Show file metadata'|@translate|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
     449        {'slideshow'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}
     450      </label>
     451    </li>
     452
     453    <li>
     454      <label>
    388455        <input type="checkbox" name="picture_metadata_icon" {if ($display.picture_metadata_icon)}checked="checked"{/if}>
    389       </label>
    390     </li>
    391 
    392     <li>
    393       <label>
    394         <span class="property">{'Download this file'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
     456        {'Show file metadata'|@translate|@string_format:$pwg->l10n('Activate icon "%s"')}
     457      </label>
     458    </li>
     459
     460    <li>
     461      <label>
    395462        <input type="checkbox" name="picture_download_icon" {if ($display.picture_download_icon)}checked="checked"{/if}>
    396       </label>
    397     </li>
    398 
    399     <li>
    400       <label>
    401         <span class="property">{'add this photo to your favorites'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}</span>
     463        {'Download this file'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}
     464      </label>
     465    </li>
     466
     467    <li>
     468      <label>
    402469        <input type="checkbox" name="picture_favorite_icon" {if ($display.picture_favorite_icon)}checked="checked"{/if}>
    403       </label>
    404     </li>
    405 
    406     <li>
    407       <label>
    408         <span class="property">{'Activate Navigation Bar'|@translate}</span>
     470        {'add this photo to your favorites'|@translate|@ucfirst|@string_format:$pwg->l10n('Activate icon "%s"')}
     471      </label>
     472    </li>
     473
     474    <li>
     475      <label>
    409476        <input type="checkbox" name="picture_navigation_icons" {if ($display.picture_navigation_icons)}checked="checked"{/if}>
    410       </label>
    411     </li>
    412 
    413     <li>
    414       <label>
    415         <span class="property">{'Activate Navigation Thumbnails'|@translate}</span>
     477        {'Activate Navigation Bar'|@translate}
     478      </label>
     479    </li>
     480
     481    <li>
     482      <label>
    416483        <input type="checkbox" name="picture_navigation_thumb" {if ($display.picture_navigation_thumb)}checked="checked"{/if}>
     484        {'Activate Navigation Thumbnails'|@translate}
    417485      </label>
    418486    </li>
     
    420488    <li>
    421489      <label>
    422         <span class="property">{'Show menubar'|@translate}</span>
    423490        <input type="checkbox" name="picture_menu" {if ($display.picture_menu)}checked="checked"{/if}>
     491        {'Show menubar'|@translate}
    424492      </label>
    425493    </li>
     
    432500    <li>
    433501      <label>
    434         <span class="property">{'Author'|@translate}</span>
    435502        <input type="checkbox" name="picture_informations[author]" {if ($display.picture_informations.author)}checked="checked"{/if}>
    436       </label>
    437     </li>
    438 
    439     <li>
    440       <label>
    441         <span class="property">{'Created on'|@translate}</span>
     503        {'Author'|@translate}
     504      </label>
     505    </li>
     506
     507    <li>
     508      <label>
    442509        <input type="checkbox" name="picture_informations[created_on]" {if ($display.picture_informations.created_on)}checked="checked"{/if}>
    443       </label>
    444     </li>
    445 
    446     <li>
    447       <label>
    448         <span class="property">{'Posted on'|@translate}</span>
     510        {'Created on'|@translate}
     511      </label>
     512    </li>
     513
     514    <li>
     515      <label>
    449516        <input type="checkbox" name="picture_informations[posted_on]" {if ($display.picture_informations.posted_on)}checked="checked"{/if}>
    450       </label>
    451     </li>
    452 
    453     <li>
    454       <label>
    455         <span class="property">{'Dimensions'|@translate}</span>
     517        {'Posted on'|@translate}
     518      </label>
     519    </li>
     520
     521    <li>
     522      <label>
    456523        <input type="checkbox" name="picture_informations[dimensions]" {if ($display.picture_informations.dimensions)}checked="checked"{/if}>
    457       </label>
    458     </li>
    459 
    460     <li>
    461       <label>
    462         <span class="property">{'File'|@translate}</span>
     524        {'Dimensions'|@translate}
     525      </label>
     526    </li>
     527
     528    <li>
     529      <label>
    463530        <input type="checkbox" name="picture_informations[file]" {if ($display.picture_informations.file)}checked="checked"{/if}>
    464       </label>
    465     </li>
    466 
    467     <li>
    468       <label>
    469         <span class="property">{'Filesize'|@translate}</span>
     531        {'File'|@translate}
     532      </label>
     533    </li>
     534
     535    <li>
     536      <label>
    470537        <input type="checkbox" name="picture_informations[filesize]" {if ($display.picture_informations.filesize)}checked="checked"{/if}>
    471       </label>
    472     </li>
    473 
    474     <li>
    475       <label>
    476         <span class="property">{'Tags'|@translate}</span>
     538        {'Filesize'|@translate}
     539      </label>
     540    </li>
     541
     542    <li>
     543      <label>
    477544        <input type="checkbox" name="picture_informations[tags]" {if ($display.picture_informations.tags)}checked="checked"{/if}>
    478       </label>
    479     </li>
    480 
    481     <li>
    482       <label>
    483         <span class="property">{'Albums'|@translate}</span>
     545        {'Tags'|@translate}
     546      </label>
     547    </li>
     548
     549    <li>
     550      <label>
    484551        <input type="checkbox" name="picture_informations[categories]" {if ($display.picture_informations.categories)}checked="checked"{/if}>
    485       </label>
    486     </li>
    487 
    488     <li>
    489       <label>
    490         <span class="property">{'Visits'|@translate}</span>
     552        {'Albums'|@translate}
     553      </label>
     554    </li>
     555
     556    <li>
     557      <label>
    491558        <input type="checkbox" name="picture_informations[visits]" {if ($display.picture_informations.visits)}checked="checked"{/if}>
    492       </label>
    493     </li>
    494 
    495     <li>
    496       <label>
    497         <span class="property">{'Rating score'|@translate}</span>
     559        {'Visits'|@translate}
     560      </label>
     561    </li>
     562
     563    <li>
     564      <label>
    498565        <input type="checkbox" name="picture_informations[rating_score]" {if ($display.picture_informations.rating_score)}checked="checked"{/if}>
    499       </label>
    500     </li>
    501 
    502     <li>
    503       <label>
    504         <span class="property">{'Who can see this photo?'|@translate} ({'available for administrators only'|@translate})</span>
     566        {'Rating score'|@translate}
     567      </label>
     568    </li>
     569
     570    <li>
     571      <label>
    505572        <input type="checkbox" name="picture_informations[privacy_level]" {if ($display.picture_informations.privacy_level)}checked="checked"{/if}>
     573        {'Who can see this photo?'|@translate} ({'available for administrators only'|@translate})
    506574      </label>
    507575    </li>
     
    517585</form>
    518586{/if}
     587
     588</div> <!-- configContent -->
     589
     590{if isset($default)}
     591{$PROFILE_CONTENT}
     592{/if}
  • trunk/admin/themes/default/theme.css

    r12670 r13004  
    246246}
    247247
    248 FIELDSET#mainConfCheck SPAN.property,
    249 FIELDSET#historyConf SPAN.property,
    250 FIELDSET#commentsConf SPAN.property,
    251 FIELDSET#uploadConf SPAN.property,
    252 FIELDSET#indexDisplayConf SPAN.property,
    253 FIELDSET#pictureDisplayConf SPAN.property,
    254 FIELDSET#pictureInfoConf SPAN.property {
    255         float: right;
    256         text-align: left;
    257 }
    258 FIELDSET#mainConfCheck INPUT,
    259 FIELDSET#historyConf INPUT,
    260 FIELDSET#commentsConf INPUT,
    261 FIELDSET#uploadConf INPUT,
    262 FIELDSET#indexDisplayConf INPUT,
    263 FIELDSET#pictureDisplayConf INPUT,
    264 FIELDSET#pictureInfoConf INPUT {
    265         float: none;
    266 }
    267 
    268 FIELDSET#mainConf SPAN.property {
    269         width: 25%;
    270 }
    271 FIELDSET#mainConf TEXTAREA.description {
    272         width: 70%;
    273 }
    274 
    275 FIELDSET#mainConfCheck SPAN.property,
    276 FIELDSET#historyConf SPAN.property,
    277 FIELDSET#indexDisplayConf SPAN.property,
    278 FIELDSET#pictureDisplayConf SPAN.property,
    279 FIELDSET#pictureInfoConf SPAN.property {
    280         width: 90%;
    281 }
    282 FIELDSET#mainConfCheck INPUT,
    283 FIELDSET#historyConf INPUT,
    284 FIELDSET#commentsConf INPUT,
    285 FIELDSET#indexDisplayConf INPUT,
    286 FIELDSET#pictureDisplayConf INPUT,
    287 FIELDSET#pictureInfoConf INPUT {
    288         margin-left: 5%;
    289 }
    290 FIELDSET#uploadConf SELECT {
    291         float: right;
    292         margin: 2px 10px 0px;
    293 }
    294 FIELDSET#uploadConf INPUT {
    295         float: right;
    296         margin: 5px 10px 0px;
    297 }
    298 FIELDSET#uploadConf SPAN.property {
    299         width: 65%;
    300 }
    301 FIELDSET#commentsConf SPAN.property {
    302         width: 85%;
    303 }
    304 
    305248.statBar {
    306249        height: 10px;
     
    527470        margin: 0;
    528471        padding: 0 0.5em 0 0;
     472}
     473
     474#mainConf, #historyConf, #commentsConf {border:none}
     475
     476#configContent label {
     477  font-weight: bold;
     478}
     479
     480#mainConf li {
     481  margin-bottom: 1em;
    529482}
    530483
     
    844797#helpContent P.nextStepLink {text-align:center; font-weight:bold; margin-bottom:20px;}
    845798
    846 #configContent FIELDSET, #availablePlugins FIELDSET  {border:none;}
     799#availablePlugins FIELDSET  {border:none;}
    847800
    848801/**
     
    10511004div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-color: #3b5998;color: #fff;}
    10521005
    1053 #mainConfCheck a.addFilter {font-weight:normal;margin-left:20px;}
    1054 #mainConfCheck a.removeFilter {font-weight:normal;}
    1055 #mainConfCheck span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */
    1056 #mainConfCheck span.filter {display:block;margin-left:20px;}
    1057 #mainConfCheck .transparent {opacity:0.5;filter:alpha(opacity=50);}
    1058 #mainConfCheck .order_by_is_custom {display:block;font-weight:normal;font-style:italic;margin-left:20px;}
     1006#mainConf a.addFilter {font-weight:normal;margin-left:20px;}
     1007#mainConf a.removeFilter {font-weight:normal;}
     1008#mainConf span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */
     1009#mainConf span.filter {display:block;margin-left:20px;}
     1010#mainConf .transparent {opacity:0.5;filter:alpha(opacity=50);}
     1011#mainConf .order_by_is_custom {display:block;font-weight:normal;font-style:italic;margin-left:20px;}
    10591012
    10601013/* Upload Form */
  • trunk/install/config.sql

    r12894 r13004  
    2727INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_new_user','false','Send an email to theadministrators when a user registers');
    2828INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_comment','false','Send an email to the administrators when a valid comment is entered');
    29 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');
     29INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_comment_validation','true','Send an email to the administrators when a comment requires validation');
    3030INSERT INTO piwigo_config (param,value,comment) VALUES ('obligatory_user_mail_address','false','Mail address is obligatory for users');
    3131INSERT INTO piwigo_config (param,value,comment) VALUES ('c13y_ignore',null,'List of ignored anomalies');
  • trunk/language/en_UK/admin.lang.php

    r13001 r13004  
    836836$lang['Unlock gallery'] = 'Unlock gallery';
    837837$lang['Gallery unlocked'] = 'Gallery unlocked';
     838$lang['Notify administrators when a comment is'] = 'Notify administrators when a comment is';
     839$lang['modified'] = 'modified';
     840$lang['deleted'] = 'deleted';
     841$lang['pending validation'] = 'pending validation';
     842$lang['Save visits in history for'] = 'Save visits in history for';
     843$lang['simple visitors'] = 'simple visitors';
     844$lang['registered users'] = 'registered users';
     845$lang['administrators'] = 'administrators';
    838846?>
  • trunk/language/fr_FR/admin.lang.php

    r13001 r13004  
    849849$lang['Unlock gallery'] = 'Déverouiller la galerie';
    850850$lang['Gallery unlocked'] = 'Galerie déverouillée';
     851$lang['Notify administrators when a comment is'] = 'Notifier les administrateurs lorsqu\'un commentaire est';
     852$lang['modified'] = 'modifié';
     853$lang['deleted'] = 'supprimé';
     854$lang['pending validation'] = 'en attente de validation';
     855$lang['Save visits in history for'] = 'Historiser les visites des ';
     856$lang['simple visitors'] = 'simple visiteurs';
     857$lang['registered users'] = 'utilisateurs enregistrés';
     858$lang['administrators'] = 'administrateurs';
    851859?>
Note: See TracChangeset for help on using the changeset viewer.