Changeset 854


Ignore:
Timestamp:
Aug 27, 2005, 2:24:31 AM (19 years ago)
Author:
plg
Message:

(not in ChangeLog)

  • adds PHPWG_ROOT_PATH to form action in identification.php
  • adds link to home on identification.php
  • avoid using language_select and template_select in profile.php (maybe these functions becom obsolete)
  • [template cclear] new FORM class : properties. Used in identification, profile, register.
  • [template cclear] deletion of now useless DIV.formbox
  • [template cclear] footer update : link to phpwebgallery website and not pierrick email.
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/identification.php

    r850 r854  
    8282    'L_FORGET' => $lang['ident_forgotten_password'],
    8383    'L_REMEMBER_ME'=>$lang['remember_me'],
     84
     85    'U_REGISTER' => add_session_id(PHPWG_ROOT_PATH.'register.php'),
     86    'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php'),
    8487   
    85     'F_LOGIN_ACTION' => add_session_id('identification.php')
     88    'F_LOGIN_ACTION' => add_session_id(PHPWG_ROOT_PATH.'identification.php')
    8689    ));
    8790

  • trunk/profile.php

    r850 r854  
    163163    'USERID'=>$userdata['id'],
    164164    'EMAIL'=>@$userdata['email'],
    165     'LANG_SELECT'=>language_select($userdata['language'], 'language'),
    166165    'NB_IMAGE_LINE'=>$userdata['nb_image_line'],
    167166    'NB_ROW_PAGE'=>$userdata['nb_line_page'],
    168     'STYLE_SELECT'=>style_select($userdata['template'], 'template'),
    169167    'RECENT_PERIOD'=>$userdata['recent_period'],
    170168    'MAXWIDTH'=>@$userdata['maxwidth'],
    … …  
    205203    'F_ACTION'=>add_session_id($url_action),
    206204    ));
     205
     206$blockname = 'template_option';
     207
     208foreach (get_templates() as $pwg_template)
     209{
     210  if (isset($_POST['submit']))
     211  {
     212    $selected = $_POST['template']==$pwg_template ? 'selected="selected"' : '';
     213  }
     214  else if ($userdata['template'] == $pwg_template)
     215  {
     216    $selected = 'selected="selected"';
     217  }
     218  else
     219  {
     220    $selected = '';
     221  }
     222 
     223  $template->assign_block_vars(
     224    $blockname,
     225    array(
     226      'VALUE'=> $pwg_template,
     227      'CONTENT' => $pwg_template,
     228      'SELECTED' => $selected
     229      ));
     230}
     231
     232$blockname = 'language_option';
     233
     234foreach (get_languages() as $language_code => $language_name)
     235{
     236  if (isset($_POST['submit']))
     237  {
     238    $selected = $_POST['language']==$language_code ? 'selected="selected"':'';
     239  }
     240  else if ($userdata['language'] == $language_code)
     241  {
     242    $selected = 'selected="selected"';
     243  }
     244  else
     245  {
     246    $selected = '';
     247  }
     248 
     249  $template->assign_block_vars(
     250    $blockname,
     251    array(
     252      'VALUE'=> $language_code,
     253      'CONTENT' => $language_name,
     254      'SELECTED' => $selected
     255      ));
     256}
     257
    207258// +-----------------------------------------------------------------------+
    208259// |                             errors display                            |

  • trunk/template/cclear/content.css

    r852 r854  
    133133  margin: 5px;
    134134  border: 1px solid gray;
     135  min-height: 150px; /* maximum thumbnail height */
    135136}
    136137

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

    r850 r854  
    6464
    6565/** forms **/
    66 div.formbox {
    67   width: 70%;
    68   margin: 0 auto 1em auto;
    69 }
    7066
    7167form { padding: 0em; }
    … …  
    212208}
    213209
     210FORM.properties UL {
     211  list-style-type: none;
     212  margin: 0;
     213  padding: 0;
     214}
     215
     216FORM.properties LI {
     217  margin-bottom: 0.5em;
     218  padding: 0;
     219  line-height: 1.8em;
     220}
     221
     222FORM.properties LABEL {
     223  float: left;
     224  width: 50%;
     225  text-align: right;
     226  margin: 0;
     227  padding: 0 0.5em 0 0;
     228}
     229
     230FORM.properties LABEL.mandatory {
     231  font-weight: bold;
     232}
     233
     234FORM.properties .focus {
     235  background-color: whitesmoke;
     236}
     237
     238FORM.properties .nofocus {
     239  background-color: lightgrey; /* must be the same as input background-color */
     240}
     241
    214242FIELDSET.elementEdit A {
    215243  display: block;

  • trunk/template/cclear/footer.tpl

    r820 r854  
    55
    66 <!-- Please, do not remove this copyright. If you really want to,
    7           contact me pierrick@phpwebgallery.net to find a solution on how
     7          contact us on http://phpwebgallery.net to find a solution on how
    88          to show the origin of the script...-->
    99

  • trunk/template/cclear/identification.tpl

    r850 r854  
    44  <div class="titrePage">
    55    <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>
     6      <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="./template/cclear/theme/register.png" alt="{lang:register}"/></a></li>
    77      <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>
    88    </ul>
    … …  
    1010  </div>
    1111
    12 <div class="formbox">
    13 <form action="{F_LOGIN_ACTION}" method="post">
    1412  <!-- BEGIN errors -->
    1513  <div class="errors">
    … …  
    2119  </div>
    2220  <!-- END errors -->
    23   <dl>
    24     <dt>{L_USERNAME}:</dt>
    25     <dd><input class="login" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" /></dd>
    26     <dt>{L_PASSWORD}:</dt>
    27     <dd><input class="login" type="password" name="password" size="25" maxlength="25" /></dd>
    28   <!-- BEGIN remember_me -->
    29     <dt>{L_REMEMBER_ME}:</dt>
    30     <dd><input type="checkbox" name="remember_me" value="1" /></dd>
    31   <!-- END remember_me -->
    32   </dl>
     21
     22<form action="{F_LOGIN_ACTION}" method="post" class="properties">
     23  <fieldset>
     24    <legend>{lang:Connection settings}</legend>
     25
     26    <ul>
     27      <li>
     28        <label for="username">{L_USERNAME}</label>
     29        <input class="login" type="text" name="username" id="username" size="25" maxlength="40" value="{USERNAME}">
     30      </li>
     31 
     32      <li>
     33        <label for="password">{L_PASSWORD}</label>
     34        <input class="login" type="password" name="password" id="password" size="25" maxlength="25">
     35      </li>
     36 
     37      <!-- BEGIN remember_me -->
     38      <li>
     39        <label>{L_REMEMBER_ME}</label>
     40        <input type="checkbox" name="remember_me" value="1">
     41      </li>
     42      <!-- END remember_me -->
     43    </ul>
     44  </fieldset>
     45
    3346  <p><input type="submit" name="login" value="{L_LOGIN}"></p>
    3447</form>
    35   <a href="{U_REGISTER}"><img src="template/cclear/theme/register.png" alt=""> {L_REGISTER}</a>
    36 </div> <!--formbox-->
     48 
     49  <p>
     50    <a href="{U_REGISTER}"><img src="template/cclear/theme/register.png" alt=""> {L_REGISTER}</a>
     51  </p>
    3752
    3853</div> <!-- content -->

  • trunk/template/cclear/profile.tpl

    r850 r854  
     1<div id="content">
     2
    13<!-- BEGIN errors -->
    24<div class="errors">
    … …  
    911<!-- END errors -->
    1012
    11 <h2>{L_TITLE}</h2>
     13  <div class="titrePage">
     14    <ul class="categoryActions">
     15      <li><a href="{U_RETURN}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
     16    </ul>
     17    <h2>{lang:Profile}</h2>
     18  </div>
    1219
    13 <div class="formbox">
    14 <form method="post" name="profile" action="{F_ACTION}" id="profile">
     20<form method="post" name="profile" action="{F_ACTION}" id="profile" class="properties">
    1521
    16   <p><input type="hidden" name="userid" value="{USERID}" /></p>
     22  <input type="hidden" name="userid" value="{USERID}" />
    1723
    18   <h3>{L_REGISTRATION_INFO}</h3>
    19   <dl>
    20     <dt width="50%">{L_USERNAME}</dt>
    21     <dd>{USERNAME}</dd>
    22     <dt>{L_EMAIL}</dt>
    23     <dd><input type="text" name="mail_address" value="{EMAIL}" /></dd>
    24   </dl>
    25   <dl class="biglabel">
    26     <dt>{L_CURRENT_PASSWORD} : <br /><span class="small">{L_CURRENT_PASSWORD_HINT}</span></dt>
    27     <dd><input type="password" name="password" value="" /></dd>
    28   </dl>
    29   <dl class="biglabel">
    30     <dt>{L_NEW_PASSWORD} : <br /><span class="small">{L_NEW_PASSWORD_HINT}</span></dt>
    31     <dd><input type="password" name="use_new_pwd" value="" /></dd>
    32   </dl>
    33   <dl class="biglabel">
    34     <dt>{L_CONFIRM_PASSWORD} : <br /><span class="small">{L_CONFIRM_PASSWORD_HINT}</span></dt>
    35     <dd><input type="password" name="passwordConf" value="" /></dd>
    36   </dl>
    37   <h3>{L_PREFERENCES}</h3>
    38   <dl>
    39     <dt>{L_NB_IMAGE_LINE}</dt>
    40     <dd>
    41       <input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" />
    42     </dd>
    43     <dt>{L_NB_ROW_PAGE}</dt>
    44     <dd>
    45       <input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" />
    46     </dd>
    47     <dt>{L_STYLE_SELECT}</dt>
    48     <dd>
    49       {STYLE_SELECT}
    50     </dd>
    51     <dt>{L_LANG_SELECT}</dt>
    52     <dd>
    53       {LANG_SELECT}
    54     </dd>
    55     <dt>{L_RECENT_PERIOD}</dt>
    56     <dd>
    57       <input type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" />
    58     </dd>
    59     <dt>{L_EXPAND_TREE}</dt>
    60     <dd>
    61       <input type="radio" class="radio" name="expand" value="true" {EXPAND_TREE_YES} />{L_YES}&nbsp;&nbsp;
    62       <input type="radio" class="radio" name="expand" value="false" {EXPAND_TREE_NO} />{L_NO}
    63     </dd>
    64     <dt>{L_NB_COMMENTS}</dt>
    65     <dd>
    66       <input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
    67       <input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO} />{L_NO}
    68     </dd>
    69     <dt>{L_MAXWIDTH}</dt>
    70     <dd>
    71       <input type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" />
    72     </dd>
    73     <dt>{L_MAXHEIGHT}</dt>
    74     <dd>
    75       <input type="text" size="4" maxlength="4" name="maxheight" value="{MAXHEIGHT}" />
    76     </dd>
    77   </dl>
     24  <fieldset>
     25    <legend>{L_REGISTRATION_INFO}</legend>
     26
     27    <ul>
     28      <li>
     29        <label>{lang:Username}</label>
     30        <strong>{USERNAME}</strong>
     31      </li>
     32
     33      <li>
     34        <label for="mail_address">{lang:Email address}</label>
     35        <input type="text" name="mail_address" id="mail_address" value="{EMAIL}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     36      </li>
     37
     38      <li>
     39        <label for="password">{L_CURRENT_PASSWORD}</label>
     40        <input type="password" name="password" id="password" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     41      </li>
     42
     43      <li>
     44        <label for="use_new_pwd">{L_NEW_PASSWORD}</label>
     45        <input type="password" name="use_new_pwd" id="use_new_pwd" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     46      </li>
     47
     48      <li>
     49        <label for="passwordConf">{L_CONFIRM_PASSWORD}</label>
     50        <input type="password" name="passwordConf" id="passwordConf" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     51      </li>
     52    </ul>
     53  </fieldset>
     54
     55  <fieldset>
     56    <legend>{L_PREFERENCES}</legend>
     57
     58    <ul>
     59      <li>
     60        <label for="nb_image_line">{L_NB_IMAGE_LINE}</label>
     61        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{NB_IMAGE_LINE}"
     62               onfocus="this.className='focus';" onblur="this.className='nofocus';">
     63      </li>
     64
     65      <li>
     66        <label for="nb_line_page">{L_NB_ROW_PAGE}</label>
     67        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{NB_ROW_PAGE}"
     68               onfocus="this.className='focus';" onblur="this.className='nofocus';">
     69      </li>
     70
     71      <li>
     72        <label for="template">{L_STYLE_SELECT}</label>
     73        <select name="template" id="template"> <!-- FIXME: if onfocus is used, the behaviour becomes weird in Firefox -->
     74          <!-- BEGIN template_option -->
     75          <option value="{template_option.VALUE}" {template_option.SELECTED}>{template_option.CONTENT}</option>
     76          <!-- END template_option -->
     77        </select>
     78      </li>
     79
     80      <li>
     81        <label for="language">{L_LANG_SELECT}</label>
     82        <select name="language" id="language"> <!-- same FIXME -->
     83          <!-- BEGIN language_option -->
     84          <option value="{language_option.VALUE}" {language_option.SELECTED}>{language_option.CONTENT}</option>
     85          <!-- END language_option -->
     86        </select>
     87      </li>
     88
     89      <li>
     90        <label for="recent_period">{L_RECENT_PERIOD}</label>
     91        <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{RECENT_PERIOD}"
     92               onfocus="this.className='focus';" onblur="this.className='nofocus';">
     93      </li>
     94
     95      <li>
     96        <label>{L_EXPAND_TREE}</label>
     97        <input type="radio" class="radio" name="expand" value="true" {EXPAND_TREE_YES}> {L_YES}
     98        <input type="radio" class="radio" name="expand" value="false" {EXPAND_TREE_NO}> {L_NO}
     99      </li>
     100
     101      <li>
     102        <label>{L_NB_COMMENTS}</label>
     103        <input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES}> {L_YES}
     104        <input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO}> {L_NO}
     105      </li>
     106 
     107      <li>
     108        <label for"maxwidth">{L_MAXWIDTH}</label>
     109        <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{MAXWIDTH}"
     110               onfocus="this.className='focus';" onblur="this.className='nofocus';">
     111      </li>
     112
     113      <li>
     114        <label for="maxheight">{L_MAXHEIGHT}</label>
     115        <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{MAXHEIGHT}"
     116               onfocus="this.className='focus';" onblur="this.className='nofocus';">
     117      </li>
     118    </ul>
     119  </fieldset>
    78120
    79121  <p class="bottomButtons">
    … …  
    84126</form>
    85127
    86   <p><a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a></p>
    87 </div>
     128</div> <!-- content -->

  • trunk/template/cclear/register.tpl

    r850 r854  
    1010  </div>
    1111
    12 <!-- TO DO -->
    13 <!-- It's easy, just lok at identification.tpl ;-) -->
    14 
    1512  <!-- BEGIN errors -->
    1613  <div class="errors">
    … …  
    2320  <!-- END errors -->
    2421
    25 <form method="post" action="{F_ACTION}" class="filter">
     22<form method="post" action="{F_ACTION}" class="properties">
    2623  <fieldset>
    2724    <legend>{lang:Enter your personnal informations}</legend>
    2825
    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>
     26    <ul>
     27      <li>
     28        <label for="login" class="mandatory">* {lang:Username}</label>
     29        <input type="text" name="login" id="login" value="{F_LOGIN}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     30      </li>
     31
     32      <li>
     33        <label for="password" class="mandatory">* {lang:Password}</label>
     34        <input type="password" name="password" id="password" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     35      </li>
     36
     37      <li>
     38        <label for="password_conf" class="mandatory">* {lang:Confirm Password}</label>
     39        <input type="password" name="password_conf" id="password_conf" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     40      </li>
     41
     42      <li>
     43        <label for="mail_address">{lang:Mail address}</label>
     44        <input type="text" name="mail_address" id="mail_address" value="{F_EMAIL}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
     45      </li>
     46    </ul>
     47
    3348  </fieldset>
    3449
    3550  <p class="bottomButtons">
    3651    <input type="submit" name="submit" value="{lang:Register}">
     52    <input type="reset" value="{lang:Reset}">
    3753  </p>
    3854
Note: See TracChangeset for help on using the changeset viewer.