Changeset 817


Ignore:
Timestamp:
Aug 17, 2005, 4:25:38 PM (19 years ago)
Author:
plg
Message:
  • modification : major simplification of admin.php. Titles are managed by included page, localized items are managed directly in the template.
  • new : sub template admin/double_select is included in templates admin/cat_options, admin/user_perm and admin/group_perm. I haven't been able to use it in admin/picture_modify because it seems impossible to have two instance of the same sub-template without interfering.
  • modification : bug 99, in profile manager, no auto submit when changing language (useless and generate accessibility problem).
  • improvement : HTML semantically correct for administration menu, simpler syntax, less tags, correct tags (dl/dt/dd instead of div/div).
  • modification : number of waiting elements and unvalidated comments are displayed in admin/intro instead of administration menu (with a link to the dedicated pages).
  • deletion : no link to profile from admin/user_list anymore (no need).
Location:
trunk
Files:
4 added
30 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin.php

    r815 r817  
    3838sync_users();
    3939
    40 //--------------------------------------- validating page and creation of title
    41 $page_valide = false;
    42 $title = '';
    43 $username='';
    44 if (isset($_POST['username']))
     40// +-----------------------------------------------------------------------+
     41// |                            variables init                             |
     42// +-----------------------------------------------------------------------+
     43
     44if (isset($_GET['page'])
     45    and preg_match('/^[a-z_]*$/', $_GET['page'])
     46    and is_file(PHPWG_ROOT_PATH.'admin/'.$_GET['page'].'.php'))
    4547{
    46   $username = $_POST['username'];
     48  $page['page'] = $_GET['page'];
    4749}
    48 else if (isset($_POST['userid']))
     50else
    4951{
    50   $username = get_username($_POST['userid']);
    51 }
    52 else if (isset($_GET['user_id']))
    53 {
    54   $username = get_username($_GET['user_id']);
    55 }
    56 
    57 $_GET['page'] = isset($_GET['page']) ? $_GET['page'] : 'intro';
    58 
    59 switch ( $_GET['page'] )
    60 {
    61   case 'user_list' :
    62   {
    63     $title = $lang['title_liste_users'];
    64     $page_valide = true;
    65     break;
    66   }
    67   case 'profile' :
    68   {
    69     $title = $lang['title_user_modify'];
    70     $page_valide = true;
    71     break;
    72   }
    73  case 'user_perm':
    74    $title = $lang['title_user_perm'].' '.$username;
    75    $page_valide = true; break;
    76  case 'group_list' :
    77    $title = $lang['title_groups'];        $page_valide = true; break;
    78  case 'group_perm' :
    79    if (!is_numeric($_GET['group_id']))
    80    {
    81      $_GET['group_id'] = -1;
    82    }
    83    $query = '
    84 SELECT name
    85   FROM '.GROUPS_TABLE.'
    86   WHERE id = '.$_GET['group_id'].'
    87 ;';
    88    $result = pwg_query($query);
    89    if (mysql_num_rows($result) > 0 )
    90    {
    91      $row = mysql_fetch_array($result);
    92      $title = $lang['title_group_perm'].' "'.$row['name'].'"';
    93      $page_valide = true;
    94    }
    95    else
    96    {
    97      $page_valide = false;
    98    }
    99    break;
    100  case 'stats':
    101    $title = $lang['title_history'];       $page_valide = true; break;
    102  case 'update':
    103    $title = $lang['title_update'];        $page_valide = true; break;
    104  case 'configuration':
    105    $title = $lang['title_configuration']; $page_valide = true; break;
    106  case 'help':
    107    $title = $lang['title_instructions'];  $page_valide = true; break;
    108  case 'cat_perm':
    109    $title = $lang['title_cat_perm'];
    110    if ( isset( $_GET['cat'] ) )
    111    {
    112      check_cat_id( $_GET['cat'] );
    113      if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
    114      {
    115        $result = get_cat_info( $page['cat'] );
    116        $name = get_cat_display_name($result['name'], '');
    117        $title.= ' "'.$name.'"';
    118      }
    119    }
    120    $page_valide = true;
    121    break;
    122  case 'cat_list':
    123    $title = $lang['title_categories'];    $page_valide = true; break;
    124  case 'cat_modify':
    125    $title = $lang['title_edit_cat'];      $page_valide = true; break;
    126  case 'infos_images':
    127    $title = $lang['title_info_images'];   $page_valide = true; break;
    128  case 'waiting':
    129    $title = $lang['title_waiting'];       $page_valide = true; break;
    130  case 'thumbnail':
    131    $title = $lang['title_thumbnails'];
    132    if ( isset( $_GET['dir'] ) )
    133    {
    134      $title.= ' '.$lang['title_thumbnails_2'].' <span class="titreImg">';
    135      // $_GET['dir'] contains :
    136      // ./galleries/vieux_lyon ou
    137      // ./galleries/vieux_lyon/visite ou
    138      // ./galleries/vieux_lyon/visite/truc ...
    139      $dir = explode( "/", $_GET['dir'] );
    140      $title.= $dir[2];
    141      for ( $i = 2; $i < sizeof( $dir ) - 1; $i++ )
    142      {
    143        $title.= ' &gt; '.$dir[$i+1];
    144      }
    145      $title.= "</span>";
    146    }
    147    $page_valide = true;
    148    break;
    149  case 'comments' :
    150    $title = $lang['title_comments'];
    151    $page_valide = true;
    152    break;
    153  case 'picture_modify' :
    154    $title = $lang['title_picmod'];
    155    $page_valide = true;
    156    break;
    157  case 'remote_site' :
    158  {
    159    $title = $lang['remote_sites'];
    160    $page_valide = true;
    161    break;
    162  }
    163  case 'cat_options' :
    164  {
    165    $title = $lang['title_cat_options'];
    166    $page_valide = true;
    167    break;
    168  }
    169  case 'element_set' :
    170  {
    171    $title = 'batch management';
    172    $page_valide = true;
    173    break;
    174  }
    175  case 'maintenance' :
    176  {
    177    $title = l10n('Maintenance');
    178    $page_valide = true;
    179    break;
    180  }
    181  case 'representative' :
    182  {
    183    $title = l10n('Representative');
    184    $page_valide = true;
    185    break;
    186  }
    187 //  case 'element_set_unit' :
    188 //  {
    189 //    $title = 'batch management';
    190 //    $page_valide = true;
    191 //    break;
    192 //  }
    193  case 'intro' :
    194  {
    195    $_GET['page'] = 'intro';
    196    $title = $lang['title_default'];
    197    $page_valide = true;
    198    break;
    199  }
    200  default :
    201  {
    202    break;
    203  }
    204 }
    205 if ( $title == '' ) $title = $lang['title_default'];
    206 
    207 // waiting
    208 $query = 'SELECT id FROM '.WAITING_TABLE;
    209 $query.= " WHERE validated='false'";
    210 $query.= ';';
    211 $result = pwg_query( $query );
    212 $nb_waiting = '';
    213 if ( mysql_num_rows( $result ) > 0 )
    214 {
    215   $nb_waiting =  ' [ '.mysql_num_rows( $result ).' ]';
    216 }
    217 // comments
    218 $query = 'SELECT id FROM '.COMMENTS_TABLE;
    219 $query.= " WHERE validated='false'";
    220 $query.= ';';
    221 $result = pwg_query( $query );
    222 $nb_comments = '';
    223 if ( mysql_num_rows( $result ) > 0 )
    224 {
    225   $nb_comments =  ' [ '.mysql_num_rows( $result ).' ]';
     52  $page['page'] = 'intro';
    22653}
    22754
    … …  
    23057$opt_link = $link_start.'cat_options&amp;section=';
    23158//----------------------------------------------------- template initialization
     59$title = l10n('PhpWebGallery administration'); // for include/page_header.php
    23260include(PHPWG_ROOT_PATH.'include/page_header.php');
    233 $template->set_filenames( array('admin'=>'admin.tpl') );
    23461
    235 $template->assign_vars(array(
    236   'L_TITLE'=>$lang['admin_panel'],
    237   'L_LINKS'=>$lang['links'],
    238   'L_GALLERY_INDEX'=>$lang['home'],
    239   'L_GENERAL'=>$lang['general'],
    240   'L_DEFAULT'=>$lang['gallery_default'],
    241   'L_HISTORY'=>$lang['history'],
    242   'L_FAQ'=>$lang['instructions'],
    243   'L_CONFIGURATION'=>$lang['config'],
    244   'L_CONFIG_GENERAL'=>$lang['general'],
    245   'L_CONFIG_COMMENTS'=>$lang['comments'],
    246   'L_CONFIG_DISPLAY'=>$lang['conf_default'],
    247   'L_CONFIG_UPLOAD'=>$lang['upload'],
    248   'L_CONFIG_SESSION'=>$lang['conf_cookie'],
    249   'L_CONFIG_METADATA'=>$lang['metadata'],
    250   'L_SITES'=>$lang['remote_sites'],
    251   'L_CATEGORIES'=>$lang['categories'],
    252   'L_MANAGE'=>$lang['manage'],
    253   'L_IMAGES'=>$lang['pictures'],
    254   'L_WAITING'=>$lang['waiting'].$nb_waiting,
    255   'L_COMMENTS'=>$lang['comments'].$nb_comments,
    256   'L_THUMBNAILS'=>$lang['thumbnails'],
    257   'L_IDENTIFY'=>$lang['identification'],
    258   'L_USERS'=>$lang['users'],
    259   'L_GROUPS'=>$lang['groups'],
    260   'L_UPDATE'=>$lang['update'],
    261   'L_CAT_UPLOAD'=>$lang['upload'],
    262   'L_CAT_COMMENTS'=>$lang['comments'],
    263   'L_CAT_VISIBLE'=>$lang['lock'],
    264   'L_CAT_STATUS'=>$lang['cat_security'],
     62$template->set_filenames(array('admin' => 'admin.tpl'));
    26563
    266   'U_HISTORY'=>add_session_id($link_start.'stats' ),
    267   'U_FAQ'=>add_session_id($link_start.'help' ),
    268   'U_SITES'=>add_session_id($link_start.'remote_site'),
    269   'U_MAINTENANCE'=>add_session_id($link_start.'maintenance'),
    270   'U_CONFIG_GENERAL'=>add_session_id($conf_link.'general' ),
    271   'U_CONFIG_COMMENTS'=>add_session_id($conf_link.'comments' ),
    272   'U_CONFIG_DISPLAY'=>add_session_id($conf_link.'default' ),
    273   'U_CONFIG_UPLOAD'=>add_session_id($conf_link.'upload' ),
    274   'U_CONFIG_SESSION'=>add_session_id($conf_link.'session' ),
    275   'U_CONFIG_METADATA'=>add_session_id($conf_link.'metadata' ),
    276   'U_CATEGORIES'=>add_session_id($link_start.'cat_list' ),
    277   'U_CAT_UPLOAD'=>add_session_id($opt_link.'upload'),
    278   'U_CAT_COMMENTS'=>add_session_id($opt_link.'comments'),
    279   'U_CAT_VISIBLE'=>add_session_id($opt_link.'visible'),
    280   'U_CAT_STATUS'=>add_session_id($opt_link.'status'),
    281   'U_CAT_OPTIONS'=>add_session_id($link_start.'cat_options'),
    282   'U_CAT_UPDATE'=>add_session_id($link_start.'update'),
    283   'U_WAITING'=>add_session_id($link_start.'waiting' ),
    284   'U_COMMENTS'=>add_session_id($link_start.'comments' ),
    285   'U_CADDIE'=>add_session_id($link_start.'element_set&amp;cat=caddie'),
    286   'U_THUMBNAILS'=>add_session_id($link_start.'thumbnail' ),
    287   'U_USERS'=>add_session_id($link_start.'user_list' ),
    288   'U_GROUPS'=>add_session_id($link_start.'group_list' ),
    289   'U_RETURN'=>add_session_id(PHPWG_ROOT_PATH.'category.php')
    290   ));
     64$template->assign_vars(
     65  array(
     66    'U_HISTORY'=>add_session_id($link_start.'stats' ),
     67    'U_FAQ'=>add_session_id($link_start.'help' ),
     68    'U_SITES'=>add_session_id($link_start.'remote_site'),
     69    'U_MAINTENANCE'=>add_session_id($link_start.'maintenance'),
     70    'U_CONFIG_GENERAL'=>add_session_id($conf_link.'general' ),
     71    'U_CONFIG_COMMENTS'=>add_session_id($conf_link.'comments' ),
     72    'U_CONFIG_DISPLAY'=>add_session_id($conf_link.'default' ),
     73    'U_CONFIG_UPLOAD'=>add_session_id($conf_link.'upload' ),
     74    'U_CONFIG_SESSION'=>add_session_id($conf_link.'session' ),
     75    'U_CONFIG_METADATA'=>add_session_id($conf_link.'metadata' ),
     76    'U_CATEGORIES'=>add_session_id($link_start.'cat_list' ),
     77    'U_CAT_UPLOAD'=>add_session_id($opt_link.'upload'),
     78    'U_CAT_COMMENTS'=>add_session_id($opt_link.'comments'),
     79    'U_CAT_VISIBLE'=>add_session_id($opt_link.'visible'),
     80    'U_CAT_STATUS'=>add_session_id($opt_link.'status'),
     81    'U_CAT_OPTIONS'=>add_session_id($link_start.'cat_options'),
     82    'U_CAT_UPDATE'=>add_session_id($link_start.'update'),
     83    'U_WAITING'=>add_session_id($link_start.'waiting' ),
     84    'U_COMMENTS'=>add_session_id($link_start.'comments' ),
     85    'U_CADDIE'=>add_session_id($link_start.'element_set&amp;cat=caddie'),
     86    'U_THUMBNAILS'=>add_session_id($link_start.'thumbnail' ),
     87    'U_USERS'=>add_session_id($link_start.'user_list' ),
     88    'U_GROUPS'=>add_session_id($link_start.'group_list' ),
     89    'U_RETURN'=>add_session_id(PHPWG_ROOT_PATH.'category.php')
     90    )
     91  );
    29192
    29293if ($conf['allow_random_representative'])
    … …  
    300101}
    301102 
    302 //--------------------------------------------------------------------- summary
    303 $link_start = PHPWG_ROOT_PATH.'admin.php?page=';
    304103//------------------------------------------------------------- content display
    305104$page['errors'] = array();
    306 $page['infos'] = array();
     105$page['infos']  = array();
    307106
    308 if ($page_valide)
    309 {
    310   switch ($_GET['page'])
    311   {
    312     case 'comments' :
    313     {
    314       include(PHPWG_ROOT_PATH.'comments.php');
    315       break;
    316     }
    317     case 'profile' :
    318     {
    319       include(PHPWG_ROOT_PATH.'profile.php');
    320       break;
    321     }
    322     default :
    323     {
    324       include(PHPWG_ROOT_PATH.'admin/'.$_GET['page'].'.php');
    325     }
    326   }
    327 }
    328 else
    329 {
    330   $template->assign_vars(
    331     array(
    332       'ADMIN_CONTENT'
    333       =>'<div style="text-align:center">'.$lang['default_message'].'</div>'
    334       )
    335     );
    336 }
     107include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php');
     108
    337109// +-----------------------------------------------------------------------+
    338110// |                            errors & infos                             |
    339111// +-----------------------------------------------------------------------+
     112
    340113if (count($page['errors']) != 0)
    341114{
    … …  
    346119  }
    347120}
     121
    348122if (count($page['infos']) != 0)
    349123{
    … …  
    357131$template->parse('admin');
    358132include(PHPWG_ROOT_PATH.'include/page_tail.php');
     133
    359134// +-----------------------------------------------------------------------+
    360135// |                     order permission refreshment                      |
    361136// +-----------------------------------------------------------------------+
     137
    362138$query = '
    363139UPDATE '.USER_CACHE_TABLE.'

  • trunk/admin/cat_options.php

    r809 r817  
    3131}
    3232include_once(PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php');
     33
    3334// +-----------------------------------------------------------------------+
    3435// |                       modification registration                       |
    3536// +-----------------------------------------------------------------------+
     37
    3638// print '<pre>';
    3739// print_r($_POST);
    … …  
    130132  }
    131133}
     134
    132135// +-----------------------------------------------------------------------+
    133136// |                             template init                             |
    134137// +-----------------------------------------------------------------------+
    135 $template->set_filenames(array('cat_options'=>'admin/cat_options.tpl'));
    136 
    137 if (!isset($_GET['section']))
    138 {
    139   $page['section'] = 'upload';
    140 }
    141 else
    142 {
    143   $page['section'] = $_GET['section'];
    144 }
    145 
     138
     139$template->set_filenames(
     140  array(
     141    'cat_options' => 'admin/cat_options.tpl',
     142    'double_select' => 'admin/double_select.tpl'
     143    )
     144  );
     145
     146$page['section'] = isset($_GET['section']) ? $_GET['section'] : 'upload';
    146147$base_url = PHPWG_ROOT_PATH.'admin.php?page=cat_options&amp;section=';
     148
    147149$template->assign_vars(
    148150  array(
    … …  
    154156 );
    155157
    156 $template->assign_vars(array(strtoupper($page['section']).'_CLASS'=>'opened'));
    157158// +-----------------------------------------------------------------------+
    158159// |                              form display                             |
    … …  
    190191    $template->assign_vars(
    191192      array(
    192         'L_CAT_TITLE' => $lang['cat_upload_title'],
     193        'L_SECTION' => $lang['cat_upload_title'],
    193194        'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
    194195        'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
    … …  
    212213    $template->assign_vars(
    213214      array(
    214         'L_CAT_TITLE' => $lang['cat_comments_title'],
     215        'L_SECTION' => $lang['cat_comments_title'],
    215216        'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
    216217        'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
    … …  
    234235    $template->assign_vars(
    235236      array(
    236         'L_CAT_TITLE' => $lang['cat_lock_title'],
     237        'L_SECTION' => $lang['cat_lock_title'],
    237238        'L_CAT_OPTIONS_TRUE' => $lang['unlocked'],
    238239        'L_CAT_OPTIONS_FALSE' => $lang['locked'],
    … …  
    256257    $template->assign_vars(
    257258      array(
    258         'L_CAT_TITLE' => $lang['cat_status_title'],
     259        'L_SECTION' => $lang['cat_status_title'],
    259260        'L_CAT_OPTIONS_TRUE' => $lang['cat_public'],
    260261        'L_CAT_OPTIONS_FALSE' => $lang['cat_private'],
    … …  
    279280    $template->assign_vars(
    280281      array(
    281         'L_CAT_TITLE' => l10n('Representative'),
     282        'L_SECTION' => l10n('Representative'),
    282283        'L_CAT_OPTIONS_TRUE' => l10n('singly represented'),
    283284        'L_CAT_OPTIONS_FALSE' => l10n('randomly represented'),
    … …  
    290291display_select_cat_wrapper($query_true,array(),'category_option_true');
    291292display_select_cat_wrapper($query_false,array(),'category_option_false');
     293
    292294// +-----------------------------------------------------------------------+
    293295// |                           sending html code                           |
    294296// +-----------------------------------------------------------------------+
     297
     298$template->assign_var_from_handle('DOUBLE_SELECT', 'double_select');
    295299$template->assign_var_from_handle('ADMIN_CONTENT', 'cat_options');
    296300?>

  • trunk/admin/cat_perm.php

    r808 r817  
    197197// |                       template initialization                         |
    198198// +-----------------------------------------------------------------------+
     199
    199200$template->set_filenames(array('cat_perm'=>'admin/cat_perm.tpl'));
    200201
    201 $form_action = PHPWG_ROOT_PATH.'admin.php';
    202 $form_action.= '?page=cat_perm&amp;cat='.$page['cat'];
    203 
    204 $template->assign_vars(array('F_ACTION' => $form_action));
     202$template->assign_vars(
     203  array(
     204    'TITLE' =>
     205      sprintf(
     206        l10n('Manage permissions for category "%s"'),
     207        get_cat_display_name_from_id($page['cat'])
     208        )
     209    'F_ACTION' =>
     210      add_session_id(
     211        PHPWG_ROOT_PATH.'admin.php?page=cat_perm&amp;cat='.$page['cat']
     212        )
     213    )
     214  );
    205215
    206216// +-----------------------------------------------------------------------+

  • trunk/admin/group_perm.php

    r815 r817  
    121121// +-----------------------------------------------------------------------+
    122122
    123 $template->set_filenames(array('group_perm'=>'admin/cat_options.tpl'));
     123$template->set_filenames(
     124  array(
     125    'group_perm' => 'admin/group_perm.tpl',
     126    'double_select' => 'admin/double_select.tpl'
     127    )
     128  );
    124129
    125130$template->assign_vars(
    126131  array(
    127     'L_RESET'=>$lang['reset'],
     132    'TITLE' =>
     133      sprintf(
     134        l10n('Manage permissions for group "%s"'),
     135        get_groupname($page['group']
     136          )
     137        ),
    128138    'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
    129139    'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
    … …  
    131141   
    132142    'F_ACTION' =>
    133     add_session_id(
    134       PHPWG_ROOT_PATH.
    135       'admin.php?page=group_perm&amp;group_id='.
    136       $page['group']
    137       )
     143      add_session_id(
     144        PHPWG_ROOT_PATH.
     145        'admin.php?page=group_perm&amp;group_id='.
     146        $page['group']
     147        )
    138148    )
    139149  );
    … …  
    172182// +-----------------------------------------------------------------------+
    173183
     184$template->assign_var_from_handle('DOUBLE_SELECT', 'double_select');
    174185$template->assign_var_from_handle('ADMIN_CONTENT', 'group_perm');
    175186

  • trunk/admin/intro.php

    r814 r817  
    193193    )
    194194  );
    195  
     195
     196// waiting elements
     197$query = '
     198SELECT COUNT(*)
     199  FROM '.WAITING_TABLE.'
     200  WHERE validated=\'false\'
     201;';
     202list($nb_waiting) = mysql_fetch_row(pwg_query($query));
     203
     204if ($nb_waiting > 0)
     205{
     206  $template->assign_block_vars(
     207    'waiting',
     208    array(
     209      'URL' => add_session_id(PHPWG_ROOT_PATH.'admin.php?page=waiting'),
     210      'INFO' => sprintf(l10n('%d waiting for validation'), $nb_waiting)
     211      )
     212    );
     213}
     214
     215// unvalidated comments
     216$query = '
     217SELECT COUNT(*)
     218  FROM '.COMMENTS_TABLE.'
     219  WHERE validated=\'false\'
     220;';
     221list($nb_comments) = mysql_fetch_row(pwg_query($query));
     222
     223if ($nb_comments > 0)
     224{
     225  $template->assign_block_vars(
     226    'unvalidated',
     227    array(
     228      'URL' => add_session_id(PHPWG_ROOT_PATH.'admin.php?page=comments'),
     229      'INFO' => sprintf(l10n('%d waiting for validation'), $nb_comments)
     230      )
     231    );
     232}
     233
    196234// +-----------------------------------------------------------------------+
    197235// |                           sending html code                           |

  • trunk/admin/picture_modify.php

    r809 r817  
    168168                                               false);
    169169//----------------------------------------------------- template initialization
    170 $template->set_filenames(array('picture_modify'=>'admin/picture_modify.tpl'));
     170$template->set_filenames(
     171  array(
     172    'picture_modify' => 'admin/picture_modify.tpl'
     173    )
     174  );
     175
    171176$template->assign_vars(array(
    172177  'TITLE_IMG'=>$title,
    … …  
    221226    AND id != '.$storage_category_id.'
    222227;';
    223 display_select_cat_wrapper($query,array(),'associated_option');
     228display_select_cat_wrapper($query, array(), 'associated_option');
    224229
    225230$result = pwg_query($query);
    … …  
    234239  WHERE id NOT IN ('.implode(',', $associateds).')
    235240;';
    236 display_select_cat_wrapper($query,array(),'dissociated_option');
     241display_select_cat_wrapper($query, array(), 'dissociated_option');
    237242
    238243// representing
    … …  
    242247  WHERE representative_picture_id = '.$_GET['image_id'].'
    243248;';
    244 display_select_cat_wrapper($query,array(),'elected_option');
     249display_select_cat_wrapper($query, array(), 'elected_option');
    245250
    246251$query = '
    … …  
    250255    OR representative_picture_id IS NULL
    251256;';
    252 display_select_cat_wrapper($query,array(),'dismissed_option');
     257display_select_cat_wrapper($query, array(), 'dismissed_option');
     258
    253259//----------------------------------------------------------- sending html code
     260
     261
    254262$template->assign_var_from_handle('ADMIN_CONTENT', 'picture_modify');
    255263?>

  • trunk/admin/user_perm.php

    r815 r817  
    110110  mass_inserts(USER_ACCESS_TABLE, array('user_id','cat_id'), $inserts);
    111111}
    112 //----------------------------------------------------- template initialization
    113 $template->set_filenames(array('user_perm'=>'admin/cat_options.tpl'));
     112
     113// +-----------------------------------------------------------------------+
     114// |                             template init                             |
     115// +-----------------------------------------------------------------------+
     116
     117$template->set_filenames(
     118  array(
     119    'user_perm' => 'admin/user_perm.tpl',
     120    'double_select' => 'admin/double_select.tpl'
     121    )
     122  );
    114123
    115124$template->assign_vars(
    116125  array(
    117     'L_RESET'=>$lang['reset'],
     126    'TITLE' =>
     127      sprintf(
     128        l10n('Manage permissions for user "%s"'),
     129        get_username($page['user']
     130          )
     131        ),
    118132    'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
    119133    'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
    120     'L_CAT_OPTIONS_INFO'=>$lang['permuser_info'],
    121134   
    122135    'F_ACTION' =>
    … …  
    158171display_select_cat_wrapper($query_false,array(),'category_option_false');
    159172
    160 //----------------------------------------------------------- sending html code
     173// +-----------------------------------------------------------------------+
     174// |                           sending html code                           |
     175// +-----------------------------------------------------------------------+
    161176
     177$template->assign_var_from_handle('DOUBLE_SELECT', 'double_select');
    162178$template->assign_var_from_handle('ADMIN_CONTENT', 'user_perm');
    163179?>

  • trunk/doc/ChangeLog

    r815 r817  
     12005-08-17 Pierrick LE GALL
     2
     3        * modification : major simplification of admin.php. Titles are
     4        managed by included page, localized items are managed directly in
     5        the template.
     6
     7        * new : sub template admin/double_select is included in templates
     8        admin/cat_options, admin/user_perm and admin/group_perm. I haven't
     9        been able to use it in admin/picture_modify because it seems
     10        impossible to have two instance of the same sub-template without
     11        interfering.
     12
     13        * modification : bug 99, in profile manager, no auto submit when
     14        changing language (useless and generate accessibility problem).
     15
     16        * improvement : HTML semantically correct for administration menu,
     17        simpler syntax, less tags, correct tags (dl/dt/dd instead of
     18        div/div).
     19
     20        * modification : number of waiting elements and unvalidated
     21        comments are displayed in admin/intro instead of administration
     22        menu (with a link to the dedicated pages).
     23
     24        * deletion : no link to profile from admin/user_list anymore (no
     25        need).
     26
    1272005-08-16 Pierrick LE GALL
    228

  • trunk/include/functions_html.inc.php

    r678 r817  
    193193  $available_lang = get_languages();
    194194
    195   $lang_select = '<select name="' . $select_name . '" onchange="this.form.submit()">';
     195  $lang_select = '<select name="' . $select_name . '">';
    196196  foreach ($available_lang as $code => $displayname)
    197197  {
    … …  
    450450  return $content;
    451451}
     452
     453function get_cat_display_name_from_id($cat_id,
     454                                      $url = 'category.php?cat=',
     455                                      $replace_space = true)
     456{
     457  $cat_info = get_cat_info($cat_id);
     458  get_cat_display_name($cat_info['id'], $url, $replace_space);
     459}
    452460?>

  • trunk/include/functions_user.inc.php

    r808 r817  
    455455  mass_inserts(USER_INFOS_TABLE, array_keys($insert), array($insert));
    456456}
     457
     458/**
     459 * returns the groupname corresponding to the given group identifier if
     460 * exists
     461 *
     462 * @param int group_id
     463 * @return mixed
     464 */
     465function get_groupname($group_id)
     466{
     467  $query = '
     468SELECT name
     469  FROM '.GROUPS_TABLE.'
     470  WHERE id = '.intval($group_id).'
     471;';
     472  $result = pwg_query($query);
     473  if (mysql_num_rows($result) > 0)
     474  {
     475    list($groupname) = mysql_fetch_row($result);
     476  }
     477  else
     478  {
     479    return false;
     480  }
     481 
     482  return $groupname;
     483}
    457484?>

  • trunk/include/user.inc.php

    r808 r817  
    2525// | USA.                                                                  |
    2626// +-----------------------------------------------------------------------+
    27 
    28 // Dynamic change of language with database persistency
    29 //
    30 // FIXME : ce bout de code fait planter l'assignation d'un language a
    31 // plusieurs users simultanement dans la nouvelle page admin/user_list.php
    32 //
    33 // if (isset($_POST['language']))
    34 // {
    35 //   $query = "UPDATE ".USERS_TABLE." SET language = '";
    36 //   $query.= $_POST['language'];
    37 //   $query.= "' WHERE id = ".$_POST['userid'].";";
    38 //   pwg_query($query);
    39 // }
    4027
    4128// retrieving connected user informations

  • trunk/template/default/admin.tpl

    r815 r817  
    1 <!-- BEGIN install_warning -->
    2   <p class="install_warning">{L_INSTALL_WARNING}</div>
    3 <!-- END install_warning -->
    41<table style="width:100%;">
    52  <tr>
    6         <td valign="top" style="padding:10px;width:1%;">
    7         <div class="table1">
     3    <td valign="top" style="width:1%;">
     4      <div id="theNavbar">
     5        <dl>
     6          <dt>{lang:links}</dt>
     7          <dd>
     8            <ul>
     9              <li><a href="{U_RETURN}">{lang:home}</a></li>
     10            </ul>
     11          </dd>
    812
    9 <div class="titreMenu">{L_LINKS}</div>
    10 <div class="menu">
    11 <ul class="menu">
    12   <li><a class="adminMenu" href="{U_RETURN}">{L_GALLERY_INDEX}</a></li>
    13   </ul>
    14 </div>
    15 <div class="titreMenu">{L_GENERAL}</div>
    16 <div class="menu">
    17 <ul class="menu">
    18   <li><a class="adminMenu" href="{U_FAQ}">{L_FAQ}</a></li>
    19   <li><a class="adminMenu" href="{U_SITES}">{L_SITES}</a></li>
    20   <li><a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a></li>
    21   <li><a class="adminMenu" href="{U_CAT_UPDATE}">{L_UPDATE}</a></li>
    22   <li><a class="adminMenu" href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
    23 </ul>
    24 </div>
    25 <div class="titreMenu">{L_CONFIGURATION}</div>
    26 <div class="menu">
    27 <ul class="menu">
    28   <li><a class="adminMenu" href="{U_CONFIG_GENERAL}">{L_CONFIG_GENERAL}</a></li>
    29   <li><a class="adminMenu" href="{U_CONFIG_COMMENTS}">{L_CONFIG_COMMENTS}</a></li>
    30   <li><a class="adminMenu" href="{U_CONFIG_DISPLAY}">{L_CONFIG_DISPLAY}</a></li>
    31   <li><a class="adminMenu" href="{U_CONFIG_UPLOAD}">{L_CONFIG_UPLOAD}</a></li>
    32   <li><a class="adminMenu" href="{U_CONFIG_SESSION}">{L_CONFIG_SESSION}</a></li>
    33   <li><a class="adminMenu" href="{U_CONFIG_METADATA}">{L_CONFIG_METADATA}</a></li>
    34 </ul>
    35 </div>
    36 <div class="titreMenu">{L_CATEGORIES}</div>
    37 <div class="menu">
    38 <ul class="menu">
    39   <li><a class="adminMenu" href="{U_CATEGORIES}">{L_MANAGE}</a></li>
    40   <li><a class="adminMenu" href="{U_CAT_UPLOAD}">{L_CAT_UPLOAD}</a></li>
    41   <li><a class="adminMenu" href="{U_CAT_COMMENTS}">{L_CAT_COMMENTS}</a></li>
    42   <li><a class="adminMenu" href="{U_CAT_VISIBLE}">{L_CAT_VISIBLE}</a></li>
    43   <li><a class="adminMenu" href="{U_CAT_STATUS}">{L_CAT_STATUS}</a></li>
    44   <!-- BEGIN representative -->
    45   <li><a class="adminMenu" href="{representative.URL}">{lang:Representative}</a></li>
    46   <!-- END representative -->
    47 </ul>
    48 </div>
    49 <div class="titreMenu">{L_IMAGES}</div>
    50 <div class="menu">
    51 <ul class="menu">
    52   <li><a class="adminMenu" href="{U_WAITING}">{L_WAITING}</a></li>
    53   <li><a class="adminMenu" href="{U_THUMBNAILS}">{L_THUMBNAILS}</a></li>
    54   <li><a class="adminMenu" href="{U_COMMENTS}">{L_COMMENTS}</a></li>
    55   <li><a class="adminMenu" href="{U_CADDIE}">Caddie</a></li>
    56 </ul>
    57 </div>
    58 <div class="titreMenu">{L_IDENTIFY}</div>
    59 <div class="menu">
    60 <ul class="menu">
    61   <li><a class="adminMenu" href="{U_USERS}">{L_USERS}</a></li>
    62   <li><a class="adminMenu" href="{U_GROUPS}">{L_GROUPS}</a></li>
    63 </ul>
    64 </div>
     13          <dt>{lang:general}</dt>
     14          <dd>
     15            <ul>
     16              <li><a href="{U_FAQ}">{lang:instructions}</a></li>
     17              <li><a href="{U_SITES}">{lang:remote_sites}</a></li>
     18              <li><a href="{U_HISTORY}">{lang:history}</a></li>
     19              <li><a href="{U_CAT_UPDATE}">{lang:update}</a></li>
     20              <li><a href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
     21            </ul>
     22          </dd>
     23
     24          <dt>{lang:config}</dt>
     25          <dd>
     26            <ul>
     27              <li><a href="{U_CONFIG_GENERAL}">{lang:general}</a></li>
     28              <li><a href="{U_CONFIG_COMMENTS}">{lang:comments}</a></li>
     29              <li><a href="{U_CONFIG_DISPLAY}">{lang:conf_default}</a></li>
     30              <li><a href="{U_CONFIG_UPLOAD}">{lang:upload}</a></li>
     31              <li><a href="{U_CONFIG_SESSION}">{lang:conf_cookie}</a></li>
     32              <li><a href="{U_CONFIG_METADATA}">{lang:metadata}</a></li>
     33            </ul>
     34          </dd>
     35
     36          <dt>{lang:categories}</dt>
     37          <dd>
     38            <ul>
     39              <li><a href="{U_CATEGORIES}">{lang:manage}</a></li>
     40              <li><a href="{U_CAT_UPLOAD}">{lang:upload}</a></li>
     41              <li><a href="{U_CAT_COMMENTS}">{lang:comments}</a></li>
     42              <li><a href="{U_CAT_VISIBLE}">{lang:lock}</a></li>
     43              <li><a href="{U_CAT_STATUS}">{lang:cat_security}</a></li>
     44              <!-- BEGIN representative -->
     45              <li><a href="{representative.URL}">{lang:Representative}</a></li>
     46              <!-- END representative -->
     47            </ul>
     48          </dd>
     49
     50          <dt>{lang:pictures}</dt>
     51          <dd>
     52            <ul>
     53              <li><a href="{U_WAITING}">{lang:waiting}</a></li>
     54              <li><a href="{U_THUMBNAILS}">{lang:thumbnails}</a></li>
     55              <li><a href="{U_COMMENTS}">{lang:comments}</a></li>
     56              <li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
     57            </ul>
     58          </dd>
     59
     60          <dt>{lang:identification}</dt>
     61          <dd>
     62            <ul>
     63              <li><a href="{U_USERS}">{lang:users}</a></li>
     64              <li><a href="{U_GROUPS}">{lang:groups}</a></li>
     65            </ul>
     66          </dd>
     67        </dl>
     68      </div> <!-- end div#theNavbar -->
     69    </td>
     70
     71    <td style="width:99%;" valign="top">
     72      <div id="adminMain">
     73
     74        <!-- BEGIN errors -->
     75        <div id="errors">
     76          <ul>
     77            <!-- BEGIN error -->
     78            <li>{errors.error.ERROR}</li>
     79            <!-- END error -->
     80          </ul>
     81        </div>
     82        <!-- END errors -->
     83
     84        <!-- BEGIN infos -->
     85        <div id="infos">
     86          <ul>
     87            <!-- BEGIN info -->
     88            <li>{infos.info.INFO}</li>
     89            <!-- END info -->
     90          </ul>
     91        </div>
     92        <!-- END infos -->
     93
     94        {ADMIN_CONTENT}
    6595      </div>
    66         </td>
    67         <td style="padding:10px;width:99%;" valign="top">
    68 <div class="home">
    69   <div class="titrePage">{PAGE_TITLE}</div>
    70 
    71   <!-- BEGIN errors -->
    72   <div id="errors">
    73     <ul>
    74       <!-- BEGIN error -->
    75       <li>{errors.error.ERROR}</li>
    76       <!-- END error -->
    77     </ul>
    78   </div>
    79   <!-- END errors -->
    80 
    81   <!-- BEGIN infos -->
    82   <div id="infos">
    83     <ul>
    84       <!-- BEGIN info -->
    85       <li>{infos.info.INFO}</li>
    86       <!-- END info -->
    87     </ul>
    88   </div>
    89   <!-- END infos -->
    90   <div id="adminMain">
    91     {ADMIN_CONTENT}
    92   </div>
    93 </div>
    94         </td>
     96    </td>
    9597  </tr>
    9698</table>

  • trunk/template/default/admin/cat_list.tpl

    r800 r817  
     1<h1>{lang:title_categories}</h1>
     2
    13<div class="admin">{CATEGORIES_NAV}</div>
    24

  • trunk/template/default/admin/cat_modify.tpl

    r809 r817  
     1<h1>{lang:title_edit_cat}</h1>
     2
    13<h2>{CATEGORIES_NAV}</h2>
    24

  • trunk/template/default/admin/cat_options.tpl

    r815 r817  
    1 <div class="admin">{L_CAT_TITLE}</div>
     1<h1>{lang:title_cat_options}</h1>
    22
    33<form method="post" action="{F_ACTION}">
    4   <table class="doubleSelect">
    5     <tr>
    6       <td>
    7         <h3>{L_CAT_OPTIONS_TRUE}</h3>
    8         <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
    9           <!-- BEGIN category_option_true -->
    10           <option class="{category_option_true.CLASS}" {category_option_true.SELECTED} value="{category_option_true.VALUE}">{category_option_true.OPTION}</option>
    11           <!-- END category_option_true -->
    12         </select>
    13         <p><input type="submit" value="&raquo;" name="falsify" style="font-size:15px;"/></p>
    14       </td>
    15 
    16       <td>
    17         <h3>{L_CAT_OPTIONS_FALSE}</h3>
    18         <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
    19           <!-- BEGIN category_option_false -->
    20           <option class="{category_option_false.CLASS}" {category_option_false.SELECTED} value="{category_option_false.VALUE}">{category_option_false.OPTION}</option>
    21           <!-- END category_option_false -->
    22         </select>
    23         <p><input type="submit" value="&laquo;" name="trueify" style="font-size:15px;" /></p>
    24       </td>
    25     </tr>
    26   </table>
     4  <fieldset>
     5    <legend>{L_SECTION}</legend>
     6    {DOUBLE_SELECT}
     7  </fieldset>
    278</form>
    289
    29 <div class="information">{L_CAT_OPTIONS_INFO}</div>
     10<p class="information">{L_CAT_OPTIONS_INFO}</div>
    3011

  • trunk/template/default/admin/cat_perm.tpl

    r800 r817  
     1<h1>{TITLE}</h1>
     2
    13<form action="{F_ACTION}" method="post" id="categoryPermissions">
    24

  • trunk/template/default/admin/configuration.tpl

    r792 r817  
     1<h1>{lang:title_configuration}</h1>
     2
    13<form method="post" action="{F_ACTION}">
    24<table width="100%" align="center">

  • trunk/template/default/admin/element_set_global.tpl

    r806 r817  
     1<h1>{lang:Batch management}</h1>
     2
    13<div class="admin">{CATEGORY_TITLE}</div>
    24

  • trunk/template/default/admin/group_list.tpl

    r815 r817  
     1<h1>{lang:title_groups}</h1>
     2
    13<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
    24  <fieldset>

  • trunk/template/default/admin/help.tpl

    r669 r817  
     1<h1>{lang:title_instructions}</h1>
     2
    13<table style="width:100%;">
    24  <!-- BEGIN cat -->

  • trunk/template/default/admin/intro.tpl

    r816 r817  
     1<h1>{lang:title_default}</h1>
     2
    13<dl>
    24  <dt>{lang:PhpWebGallery version}</dt>
    … …  
    2022  <dd>
    2123    <ul>
    22       <li>{DB_ELEMENTS}</li>
     24      <li>
     25        {DB_ELEMENTS}
     26        <!-- BEGIN waiting -->
     27        (<a href="{waiting.URL}">{waiting.INFO}</a>)
     28        <!-- END waiting -->
     29      </li>
    2330      <li>{DB_CATEGORIES}</li>
    2431      <li>{DB_USERS}</li>
    2532      <li>{DB_GROUPS}</li>
    26       <li>{DB_COMMENTS}</li>
     33      <li>
     34        {DB_COMMENTS}
     35        <!-- BEGIN unvalidated -->
     36        (<a href="{unvalidated.URL}">{unvalidated.INFO}</a>)
     37        <!-- END unvalidated -->
     38      </li>
    2739      <li>{DB_DATE}</li>
    2840    </ul>
    2941  </dd>
    3042
    31   <dt></dt>
    32   <dd></dd>
    33 
    34   <dt></dt>
    35   <dd></dd>
    3643</dl>

  • trunk/template/default/admin/maintenance.tpl

    r809 r817  
     1<h1>{lang:Maintenance}</h1>
     2
    13<ul>
    24  <li><a href="{U_MAINT_CATEGORIES}">{lang:update categories informations}</a></li>

  • trunk/template/default/admin/picture_modify.tpl

    r792 r817  
     1<h1>{lang:title_picmod}</h1>
     2
    13<div class="admin">{TITLE_IMG}</div>
    24<form action="{F_ACTION}" method="POST">
    … …  
    6163</form>
    6264
    63 <form name="form1" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
     65<form name="form1" method="post" action="{F_ACTION}">
     66  <fieldset>
     67    <legend>{lang:Association to categories}</legend>
    6468
    65   <div style="clear:both;"></div>
     69    <table class="doubleSelect">
     70      <tr>
     71        <td>
     72          <h3>{L_CAT_ASSOCIATED}</h3>
     73          <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30">
     74            <!-- BEGIN associated_option -->
     75            <option {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
     76            <!-- END associated_option -->
     77          </select>
     78          <p><input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;"/></p>
     79        </td>
    6680
    67   <div style="height:auto;">
     81        <td>
     82          <h3>{L_CAT_DISSOCIATED}</h3>
     83          <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30">
     84            <!-- BEGIN dissociated_option -->
     85            <option {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
     86            <!-- END dissociated_option -->
     87          </select>
     88          <p><input type="submit" value="&laquo;" name="associate" style="font-size:15px;" /></p>
     89        </td>
     90      </tr>
     91    </table>
    6892
    69     <div style="float:left;padding:10px;width:300px;">
    70       <span class="titreMenu">{L_CAT_ASSOCIATED}</span><br />
    71       <select style="height:auto;width:280px" name="cat_associated[]" multiple="multiple" size="10">
    72         <!-- BEGIN associated_option -->
    73         <option class="{associated_option.CLASS}" {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
    74         <!-- END associated_option -->
    75       </select>
    76     </div>
    77 
    78     <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
    79       <input type="submit" value="&laquo;" name="associate" style="font-size:15px;" class="bouton" /><br/>
    80       <input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;" class="bouton" />
    81     </div>
    82 
    83     <div style="float:right;padding:10px;width:300px;">
    84       <span class="titreMenu">{L_CAT_DISSOCIATED}</span><br />
    85       <select style="width:280px" name="cat_dissociated[]" multiple="multiple" size="10">
    86         <!-- BEGIN dissociated_option -->
    87         <option class="{dissociated_option.CLASS}" {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
    88         <!-- END dissociated_option -->
    89       </select>
    90     </div>
    91 
    92   </div>
    93 
    94   <div style="clear:both;"></div>
    95 
    96   <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
    97 
     93  </fieldset>
    9894</form>
    9995
    100 <form name="form2" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
     96<form name="form2" method="post" action="{F_ACTION}">
     97  <fieldset>
     98    <legend>{lang:Representation of categories}</legend>
    10199
    102   <div style="clear:both;"></div>
     100    <table class="doubleSelect">
     101      <tr>
     102        <td>
     103          <h3>{L_REPRESENTS}</h3>
     104          <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30">
     105            <!-- BEGIN elected_option -->
     106            <option {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
     107            <!-- END elected_option -->
     108          </select>
     109          <p><input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;"/></p>
     110        </td>
    103111
    104   <div style="height:auto;">
     112        <td>
     113          <h3>{L_DOESNT_REPRESENT}</h3>
     114          <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30">
     115            <!-- BEGIN dismissed_option -->
     116            <option {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
     117            <!-- END dismissed_option -->
     118          </select>
     119          <p><input type="submit" value="&laquo;" name="elect" style="font-size:15px;" /></p>
     120        </td>
     121      </tr>
     122    </table>
    105123
    106     <div style="float:left;padding:10px;width:300px;">
    107       <span class="titreMenu">{L_REPRESENTS}</span><br />
    108       <select style="height:auto;width:280px" name="cat_elected[]" multiple="multiple" size="10">
    109         <!-- BEGIN elected_option -->
    110         <option class="{elected_option.CLASS}" {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
    111         <!-- END elected_option -->
    112       </select>
    113     </div>
    114 
    115     <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
    116       <input type="submit" value="&laquo;" name="elect" style="font-size:15px;" class="bouton" /><br/>
    117       <input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;" class="bouton" />
    118     </div>
    119 
    120     <div style="float:right;padding:10px;width:300px;">
    121       <span class="titreMenu">{L_DOESNT_REPRESENT}</span><br />
    122       <select style="width:280px" name="cat_dismissed[]" multiple="multiple" size="10">
    123         <!-- BEGIN dismissed_option -->
    124         <option class="{dismissed_option.CLASS}" {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
    125         <!-- END dismissed_option -->
    126       </select>
    127     </div>
    128 
    129   </div>
    130 
    131   <div style="clear:both;"></div>
    132 
    133   <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
    134 
     124  </fieldset>
    135125</form>

  • trunk/template/default/admin/remote_site.tpl

    r792 r817  
     1<h1>{lang:remote_sites}</h1>
     2
    13{REMOTE_SITE_TITLE}
    24

  • trunk/template/default/admin/stats.tpl

    r766 r817  
     1<h1>{lang:title_history}</h1>
     2
    13<div class="admin">{L_STAT_TITLE}</div>
    24<img class="image" src="{IMG_REPORT}" alt="{L_STAT_MONTHLY_ALT}" />

  • trunk/template/default/admin/thumbnail.tpl

    r792 r817  
     1<h1>{lang:title_thumbnails}</h1>
     2
    13<!-- BEGIN results -->
    24<div class="admin">{L_RESULTS}</div>

  • trunk/template/default/admin/update.tpl

    r792 r817  
     1<h1>{lang:title_update}</h1>
     2
    13<!-- BEGIN update -->
    24<div class="admin">{L_RESULT_UPDATE}</div>

  • trunk/template/default/admin/user_list.tpl

    r815 r817  
     1<h1>{lang:title_liste_users}</h1>
     2
    13<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
    24  <fieldset>
    … …  
    8486    <td>{user.GROUPS}</td>
    8587    <td style="text-align:center;">
    86       <a href="{user.U_MOD}"><img src="./template/default/theme/profile.png" style="border:none" alt="profile" title="profile" /></a>
    8788      <a href="{user.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
    8889    </td>

  • trunk/template/default/admin/waiting.tpl

    r792 r817  
     1<h1>{lang:title_waiting}</h1>
     2
    13<form action="{F_ACTION}" method="post">
    24  <table style="width:100%;" >

  • trunk/template/default/default.css

    r814 r817  
    367367div#adminMain {
    368368  text-align: left;
     369  background-color: #5f5f5f;
     370  border: 1px solid black;
     371  display: block;
     372  width: 100%;
    369373}
    370374
    … …  
    531535}
    532536
     537div#adminMain h1 {
     538  margin-top: 0;
     539  background-image: url(theme/tableh1_bg.gif);
     540  color: #e0e0e0;
     541  font-family: 'Trebuchet MS', Verdana, sans-serif;
     542  font-weight: 600;
     543  font-size: 16px;
     544  padding-right: 10px;
     545  padding-left: 10px;
     546  border-bottom: 1px solid black;
     547  border-right: 1px solid black;
     548  height: 25px;
     549  line-height: 25px;
     550  text-align: left;
     551}
     552
    533553div#adminMain dl {
    534554  margin: 10px;
    … …  
    544564  font-size: 110%;
    545565}
     566
     567div#theNavbar {
     568  background-color: #5f5f5f;
     569  border: 1px solid black;
     570  text-align: left;
     571}
     572
     573div#theNavbar>dl,
     574div#theNavbar>dl>dd
     575{
     576  margin: 0;
     577}
     578
     579div#theNavbar>dl>dt {
     580  background-image: url(theme/tableh1_bg.gif);
     581  color: #fff48e;
     582  font-size: 12px;
     583  font-weight: 600;
     584  padding-top: 0;
     585  padding-right: 10px;
     586  padding-left: 10px;
     587  border-bottom: 1px solid black;
     588  border-right: 1px solid black;
     589  height: 25px;
     590  line-height: 25px;
     591  text-align: center;
     592}
     593
     594div#theNavbar>dl>dd>ul {
     595  white-space: nowrap;
     596  list-style-type: square;
     597  padding-left: 15px;
     598  margin: 5px;
     599}
Note: See TracChangeset for help on using the changeset viewer.