aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--profile.php87
-rw-r--r--template/yoga/profile.tpl18
-rw-r--r--template/yoga/profile_content.tpl89
3 files changed, 68 insertions, 126 deletions
diff --git a/profile.php b/profile.php
index c7c112928..3cd387e22 100644
--- a/profile.php
+++ b/profile.php
@@ -61,11 +61,7 @@ if (!defined('PHPWG_ROOT_PATH'))
// +-----------------------------------------------------------------------+
if (count($errors) != 0)
{
- $template->assign_block_vars('errors',array());
- foreach ($errors as $error)
- {
- $template->assign_block_vars('errors.error', array('ERROR'=>$error));
- }
+ $template->assign('errors', $errors);
}
$template->set_filename('profile', 'profile.tpl');
trigger_action('loc_end_profile');
@@ -216,18 +212,12 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
$template->set_filename('profile_content', 'profile_content.tpl');
- $expand = ($userdata['expand'] == 'true') ?
- 'EXPAND_TREE_YES':'EXPAND_TREE_NO';
-
- $nb_comments =
- ($userdata['show_nb_comments'] == 'true') ?
- 'NB_COMMENTS_YES':'NB_COMMENTS_NO';
-
- $nb_hits =
- ($userdata['show_nb_hits'] == 'true') ?
- 'NB_HITS_YES':'NB_HITS_NO';
+ $template->assign('radio_options',
+ array(
+ 'true' => l10n('yes'),
+ 'false' => l10n('no')));
- $template->assign_vars(
+ $template->assign(
array(
'USERNAME'=>$userdata['username'],
'USERID'=>$userdata['id'],
@@ -237,75 +227,38 @@ function load_profile_in_template($url_action, $url_redirect, $userdata)
'RECENT_PERIOD'=>$userdata['recent_period'],
'MAXWIDTH'=>@$userdata['maxwidth'],
'MAXHEIGHT'=>@$userdata['maxheight'],
-
- $expand=>'checked="checked"',
- $nb_comments=>'checked="checked"',
- $nb_hits=>'checked="checked"',
-
+ 'EXPAND' =>$userdata['expand'] ? 'true' : 'false',
+ 'NB_COMMENTS'=>$userdata['show_nb_comments'] ? 'true' : 'false',
+ 'NB_HITS'=>$userdata['show_nb_hits'] ? 'true' : 'false',
'REDIRECT' => $url_redirect,
-
'F_ACTION'=>$url_action,
));
- $blockname = 'template_option';
-
foreach (get_pwg_themes() as $pwg_template)
{
- if (isset($_POST['submit']))
+ if (isset($_POST['submit'])
+ or $userdata['template'].'/'.$userdata['theme'] == $pwg_template)
{
- $selected = $_POST['template']==$pwg_template ? 'selected="selected"' : '';
+ $template->assign('template_selection', $pwg_template);
}
- else if ($userdata['template'].'/'.$userdata['theme'] == $pwg_template)
- {
- $selected = 'selected="selected"';
- }
- else
- {
- $selected = '';
- }
-
- $template->assign_block_vars(
- $blockname,
- array(
- 'VALUE'=> $pwg_template,
- 'CONTENT' => $pwg_template,
- 'SELECTED' => $selected
- ));
+ $template_options[$pwg_template] = $pwg_template;
}
-
- $blockname = 'language_option';
+ $template->assign('template_options', $template_options);
foreach (get_languages() as $language_code => $language_name)
{
- if (isset($_POST['submit']))
+ if (isset($_POST['submit']) or $userdata['language'] == $language_code)
{
- $selected = $_POST['language']==$language_code ? 'selected="selected"':'';
+ $template->assign('language_selection', $language_code);
}
- 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
- ));
+ $language_options[$language_code] = $language_name;
}
+ $template->assign('language_options', $language_options);
if (!(in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']))))
{
- $template->assign_block_vars('not_special_user', array());
- if ( !defined('IN_ADMIN') )
- {
- $template->assign_block_vars( 'not_special_user.not_admin', array() );
- }
+ $template->assign('not_special_user', true);
+ $template->assign('in_admin', defined('IN_ADMIN'));
}
$template->assign_var_from_handle('PROFILE_CONTENT', 'profile_content');
diff --git a/template/yoga/profile.tpl b/template/yoga/profile.tpl
index 10a0d35d8..3107bb126 100644
--- a/template/yoga/profile.tpl
+++ b/template/yoga/profile.tpl
@@ -1,22 +1,22 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
<div id="content">
-<!-- BEGIN errors -->
+{if isset($errors)}
<div class="errors">
<ul>
- <!-- BEGIN error -->
- <li>{errors.error.ERROR}</li>
- <!-- END error -->
+ {foreach from=$errors item=error}
+ <li>{$error}</li>
+ {/foreach}
</ul>
</div>
-<!-- END errors -->
+{/if}
<div class="titrePage">
<ul class="categoryActions">
- <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+ <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
</ul>
- <h2>{lang:Profile}</h2>
+ <h2>{'Profile'|@translate}</h2>
</div>
-{PROFILE_CONTENT}
+{$PROFILE_CONTENT}
</div> <!-- content -->
diff --git a/template/yoga/profile_content.tpl b/template/yoga/profile_content.tpl
index aa7fcbf6c..2be70857b 100644
--- a/template/yoga/profile_content.tpl
+++ b/template/yoga/profile_content.tpl
@@ -1,121 +1,110 @@
-<!-- DEV TAG: not smarty migrated -->
-<form method="post" name="profile" action="{F_ACTION}" id="profile" class="properties">
+{* $Id$ *}
+<form method="post" name="profile" action="{$F_ACTION}" id="profile" class="properties">
<fieldset>
- <legend>{lang:register_title}</legend>
- <input type="hidden" name="userid" value="{USERID}" />
- <input type="hidden" name="redirect" value="{REDIRECT}" />
+ <legend>{'register_title'|@translate}</legend>
+ <input type="hidden" name="userid" value="{$USERID}" />
+ <input type="hidden" name="redirect" value="{$REDIRECT}" />
<ul>
<li>
- <span class="property">{lang:Username}</span>
- {USERNAME}
+ <span class="property">{'Username'|@translate}</span>
+ {$USERNAME}
</li>
-<!-- BEGIN not_special_user -->
+{if isset($not_special_user)}
<li>
<span class="property">
- <label for="mail_address">{lang:Email address}</label>
+ <label for="mail_address">{'Email address'|@translate}</label>
</span>
- <input type="text" name="mail_address" id="mail_address" value="{EMAIL}">
+ <input type="text" name="mail_address" id="mail_address" value="{$EMAIL}">
</li>
-<!-- BEGIN not_admin -->
+{if !$in_admin}
<li>
<span class="property">
- <label for="password">{lang:Password}</label>
+ <label for="password">{'Password'|@translate}</label>
</span>
<input type="password" name="password" id="password" value="">
</li>
-<!-- END not_admin -->
+{/if}
<li>
<span class="property">
- <label for="use_new_pwd">{lang:new_password}</label>
+ <label for="use_new_pwd">{'new_password'|@translate}</label>
</span>
<input type="password" name="use_new_pwd" id="use_new_pwd" value="">
</li>
<li>
<span class="property">
- <label for="passwordConf">{lang:Confirm Password}</label>
+ <label for="passwordConf">{'Confirm Password'|@translate}</label>
</span>
<input type="password" name="passwordConf" id="passwordConf" value="">
</li>
</ul>
-<!-- END not_special_user -->
+{/if}
</fieldset>
<fieldset>
- <legend>{lang:preferences}</legend>
+ <legend>{'preferences'|@translate}</legend>
<ul>
<li>
<span class="property">
- <label for="nb_image_line">{lang:nb_image_per_row}</label>
+ <label for="nb_image_line">{'nb_image_per_row'|@translate}</label>
</span>
- <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{NB_IMAGE_LINE}">
+ <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
</li>
<li>
<span class="property">
- <label for="nb_line_page">{lang:nb_row_per_page}</label>
+ <label for="nb_line_page">{'nb_row_per_page'|@translate}</label>
</span>
- <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{NB_ROW_PAGE}" >
+ <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
</li>
<li>
<span class="property">
- <label for="template">{lang:theme}</label>
+ <label for="template">{'theme'|@translate}</label>
</span>
- <select name="template" id="template">
- <!-- BEGIN template_option -->
- <option value="{template_option.VALUE}" {template_option.SELECTED}>{template_option.CONTENT}</option>
- <!-- END template_option -->
- </select>
+ {html_options name=template options=$template_options selected=$template_selection}
</li>
<li>
<span class="property">
- <label for="language">{lang:language}</label>
+ <label for="language">{'language'|@translate}</label>
</span>
- <select name="language" id="language">
- <!-- BEGIN language_option -->
- <option value="{language_option.VALUE}" {language_option.SELECTED}>{language_option.CONTENT}</option>
- <!-- END language_option -->
- </select>
+ {html_options name=language options=$language_options selected=$language_selection}
</li>
<li>
<span class="property">
- <label for="recent_period">{lang:recent_period}</label>
+ <label for="recent_period">{'recent_period'|@translate}</label>
</span>
- <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{RECENT_PERIOD}">
+ <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$RECENT_PERIOD}">
</li>
<li>
- <span class="property">{lang:auto_expand}</span>
- <label><input type="radio" name="expand" value="true" {EXPAND_TREE_YES}> {lang:yes}</label>
- <label><input type="radio" name="expand" value="false" {EXPAND_TREE_NO}> {lang:no}</label>
+ <span class="property">{'auto_expand'|@translate}</span>
+ {html_radios name='expand' options=$radio_options selected=$EXPAND}
</li>
<li>
- <span class="property">{lang:show_nb_comments}</span>
- <label><input type="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES}> {lang:yes}</label>
- <label><input type="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO}> {lang:no}</label>
+ <span class="property">{'show_nb_comments'|@translate}</span>
+ {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
</li>
<li>
- <span class="property">{lang:show_nb_hits}</span>
- <label><input type="radio" name="show_nb_hits" value="true" {NB_HITS_YES}> {lang:yes}</label>
- <label><input type="radio" name="show_nb_hits" value="false" {NB_HITS_NO}> {lang:no}</label>
+ <span class="property">{'show_nb_hits'|@translate}</span>
+ {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
</li>
<li>
<span class="property">
- <label for="maxwidth">{lang:maxwidth}</label>
+ <label for="maxwidth">{'maxwidth'|@translate}</label>
</span>
- <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{MAXWIDTH}">
+ <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{$MAXWIDTH}">
</li>
<li>
<span class="property">
- <label for="maxheight">{lang:maxheight}</label>
+ <label for="maxheight">{'maxheight'|@translate}</label>
</span>
- <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{MAXHEIGHT}">
+ <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{$MAXHEIGHT}">
</li>
</ul>
</fieldset>
<p class="bottomButtons">
- <input class="submit" type="submit" name="validate" value="{lang:submit}">
- <input class="submit" type="reset" name="reset" value="{lang:reset}">
+ <input class="submit" type="submit" name="validate" value="{'submit'|@translate}">
+ <input class="submit" type="reset" name="reset" value="{'reset'|@translate}">
</p>
</form>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 20:13:09 +0000