Changeset 13013


Ignore:
Timestamp:
02/02/12 00:03:35 (8 years ago)
Author:
plg
Message:

feature 2561: redesign on album administration screen.

  • only one form on the screen and several tabs
  • simpler URL pattern : page=album-123-properties / page=album-123-sort_order / page=album-123-permissions
  • action to associate all photos of an album to another (new) virtual album was removed. This can be easily done with the new Batch Manager
  • notification by email on an album still has to be moved on a new dedicated tab
  • action icons (jump to album, manage photos, manage sub-albums, delete album...) replaced by plain text links
Location:
trunk
Files:
1 added
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin.php

    r12930 r13013  
    115115  $_GET['page'] = 'plugin'; 
    116116  $_GET['section'] = $matches[1].'/admin.php'; 
     117  if (isset($matches[2])) 
     118  { 
     119    $_GET['tab'] = $matches[2]; 
     120  } 
     121} 
     122 
     123// ?page=album-134-properties is an clean alias of 
     124// ?page=album&cat_id=134&tab=properties 
     125if (isset($_GET['page']) and preg_match('/^album-(\d+)(?:-(.*))?$/', $_GET['page'], $matches)) 
     126{ 
     127  $_GET['page'] = 'album'; 
     128  $_GET['cat_id'] = $matches[1]; 
    117129  if (isset($matches[2])) 
    118130  { 
  • trunk/admin/cat_list.php

    r12922 r13013  
    298298 
    299299      'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'], 
    300       'U_EDIT'     => $base_url.'cat_modify&cat_id='.$category['id'], 
     300      'U_EDIT'     => $base_url.'album-'.$category['id'], 
    301301 
    302302      'IS_VIRTUAL' => empty($category['dir']) 
  • trunk/admin/cat_modify.php

    r12954 r13013  
    164164  } 
    165165 
    166   array_push($page['infos'], l10n('Album updated successfully')); 
     166  // we redirect to hide/show the "permissions" tab if the category status 
     167  // has changed 
     168  $_SESSION['page_infos'] = array(l10n('Album updated successfully')); 
     169  redirect($admin_album_base_url); 
    167170} 
    168171elseif (isset($_POST['set_random_representant'])) 
     
    179182  pwg_query($query); 
    180183} 
    181 elseif (isset($_POST['submitAdd'])) 
    182 { 
    183   $output_create = create_virtual_category( 
    184     $_POST['virtual_name'], 
    185     (0 == $_POST['parent'] ? null : $_POST['parent']) 
    186     ); 
    187  
    188   if (isset($output_create['error'])) 
    189   { 
    190     array_push($page['errors'], $output_create['error']); 
    191   } 
    192   else 
    193   { 
    194     // Virtual album creation succeeded 
    195     // 
    196     // Add the information in the information list 
    197     array_push($page['infos'], $output_create['info']); 
    198  
    199     // Link the new category to the current category 
    200     associate_categories_to_categories( 
    201       array($_GET['cat_id']), 
    202       array($output_create['id']) 
    203       ); 
    204  
    205     // information 
    206     array_push( 
    207       $page['infos'], 
    208       sprintf( 
    209         l10n('Album photos associated to the following albums: %s'), 
    210         '<ul><li>' 
    211         .get_cat_display_name_from_id($output_create['id']) 
    212         .'</li></ul>' 
    213         ) 
    214       ); 
    215   } 
    216 } 
    217 elseif (isset($_POST['submitDestinations']) 
    218          and isset($_POST['destinations']) 
    219          and count($_POST['destinations']) > 0) 
    220 { 
    221   associate_categories_to_categories( 
    222     array($_GET['cat_id']), 
    223     $_POST['destinations'] 
    224     ); 
    225  
    226   $category_names = array(); 
    227   foreach ($_POST['destinations'] as $category_id) 
    228   { 
    229     array_push( 
    230       $category_names, 
    231       get_cat_display_name_from_id($category_id) 
    232       ); 
    233   } 
    234  
    235   array_push( 
    236     $page['infos'], 
    237     sprintf( 
    238       l10n('Album photos associated to the following albums: %s'), 
    239       '<ul><li>'.implode('</li><li>', $category_names).'</li></ul>' 
    240       ) 
    241     ); 
    242 } 
    243  
    244 $query = ' 
    245 SELECT * 
    246   FROM '.CATEGORIES_TABLE.' 
    247   WHERE id = '.$_GET['cat_id'].' 
    248 ;'; 
    249 $category = pwg_db_fetch_assoc( pwg_query( $query ) ); 
     184 
    250185// nullable fields 
    251186foreach (array('comment','dir','site_id', 'id_uppercat') as $nullable) 
     
    269204$navigation = get_cat_display_name_cache( 
    270205  $category['uppercats'], 
    271   get_root_url().'admin.php?page=cat_modify&amp;cat_id=' 
     206  get_root_url().'admin.php?page=album-' 
    272207  ); 
    273208 
    274 $form_action = get_root_url().'admin.php?page=cat_modify&amp;cat_id='.$_GET['cat_id']; 
     209$form_action = $admin_album_base_url.'-properties'; 
    275210 
    276211//----------------------------------------------------- template initialization 
    277 $template->set_filename( 'categories', 'cat_modify.tpl'); 
     212$template->set_filename( 'album_properties', 'cat_modify.tpl'); 
    278213 
    279214$base_url = get_root_url().'admin.php?page='; 
     
    304239      ), 
    305240 
    306     'MAIL_CONTENT' => empty($_POST['mail_content']) 
    307         ? '' : stripslashes($_POST['mail_content']), 
    308241    'U_CHILDREN' => $cat_list_url.'&amp;parent_id='.$category['id'], 
    309242    'U_HELP' => get_root_url().'admin/popuphelp.php?page=cat_modify', 
     
    318251} 
    319252 
    320  
    321 if ('private' == $category['status']) 
    322 { 
    323   $template->assign( 'U_MANAGE_PERMISSIONS', 
    324       $base_url.'cat_perm&amp;cat='.$category['id'] 
    325     ); 
    326 } 
    327  
    328253// manage album elements link 
    329254if ($category['has_images']) 
     
    333258    $base_url.'batch_manager&amp;cat='.$category['id'] 
    334259    ); 
    335 } 
     260 
     261  $query = ' 
     262SELECT 
     263    COUNT(image_id), 
     264    MIN(DATE(date_available)), 
     265    MAX(DATE(date_available)) 
     266  FROM '.IMAGES_TABLE.' 
     267    JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id 
     268  WHERE category_id = '.$category['id'].' 
     269;'; 
     270  list($image_count, $min_date, $max_date) = pwg_db_fetch_row(pwg_query($query)); 
     271 
     272  if ($min_date == $max_date) 
     273  { 
     274    $intro = sprintf( 
     275      l10n('This album contains %d photos, added on %s.'), 
     276      $image_count, 
     277      format_date($min_date) 
     278      ); 
     279  } 
     280  else 
     281  { 
     282    $intro = sprintf( 
     283      l10n('This album contains %d photos, added between %s and %s.'), 
     284      $image_count, 
     285      format_date($min_date), 
     286      format_date($max_date) 
     287      ); 
     288  } 
     289} 
     290else 
     291{ 
     292  $intro = l10n('This album contains no photo.'); 
     293} 
     294 
     295$template->assign('INTRO', $intro); 
    336296 
    337297$template->assign( 
     
    353313  $template->assign( 
    354314    array( 
    355       'CAT_FULL_DIR'       => preg_replace('/\/$/', 
    356                                     '', 
    357                                     $category['cat_full_dir'] ) 
     315      'CAT_FULL_DIR' => preg_replace('/\/$/', '', $category['cat_full_dir']) 
    358316      ) 
    359317    ); 
     
    431389} 
    432390 
    433  
    434 // create virtual in parent and link 
    435 $query = ' 
    436 SELECT id,name,uppercats,global_rank 
    437   FROM '.CATEGORIES_TABLE.' 
    438 ;'; 
    439 display_select_cat_wrapper( 
    440   $query, 
    441   array(), 
    442   'create_new_parent_options' 
    443   ); 
    444  
    445  
    446 // destination categories 
    447 $query = ' 
    448 SELECT id,name,uppercats,global_rank 
    449   FROM '.CATEGORIES_TABLE.' 
    450   WHERE id != '.$category['id'].' 
    451 ;'; 
    452 display_select_cat_wrapper( 
    453   $query, 
    454   array(), 
    455   'category_destination_options' 
    456   ); 
    457  
    458 // info by email to an access granted group of category informations 
    459 if (isset($_POST['submitEmail']) and !empty($_POST['group'])) 
    460 { 
    461   set_make_full_url(); 
    462  
    463   /* TODO: if $category['representative_picture_id'] 
    464     is empty find child representative_picture_id */ 
    465   if (!empty($category['representative_picture_id'])) 
    466   { 
    467     $query = ' 
    468 SELECT id, file, path, representative_ext 
    469   FROM '.IMAGES_TABLE.' 
    470   WHERE id = '.$category['representative_picture_id'].' 
    471 ;'; 
    472  
    473     $result = pwg_query($query); 
    474     if (pwg_db_num_rows($result) > 0) 
    475     { 
    476       $element = pwg_db_fetch_assoc($result); 
    477  
    478       $img_url  = '<a href="'. 
    479                       make_picture_url(array( 
    480                           'image_id' => $element['id'], 
    481                           'image_file' => $element['file'], 
    482                           'category' => $category 
    483                         )) 
    484                       .'" class="thumblnk"><img src="'.DerivativeImage::thumb_url($element).'"></a>'; 
    485     } 
    486   } 
    487  
    488   if (!isset($img_url)) 
    489   { 
    490     $img_url = ''; 
    491   } 
    492  
    493   // TODO Mettre un array pour traduction subjet 
    494   pwg_mail_group( 
    495     $_POST['group'], 
    496     get_str_email_format(true), /* TODO add a checkbox in order to choose format*/ 
    497     get_l10n_args('[%s] Visit album %s', 
    498       array($conf['gallery_title'], $category['name'])), 
    499     'cat_group_info', 
    500     array 
    501     ( 
    502       'IMG_URL' => $img_url, 
    503       'CAT_NAME' => $category['name'], 
    504       'LINK' => make_index_url( 
    505           array( 
    506             'category' => array( 
    507               'id' => $category['id'], 
    508               'name' => $category['name'], 
    509               'permalink' => $category['permalink'] 
    510               ))), 
    511       'CPL_CONTENT' => empty($_POST['mail_content']) 
    512                           ? '' : stripslashes($_POST['mail_content']) 
    513     ), 
    514     '' /* TODO Add listbox in order to choose Language selected */); 
    515  
    516   unset_make_full_url(); 
    517  
    518   $query = ' 
    519 SELECT 
    520     name 
    521   FROM '.GROUPS_TABLE.' 
    522   WHERE id = '.$_POST['group'].' 
    523 ;'; 
    524   list($group_name) = pwg_db_fetch_row(pwg_query($query)); 
    525  
    526   array_push( 
    527     $page['infos'], 
    528     sprintf( 
    529       l10n('An information email was sent to group "%s"'), 
    530       $group_name 
    531       ) 
    532     ); 
    533 } 
    534  
    535 if ('private' == $category['status']) 
    536 { 
    537   $query = ' 
    538 SELECT 
    539     group_id 
    540   FROM '.GROUP_ACCESS_TABLE.' 
    541   WHERE cat_id = '.$category['id'].' 
    542 ;'; 
    543 } 
    544 else 
    545 { 
    546   $query = ' 
    547 SELECT 
    548     id AS group_id 
    549   FROM '.GROUPS_TABLE.' 
    550 ;'; 
    551 } 
    552 $group_ids = array_from_query($query, 'group_id'); 
    553  
    554 if (count($group_ids) > 0) 
    555 { 
    556   $query = ' 
    557 SELECT 
    558     id, 
    559     name 
    560   FROM '.GROUPS_TABLE.' 
    561   WHERE id IN ('.implode(',', $group_ids).') 
    562   ORDER BY name ASC 
    563 ;'; 
    564   $template->assign('group_mail_options', 
    565       simple_hash_from_query($query, 'id', 'name') 
    566     ); 
    567 } 
    568  
    569391trigger_action('loc_end_cat_modify'); 
    570392 
    571393//----------------------------------------------------------- sending html code 
    572 $template->assign_var_from_handle('ADMIN_CONTENT', 'categories'); 
     394$template->assign_var_from_handle('ADMIN_CONTENT', 'album_properties'); 
    573395?> 
  • trunk/admin/cat_perm.php

    r12922 r13013  
    167167      get_cat_display_name_from_id( 
    168168        $page['cat'], 
    169         'admin.php?page=cat_modify&amp;cat_id=' 
     169        'admin.php?page=album-' 
    170170        ), 
    171171    'U_HELP' => get_root_url().'admin/popuphelp.php?page=cat_perm', 
    172     'F_ACTION' => get_root_url().'admin.php?page=cat_perm&amp;cat='.$page['cat'] 
     172    'F_ACTION' => $admin_album_base_url.'-permissions', 
    173173    ) 
    174174  ); 
  • trunk/admin/element_set_ranks.php

    r12922 r13013  
    181181$navigation = get_cat_display_name_cache( 
    182182  $category['uppercats'], 
    183   get_root_url().'admin.php?page=cat_modify&amp;cat_id=' 
     183  get_root_url().'admin.php?page=album-' 
    184184  ); 
    185185 
  • trunk/admin/include/functions.php

    r12930 r13013  
    19921992      return 0; 
    19931993 
     1994    case 'album': 
    19941995    case 'cat_list': 
    19951996    case 'cat_modify': 
  • trunk/admin/include/photos_add_direct_process.inc.php

    r12922 r13013  
    253253;'; 
    254254    list($count) = pwg_db_fetch_row(pwg_query($query)); 
    255     $category_name = get_cat_display_name_from_id($category_id, 'admin.php?page=cat_modify&amp;cat_id='); 
     255    $category_name = get_cat_display_name_from_id($category_id, 'admin.php?page=album-'); 
    256256     
    257257    // information 
  • trunk/admin/picture_modify.php

    r12922 r13013  
    361361    get_cat_display_name_cache( 
    362362      $row['uppercats'], 
    363       get_root_url().'admin.php?page=cat_modify&amp;cat_id=', 
     363      get_root_url().'admin.php?page=album-', 
    364364      false 
    365365      ); 
  • trunk/admin/themes/default/template/cat_modify.tpl

    r12887 r13013  
    1  
    2 {include file='include/autosize.inc.tpl'} 
    3 {include file='include/resize.inc.tpl'} 
    4  
    51<div class="titrePage"> 
    6   <h2>{'Edit album'|@translate}</h2> 
     2  <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} {$TABSHEET_TITLE}</h2> 
    73</div> 
    8  
    9 <h3>{$CATEGORIES_NAV}</h3> 
    10  
    11 <ul class="categoryActions"> 
    12   {if cat_admin_access($CAT_ID)} 
    13   <li><a href="{$U_JUMPTO}" title="{'jump to album'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" alt="{'jump to album'|@translate}"></a></li> 
    14   {/if} 
    15   {if isset($U_MANAGE_ELEMENTS) } 
    16   <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage album photos'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" alt="{'Photos'|@translate}"></a></li> 
    17   {/if} 
    18   <li><a href="{$U_MANAGE_RANKS}" title="{'Manage photo ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" alt="{'ranks'|@translate}"></a></li> 
    19   <li><a href="{$U_CHILDREN}" title="{'manage sub-albums'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" alt="{'sub-albums'|@translate}"></a></li> 
    20   {if isset($U_MANAGE_PERMISSIONS) } 
    21   <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'Edit album permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" alt="{'Permissions'|@translate}"></a></li> 
    22   {/if} 
    23   {if isset($U_SYNC) } 
    24   <li><a href="{$U_SYNC}" title="{'Synchronize'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/synchronize.png" alt="{'Synchronize'|@translate}"></a></li> 
    25   {/if} 
    26   {if isset($U_DELETE) } 
    27   <li><a href="{$U_DELETE}" title="{'delete album'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" alt="{'delete album'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"></a></li> 
    28   {/if} 
    29 </ul> 
    304 
    315<form action="{$F_ACTION}" method="POST" id="catModify"> 
     
    337<fieldset> 
    348  <legend>{'Informations'|@translate}</legend> 
    35   <table> 
    369 
    37     {if isset($CAT_FULL_DIR) } 
     10  <table style="width:100%"> 
    3811    <tr> 
    39       <td><strong>{'Directory'|@translate}</strong></td> 
    40       <td class="row1">{$CAT_FULL_DIR}</td> 
    41     </tr> 
    42     {/if} 
    43      
    44     <tr> 
    45       <td><strong>{'Name'|@translate}</strong></td> 
    46       <td> 
    47         <input type="text" class="large" name="name" value="{$CAT_NAME}" maxlength="60"> 
     12      <td style="width:1%;padding-right:10px;text-align:center;"> 
     13{if isset($representant) } 
     14  {if isset($representant.picture) } 
     15        <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt="" style="border:2px solid #ddd"></a> 
     16  {else} 
     17        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" alt="{'Random photo'|@translate}"> 
     18  {/if} 
     19 
     20  {if $representant.ALLOW_SET_RANDOM } 
     21        <p style="text-align:center;"><input class="submit" type="submit" name="set_random_representant" value="Refresh" title="{'Find a new representant by random'|@translate}"></p> 
     22  {/if} 
     23 
     24  {if isset($representant.ALLOW_DELETE) } 
     25        <p><input class="submit" type="submit" name="delete_representant" value="{'Delete Representant'|@translate}"></p> 
     26  {/if} 
     27{/if} 
    4828      </td> 
    49     </tr> 
    50     <tr> 
    51       <td><strong>{'Description'|@translate}</strong></td> 
    52       <td> 
    53         <textarea cols="50" rows="5" name="comment" id="comment" class="description">{$CAT_COMMENT}</textarea> 
    54       </td> 
    55     </tr> 
    56   </table> 
    57 </fieldset> 
    5829 
    59 {if isset($move_cat_options) } 
    60 <fieldset id="move"> 
    61   <legend>{'Move'|@translate}</legend> 
    62   {'Parent album'|@translate} 
    63   <select class="categoryDropDown" name="parent"> 
    64     <option value="0">------------</option> 
    65     {html_options options=$move_cat_options selected=$move_cat_options_selected } 
    66   </select> 
    67 </fieldset> 
     30      <td style="vertical-align:top;border-left:2px solid #ddd;padding-left:10px;"> 
     31<p>{$INTRO}</p> 
     32<ul style="padding-left:15px;"> 
     33{if cat_admin_access($CAT_ID)} 
     34  <li><a href="{$U_JUMPTO}">{'jump to album'|@translate} →</a></li> 
    6835{/if} 
    6936 
    70 <fieldset id="options"> 
    71   <legend>{'Options'|@translate}</legend> 
    72   <table> 
    73     <tr> 
    74       <td><strong>{'Access type'|@translate}</strong> 
    75       <td> 
    76         {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS} 
    77       </td> 
    78     </tr> 
    79     <tr> 
    80       <td><strong>{'Lock'|@translate}</strong> 
    81       <td> 
    82         {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE} 
    83       </td> 
    84     </tr> 
    85   {if isset($CAT_COMMENTABLE)} 
    86     <tr> 
    87       <td><strong>{'Comments'|@translate}</strong> 
    88       <td> 
    89         {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE} 
    90       </td> 
    91     </tr> 
    92   {/if} 
    93   </table> 
    94 </fieldset> 
    95  
    96 <p style="text-align:center;"> 
    97   <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"> 
    98   <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> 
    99 </p> 
    100  
    101 {if isset($representant) } 
    102 <fieldset id="representant"> 
    103   <legend>{'Representant'|@translate}</legend> 
    104   <table> 
    105     <tr> 
    106       <td align="center"> 
    107         {if isset($representant.picture) } 
    108         <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt=""></a> 
    109         {else} 
    110         <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_representant_random.png" alt="{'Random photo'|@translate}"> 
    111         {/if} 
    112       </td> 
    113       <td> 
    114         {if $representant.ALLOW_SET_RANDOM } 
    115         <p><input class="submit" type="submit" name="set_random_representant" value="{'Find a new representant by random'|@translate}"></p> 
    116         {/if} 
    117  
    118         {if isset($representant.ALLOW_DELETE) } 
    119         <p><input class="submit" type="submit" name="delete_representant" value="{'Delete Representant'|@translate}"></p> 
    120         {/if} 
    121       </td> 
    122     </tr> 
    123   </table> 
    124 </fieldset> 
     37{if isset($U_MANAGE_ELEMENTS) } 
     38  <li><a href="{$U_MANAGE_ELEMENTS}">{'manage album photos'|@translate}</a></li> 
    12539{/if} 
    12640 
    127 </form> 
     41  <li><a href="{$U_CHILDREN}">{'manage sub-albums'|@translate}</a></li> 
    12842 
    129 <form action="{$F_ACTION}" method="POST" id="links"> 
     43{if isset($U_SYNC) } 
     44  <li><a href="{$U_SYNC}">{'Synchronize'|@translate}</a> ({'Directory'|@translate} = {$CAT_FULL_DIR})</li> 
     45{/if} 
    13046 
    131 <fieldset id="linkAllNew"> 
    132   <legend>{'Link all album photos to a new album'|@translate}</legend> 
     47{if isset($U_DELETE) } 
     48  <li><a href="{$U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'delete album'|@translate}</a></li> 
     49{/if} 
    13350 
    134   <table> 
    135     <tr> 
    136       <td>{'Virtual album name'|@translate}</td> 
    137       <td><input type="text" class="large" name="virtual_name"></td> 
    138     </tr> 
    139  
    140     <tr> 
    141       <td>{'Parent album'|@translate}</td> 
    142       <td> 
    143         <select class="categoryDropDown" name="parent"> 
    144           <option value="0">------------</option> 
    145           {html_options options=$create_new_parent_options } 
    146         </select> 
     51</ul> 
    14752      </td> 
    14853    </tr> 
    14954  </table> 
    15055 
     56</fieldset> 
     57 
     58<fieldset> 
     59  <legend>{'Properties'|@translate}</legend> 
    15160  <p> 
    152     <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd"> 
    153     <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> 
     61    <strong>{'Name'|@translate}</strong> 
     62    <br> 
     63    <input type="text" class="large" name="name" value="{$CAT_NAME}" maxlength="60"> 
    15464  </p> 
    15565 
     66  <p> 
     67    <strong>{'Description'|@translate}</strong> 
     68    <br> 
     69    <textarea cols="50" rows="5" name="comment" id="comment" class="description">{$CAT_COMMENT}</textarea> 
     70  </p> 
     71 
     72{if isset($move_cat_options) } 
     73  <p> 
     74    <strong>{'Parent album'|@translate}</strong> 
     75    <br> 
     76    <select class="categoryDropDown" name="parent"> 
     77      <option value="0">------------</option> 
     78      {html_options options=$move_cat_options selected=$move_cat_options_selected } 
     79    </select> 
     80  </p> 
     81{/if} 
     82 
     83  <p> 
     84    <strong>{'Access type'|@translate}</strong> 
     85    <br> 
     86    {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS} 
     87  </p> 
     88 
     89  <p> 
     90    <strong>{'Lock'|@translate}</strong> 
     91    <br> 
     92    {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE} 
     93  </p> 
     94 
     95  {if isset($CAT_COMMENTABLE)} 
     96  <p> 
     97    <strong>{'Comments'|@translate}</strong> 
     98    <br> 
     99    {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE} 
     100  </p> 
     101  {/if} 
     102 
     103  <p style="margin:0"> 
     104    <input class="submit" type="submit" value="{'Save Settings'|@translate}" name="submit"> 
     105  </p> 
    156106</fieldset> 
    157107 
    158 <fieldset id="linkAllExist"> 
    159   <legend>{'Link all album photos to some existing albums'|@translate}</legend> 
    160  
    161   <table> 
    162     <tr> 
    163       <td>{'Albums'|@translate}</td> 
    164       <td> 
    165         <select class="categoryList" name="destinations[]" multiple="multiple" size="5"> 
    166           {html_options options=$category_destination_options } 
    167         </select> 
    168       </td> 
    169     </tr> 
    170   </table> 
    171  
    172   <p> 
    173     <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitDestinations"> 
    174     <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> 
    175   </p> 
    176  
    177 </fieldset> 
    178  
    179 {if isset($group_mail_options)} 
    180 <fieldset id="emailCatInfo"> 
    181   <legend>{'Send an information email to group members'|@translate}</legend> 
    182  
    183   <table> 
    184     <tr> 
    185       <td><strong>{'Group'|@translate}</strong></td> 
    186       <td> 
    187         <select name="group"> 
    188           {html_options options=$group_mail_options} 
    189         </select> 
    190       </td> 
    191     </tr> 
    192     <tr> 
    193       <td><strong>{'Mail content'|@translate}</strong></td> 
    194       <td> 
    195         <textarea cols="50" rows="5" name="mail_content" id="mail_content" class="description">{$MAIL_CONTENT}</textarea> 
    196       </td> 
    197     </tr> 
    198  
    199   </table> 
    200  
    201   <p> 
    202     <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitEmail"> 
    203     <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset"> 
    204   </p> 
    205  
    206 </fieldset> 
    207 {/if} 
    208  
    209108</form> 
  • trunk/admin/themes/default/template/cat_perm.tpl

    r12825 r13013  
    11<div class="titrePage"> 
    2   <h2>{'Edit album permissions'|@translate}</h2> 
     2  <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} {$TABSHEET_TITLE}</h2> 
    33</div> 
    4  
    5 <h3>{$CATEGORIES_NAV}</h3> 
    64 
    75<form action="{$F_ACTION}" method="post" id="categoryPermissions"> 
  • trunk/admin/themes/default/template/element_set_ranks.tpl

    r9868 r13013  
    3838{/literal}{/footer_script} 
    3939 
    40 <h2>{'Manage photo ranks'|@translate}</h2> 
    41  
    42 <h3>{$CATEGORIES_NAV}</h3> 
     40<div class="titrePage"> 
     41  <h2><span style="letter-spacing:0">{$CATEGORIES_NAV}</span> &#8250; {'Edit album'|@translate} {$TABSHEET_TITLE}</h2> 
     42</div> 
    4343 
    4444<form action="{$F_ACTION}" method="post"> 
  • trunk/admin/themes/default/theme.css

    r13004 r13013  
    220220FORM#catModify TABLE { width: auto; } 
    221221 
     222#catModify p { 
     223  line-height: 20px; 
     224  margin: 0 0 1.5em; 
     225  text-align: left; 
     226} 
     227 
    222228FIELDSET.elementEdit .thumb { 
    223229        display: block; 
     
    788794.themeBoxes {min-height:0;text-align:left;} 
    789795 
    790 h2 { letter-spacing:2px; font-weight:bold;} 
     796h2 { letter-spacing:1px; font-weight:bold;} 
    791797h2:lang(en) { text-transform:capitalize; } 
    792798 
  • trunk/language/en_UK/admin.lang.php

    r13004 r13013  
    844844$lang['registered users'] = 'registered users'; 
    845845$lang['administrators'] = 'administrators'; 
     846$lang['This album contains %d photos, added on %s.'] = 'This album contains %d photos, added on %s.'; 
     847$lang['This album contains %d photos, added between %s and %s.'] = 'This album contains %d photos, added between %s and %s.'; 
     848$lang['This album contains no photo.'] = 'This album contains no photo.'; 
    846849?> 
  • trunk/language/fr_FR/admin.lang.php

    r13004 r13013  
    857857$lang['registered users'] = 'utilisateurs enregistrés'; 
    858858$lang['administrators'] = 'administrateurs'; 
     859$lang['This album contains %d photos, added on %s.'] = 'Cet album contient %d photos, ajoutées le %s.'; 
     860$lang['This album contains %d photos, added between %s and %s.'] = 'Cet album contient %d photos, ajoutées entre le %s et le %s..'; 
     861$lang['This album contains no photo.'] = 'Cet album ne contient pas de photo.'; 
    859862?> 
Note: See TracChangeset for help on using the changeset viewer.