Changeset 850


Ignore:
Timestamp:
Aug 26, 2005, 12:43:47 AM (19 years ago)
Author:
plg
Message:
  • new : HTML BODY identifier to let CSS stylesheets manage specific behaviour.
  • deletion : admin/search useless
  • improvement : in admin/user_list, special behaviour for true/false fields (expand, show_comments)
  • new : gallery_title and gallery_description are displayed at the top of each page.
  • improvement : simplification in HTML for categories menu.
  • improvement : standardization of presentation in all public pages (identification, registration, search, profile, notification, comments, etc.)

(not in ChangeLog, below this line)

  • add forgotten notification.php (should have been added in a previous commit)
  • [template cclear] deletion of useless class .bouton
  • [template cclear] for test purpose, new presentation of register page (using FORM.filter)
  • [template cclear] adaptation of admin/group_list from template default
  • [template cclear] deletion of obsolete admin/infos_images
  • [template cclear] deletion of obsolete admin/search_username
  • [template cclear] new icon register.png
Location:
trunk
Files:
2 added
3 deleted
39 edited

Legend:

Unmodified
Added
Removed

  • trunk/about.php

    r688 r850  
    3434//
    3535$title= $lang['about_page_title'];
     36$page['body_id'] = 'theAboutPage';
    3637include(PHPWG_ROOT_PATH.'include/page_header.php');
    3738
    3839$template->set_filenames(array('about'=>'about.tpl'));
    39 $template->assign_vars(array(
    40         'PAGE_TITLE' => $title,
    41         'L_ABOUT' => $lang['about_message'],
    42         'L_RETURN' =>  $lang['home'],
    43         'L_RETURN_HINT' =>  $lang['home_hint'], 
    44         'U_RETURN' => add_session_id(PHPWG_ROOT_PATH.'category.php?'.$_SERVER['QUERY_STRING'])
    45         )
    46         );
     40$template->assign_vars(
     41  array(
     42    'L_ABOUT' => $lang['about_message'],
     43    'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php')
     44    )
     45  );
    4746
    4847$template->parse('about');

  • trunk/admin.php

    r817 r850  
    5858//----------------------------------------------------- template initialization
    5959$title = l10n('PhpWebGallery administration'); // for include/page_header.php
     60$page['gallery_title'] = l10n('PhpWebGallery Administration');
     61$page['body_id'] = 'theAdminPage';
    6062include(PHPWG_ROOT_PATH.'include/page_header.php');
    6163

  • trunk/admin/user_list.php

    r808 r850  
    125125    $formfields =
    126126      array('nb_image_line', 'nb_line_page', 'template', 'language',
    127             'recent_period', 'expand', 'show_nb_comments', 'maxwidth',
     127            'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
    128128            'maxheight', 'status');
    129  
     129
     130    $true_false_fields = array('expand', 'show_nb_comments');
     131   
    130132    foreach ($formfields as $formfield)
    131133    {
    132       if ($_POST[$formfield.'_action'] != 'leave')
     134      // special for true/false fields
     135      if (in_array($formfield, $true_false_fields))
     136      {
     137        $test = $formfield;
     138      }
     139      else
     140      {
     141        $test = $formfield.'_action';
     142      }
     143               
     144      if ($_POST[$test] != 'leave')
    133145      {
    134146        array_push($dbfields['update'], $formfield);
    135147      }
    136148    }
    137    
     149
    138150    // updating elements is useful only if needed...
    139151    if (count($dbfields['update']) > 0)
    … …  
    151163          // if the action is 'unset', the key won't be in row and
    152164          // mass_updates function will set this field to NULL
    153           if ('set' == $_POST[$dbfield.'_action'])
     165          if (in_array($dbfield, $true_false_fields)
     166              or 'set' == $_POST[$dbfield.'_action'])
    154167          {
    155168            $data[$dbfield] = $_POST[$dbfield];
    … …  
    165178        array_push($datas, $data);
    166179      }
     180
     181//       echo '<pre>';
     182//       print_r($datas);
     183//       echo '</pre>';
    167184
    168185      mass_updates(USER_INFOS_TABLE, $dbfields, $datas);
    … …  
    367384      'MAXHEIGHT' => @$conf['default_maxheight'],
    368385      'RECENT_PERIOD' => $conf['recent_period'],
    369       'EXPAND_YES' => $conf['auto_expand'] ? 'checked="checked"' : '',
    370       'EXPAND_NO' => !$conf['auto_expand'] ? 'checked="checked"' : '',
    371       'SHOW_NB_COMMENTS_YES' =>
    372         $conf['show_nb_comments'] ? 'checked="checked"' : '',
    373       'SHOW_NB_COMMENTS_NO' =>
    374         !$conf['show_nb_comments'] ? 'checked="checked"' : ''
    375386      ));
    376387}

  • trunk/category.php

    r834 r850  
    113113//
    114114$title = $page['title'];
     115$page['body_id'] = 'theCategoryPage';
    115116include(PHPWG_ROOT_PATH.'include/page_header.php');
    116117
    … …  
    135136$icon_recent = get_icon(date('Y-m-d'));
    136137
    137 $template->assign_vars(array(
     138$template->assign_vars(
     139  array(
    138140  'NB_PICTURE' => count_user_total_images(),
    139141  'TITLE' => $template_title,

  • trunk/comments.php

    r848 r850  
    166166// |                       page header and options                         |
    167167// +-----------------------------------------------------------------------+
    168 if (!defined('IN_ADMIN'))
    169 {
    170   $title= l10n('title_comments');
    171   include(PHPWG_ROOT_PATH.'include/page_header.php');
    172 }
     168
     169$title= l10n('title_comments');
     170$page['body_id'] = 'theCommentsPage';
     171include(PHPWG_ROOT_PATH.'include/page_header.php');
    173172
    174173$template->set_filenames(array('comments'=>'comments.tpl'));

  • trunk/doc/ChangeLog

    r849 r850  
     12005-08-26 Pierrick LE GALL
     2
     3        * new : HTML BODY identifier to let CSS stylesheets manage
     4        specific behaviour.
     5
     6        * deletion : admin/search useless
     7
     8        * improvement : in admin/user_list, special behaviour for
     9        true/false fields (expand, show_comments)
     10
     11        * new : gallery_title and gallery_description are displayed at the
     12        top of each page.
     13
     14        * improvement : simplification in HTML for categories menu.
     15
     16        * improvement : standardization of presentation in all public
     17        pages (identification, registration, search, profile,
     18        notification, comments, etc.)
     19
    1202005-08-25 Pierrick LE GALL
    221

  • trunk/identification.php

    r808 r850  
    6565//
    6666$title = $lang['identification'];
     67$page['body_id'] = 'theIdentificationPage';
    6768include(PHPWG_ROOT_PATH.'include/page_header.php');
    6869

  • trunk/include/config_default.inc.php

    r833 r850  
    271271$conf['allow_html_descriptions'] = true;
    272272
    273 // gallery_title : Title for RSS feed
    274 $conf['gallery_title'] = 'PhpWebGallery demo';
     273// gallery_title : Title at top of each page and for RSS feed
     274$conf['gallery_title'] = 'PhpWebGallery demonstration site';
     275
     276// gallery_description : Short description displayed with gallery title
     277$conf['gallery_description'] = 'My photos web site';
    275278
    276279// galery_url : URL given in RSS feed
    277280$conf['gallery_url'] = 'http://demo.phpwebgallery.net';
     281
    278282?>

  • trunk/include/functions_html.inc.php

    r831 r850  
    375375    }
    376376    $ref_level = $level;
    377    
     377
    378378    $menu.= '
    379379
    380            <li>';
    381  
    382     $url = add_session_id(PHPWG_ROOT_PATH.'category.php?cat='.$category['id']);
    383 
    384     $class = '';
     380           <li';
    385381    if (isset($page['cat'])
    386382        and is_numeric($page['cat'])
    387383        and $category['id'] == $page['cat'])
    388384    {
    389       $class = 'menuCategorySelected';
    390     }
    391     else
    392     {
    393       $class = 'menuCategoryNotSelected';
    394     }
    395 
     385      $menu.= ' class="selected"';
     386    }
     387    $menu.= '>';
     388 
     389    $url = add_session_id(PHPWG_ROOT_PATH.'category.php?cat='.$category['id']);
    396390    $menu.= '
    397              <a href="'.$url.'" class="'.$class.'">'.$category['name'].'</a>';
     391             <a href="'.$url.'">'.$category['name'].'</a>';
    398392
    399393    if ($category['nb_images'] > 0)

  • trunk/include/page_header.php

    r722 r850  
    3636$template->assign_vars(
    3737  array(
     38    'GALLERY_TITLE' =>
     39      isset($page['gallery_title']) ?
     40        $page['gallery_title'] : $conf['gallery_title'],
     41   
     42    'GALLERY_DESCRIPTION' =>
     43      isset($page['gallery_description']) ?
     44        $page['gallery_description'] : $conf['gallery_description'],
     45   
     46    'BODY_ID' =>
     47      isset($page['body_id']) ?
     48        $page['body_id'] : '',
     49   
    3850    'CONTENT_ENCODING' => $lang_info['charset'],
    3951    'PAGE_TITLE' => $title,

  • trunk/language/en_UK.iso-8859-1/common.lang.php

    r797 r850  
    225225$lang['about_page_title'] = 'About PhpWebGallery';
    226226$lang['about_title'] = 'About...';
    227 $lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Information about PhpWebGallery</div>
    228 <ul>
     227$lang['about_message'] = '<ul>
    229228  <li>PhpWebGallery is a web application giving you the possibility to create an online images gallery easily.</li>
    230229  <li>Technicaly, PhpWebGallery is fully developped with PHP (the elePHPant) with a MySQL database (the SQuirreL).</li>
    231   <li>If you have any suggestions or comments, please visit <a href="http://www.phpwebgallery.net" style="text-decoration:underline">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net" style="text-decoration:underline">forum</a>.</li>
     230  <li>If you have any suggestions or comments, please visit <a href="http://www.phpwebgallery.net">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net">forum</a>.</li>
    232231</ul>';
    233232

  • trunk/picture.php

    r849 r850  
    467467}
    468468
     469$page['body_id'] = 'thePicturePage';
    469470include(PHPWG_ROOT_PATH.'include/page_header.php');
    470471$template->set_filenames(array('picture'=>'picture.tpl'));

  • trunk/profile.php

    r808 r850  
    143143// |                       page header and options                         |
    144144// +-----------------------------------------------------------------------+
     145
    145146$title= $lang['customize_page_title'];
     147$page['body_id'] = 'theProfilePage';
    146148include(PHPWG_ROOT_PATH.'include/page_header.php');
    147149
    148150$url_action = PHPWG_ROOT_PATH.'profile.php';
     151
    149152//----------------------------------------------------- template initialization
    150153$template->set_filenames(array('profile_body'=>'profile.tpl'));

  • trunk/register.php

    r808 r850  
    6868//
    6969$title= $lang['register_page_title'];
     70$page['body_id'] = 'theRegisterPage';
    7071include(PHPWG_ROOT_PATH.'include/page_header.php');
    7172
    … …  
    7980  'L_CONFIRM_PASSWORD' => $lang['reg_confirm'],
    8081  'L_EMAIL' => $lang['mail_address'],
     82
     83  'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php'),
    8184 
    8285  'F_ACTION' => add_session_id('register.php'),

  • trunk/search.php

    r773 r850  
    146146//
    147147$title= $lang['search_title'];
     148$page['body_id'] = 'theSearchPage';
    148149include(PHPWG_ROOT_PATH.'include/page_header.php');
    149150

  • trunk/template/cclear/about.tpl

    r820 r850  
    1 <h2>{PAGE_TITLE}</h2>
    2 <div class="menu" style="white-space:normal;margin:10px;">
    3   {L_ABOUT}
     1<div id="content">
     2
     3  <div class="titrePage">
     4    <ul class="categoryActions">
     5      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
     6    </ul>
     7    <h2>{lang:About}</h2>
     8  </div>
     9
     10  {lang:about_message}
     11
    412</div>
    5 <div style="text-align:center;margin:5px;">
    6 <a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a>
    7 </div>
    8 <div style="text-align:center;margin:5px;">
    9 <img src="./template/clear/images/php_sqreuil_artistes.gif" alt="php logo" />
    10 </div>

  • trunk/template/cclear/admin.tpl

    r828 r850  
    11<!-- $Id$ -->
     2
    23<div id="menubar">
    34  <dl>
    … …  
    6768
    6869<div id="content">
    69   <!--h2>{PAGE_TITLE}</h2-->
    7070  <!-- BEGIN errors -->
    7171  <div id="errors">
    … …  
    9090  {ADMIN_CONTENT}
    9191</div>
    92 
    93 

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

    r837 r850  
    3838    <!-- END category -->
    3939
    40   <p><input name="submitOrder" type="submit" class="bouton" value="{lang:Save order}" /></p>
     40  <p><input name="submitOrder" type="submit" value="{lang:Save order}" /></p>
    4141
    4242</form>
    … …  
    4545  {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
    4646  <input type="hidden" name="rank" value="{NEXT_RANK}"/>
    47   <input type="submit" value="{L_SUBMIT}" class="bouton" name="submitAdd" />
     47  <input type="submit" value="{L_SUBMIT}" name="submitAdd" />
    4848</form>

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

    r840 r850  
    55<form action="{F_ACTION}" method="post" id="categoryPermissions">
    66
    7   <h3>{lang:Groups}</h3>
     7  <h4>{lang:Groups}</h4>
    88
    99  <fieldset>
    … …  
    2727  </fieldset>
    2828
    29   <h3>{lang:Users}</h3>
     29  <h4>{lang:Users}</h4>
    3030 
    3131  <fieldset>

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

    r849 r850  
    191191    <tr>
    192192      <td colspan="2" align="center">
    193         <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}">
    194         <input type="reset" name="reset" class="bouton" value="{L_RESET}">
     193        <input type="submit" name="submit" value="{L_SUBMIT}">
     194        <input type="reset" name="reset" value="{L_RESET}">
    195195      </td>
    196196    </tr>

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

    r837 r850  
    2828  </ul>
    2929
    30   <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" class="bouton" /></p>
     30  <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" /></p>
    3131
    3232</fieldset>
    … …  
    153153
    154154   
    155   <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" /></p>
     155  <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit" /></p>
    156156
    157157</fieldset>

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

    r820 r850  
    1 <!-- BEGIN errors -->
    2 <div class="errors">
    3 <ul>
    4   <!-- BEGIN error -->
    5   <li>{errors.error.ERROR}</li>
    6   <!-- END error -->
    7 </ul>
    8 </div>
    9 <!-- END errors -->
    10 <form method="post" name="post" action="{S_GROUP_ACTION}">
    11 <div class="admin">{L_GROUP_SELECT}</div>
    12 <!-- BEGIN select_box -->
    13 {S_GROUP_SELECT}&nbsp;&nbsp;<input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" />
    14 <input type="submit" name="delete" value="{L_GROUP_DELETE}" class="bouton" />
    15 <div style="vertical-align:middle;">
    16 <input type="checkbox" name="confirm_delete" value="1">{L_GROUP_CONFIRM}
    17 </div>
    18 <!-- END select_box -->
    19 <input type="text" name="newgroup">
    20 <input type="submit" class="bouton" name="new" value="{L_CREATE_NEW_GROUP}" />
    21 <br />
    22 <br />
    23 <!-- BEGIN edit_group -->
    24 <div class="admin">{L_GROUP_EDIT} [{edit_group.GROUP_NAME}]</div>
    25 <table class="table2" width="60%" style="margin-left:20%;">
    26 <tr class="throw">
    27     <th width="25%">{L_USER_NAME}</th>
    28           <th width="25%">{L_USER_EMAIL}</th>
    29     <th width="10%">{L_USER_SELECT}</th>
    30 </tr>
    31 <!-- BEGIN user -->
    32   <tr class="{edit_group.user.T_CLASS}">
    33     <td>{edit_group.user.NAME}</td>
    34     <td>{edit_group.user.EMAIL}</td>
    35           <td align="center"><input name="members[]" type="checkbox" value="{edit_group.user.ID}"></td>
     1<h2>{lang:title_groups}</h2>
     2
     3<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
     4  <fieldset>
     5    <legend>{lang:Add group}</legend>
     6    <label>{lang:Group name} <input type="text" name="groupname" maxlength="50" size="20" /></label>
     7    <input type="submit" name="submit_add" value="{lang:Add}" />
     8  </fieldset>
     9</form>
     10
     11<table class="table2">
     12  <tr class="throw">
     13    <th>{lang:Group name}</th>
     14    <th>{lang:Members}</th>
     15    <th>{lang:Actions}</th>
    3616  </tr>
    37 <!-- END user -->
    38 <tr>
    39   <td colspan="3" align="right" valign="middle">
    40     <input type="submit" name="deny_user" value="{L_DENY_SELECTED}" class="bouton" />
    41   </td>
    42 </tr>
     17  <!-- BEGIN group -->
     18  <tr class="{group.CLASS}">
     19    <td>{group.NAME}</td>
     20    <td><a href="{group.U_MEMBERS}">{group.MEMBERS}</a></td>
     21    <td style="text-align:center;">
     22      <a href="{group.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="permissions" title="{lang:permissions}" /></a>
     23      <a href="{group.U_DELETE}"><img src="./template/default/theme/delete.png" style="border:none" alt="delete" title="{lang:delete}" /></a>
     24    </td>
     25  </tr>
     26  <!-- END group -->
    4327</table>
    44 <div align="left" style="margin-left:20%;">
    45 <input type="text" name="username" maxlength="50" size="20" />
    46 <input type="submit" name="add" value="{L_ADD_MEMBER}" class="bouton" />
    47 <input name="edit_group_id" type="hidden" value="{edit_group.GROUP_ID}">
    48 <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
    49 </div>
    50 <br />
    51 <!-- END edit_group -->
    52 </form>

  • trunk/template/cclear/admin/group_perm.tpl

    r820 r850  
    1 <!-- BEGIN select_box -->
    2 <form method="post" name="post" action="{S_GROUP_ACTION}">
    3   <div class="admin">{L_GROUP_SELECT}</div>
    4   {S_GROUP_SELECT}&nbsp;&nbsp;
    5   <input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" />
     1<h2>{TITLE}</h2>
     2
     3<form method="post" action="{F_ACTION}">
     4  {DOUBLE_SELECT}
    65</form>
    7 <!-- END select_box -->
     6
     7<p>{lang:Only private categories are listed}</p>

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

    r820 r850  
    5656  {L_REMOTE_SITE_CREATE}
    5757  <input type="text" name="galleries_url" value="{F_GALLERIES_URL}" />
    58   <input class="bouton" type="submit" name="submit" value="{L_SUBMIT}" />
     58  <input type="submit" name="submit" value="{L_SUBMIT}" />
    5959</form>
    6060

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

    r841 r850  
    9999    <tr>
    100100      <td colspan="3" style="text-align:center;">
    101         <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}"/>
     101        <input type="submit" name="submit" value="{L_SUBMIT}"/>
    102102      </td>
    103103    </tr>

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

    r849 r850  
    8080
    8181  <p class="bottomButtons">
    82     <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
    83     <input type="reset"  value="{L_RESET}"  name="reset"  class="bouton" />
     82    <input type="submit" value="{L_SUBMIT}" name="submit" />
     83    <input type="reset"  value="{L_RESET}"  name="reset"  />
    8484  </p>
    8585

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

    r827 r850  
    1 <h1>{lang:title_liste_users}</h1>
     1<h2>{lang:title_liste_users}</h2>
    22
    33<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
    … …  
    66    <label>{L_USERNAME} <input type="text" name="login" maxlength="50" size="20" /></label>
    77    <label>{L_PASSWORD} <input type="text" name="password" /></label>
    8     <input type="submit" name="submit_add" value="{L_SUBMIT}" class="bouton" />
     8    <input type="submit" name="submit_add" value="{L_SUBMIT}" />
    99  </fieldset>
    1010</form>
    … …  
    6161  </label>
    6262
    63   <input type="submit" name="submit_filter" value="{L_SUBMIT}" class="bouton" />
     63  <input type="submit" name="submit_filter" value="{L_SUBMIT}" />
    6464
    6565</fieldset>
    … …  
    6969<form method="post" name="preferences" action="{F_PREF_ACTION}">
    7070
    71 <table class="table2" style="width:100%;" >
     71<table class="table2">
    7272  <tr class="throw">
    73     <th style="width:1%;"></th>
    74     <th style="width:20%;">{L_USERNAME}</th>
    75     <th style="width:20%;">{L_STATUS}</th>
    76     <th style="width:30%;">{L_EMAIL}</th>
    77     <th style="width:30%;">{L_GROUPS}</th>
    78     <th style="width:1%;">{L_ACTIONS}</th>
     73    <th>&nbsp;</th>
     74    <th>{L_USERNAME}</th>
     75    <th>{L_STATUS}</th>
     76    <th>{L_EMAIL}</th>
     77    <th>{lang:Groups}</th>
     78    <th>{L_ACTIONS}</th>
    7979  </tr>
    8080  <!-- BEGIN user -->
    … …  
    9191  <!-- END user -->
    9292</table>
     93
    9394<div class="navigationBar">{NAVBAR}</div>
    9495
    … …  
    9697<fieldset>
    9798  <legend>{lang:Deletions}</legend>
    98   <input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm}
    99   <input type="submit" value="{lang:Delete selected users}" name="delete" class="bouton" />
     99  <label><input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm}</label>
     100  <input type="submit" value="{lang:Delete selected users}" name="delete" />
     101</fieldset>
     102
     103<fieldset>
     104  <legend>{lang:Status}</legend>
     105
     106  <table>
     107    <tr>
     108      <td>{L_STATUS}</td>
     109      <td>
     110        <label><input type="radio" name="status_action" value="leave" checked="checked" /> {lang:leave}</label>
     111        <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {lang:set to}</label>
     112        <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1">
     113          <!-- BEGIN pref_status_option -->
     114          <option {pref_status_option.SELECTED} value="{pref_status_option.VALUE}">{pref_status_option.CONTENT}</option>
     115          <!-- END pref_status_option -->
     116        </select>
     117      </td>
     118    </tr>
     119  </table>
     120
    100121</fieldset>
    101122
    … …  
    140161    <td>{L_NB_IMAGE_LINE}</td>
    141162    <td>
    142       <input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> leave unchanged
    143       <input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> set to
     163      <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {lang:leave}</label>
     164      <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> {lang:set to}</label>
    144165      <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;"
    145166             size="3" maxlength="2" type="text" name="nb_image_line" value="{NB_IMAGE_LINE}" />
    … …  
    150171    <td>{L_NB_LINE_PAGE}</td>
    151172    <td>
    152       <input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> leave unchanged
    153       <input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> set to
     173      <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {lang:leave}</label>
     174      <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {lang:set to}</label>
    154175      <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;"
    155176             size="3" maxlength="2" type="text" name="nb_line_page" value="{NB_LINE_PAGE}" />
    … …  
    160181    <td>{L_TEMPLATE}</td>
    161182    <td>
    162       <input type="radio" name="template_action" value="leave" checked="checked" /> leave unchanged
    163       <input type="radio" name="template_action" value="set" id="template_action_set" /> set to
     183      <label><input type="radio" name="template_action" value="leave" checked="checked" /> {lang:leave}</label>
     184      <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {lang:set to}</label>
    164185      <select onmousedown="document.getElementById('template_action_set').checked = true;" name="template" size="1">
    165186        <!-- BEGIN template_option -->
    … …  
    173194    <td>{L_LANGUAGE}</td>
    174195    <td>
    175       <input type="radio" name="language_action" value="leave" checked="checked" /> leave unchanged
    176       <input type="radio" name="language_action" value="set" id="language_action_set" /> set to
     196      <label><input type="radio" name="language_action" value="leave" checked="checked" /> {lang:leave}</label>
     197      <label><input type="radio" name="language_action" value="set" id="language_action_set" /> {lang:set to}</label>
    177198      <select onmousedown="document.getElementById('language_action_set').checked = true;" name="language" size="1">
    178199        <!-- BEGIN language_option -->
    … …  
    186207    <td>{L_RECENT_PERIOD}</td>
    187208    <td>
    188       <input type="radio" name="recent_period_action" value="leave" checked="checked" /> leave unchanged
    189       <input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> set to
     209      <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {lang:leave}</label>
     210      <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> {lang:set to}</label>
    190211      <input onmousedown="document.getElementById('recent_period_action_set').checked = true;"
    191212             type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" />
    … …  
    196217    <td>{L_EXPAND}</td>
    197218    <td>
    198       <input type="radio" name="expand_action" value="leave" checked="checked" /> leave unchanged
    199       <input type="radio" name="expand_action" value="set" id="expand_action_set" /> set to
    200       <input onmousedown="document.getElementById('expand_action_set').checked = true;"
    201              type="radio" class="radio" name="expand" value="true"  {EXPAND_YES} />{L_YES}
    202       <input onmousedown="document.getElementById('expand_action_set').checked = true;"
    203              type="radio" class="radio" name="expand" value="false" {EXPAND_NO}  />{L_NO}
     219      <label><input type="radio" name="expand" value="leave" checked="checked" /> {lang:leave}</label>
     220      / {lang:set to}
     221      <label><input type="radio" name="expand" value="true"  {EXPAND_YES} />{L_YES}</label>
     222      <label><input type="radio" name="expand" value="false" {EXPAND_NO}  />{L_NO}</label>
    204223    </td>
    205224  </tr>
    … …  
    208227    <td>{L_SHOW_NB_COMMENTS}</td>
    209228    <td>
    210       <input type="radio" name="show_nb_comments_action" value="leave" checked="checked" /> leave unchanged
    211       <input type="radio" name="show_nb_comments_action" value="set" id="show_nb_comments_action_set" /> set to
    212       <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;"
    213              type="radio" class="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES}
    214       <input onmousedown="document.getElementById('show_nb_comments_action_set').checked = true;"
    215              type="radio" class="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO}
     229      <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {lang:leave}</label>
     230      / {lang:set to}
     231      <label><input type="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES}</label>
     232      <label><input type="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO}</label>
    216233    </td>
    217234  </tr>
    … …  
    220237    <td>{L_MAXWIDTH}</td>
    221238    <td>
    222       <input type="radio" name="maxwidth_action" value="leave" checked="checked" /> leave unchanged
    223       <input type="radio" name="maxwidth_action" value="unset" /> unset
    224       <input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> set to
     239      <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {lang:leave}</label>
     240      <label><input type="radio" name="maxwidth_action" value="unset" /> {lang:unset}</label>
     241      <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> {lang:set to}</label>
    225242      <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;"
    226243             type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" />
    … …  
    232249    <td>{L_MAXHEIGHT}</td>
    233250    <td>
    234       <input type="radio" name="maxheight_action" value="leave" checked="checked" /> leave unchanged
    235       <input type="radio" name="maxheight_action" value="unset" /> unset
    236       <input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> set to
     251      <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {lang:leave}</label>
     252      <label><input type="radio" name="maxheight_action" value="unset" /> {lang:unset}</label>
     253      <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> {lang:set to}</label>
    237254      <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
    238255             type="text" size="4" maxlength="4" name="maxheight" value="{maxheight}" />
    … …  
    240257  </tr>
    241258
    242   <tr>
    243     <td>{L_STATUS}</td>
    244     <td>
    245       <input type="radio" name="status_action" value="leave" checked="checked" /> leave unchanged
    246       <input type="radio" name="status_action" value="set" id="status_action_set" /> set to
    247       <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1">
    248         <!-- BEGIN pref_status_option -->
    249         <option {pref_status_option.SELECTED} value="{pref_status_option.VALUE}">{pref_status_option.CONTENT}</option>
    250         <!-- END pref_status_option -->
    251       </select>
    252     </td>
    253   </tr>
    254259
    255260</table>
    … …  
    257262</fieldset>
    258263
    259 <p style="text-align:center;">
    260   target 
    261   <input type="radio" name="target" value="all" /> all
    262   <input type="radio" name="target" value="selection" checked="checked" /> selection
     264<p>
     265  {lang:target}
     266  <label><input type="radio" name="target" value="all" /> {lang:all}
     267  <label><input type="radio" name="target" value="selection" checked="checked" /> {lang:selection}
    263268</p>
    264269
    265 <p style="text-align:center;">
    266   <input type="submit" value="{L_SUBMIT}" name="pref_submit" class="bouton" />
    267   <input type="reset" value="{L_RESET}" name="pref_reset" class="bouton" />
     270<p>
     271  <input type="submit" value="{L_SUBMIT}" name="pref_submit" />
     272  <input type="reset" value="{L_RESET}" name="pref_reset" />
    268273</p>
    269274

  • trunk/template/cclear/admin/user_perm.tpl

    r820 r850  
    1 <div class="admin">{L_SELECT_USERNAME}</div>
    2 <form method="post" name="post" action="{F_SEARCH_USER_ACTION}">
    3   <input type="text" name="username" maxlength="50" size="20" />
    4   <input type="submit" name="submituser" value="{L_LOOKUP_USER}" class="bouton" />
    5   <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpwgsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
    6 </form>
     1<h2>{TITLE}</h2>
     2
     3<!-- BEGIN groups -->
     4<fieldset>
     5  <legend>{lang:Categories authorized thanks to group associations}</legend>
     6
     7  <ul>
     8    <!-- BEGIN category -->
     9    <li>{groups.category.NAME}</li>
     10    <!-- END category -->
     11  </ul>
     12</fieldset>
     13<!-- END groups -->
     14
     15<fieldset>
     16  <legend>{lang:Other private categories}</legend>
     17
     18  <form method="post" action="{F_ACTION}">
     19    {DOUBLE_SELECT}
     20  </form>
     21</fieldset>

  • trunk/template/cclear/category.tpl

    r846 r850  
    11<!-- $Id$ -->
    2 <h1>PhpWebGallery demonstration site</h1>
    3 
    42<div id="menubar">
    53<!-- BEGIN links -->
    … …  
    8583      </p>
    8684      <!-- END remember_me -->
    87       <p><input type="submit" name="login" value="{L_SUBMIT}" class="bouton"></p>
     85      <p><input type="submit" name="login" value="{L_SUBMIT}"></p>
    8886    </form>
    8987    <!-- END quickconnect -->

  • trunk/template/cclear/comments.tpl

    r848 r850  
    1 <div id="commentsPage">
    2 
     1<!-- $Id$ -->
    32<div id="content">
    43
    … …  
    9392
    9493</div> <!-- content -->
    95 
    96 </div> <!-- commentsPage -->

  • trunk/template/cclear/content.css

    r848 r850  
    66}
    77
    8 #commentsPage #content {
     8BODY#theCommentsPage #content,
     9BODY#theRegisterPage #content,
     10BODY#theIdentificationPage #content,
     11BODY#theProfilePage #content,
     12BODY#theSearchPage #content,
     13BODY#theAboutPage #content,
     14BODY#theNotificationPage #content
     15{
    916  margin: 1em;
    1017}
    … …  
    127134#content DIV.comment > A.illustration {
    128135  display: block;
    129   float: left;
     136  position: absolute;
    130137  margin: 5px;
    131138}
    … …  
    143150  text-align: center;
    144151  margin: 0.2em;
    145   clear: left;
    146152}
    147153
    … …  
    156162  padding: 0.5em;
    157163}
     164

  • trunk/template/cclear/default-colors.css

    r847 r850  
    118118        border: 1px solid gray;
    119119}
    120 .bouton {
    121         background-color:#d3d3d3;
    122 }
     120
    123121.errors { /* Errors display */
    124122        color:red;
    … …  
    133131        font-weight:normal;
    134132}
    135 fieldset>legend {
     133LEGEND {
    136134  font-style: italic;
    137135}
    138136
     137FIELDSET {
     138  border: 1px solid gray;
     139}

  • trunk/template/cclear/default-layout.css

    r848 r850  
    2929H2 {
    3030    margin: 0;
    31     padding: 5px 10px;
     31    padding: 5px;
    3232    text-align: left;
    3333    font-size: 120%;
    … …  
    6868  margin: 0 auto 1em auto;
    6969}
    70 form { padding: 0.5em; }
     70
     71form { padding: 0em; }
     72
    7173/* form row are dl instead of table rows */
    7274form dl {
    … …  
    113115        margin-top: 2em;
    114116        margin-bottom: 2em;
    115 }
    116 
    117 form table {
    118         width: 99%; /* IE 6 seems to dislike 100% in admin->user */
    119117}
    120118.small {
    … …  
    149147
    150148.table2 {
    151         border: 1px solid #000000;
    152         margin: auto 10px auto 10px;
    153         padding:0px;
    154 }
     149  border: 1px solid black;
     150  margin: 1em auto;
     151  padding: 0;
     152}
     153
     154.table2 TD, .table2 TH {
     155  padding: 0 1em;
     156}
     157
    155158form#add_virtual p { text-align: left; }
    156159form#categoryOrdering p {
    … …  
    182185 * below the label
    183186 */
    184 FORM.filter FIELDSET {
    185   padding: 10px;
     187FIELDSET {
     188  padding: 1em;
     189  margin: 1em;
    186190}
    187191
    … …  
    194198}
    195199
    196 FORM.filter>FIELDSET>LABEL>INPUT, FORM.filter>FIELDSET>LABEL>SELECT {
    197   display: block;
    198 }
    199 
    200 FORM.filter FIELDSET P, FORM.filter FIELDSET>INPUT {
     200FORM.filter FIELDSET LABEL INPUT, FORM.filter FIELDSET LABEL SELECT {
     201  display: block;
     202  margin: 0.5em 0;
     203}
     204
     205FORM.filter FIELDSET P, FORM.filter FIELDSET INPUT {
    201206  clear: left;
    202207  display: block;
    203208}
    204209
    205 FORM.filter FIELDSET {
    206   border: 1px solid gray;
    207 }
    208 
    209 FORM.filter FIELDSET + INPUT {
    210   margin-top: 10px;
    211 }
     210FORM.filter INPUT[type="submit"] {
     211  margin-top: 1em;
     212}
     213
     214FIELDSET.elementEdit A {
     215  display: block;
     216  float: right;
     217}
     218
     219TABLE.doubleSelect {
     220  text-align: center;
     221  margin: 0 auto;
     222}
     223
     224TABLE.doubleSelect TD {
     225  padding: 0 5px;
     226}
     227
     228FORM#categoryPermissions LI {
     229  display:inline;
     230  white-space: nowrap;
     231}
     232
     233#theHeader {
     234}
     235
     236#theHeader H1 {
     237  margin-bottom: 0.5em;
     238}
     239
     240#theHeader P {
     241  margin-top: 0;
     242  padding: 0;
     243}
     244
     245BODY#theAdminPage #theHeader P {
     246  display: none;
     247}

  • trunk/template/cclear/header.tpl

    r820 r850  
    2222</head>
    2323
    24 <body>
     24<body id="{BODY_ID}">
    2525<div id="the_page">
     26
     27<div id="theHeader">
     28  <h1>{GALLERY_TITLE}</h1>
     29  <p>{GALLERY_DESCRIPTION}</p>
     30</div>

  • trunk/template/cclear/identification.tpl

    r838 r850  
    1 <h2>{L_TITLE}</h2>
     1<!-- $Id$ -->
     2<div id="content">
     3
     4  <div class="titrePage">
     5    <ul class="categoryActions">
     6      <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="./template/cclear/theme/register.png" alt="{lang:register"/></a></li>
     7      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
     8    </ul>
     9    <h2>{lang:Identification}</h2>
     10  </div>
     11
    212<div class="formbox">
    313<form action="{F_LOGIN_ACTION}" method="post">
    … …  
    2131  <!-- END remember_me -->
    2232  </dl>
    23   <p><input type="submit" name="login" value="{L_LOGIN}" class="bouton" /></p>
     33  <p><input type="submit" name="login" value="{L_LOGIN}"></p>
    2434</form>
    25   <!-- BEGIN free_access -->
    26   <p><a href="./category.php">[ {L_GUEST} ]</a></p>
    27   <a href="register.php"><img src="template/cclear/theme/register.gif" style="border:0;" alt=""/>&nbsp;{L_REGISTER}</a>&nbsp;&nbsp;-&nbsp;&nbsp;
    28   <!-- END free_access -->
    29   <a href="mailto:{MAIL_ADMIN}?subject=[PhpWebGallery] {L_FORGET}"><img src="template/cclear/theme/lost.gif" style="border:0;" alt=""/>&nbsp;{L_FORGET}</a>
     35  <a href="{U_REGISTER}"><img src="template/cclear/theme/register.png" alt=""> {L_REGISTER}</a>
    3036</div> <!--formbox-->
     37
     38</div> <!-- content -->

  • trunk/template/cclear/notification.tpl

    r837 r850  
    1 {lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}
     1<div id="content">
    22
    3 <p><a href="{FEED_URL}">{lang:RSS feed}</a></p>
    4 <p><a href="{HOME_URL}">{lang:Return to home page}</a></p>
     3  <div class="titrePage">
     4    <ul class="categoryActions">
     5      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
     6    </ul>
     7    <h2>{lang:Notification}</h2>
     8  </div>
     9
     10  <p>{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}</p>
     11
     12  <p><a href="{FEED_URL}">{lang:RSS feed}</a></p>
     13</div>

  • trunk/template/cclear/profile.tpl

    r837 r850  
    7777  </dl>
    7878
    79   <p>
    80     <input type="submit" name="validate" value="{L_SUBMIT}" class="bouton" />
    81     <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
     79  <p class="bottomButtons">
     80    <input type="submit" name="validate" value="{L_SUBMIT}">
     81    <input type="reset" name="reset" value="{L_RESET}">
    8282  </p>
     83
    8384</form>
    8485

  • trunk/template/cclear/register.tpl

    r820 r850  
    1 <h2>{L_TITLE}</h2>
     1<div id="registerPage">
     2
     3<div id="content">
     4
     5  <div class="titrePage">
     6    <ul class="categoryActions">
     7      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
     8    </ul>
     9    <h2>{lang:Registration}</h2>
     10  </div>
     11
    212<!-- TO DO -->
    313<!-- It's easy, just lok at identification.tpl ;-) -->
    414
    5 <form method="post" action="{F_ACTION}">
    6   <table style="width:60%;" align="center">
    7         <!-- BEGIN errors -->
    8   <tr>
    9         <td colspan="2">
    10           <div class="errors">
    11                 <ul>
    12                   <!-- BEGIN error -->
    13                   <li>{errors.error.ERROR}</li>
    14                   <!-- END error -->
    15                 </ul>
    16           </div>
    17         </td>
    18   </tr>
     15  <!-- BEGIN errors -->
     16  <div class="errors">
     17    <ul>
     18      <!-- BEGIN error -->
     19      <li>{errors.error.ERROR}</li>
     20      <!-- END error -->
     21    </ul>
     22  </div>
    1923  <!-- END errors -->
    20         <tr>
    21           <td width="60%">{L_USERNAME}</td>
    22           <td width="40%">
    23                 <input type="text" name="login" value="{F_LOGIN}" />
    24           </td>
    25         </tr>
    26         <tr>
    27           <td >{L_PASSWORD}</td>
    28           <td >
    29                 <input type="password" name="password" />
    30           </td>
    31         </tr>
    32         <tr>
    33           <td >{L_CONFIRM_PASSWORD}</td>
    34           <td >
    35                 <input type="password" name="password_conf" />
    36           </td>
    37         </tr>
    38         <tr>
    39           <td >{L_EMAIL}</td>
    40           <td >
    41                 <input type="text" name="mail_address" value="{F_EMAIL}" />
    42           </td>
    43         </tr>
    44         <tr>
    45           <td colspan="2">&nbsp;</td>
    46         </tr>
    47         <tr>
    48         <tr>
    49           <td colspan="2" align="center">
    50                 <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
    51           </td>
    52         </tr>
    53         <tr>
    54           <td colspan="2" align="center">
    55                 <a href="./category.php">[ {L_GUEST} ]</a>
    56           </td>
    57         </tr>
    58   </table>
     24
     25<form method="post" action="{F_ACTION}" class="filter">
     26  <fieldset>
     27    <legend>{lang:Enter your personnal informations}</legend>
     28
     29    <label>* {lang:Username}<input type="text" name="login" value="{F_LOGIN}"></label>
     30    <label>* {lang:Password}<input type="password" name="password"></label>
     31    <label>* {lang:Confirm Password}<input type="password" name="password_conf"></label>
     32    <label>{lang:Mail address}<input type="text" name="mail_address" value="{F_EMAIL}"></label>
     33  </fieldset>
     34
     35  <p class="bottomButtons">
     36    <input type="submit" name="submit" value="{lang:Register}">
     37  </p>
     38
    5939</form>
     40
     41</div> <!-- content -->
     42</div> <!-- registerPage -->

  • trunk/template/cclear/search.tpl

    r820 r850  
    1 <h2>{L_SEARCH_TITLE}</h2>
     1<div id="content">
     2
     3  <div class="titrePage">
     4    <ul class="categoryActions">
     5      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
     6    </ul>
     7    <h2>{lang:Search}</h2>
     8  </div>
     9
    210<!-- TO DO -->
    311<form method="post" name="post" action="{S_SEARCH_ACTION}">
    … …  
    1220<!-- END errors -->
    1321<table width="100%" align="center" cellpadding="2">
    14   <tr class="admin">
    15     <th colspan="4">{L_SEARCH_TITLE}</th>
    16   </tr>
    1722  <tr>
    1823    <td width="50%" colspan="2"><b>{L_SEARCH_KEYWORDS} : </b><br /><span class="small">{L_SEARCH_KEYWORDS_HINT}</span></td>
    … …  
    130135</table>
    131136</form>
    132 <a href="{U_HOME}" title="{L_RETURN_HINT}">[ {L_RETURN} ]</a>
     137
     138</div> <!-- content -->
Note: See TracChangeset for help on using the changeset viewer.