aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-08-27 00:24:31 +0000
committerplegall <plg@piwigo.org>2005-08-27 00:24:31 +0000
commita891960d5a9ac504a173520f4604e6740c58493b (patch)
tree88f15e6cedf4fede92988cc1b0589a8e659b9725
parent1abfbf5eaec88e63cea97bde6d1ecceae8e51520 (diff)
(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] solution #3 from http://forum.phpwebgallery.net/viewtopic.php?pid=21443#p21443 : adds the fix on min-height. - [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. git-svn-id: http://piwigo.org/svn/trunk@854 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--identification.php5
-rw-r--r--profile.php55
-rw-r--r--template/cclear/content.css1
-rw-r--r--template/cclear/default-layout.css36
-rw-r--r--template/cclear/footer.tpl2
-rw-r--r--template/cclear/identification.tpl45
-rw-r--r--template/cclear/profile.tpl179
-rw-r--r--template/cclear/register.tpl32
8 files changed, 255 insertions, 100 deletions
diff --git a/identification.php b/identification.php
index 79157e632..772f42722 100644
--- a/identification.php
+++ b/identification.php
@@ -81,8 +81,11 @@ $template->assign_vars(
'L_REGISTER' => $lang['ident_register'],
'L_FORGET' => $lang['ident_forgotten_password'],
'L_REMEMBER_ME'=>$lang['remember_me'],
+
+ 'U_REGISTER' => add_session_id(PHPWG_ROOT_PATH.'register.php'),
+ 'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php'),
- 'F_LOGIN_ACTION' => add_session_id('identification.php')
+ 'F_LOGIN_ACTION' => add_session_id(PHPWG_ROOT_PATH.'identification.php')
));
if ($conf['authorize_remembering'])
diff --git a/profile.php b/profile.php
index 55b121691..170b14913 100644
--- a/profile.php
+++ b/profile.php
@@ -162,10 +162,8 @@ $template->assign_vars(
'USERNAME'=>$userdata['username'],
'USERID'=>$userdata['id'],
'EMAIL'=>@$userdata['email'],
- 'LANG_SELECT'=>language_select($userdata['language'], 'language'),
'NB_IMAGE_LINE'=>$userdata['nb_image_line'],
'NB_ROW_PAGE'=>$userdata['nb_line_page'],
- 'STYLE_SELECT'=>style_select($userdata['template'], 'template'),
'RECENT_PERIOD'=>$userdata['recent_period'],
'MAXWIDTH'=>@$userdata['maxwidth'],
'MAXHEIGHT'=>@$userdata['maxheight'],
@@ -204,6 +202,59 @@ $template->assign_vars(
'F_ACTION'=>add_session_id($url_action),
));
+
+$blockname = 'template_option';
+
+foreach (get_templates() as $pwg_template)
+{
+ if (isset($_POST['submit']))
+ {
+ $selected = $_POST['template']==$pwg_template ? 'selected="selected"' : '';
+ }
+ else if ($userdata['template'] == $pwg_template)
+ {
+ $selected = 'selected="selected"';
+ }
+ else
+ {
+ $selected = '';
+ }
+
+ $template->assign_block_vars(
+ $blockname,
+ array(
+ 'VALUE'=> $pwg_template,
+ 'CONTENT' => $pwg_template,
+ 'SELECTED' => $selected
+ ));
+}
+
+$blockname = 'language_option';
+
+foreach (get_languages() as $language_code => $language_name)
+{
+ if (isset($_POST['submit']))
+ {
+ $selected = $_POST['language']==$language_code ? 'selected="selected"':'';
+ }
+ else if ($userdata['language'] == $language_code)
+ {
+ $selected = 'selected="selected"';
+ }
+ else
+ {
+ $selected = '';
+ }
+
+ $template->assign_block_vars(
+ $blockname,
+ array(
+ 'VALUE'=> $language_code,
+ 'CONTENT' => $language_name,
+ 'SELECTED' => $selected
+ ));
+}
+
// +-----------------------------------------------------------------------+
// | errors display |
// +-----------------------------------------------------------------------+
diff --git a/template/cclear/content.css b/template/cclear/content.css
index 7fcaf4b6a..8589c4520 100644
--- a/template/cclear/content.css
+++ b/template/cclear/content.css
@@ -132,6 +132,7 @@ ul.categoryActions {
#content DIV.comment {
margin: 5px;
border: 1px solid gray;
+ min-height: 150px; /* maximum thumbnail height */
}
#content DIV.comment > A.illustration {
diff --git a/template/cclear/default-layout.css b/template/cclear/default-layout.css
index 36d1f3249..33adf19e8 100644
--- a/template/cclear/default-layout.css
+++ b/template/cclear/default-layout.css
@@ -63,10 +63,6 @@ ul, dl, li { text-align: left;}
pre { text-align:left; }
/** forms **/
-div.formbox {
- width: 70%;
- margin: 0 auto 1em auto;
-}
form { padding: 0em; }
@@ -211,6 +207,38 @@ FORM.filter INPUT[type="submit"] {
margin-top: 1em;
}
+FORM.properties UL {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+FORM.properties LI {
+ margin-bottom: 0.5em;
+ padding: 0;
+ line-height: 1.8em;
+}
+
+FORM.properties LABEL {
+ float: left;
+ width: 50%;
+ text-align: right;
+ margin: 0;
+ padding: 0 0.5em 0 0;
+}
+
+FORM.properties LABEL.mandatory {
+ font-weight: bold;
+}
+
+FORM.properties .focus {
+ background-color: whitesmoke;
+}
+
+FORM.properties .nofocus {
+ background-color: lightgrey; /* must be the same as input background-color */
+}
+
FIELDSET.elementEdit A {
display: block;
float: right;
diff --git a/template/cclear/footer.tpl b/template/cclear/footer.tpl
index 7ebbeeeb0..ea92324d8 100644
--- a/template/cclear/footer.tpl
+++ b/template/cclear/footer.tpl
@@ -4,7 +4,7 @@
<!-- END debug -->
<!-- Please, do not remove this copyright. If you really want to,
- contact me pierrick@phpwebgallery.net to find a solution on how
+ contact us on http://phpwebgallery.net to find a solution on how
to show the origin of the script...-->
{L_POWERED_BY} <a href="http://www.phpwebgallery.net" class="back">PhpWebGallery</a>
diff --git a/template/cclear/identification.tpl b/template/cclear/identification.tpl
index 8b0201834..233b338de 100644
--- a/template/cclear/identification.tpl
+++ b/template/cclear/identification.tpl
@@ -3,14 +3,12 @@
<div class="titrePage">
<ul class="categoryActions">
- <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="./template/cclear/theme/register.png" alt="{lang:register"/></a></li>
+ <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="./template/cclear/theme/register.png" alt="{lang:register}"/></a></li>
<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>
</ul>
<h2>{lang:Identification}</h2>
</div>
-<div class="formbox">
-<form action="{F_LOGIN_ACTION}" method="post">
<!-- BEGIN errors -->
<div class="errors">
<ul>
@@ -20,19 +18,36 @@
</ul>
</div>
<!-- END errors -->
- <dl>
- <dt>{L_USERNAME}:</dt>
- <dd><input class="login" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" /></dd>
- <dt>{L_PASSWORD}:</dt>
- <dd><input class="login" type="password" name="password" size="25" maxlength="25" /></dd>
- <!-- BEGIN remember_me -->
- <dt>{L_REMEMBER_ME}:</dt>
- <dd><input type="checkbox" name="remember_me" value="1" /></dd>
- <!-- END remember_me -->
- </dl>
+
+<form action="{F_LOGIN_ACTION}" method="post" class="properties">
+ <fieldset>
+ <legend>{lang:Connection settings}</legend>
+
+ <ul>
+ <li>
+ <label for="username">{L_USERNAME}</label>
+ <input class="login" type="text" name="username" id="username" size="25" maxlength="40" value="{USERNAME}">
+ </li>
+
+ <li>
+ <label for="password">{L_PASSWORD}</label>
+ <input class="login" type="password" name="password" id="password" size="25" maxlength="25">
+ </li>
+
+ <!-- BEGIN remember_me -->
+ <li>
+ <label>{L_REMEMBER_ME}</label>
+ <input type="checkbox" name="remember_me" value="1">
+ </li>
+ <!-- END remember_me -->
+ </ul>
+ </fieldset>
+
<p><input type="submit" name="login" value="{L_LOGIN}"></p>
</form>
- <a href="{U_REGISTER}"><img src="template/cclear/theme/register.png" alt=""> {L_REGISTER}</a>
-</div> <!--formbox-->
+
+ <p>
+ <a href="{U_REGISTER}"><img src="template/cclear/theme/register.png" alt=""> {L_REGISTER}</a>
+ </p>
</div> <!-- content -->
diff --git a/template/cclear/profile.tpl b/template/cclear/profile.tpl
index 76fe2dba6..08983b91b 100644
--- a/template/cclear/profile.tpl
+++ b/template/cclear/profile.tpl
@@ -1,3 +1,5 @@
+<div id="content">
+
<!-- BEGIN errors -->
<div class="errors">
<ul>
@@ -8,73 +10,113 @@
</div>
<!-- END errors -->
-<h2>{L_TITLE}</h2>
-
-<div class="formbox">
-<form method="post" name="profile" action="{F_ACTION}" id="profile">
-
- <p><input type="hidden" name="userid" value="{USERID}" /></p>
-
- <h3>{L_REGISTRATION_INFO}</h3>
- <dl>
- <dt width="50%">{L_USERNAME}</dt>
- <dd>{USERNAME}</dd>
- <dt>{L_EMAIL}</dt>
- <dd><input type="text" name="mail_address" value="{EMAIL}" /></dd>
- </dl>
- <dl class="biglabel">
- <dt>{L_CURRENT_PASSWORD} : <br /><span class="small">{L_CURRENT_PASSWORD_HINT}</span></dt>
- <dd><input type="password" name="password" value="" /></dd>
- </dl>
- <dl class="biglabel">
- <dt>{L_NEW_PASSWORD} : <br /><span class="small">{L_NEW_PASSWORD_HINT}</span></dt>
- <dd><input type="password" name="use_new_pwd" value="" /></dd>
- </dl>
- <dl class="biglabel">
- <dt>{L_CONFIRM_PASSWORD} : <br /><span class="small">{L_CONFIRM_PASSWORD_HINT}</span></dt>
- <dd><input type="password" name="passwordConf" value="" /></dd>
- </dl>
- <h3>{L_PREFERENCES}</h3>
- <dl>
- <dt>{L_NB_IMAGE_LINE}</dt>
- <dd>
- <input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" />
- </dd>
- <dt>{L_NB_ROW_PAGE}</dt>
- <dd>
- <input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" />
- </dd>
- <dt>{L_STYLE_SELECT}</dt>
- <dd>
- {STYLE_SELECT}
- </dd>
- <dt>{L_LANG_SELECT}</dt>
- <dd>
- {LANG_SELECT}
- </dd>
- <dt>{L_RECENT_PERIOD}</dt>
- <dd>
- <input type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" />
- </dd>
- <dt>{L_EXPAND_TREE}</dt>
- <dd>
- <input type="radio" class="radio" name="expand" value="true" {EXPAND_TREE_YES} />{L_YES}&nbsp;&nbsp;
- <input type="radio" class="radio" name="expand" value="false" {EXPAND_TREE_NO} />{L_NO}
- </dd>
- <dt>{L_NB_COMMENTS}</dt>
- <dd>
- <input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
- <input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO} />{L_NO}
- </dd>
- <dt>{L_MAXWIDTH}</dt>
- <dd>
- <input type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" />
- </dd>
- <dt>{L_MAXHEIGHT}</dt>
- <dd>
- <input type="text" size="4" maxlength="4" name="maxheight" value="{MAXHEIGHT}" />
- </dd>
- </dl>
+ <div class="titrePage">
+ <ul class="categoryActions">
+ <li><a href="{U_RETURN}" title="{lang:return to homepage}"><img src="./template/cclear/theme/home.png" alt="{lang:home}"/></a></li>
+ </ul>
+ <h2>{lang:Profile}</h2>
+ </div>
+
+<form method="post" name="profile" action="{F_ACTION}" id="profile" class="properties">
+
+ <input type="hidden" name="userid" value="{USERID}" />
+
+ <fieldset>
+ <legend>{L_REGISTRATION_INFO}</legend>
+
+ <ul>
+ <li>
+ <label>{lang:Username}</label>
+ <strong>{USERNAME}</strong>
+ </li>
+
+ <li>
+ <label for="mail_address">{lang:Email address}</label>
+ <input type="text" name="mail_address" id="mail_address" value="{EMAIL}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label for="password">{L_CURRENT_PASSWORD}</label>
+ <input type="password" name="password" id="password" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label for="use_new_pwd">{L_NEW_PASSWORD}</label>
+ <input type="password" name="use_new_pwd" id="use_new_pwd" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label for="passwordConf">{L_CONFIRM_PASSWORD}</label>
+ <input type="password" name="passwordConf" id="passwordConf" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+ </ul>
+ </fieldset>
+
+ <fieldset>
+ <legend>{L_PREFERENCES}</legend>
+
+ <ul>
+ <li>
+ <label for="nb_image_line">{L_NB_IMAGE_LINE}</label>
+ <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{NB_IMAGE_LINE}"
+ onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label for="nb_line_page">{L_NB_ROW_PAGE}</label>
+ <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{NB_ROW_PAGE}"
+ onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label for="template">{L_STYLE_SELECT}</label>
+ <select name="template" id="template"> <!-- FIXME: if onfocus is used, the behaviour becomes weird in Firefox -->
+ <!-- BEGIN template_option -->
+ <option value="{template_option.VALUE}" {template_option.SELECTED}>{template_option.CONTENT}</option>
+ <!-- END template_option -->
+ </select>
+ </li>
+
+ <li>
+ <label for="language">{L_LANG_SELECT}</label>
+ <select name="language" id="language"> <!-- same FIXME -->
+ <!-- BEGIN language_option -->
+ <option value="{language_option.VALUE}" {language_option.SELECTED}>{language_option.CONTENT}</option>
+ <!-- END language_option -->
+ </select>
+ </li>
+
+ <li>
+ <label for="recent_period">{L_RECENT_PERIOD}</label>
+ <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{RECENT_PERIOD}"
+ onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label>{L_EXPAND_TREE}</label>
+ <input type="radio" class="radio" name="expand" value="true" {EXPAND_TREE_YES}> {L_YES}
+ <input type="radio" class="radio" name="expand" value="false" {EXPAND_TREE_NO}> {L_NO}
+ </li>
+
+ <li>
+ <label>{L_NB_COMMENTS}</label>
+ <input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES}> {L_YES}
+ <input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO}> {L_NO}
+ </li>
+
+ <li>
+ <label for"maxwidth">{L_MAXWIDTH}</label>
+ <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{MAXWIDTH}"
+ onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label for="maxheight">{L_MAXHEIGHT}</label>
+ <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{MAXHEIGHT}"
+ onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+ </ul>
+ </fieldset>
<p class="bottomButtons">
<input type="submit" name="validate" value="{L_SUBMIT}">
@@ -83,5 +125,4 @@
</form>
- <p><a href="{U_RETURN}" title="{L_RETURN_HINT}">[{L_RETURN}]</a></p>
-</div>
+</div> <!-- content -->
diff --git a/template/cclear/register.tpl b/template/cclear/register.tpl
index c696bfe8b..3b39fcbf2 100644
--- a/template/cclear/register.tpl
+++ b/template/cclear/register.tpl
@@ -9,9 +9,6 @@
<h2>{lang:Registration}</h2>
</div>
-<!-- TO DO -->
-<!-- It's easy, just lok at identification.tpl ;-) -->
-
<!-- BEGIN errors -->
<div class="errors">
<ul>
@@ -22,18 +19,37 @@
</div>
<!-- END errors -->
-<form method="post" action="{F_ACTION}" class="filter">
+<form method="post" action="{F_ACTION}" class="properties">
<fieldset>
<legend>{lang:Enter your personnal informations}</legend>
- <label>* {lang:Username}<input type="text" name="login" value="{F_LOGIN}"></label>
- <label>* {lang:Password}<input type="password" name="password"></label>
- <label>* {lang:Confirm Password}<input type="password" name="password_conf"></label>
- <label>{lang:Mail address}<input type="text" name="mail_address" value="{F_EMAIL}"></label>
+ <ul>
+ <li>
+ <label for="login" class="mandatory">* {lang:Username}</label>
+ <input type="text" name="login" id="login" value="{F_LOGIN}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label for="password" class="mandatory">* {lang:Password}</label>
+ <input type="password" name="password" id="password" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label for="password_conf" class="mandatory">* {lang:Confirm Password}</label>
+ <input type="password" name="password_conf" id="password_conf" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+
+ <li>
+ <label for="mail_address">{lang:Mail address}</label>
+ <input type="text" name="mail_address" id="mail_address" value="{F_EMAIL}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+ </li>
+ </ul>
+
</fieldset>
<p class="bottomButtons">
<input type="submit" name="submit" value="{lang:Register}">
+ <input type="reset" value="{lang:Reset}">
</p>
</form>