Thread: [phpwiki-checkins] SF.net SVN: phpwiki:[6729] trunk/themes/default/templates/userprefs.tmpl

Revision: 6729
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6729&view=rev
Author: vargenau
Date: 2009年03月27日 19:52:42 +0000 (2009年3月27日)
Log Message:
-----------
Always use <p>
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2009年03月27日 12:29:21 UTC (rev 6728)
+++ trunk/themes/default/templates/userprefs.tmpl	2009年03月27日 19:52:42 UTC (rev 6729)
@@ -173,15 +173,14 @@
 
 <tr><td colspan="3"><h2><?=_("Appearance")?></h2></td></tr>
 
- <tr><td colspan="2"><?=_("Here you can override site-specific default values.") ?></td>
- <td><span class="hint"><?= _("Currently not recommended!") ?></span></td></tr>
+ <tr><td colspan="3"><?=_("Here you can override site-specific default values.") ?></td></tr>
 <?php /* Alternatively this could be done with <fieldset> and <legend>. */ ?>
 <tr><td align="right"><?=$SelectThemesDesc?></td>
 <td><?= $SelectThemes ?></td>
- <td><span class="hint"><?=_("System default:")?> <?= THEME ?></span></td></tr>
+ <td><p class="hint"><?=_("System default:")?> <?= THEME ?></span></td></tr>
 <tr><td align="right"><?=$SelectLanguagesDesc?></td>
 <td><?= $SelectLanguages ?></td>
-	 <td><span class="hint"><?=_("System default:")?> <?= DEFAULT_LANGUAGE ?></span></td></tr>
+	 <td><p class="hint"><?=_("System default:")?> <?= DEFAULT_LANGUAGE ?></span></td></tr>
 <tr><td align="right"><?=fmt("Hide %s:", WikiLink("LinkIcons"))?></td>
 <td><?=$NoLinkIconsCB?></td>
 <td><p class="hint"><?=_("Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections.")?></p></td></tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6736
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6736&view=rev
Author: vargenau
Date: 2009年03月28日 03:07:56 +0000 (2009年3月28日)
Log Message:
-----------
Valid XHTML code
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2009年03月28日 02:38:52 UTC (rev 6735)
+++ trunk/themes/default/templates/userprefs.tmpl	2009年03月28日 03:07:56 UTC (rev 6736)
@@ -177,10 +177,10 @@
 <?php /* Alternatively this could be done with <fieldset> and <legend>. */ ?>
 <tr><td align="right"><?=$SelectThemesDesc?></td>
 <td><?= $SelectThemes ?></td>
- <td><p class="hint"><?=_("System default:")?> <?= THEME ?></span></td></tr>
+ <td><p class="hint"><?=_("System default:")?> <?= THEME ?></p></td></tr>
 <tr><td align="right"><?=$SelectLanguagesDesc?></td>
 <td><?= $SelectLanguages ?></td>
-	 <td><p class="hint"><?=_("System default:")?> <?= DEFAULT_LANGUAGE ?></span></td></tr>
+	 <td><p class="hint"><?=_("System default:")?> <?= DEFAULT_LANGUAGE ?></p></td></tr>
 <tr><td align="right"><?=fmt("Hide %s:", WikiLink("Help:LinkIcons"))?></td>
 <td><?=$NoLinkIconsCB?></td>
 <td><p class="hint"><?=_("Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections.")?></p></td></tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6919
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6919&view=rev
Author: vargenau
Date: 2009年06月11日 19:38:58 +0000 (2009年6月11日)
Log Message:
-----------
Valid XHTML code
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2009年06月11日 19:18:40 UTC (rev 6918)
+++ trunk/themes/default/templates/userprefs.tmpl	2009年06月11日 19:38:58 UTC (rev 6919)
@@ -168,15 +168,17 @@
 <?php } ?>
 </td><td><p class="hint"><?=_("Note, that user accounts with bouncing emails will be disabled.")?></p></td></tr>
 
- <tr><td colspan="2">
- <?=_("Get an email notification at changes of the following pages:")?><br />
+ <tr><td colspan="3">
+ <?=_("Get an email notification at changes of the following pages:")?>
+ </td></tr>
+ <tr>
 <?php if ($isForm) { ?>
- <blockquote><textarea name="pref[notifyPages]" cols="50" rows="4"><?=$pref->get('notifyPages')?></textarea></blockquote></td>
+ <td colspan="2"><textarea name="pref[notifyPages]" cols="40" rows="6"><?=$pref->get('notifyPages')?></textarea></td>
 <td><p class="hint"><?=_("Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td>
 <?php } else { ?>
- <td><?=$pref->get('notifyPages')?></td><td></td>
+ <td colspan="3"><?=$pref->get('notifyPages')?></td>
 <?php } ?>
- </tr>
+ </tr>
 
 <tr>
 <td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8122
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8122&view=rev
Author: vargenau
Date: 2011年09月26日 13:00:23 +0000 (2011年9月26日)
Log Message:
-----------
Simplify layout
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2011年09月26日 12:59:10 UTC (rev 8121)
+++ trunk/themes/default/templates/userprefs.tmpl	2011年09月26日 13:00:23 UTC (rev 8122)
@@ -1,7 +1,5 @@
 <?php // -*-php-*-
 // $Id$
-?>
-<?php
 // Todo: Move the logic and code to the plugin
 // This is very experimental and the read-only part an ugly hack so far.
 foreach (explode(',','errmsg,isForm') as $var) {
@@ -139,97 +137,110 @@
 
 <table border="0">
 <?php if ($isForm and $user->mayChangePass()) { ?>
- <tr><td colspan="3"><h2><?php echo ($request->getPref('passwd') ? _("Change Password") : _("Set Password")) ?></h2></td></tr>
+ <tr><td colspan="2"><h2><?php echo ($request->getPref('passwd') ? _("Change Password") : _("Set Password")) ?></h2></td></tr>
 
- <tr><td align="right"><?php echo _("New password")?>:</td>
+ <tr><td align="right"><?php echo _("New password") . _(":")?></td>
 <td><input type="password" name="pref[passwd]" size="16" maxlength="16" class="text" value="" /></td>
 <td></td></tr>
- <tr><td align="right"><?php echo _("Type it again")?>:</td>
+ <tr><td align="right"><?php echo _("Type it again") . _(":")?></td>
 <td><input type="password" name="pref[passwd2]" size="16" maxlength="16" class="text" value="" /></td>
 <td></td></tr>
 <?php } ?>
 
 <?php if (ENABLE_USER_NEW) { ?>
- <tr><td colspan="3"><h2><?php echo _("E-mail")?></h2></td></tr>
+ <tr><td colspan="2"><h2><?php echo _("E-mail")?></h2></td></tr>
 
- <tr><td><?php echo _("Your E-Mail:")?></td>
- <td>
+ <tr><td>
+ <p>
+ <?php echo _("Your E-Mail"). _(":")?>
 <?php if ($isForm) { ?>
 <input type="text" name="pref[email]" size="30" maxlength="60"
 	 value="<?php echo $pref->get('email')?>" />
 <?php } else { ?>
 '<?php echo $pref->get('email') ?>'
 <?php } ?>
- &nbsp;&nbsp;<?php echo _("Status:") ?>&nbsp;&nbsp;
+ </p>
+ <p>
+ <?php echo _("Status") . _(":") ?>
 <?php if ($pref->get('emailVerified')) { ?>
 <?php echo _("Email verified.") ?>
 <?php } else { ?>
 <?php echo _("Email not yet verified.") ?>
 <?php } ?>
+ </p>
 </td><td><p class="hint"><?php echo _("Note, that user accounts with bouncing emails will be disabled.")?></p></td></tr>
 
- <tr><td colspan="3">
+ <tr><td colspan="2">
 <?php echo _("Get an email notification at changes of the following pages:")?>
 </td></tr>
 <tr>
 <?php if ($isForm) { ?>
- <td colspan="2"><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td>
+ <td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td>
 <td><p class="hint"><?php echo _("Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td>
 <?php } else { ?>
- <td colspan="3"><?php echo $pref->get('notifyPages')?></td>
+ <td><?php echo $pref->get('notifyPages')?></td>
 <?php } ?>
 </tr>
 
 <tr>
 <td>
- <p><?php echo _("Do not send my own modifications:")?></p>
+ <p class="nowrap">
+ <?php echo $OwnModificationsCB ?>
+ <?php echo _("Do not send my own modifications")?>
+ </p>
 </td>
 <td>
- <p><?php echo $OwnModificationsCB ?></p>
- </td>
- <td>
 <p class="hint"><?php echo _("Check if you do not want to be notified of your own modifications.")?></p>
 </td>
 </tr>
 
 <tr>
 <td>
- <p><?php echo _("Do not send minor modifications:")?></p>
+ <p class="nowrap">
+ <?php echo $MajorModificationsOnlyCB ?>
+ <?php echo _("Do not send minor modifications")?>
+ </p>
 </td>
 <td>
- <p><?php echo $MajorModificationsOnlyCB ?></p>
- </td>
- <td>
 <p class="hint"><?php echo _("Check if you do not want to be notified of minor modifications.")?></p>
 </td>
 </tr>
 
 <?php } ?>
 
- <tr><td colspan="3"><h2><?php echo _("Appearance")?></h2></td></tr>
+ <tr><td colspan="2"><h2><?php echo _("Appearance")?></h2></td></tr>
 
- <tr><td colspan="3"><?php echo _("Here you can override site-specific default values.") ?></td></tr>
+ <tr><td colspan="2"><?php echo _("Here you can override site-specific default values.") ?></td></tr>
 <?php /* Alternatively this could be done with <fieldset> and <legend>. */ ?>
- <tr><td align="right"><?php echo $SelectThemesDesc?></td>
- <td><?php echo $SelectThemes ?></td>
+ <tr><td>
+ <?php echo $SelectThemesDesc?>
+ <?php echo $SelectThemes ?>
+ </td>
 <td><p class="hint"><?php echo _("System default:")?> <?php echo THEME ?></p></td></tr>
- <tr><td align="right"><?php echo $SelectLanguagesDesc?></td>
- <td><?php echo $SelectLanguages ?></td>
+ <tr><td>
+ <?php echo $SelectLanguagesDesc?>
+ <?php echo $SelectLanguages ?>
+ </td>
 	 <td><p class="hint"><?php echo _("System default:")?> <?php echo DEFAULT_LANGUAGE ?></p></td></tr>
- <tr><td align="right"><?php echo fmt("Hide %s:", WikiLink("Help:LinkIcons"))?></td>
- <td><?php echo $NoLinkIconsCB?></td>
+ <tr><td>
+ <?php echo $NoLinkIconsCB?>
+ <?php echo fmt("Hide %s", WikiLink("Help:LinkIcons"))?>
+ </td>
 <td><p class="hint"><?php echo _("Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections.")?></p></td></tr>
- <tr><td align="right"><?php echo fmt("Add %s:", WikiLink("Help:GoogleLink"))?></td>
- <td><?php echo $GoogleLinkCB?></td>
+ <tr><td>
+ <?php echo $GoogleLinkCB?>
+ <?php echo fmt("Add %s", WikiLink("Help:GoogleLink"))?>
+ </td>
 <td><p class="hint"><?php echo fmt("Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s.", WikiLink("MeatBall:GooglePrompt"))?></p></td></tr>
- <tr><td align="right"><?php echo fmt("Enable DoubleClick Edit")?></td>
- <td><?php echo $DoubleClickCB?></td>
+ <tr><td>
+ <?php echo $DoubleClickCB?>
+ <?php echo fmt("Enable DoubleClick Edit")?>
+ </td>
 <td><p class="hint"><?php echo fmt("Enabled makes it hard to double-click words and sentences for cut and paste. See %s.", WikiLink("PhpWiki:DoubleClickToEditPage"))?></p></td></tr>
 
+ <tr><td colspan="2"><h2><?php echo _("Edit Area Size")?></h2></td></tr>
 
- <tr><td colspan="3"><h2><?php echo _("Edit Area Size")?></h2></td></tr>
-
- <tr><td colspan="2">
+ <tr><td>
 <?php echo _("Height")?>:&nbsp;
 <?php if ($isForm) { ?>
 <input type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric"
@@ -249,9 +260,9 @@
 <?php echo _("Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored.")?></p>
 </td></tr>
 
- <tr><td colspan="3"><h2><?php echo _("Time Zone")?></h2></td></tr>
+ <tr><td colspan="2"><h2><?php echo _("Time Zone")?></h2></td></tr>
 
- <tr><td colspan="2"><p>
+ <tr><td><p>
 <?php echo fmt("Add %s hours to the server's local time when reporting times.",
 $timeOffsetInput)?>
 </p></td><td>
@@ -263,12 +274,14 @@
 </p>
 </td></tr>
 
- <tr><td colspan="3"><h2><?php echo _("Date Format")?></h2></td></tr>
+ <tr><td colspan="2"><h2><?php echo _("Date Format")?></h2></td></tr>
 
- <tr><td colspan="2"><p>
- <?php echo _("Show relative dates using 'Today' and 'Yesterday'")?>:
- <?php echo $RelativeDatesCB ?>
- </p></td><td></td></tr>
+ <tr><td colspan="2">
+ <p>
+ <?php echo $RelativeDatesCB ?>
+ <?php echo _("Show relative dates using 'Today' and 'Yesterday'")?>
+ </p>
+ </td></tr>
 </table>
 
 <?php if ($isForm) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8123
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8123&view=rev
Author: vargenau
Date: 2011年09月26日 13:56:22 +0000 (2011年9月26日)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2011年09月26日 13:00:23 UTC (rev 8122)
+++ trunk/themes/default/templates/userprefs.tmpl	2011年09月26日 13:56:22 UTC (rev 8123)
@@ -7,7 +7,7 @@
 }
 
 $plugin = $request->getArg('pagename');
-if (isActionPage($request->getArg('pagename')) 
+if (isActionPage($request->getArg('pagename'))
 and $isForm and $plugin == _("PreferencesInfo")) {
 $isForm = false;
 }
@@ -64,45 +64,45 @@
 $SelectThemes = ''; $SelectLanguages = '';
 $SelectThemesDesc = ''; $SelectLanguagesDesc = '';
 if ( $isForm ) {
- $SelectOptions = HTML(); 
+ $SelectOptions = HTML();
 if (!empty($available_themes) and is_array($available_themes)) {
-	if (!$pref->get('theme') or $pref->get('theme') == THEME)
-	 $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
-	else
-	 $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
-	foreach ($available_themes as $theme) {
-	 if ($theme == $pref->get('theme') and $theme != THEME)
-		$SelectOptions->pushContent(selectedOption($theme));
-	 else
-		$SelectOptions->pushContent(unselectedOption($theme));
-	}
-	$SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
-				 $SelectOptions);
-	$SelectThemesDesc = _("Personal theme:");
+ if (!$pref->get('theme') or $pref->get('theme') == THEME)
+ $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+ else
+ $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+ foreach ($available_themes as $theme) {
+ if ($theme == $pref->get('theme') and $theme != THEME)
+ $SelectOptions->pushContent(selectedOption($theme));
+ else
+ $SelectOptions->pushContent(unselectedOption($theme));
 }
- 
+ $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
+ $SelectOptions);
+ $SelectThemesDesc = _("Personal theme:");
+ }
+
 $SelectOptions = HTML();
 if (!empty($available_languages) and is_array($available_languages)) {
-	if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
-	 $SelectOptions->pushContent(selectedOption("",_("<system language>")));
-	else
-	 $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
-	foreach ($available_languages as $lang) {
-	 if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
-		$SelectOptions->pushContent(selectedOption($lang));
-	 else
-		$SelectOptions->pushContent(unselectedOption($lang));
-	}
-	$SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
-					$SelectOptions);
-	$SelectLanguagesDesc = _("Personal language:");
+ if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
+ $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+ else
+ $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+ foreach ($available_languages as $lang) {
+ if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
+ $SelectOptions->pushContent(selectedOption($lang));
+ else
+ $SelectOptions->pushContent(unselectedOption($lang));
+ }
+ $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
+ $SelectOptions);
+ $SelectLanguagesDesc = _("Personal language:");
 } else {
-	if ($SelectThemes == '') {
-	 $appearance = false;
-	 $SelectThemesDesc = '';
-	 $SelectLanguagesDesc = '';
-	}
+ if ($SelectThemes == '') {
+ $appearance = false;
+ $SelectThemesDesc = '';
+ $SelectLanguagesDesc = '';
 }
+ }
 } else {
 $SelectThemesDesc = _("Personal theme:");
 $SelectLanguagesDesc = _("Personal language:");
@@ -117,22 +117,22 @@
 
 <?php if ($isForm) { ?>
 <form action="<?php echo $request->getPostURL()?>" method="post">
-<?php } else { 
+<?php } else {
 $fill = "&nbsp;";
 // See also plugin _AuthInfo
 $authmethod = ENABLE_USER_NEW ? @$user->_authmethod : @$user->auth_how;
 ?>
 <?php echo HTML::pre(sprintf("%12s: [% 10s] %s\n",_("UserId"),$pref->get('userid'), " from " . $authmethod),
-	 sprintf("%12s: [% 10s] %16s: [% 10s] | %8s: [%2s]\n","getId",$user->getId(),"getAuthenticatedId",$user->getAuthenticatedId(),"isSignedIn", $user->isSignedIn()),
-	 //sprintf("%12s: [% 10s]\n",_("Password"),empty($pref->get('passwd')) ? _("<empty>") : _("<not empty>")),
-	 sprintf("%12s: [% 10s] %15s: [% 8s]\n",
-		 _("Auth Level"),$user->_level,_("Auth Method"),$authmethod),
-	 sprintf("%12s: [% 10s]\n",_("HomePage"),$user->hasHomePage() ? (ENABLE_USER_NEW ? $user->_HomePagehandle->_pagename : $user->_homepage->_pagename ) : ''),
-	 sprintf("%12s: [% 10s]\n",_("E-Mail"),$pref->get('email')),
-	 //sprintf("%12s: [% 10s]\n",_("Notify"),$pref->get('notifyPages')),
-	 sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Theme"), $pref->get('theme'), _("Current Theme"),$WikiTheme->_name),
-	 sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Language"),$pref->get('lang'),_("Current Language"),$GLOBALS['LANG'])
-	 ) ?>
+ sprintf("%12s: [% 10s] %16s: [% 10s] | %8s: [%2s]\n","getId",$user->getId(),"getAuthenticatedId",$user->getAuthenticatedId(),"isSignedIn", $user->isSignedIn()),
+ //sprintf("%12s: [% 10s]\n",_("Password"),empty($pref->get('passwd')) ? _("<empty>") : _("<not empty>")),
+ sprintf("%12s: [% 10s] %15s: [% 8s]\n",
+ _("Auth Level"),$user->_level,_("Auth Method"),$authmethod),
+ sprintf("%12s: [% 10s]\n",_("HomePage"),$user->hasHomePage() ? (ENABLE_USER_NEW ? $user->_HomePagehandle->_pagename : $user->_homepage->_pagename ) : ''),
+ sprintf("%12s: [% 10s]\n",_("E-Mail"),$pref->get('email')),
+ //sprintf("%12s: [% 10s]\n",_("Notify"),$pref->get('notifyPages')),
+ sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Theme"), $pref->get('theme'), _("Current Theme"),$WikiTheme->_name),
+ sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Language"),$pref->get('lang'),_("Current Language"),$GLOBALS['LANG'])
+ ) ?>
 <?php } ?>
 
 <table border="0">
@@ -155,7 +155,7 @@
 <?php echo _("Your E-Mail"). _(":")?>
 <?php if ($isForm) { ?>
 <input type="text" name="pref[email]" size="30" maxlength="60"
-	 value="<?php echo $pref->get('email')?>" />
+ value="<?php echo $pref->get('email')?>" />
 <?php } else { ?>
 '<?php echo $pref->get('email') ?>'
 <?php } ?>
@@ -221,7 +221,7 @@
 <?php echo $SelectLanguagesDesc?>
 <?php echo $SelectLanguages ?>
 </td>
-	 <td><p class="hint"><?php echo _("System default:")?> <?php echo DEFAULT_LANGUAGE ?></p></td></tr>
+ <td><p class="hint"><?php echo _("System default:")?> <?php echo DEFAULT_LANGUAGE ?></p></td></tr>
 <tr><td>
 <?php echo $NoLinkIconsCB?>
 <?php echo fmt("Hide %s", WikiLink("Help:LinkIcons"))?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8133
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8133&view=rev
Author: vargenau
Date: 2011年09月27日 08:04:04 +0000 (2011年9月27日)
Log Message:
-----------
Translate ":"
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2011年09月27日 07:47:49 UTC (rev 8132)
+++ trunk/themes/default/templates/userprefs.tmpl	2011年09月27日 08:04:04 UTC (rev 8133)
@@ -241,14 +241,14 @@
 <tr><td colspan="2"><h2><?php echo _("Edit Area Size")?></h2></td></tr>
 
 <tr><td>
- <?php echo _("Height")?>:&nbsp;
+ <?php echo _("Height") . _(":")?>
 <?php if ($isForm) { ?>
 <input type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric"
 value="<?php echo $pref->get('editHeight')?>" />
 <?php } else { ?>
 <?php echo $pref->get('editHeight')?>
 <?php } ?>
- &nbsp;&nbsp;<?php echo _("Width")?>:&nbsp;
+ <?php echo _("Width") . _(":")?>
 <?php if ($isForm) { ?>
 <input type="text" name="pref[editWidth]" size="4" maxlength="4" class="numeric"
 value="<?php echo $pref->get('editWidth')?>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8154
 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8154&view=rev
Author: vargenau
Date: 2011年10月03日 12:28:51 +0000 (2011年10月03日)
Log Message:
-----------
E-mail
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2011年10月03日 12:27:54 UTC (rev 8153)
+++ trunk/themes/default/templates/userprefs.tmpl	2011年10月03日 12:28:51 UTC (rev 8154)
@@ -128,7 +128,7 @@
 sprintf("%12s: [% 10s] %15s: [% 8s]\n",
 _("Auth Level"),$user->_level,_("Auth Method"),$authmethod),
 sprintf("%12s: [% 10s]\n",_("HomePage"),$user->hasHomePage() ? (ENABLE_USER_NEW ? $user->_HomePagehandle->_pagename : $user->_homepage->_pagename ) : ''),
- sprintf("%12s: [% 10s]\n",_("E-Mail"),$pref->get('email')),
+ sprintf("%12s: [% 10s]\n",_("E-mail"),$pref->get('email')),
 //sprintf("%12s: [% 10s]\n",_("Notify"),$pref->get('notifyPages')),
 sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Theme"), $pref->get('theme'), _("Current Theme"),$WikiTheme->_name),
 sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Language"),$pref->get('lang'),_("Current Language"),$GLOBALS['LANG'])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8927
 http://sourceforge.net/p/phpwiki/code/8927
Author: vargenau
Date: 2014年06月23日 09:42:14 +0000 (2014年6月23日)
Log Message:
-----------
Reformat code
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2014年06月23日 08:48:51 UTC (rev 8926)
+++ trunk/themes/default/templates/userprefs.tmpl	2014年06月23日 09:42:14 UTC (rev 8927)
@@ -62,46 +62,50 @@
 
 $SelectThemes = ''; $SelectLanguages = '';
 $SelectThemesDesc = ''; $SelectLanguagesDesc = '';
-if ( $isForm ) {
+if ($isForm) {
 $SelectOptions = HTML();
 if (!empty($available_themes) and is_array($available_themes)) {
- if (!$pref->get('theme') or $pref->get('theme') == THEME)
- $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
- else
- $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
- foreach ($available_themes as $theme) {
- if ($theme == $pref->get('theme') and $theme != THEME)
- $SelectOptions->pushContent(selectedOption($theme));
- else
- $SelectOptions->pushContent(unselectedOption($theme));
+ if (!$pref->get('theme') or $pref->get('theme') == THEME) {
+ $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+ } else {
+ $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+ }
+ foreach ($available_themes as $theme) {
+ if ($theme == $pref->get('theme') and $theme != THEME) {
+ $SelectOptions->pushContent(selectedOption($theme));
+ } else {
+ $SelectOptions->pushContent(unselectedOption($theme));
+ }
+ }
+ $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
+ $SelectOptions);
+ $SelectThemesDesc = _("Personal theme:");
 }
- $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
- $SelectOptions);
- $SelectThemesDesc = _("Personal theme:");
- }
 
 $SelectOptions = HTML();
 if (!empty($available_languages) and is_array($available_languages)) {
- if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
- $SelectOptions->pushContent(selectedOption("",_("<system language>")));
- else
- $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
- foreach ($available_languages as $lang) {
- if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
- $SelectOptions->pushContent(selectedOption($lang));
- else
- $SelectOptions->pushContent(unselectedOption($lang));
- }
- $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
- $SelectOptions);
- $SelectLanguagesDesc = _("Personal language:");
+ if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE) {
+ $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+ } else {
+ $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+ }
+ foreach ($available_languages as $lang) {
+ if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE) {
+ $SelectOptions->pushContent(selectedOption($lang));
+ } else {
+ $SelectOptions->pushContent(unselectedOption($lang));
+ }
+ }
+ $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
+ $SelectOptions);
+ $SelectLanguagesDesc = _("Personal language:");
 } else {
- if ($SelectThemes == '') {
- $appearance = false;
- $SelectThemesDesc = '';
- $SelectLanguagesDesc = '';
+ if ($SelectThemes == '') {
+ $appearance = false;
+ $SelectThemesDesc = '';
+ $SelectLanguagesDesc = '';
+ }
 }
- }
 } else {
 $SelectThemesDesc = _("Personal theme:");
 $SelectLanguagesDesc = _("Personal language:");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8928
 http://sourceforge.net/p/phpwiki/code/8928
Author: vargenau
Date: 2014年06月23日 09:51:37 +0000 (2014年6月23日)
Log Message:
-----------
fusionforge cannot be selected as standalone theme
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2014年06月23日 09:42:14 UTC (rev 8927)
+++ trunk/themes/default/templates/userprefs.tmpl	2014年06月23日 09:51:37 UTC (rev 8928)
@@ -71,10 +71,13 @@
 $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
 }
 foreach ($available_themes as $theme) {
- if ($theme == $pref->get('theme') and $theme != THEME) {
- $SelectOptions->pushContent(selectedOption($theme));
- } else {
- $SelectOptions->pushContent(unselectedOption($theme));
+ // 'fusionforge' cannot be selected as standalone theme
+ if ($theme != 'fusionforge') {
+ if ($theme == $pref->get('theme') and $theme != THEME) {
+ $SelectOptions->pushContent(selectedOption($theme));
+ } else {
+ $SelectOptions->pushContent(unselectedOption($theme));
+ }
 }
 }
 $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8931
 http://sourceforge.net/p/phpwiki/code/8931
Author: vargenau
Date: 2014年06月24日 14:35:20 +0000 (2014年6月24日)
Log Message:
-----------
Sort menus
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2014年06月23日 13:16:31 UTC (rev 8930)
+++ trunk/themes/default/templates/userprefs.tmpl	2014年06月24日 14:35:20 UTC (rev 8931)
@@ -65,6 +65,7 @@
 if ($isForm) {
 $SelectOptions = HTML();
 if (!empty($available_themes) and is_array($available_themes)) {
+ sort(&$available_themes);
 if (!$pref->get('theme') or $pref->get('theme') == THEME) {
 $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
 } else {
@@ -87,6 +88,7 @@
 
 $SelectOptions = HTML();
 if (!empty($available_languages) and is_array($available_languages)) {
+ sort(&$available_languages);
 if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE) {
 $SelectOptions->pushContent(selectedOption("",_("<system language>")));
 } else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9284
 http://sourceforge.net/p/phpwiki/code/9284
Author: vargenau
Date: 2014年11月05日 16:37:16 +0000 (2014年11月05日)
Log Message:
-----------
Add labels
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2014年11月05日 15:37:36 UTC (rev 9283)
+++ trunk/themes/default/templates/userprefs.tmpl	2014年11月05日 16:37:16 UTC (rev 9284)
@@ -161,9 +161,13 @@
 
 <tr><td>
 <p>
+ <?php if ($isForm) { ?>
+ <label for="email">
+ <?php } ?>
 <?php echo _("Your e-mail"). _(": ")?>
 <?php if ($isForm) { ?>
- <input type="text" name="pref[email]" size="30" maxlength="60"
+ </label>
+ <input id="email" type="text" name="pref[email]" size="30" maxlength="60"
 value="<?php echo $pref->get('email')?>" />
 <?php } else { ?>
 '<?php echo $pref->get('email') ?>'
@@ -229,13 +233,25 @@
 <tr><td colspan="2"><?php echo _("Here you can override site-specific default values.") ?></td></tr>
 <tr>
 <td>
- <?php echo $SelectThemesDesc?>
+ <?php if ($isForm) { ?>
+ <label for="theme">
+ <?php } ?>
+ <?php echo $SelectThemesDesc ?>
+ <?php if ($isForm) { ?>
+ </label>
+ <?php } ?>
 <?php echo $SelectThemes ?>
 </td>
 <td><p class="hint"><?php echo _("System default:") ?> <?php echo THEME ?></p></td></tr>
 <tr>
 <td>
- <?php echo $SelectLanguagesDesc?>
+ <?php if ($isForm) { ?>
+ <label for="lang">
+ <?php } ?>
+ <?php echo $SelectLanguagesDesc ?>
+ <?php if ($isForm) { ?>
+ </label>
+ <?php } ?>
 <?php echo $SelectLanguages ?>
 </td>
 <td><p class="hint"><?php echo _("System default:") ?> <?php echo DEFAULT_LANGUAGE ?></p></td></tr>
@@ -263,7 +279,9 @@
 <tr>
 <td>
 <?php echo $DoubleClickCB?>
+ <label for="doubleClickEdit">
 <?php echo fmt("Enable DoubleClick Edit") ?>
+ </label>
 </td>
 <td><p class="hint"><?php echo fmt("Enabled makes it hard to double-click words and sentences for cut and paste. See %s.", WikiLink("PhpWiki:DoubleClickToEditPage"))?></p>
 </td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9342
 http://sourceforge.net/p/phpwiki/code/9342
Author: vargenau
Date: 2014年11月19日 14:36:37 +0000 (2014年11月19日)
Log Message:
-----------
Remove nonexistent link
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2014年11月19日 14:34:11 UTC (rev 9341)
+++ trunk/themes/default/templates/userprefs.tmpl	2014年11月19日 14:36:37 UTC (rev 9342)
@@ -283,7 +283,7 @@
 <?php echo fmt("Enable DoubleClick Edit") ?>
 </label>
 </td>
- <td><p class="hint"><?php echo fmt("Enabled makes it hard to double-click words and sentences for cut and paste. See %s.", WikiLink("PhpWiki:DoubleClickToEditPage"))?></p>
+ <td><p class="hint"><?php echo _("Enabled makes it hard to double-click words and sentences for cut and paste.") ?></p>
 </td>
 </tr>
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10131
 http://sourceforge.net/p/phpwiki/code/10131
Author: vargenau
Date: 2019年07月25日 09:45:56 +0000 (2019年7月25日)
Log Message:
-----------
Add <p> in User preferences
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2019年07月22日 09:03:52 UTC (rev 10130)
+++ trunk/themes/default/templates/userprefs.tmpl	2019年07月25日 09:45:56 UTC (rev 10131)
@@ -122,9 +122,9 @@
 
 ?>
 <?php echo $errmsg ?>
-
+<p>
 <?php echo fmt("User preferences for user %s", WikiLink($user->UserName())) ?>
-
+</p>
 <?php if ($isForm) { ?>
 <form action="<?php echo $request->getPostURL() ?>" method="post">
 <?php } else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10890
 http://sourceforge.net/p/phpwiki/code/10890
Author: vargenau
Date: 2022年01月12日 16:14:08 +0000 (2022年1月12日)
Log Message:
-----------
UserPreferences are always a form
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2022年01月12日 15:37:39 UTC (rev 10889)
+++ trunk/themes/default/templates/userprefs.tmpl	2022年01月12日 16:14:08 UTC (rev 10890)
@@ -1,30 +1,27 @@
 <?php
 // Todo: Move the logic and code to the plugin
 // This is very experimental and the read-only part an ugly hack so far.
-foreach (explode(',','errmsg,isForm') as $var) {
+foreach (explode(',','errmsg') as $var) {
 if (empty($$var)) $$var = false;
 }
 
 $plugin = $request->getArg('pagename');
 $time = time();
-$user =& $request->getUser();
-$pref =& $request->_prefs;
+$user = $request->getUser();
+$pref = $request->_prefs;
 $num = $request->getArg('num');
 
 if (!$pref) return;
+
 $offset = $pref->get('timeOffset');
 $serverTime = $time - $offset * 3600;
-if ($isForm)
- $timeOffsetInput = HTML::input(array('type' => "text",
- 'id' => 'timeOffsetInput',
- 'size' => 6,
- 'maxlength' => 6,
- 'name' => "pref[timeOffset]",
- 'class' => "numeric",
- 'value' => $offset));
-else
- $timeOffsetInput = $pref->get('timeOffset');
-
+$timeOffsetInput = HTML::input(array('type' => "text",
+ 'id' => 'timeOffsetInput',
+ 'size' => 6,
+ 'maxlength' => 6,
+ 'name' => "pref[timeOffset]",
+ 'class' => "numeric",
+ 'value' => $offset));
 $OwnModificationsCB = HTML::input(array('type' => 'checkbox',
 'id' => 'ownModifications',
 'name' => 'pref[ownModifications]',
@@ -66,57 +63,47 @@
 
 $SelectThemes = ''; $SelectLanguages = '';
 $SelectThemesDesc = ''; $SelectLanguagesDesc = '';
-if ($isForm) {
- $SelectOptions = HTML();
- if (!empty($available_themes) and is_array($available_themes)) {
- if (!$pref->get('theme') or $pref->get('theme') == THEME) {
- $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+$SelectOptions = HTML();
+if (!empty($available_themes) and is_array($available_themes)) {
+ if (!$pref->get('theme') or $pref->get('theme') == THEME) {
+ $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+ } else {
+ $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+ }
+ foreach ($available_themes as $theme) {
+ if ($theme == $pref->get('theme') and $theme != THEME) {
+ $SelectOptions->pushContent(selectedOption($theme));
 } else {
- $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+ $SelectOptions->pushContent(unselectedOption($theme));
 }
- foreach ($available_themes as $theme) {
- if ($theme == $pref->get('theme') and $theme != THEME) {
- $SelectOptions->pushContent(selectedOption($theme));
- } else {
- $SelectOptions->pushContent(unselectedOption($theme));
- }
- }
- $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
- $SelectOptions);
- $SelectThemesDesc = _("Personal theme:");
 }
+ $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'), $SelectOptions);
+ $SelectThemesDesc = _("Personal theme:");
+}
 
- $SelectOptions = HTML();
- if (!empty($available_languages) and is_array($available_languages)) {
- if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE) {
- $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+$SelectOptions = HTML();
+if (!empty($available_languages) and is_array($available_languages)) {
+ if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE) {
+ $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+ } else {
+ $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+ }
+ foreach ($available_languages as $lang) {
+ if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE) {
+ $SelectOptions->pushContent(selectedOption($lang));
 } else {
- $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+ $SelectOptions->pushContent(unselectedOption($lang));
 }
- foreach ($available_languages as $lang) {
- if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE) {
- $SelectOptions->pushContent(selectedOption($lang));
- } else {
- $SelectOptions->pushContent(unselectedOption($lang));
- }
- }
- $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
- $SelectOptions);
- $SelectLanguagesDesc = _("Personal language:");
- } else {
- if ($SelectThemes == '') {
- $appearance = false;
- $SelectThemesDesc = '';
- $SelectLanguagesDesc = '';
- }
 }
+ $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'), $SelectOptions);
+ $SelectLanguagesDesc = _("Personal language:");
 } else {
- $SelectThemesDesc = _("Personal theme:");
- $SelectLanguagesDesc = _("Personal language:");
- $SelectThemes = $pref->get('theme');
- $SelectLanguages = $pref->get('lang');
+ if ($SelectThemes == '') {
+ $appearance = false;
+ $SelectThemesDesc = '';
+ $SelectLanguagesDesc = '';
+ }
 }
-
 ?>
 <?php echo $errmsg ?>
 <?php if (empty($errmsg)) { ?>
@@ -123,7 +110,7 @@
 <?php if ($num=='reset') { ?>
 <div class="feedback"><p><?php echo _('Your UserPreferences have been successfully reset to default.') ?></p></div>
 <?php } elseif ($num==1) { ?>
-<div class="feedback"><p><?php echo _('One UserPreferences field successfully updated.') ?></p></div>
+<div class="feedback"><p><?php echo _('User Preference for theme successfully updated.') ?></p></div>
 <?php } elseif ($num) { ?>
 <div class="feedback"><p><?php echo sprintf(_("%d UserPreferences fields successfully updated."), $num) ?></p></div>
 <?php } ?>
@@ -131,36 +118,18 @@
 <p>
 <?php echo fmt("User preferences for user %s", WikiLink($user->UserName())) ?>
 </p>
-<?php if ($isForm) { ?>
 <form action="<?php echo $request->getPostURL() ?>" method="post">
-<?php } else {
- $fill = "&nbsp;";
- // See also plugin DebugAuthInfo
- $authmethod = @$user->_authmethod;
-?>
-<?php echo HTML::pre(sprintf("%12s: [% 10s] %s\n",_("UserId"),$pref->get('userid'), " from " . $authmethod),
- sprintf("%12s: [% 10s] %16s: [% 10s] | %8s: [%2s]\n","getId",$user->getId(),"getAuthenticatedId",$user->getAuthenticatedId(),"isSignedIn", $user->isSignedIn()),
- //sprintf("%12s: [% 10s]\n",_("Password"),empty($pref->get('passwd')) ? _("<empty>") : _("<not empty>")),
- sprintf("%12s: [% 10s] %15s: [% 8s]\n",
- _("Auth Level"),$user->_level,_("Auth Method"),$authmethod),
- sprintf("%12s: [% 10s]\n",_("HomePage"),$user->hasHomePage() ? $user->_HomePagehandle->_pagename : ''),
- sprintf("%12s: [% 10s]\n",_("E-mail"),$pref->get('email')),
- //sprintf("%12s: [% 10s]\n",_("Notify"),$pref->get('notifyPages')),
- sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Theme"), $pref->get('theme'), _("Current theme"),$WikiTheme->_name),
- sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Language"),$pref->get('lang'),_("Current language"),$GLOBALS['LANG'])
- ) ?>
-<?php } ?>
 
 <table>
-<?php if ($isForm and $user->mayChangePass()) { ?>
+<?php if ($user->mayChangePass()) { ?>
 <tr><td colspan="2"><h2><?php echo ($request->getPref('passwd') ? _("Change Password") : _("Set Password")) ?></h2></td></tr>
 
- <tr><td class="align-right"><?php echo _("New password") . _(":")?></td>
- <td><input type="password" name="pref[passwd]" size="16" maxlength="16" class="text" value="" /></td>
- <td></td></tr>
- <tr><td class="align-right"><?php echo _("Type it again") . _(":")?></td>
- <td><input type="password" name="pref[passwd2]" size="16" maxlength="16" class="text" value="" /></td>
- <td></td></tr>
+ <tr><td class="align-right"><?php echo _("New password") . _(":")?></td>
+ <td><input type="password" name="pref[passwd]" size="16" maxlength="16" class="text" value="" /></td>
+ <td></td></tr>
+ <tr><td class="align-right"><?php echo _("Type it again") . _(":")?></td>
+ <td><input type="password" name="pref[passwd2]" size="16" maxlength="16" class="text" value="" /></td>
+ <td></td></tr>
 <?php } ?>
 
 <tr><td colspan="2"><h2><?php echo _("E-mail")?></h2></td></tr>
@@ -167,17 +136,11 @@
 
 <tr><td>
 <p>
- <?php if ($isForm) { ?>
 <label for="email">
- <?php } ?>
 <?php echo _("Your e-mail"). _(": ")?>
- <?php if ($isForm) { ?>
 </label>
 <input id="email" type="text" name="pref[email]" size="30" maxlength="60"
 value="<?php echo $pref->get('email')?>" />
- <?php } else { ?>
- '<?php echo $pref->get('email') ?>'
- <?php } ?>
 </p>
 <p>
 <?php echo _("Status") . _(": ") ?>
@@ -194,7 +157,6 @@
 </td></tr>
 
 <tr>
- <?php if ($isForm) { ?>
 <td>
 <label for="notifyPages">
 <textarea id="notifyPages" name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages') ?></textarea>
@@ -201,9 +163,6 @@
 </label>
 </td>
 <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.") ?></p></td>
- <?php } else { ?>
- <td colspan="2"><?php echo $pref->get('notifyPages') ?></td>
- <?php } ?>
 </tr>
 
 <tr>
@@ -239,25 +198,17 @@
 <tr><td colspan="2"><?php echo _("Here you can override site-specific default values.") ?></td></tr>
 <tr>
 <td>
- <?php if ($isForm) { ?>
 <label for="theme">
- <?php } ?>
 <?php echo $SelectThemesDesc ?>
- <?php if ($isForm) { ?>
 </label>
- <?php } ?>
 <?php echo $SelectThemes ?>
 </td>
 <td><p class="hint"><?php echo _("System default:") ?> <?php echo THEME ?></p></td></tr>
 <tr>
 <td>
- <?php if ($isForm) { ?>
 <label for="lang">
- <?php } ?>
 <?php echo $SelectLanguagesDesc ?>
- <?php if ($isForm) { ?>
 </label>
- <?php } ?>
 <?php echo $SelectLanguages ?>
 </td>
 <td><p class="hint"><?php echo _("System default:") ?> <?php echo DEFAULT_LANGUAGE ?></p></td></tr>
@@ -297,28 +248,16 @@
 <tr><td colspan="2"><h2><?php echo _("Edit Area Size") ?></h2></td></tr>
 
 <tr><td>
- <?php if ($isForm) { ?>
 <label for="height">
- <?php } ?>
 <?php echo _("Height") . _(":") ?>
- <?php if ($isForm) { ?>
 </label>
 <input id="height" type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric"
 value="<?php echo $pref->get('editHeight') ?>" />
- <?php } else { ?>
- <?php echo $pref->get('editHeight') ?>
- <?php } ?>
- <?php if ($isForm) { ?>
 <label for="width">
- <?php } ?>
 <?php echo _("Width") . _(":") ?>
- <?php if ($isForm) { ?>
 </label>
 <input id="width" type="text" name="pref[editWidth]" size="4" maxlength="4" class="numeric"
 value="<?php echo $pref->get('editWidth') ?>" />
- <?php } else { ?>
- <?php echo $pref->get('editWidth') ?>
- <?php } ?>
 </td>
 <td><p class="hint">
 <?php echo _("Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored.") ?></p>
@@ -356,7 +295,6 @@
 </td></tr>
 </table>
 
-<?php if ($isForm) { ?>
 <hr />
 <p>
 <?php echo Button("submit:", _("Update Preferences"), 'wikiadmin') ?>
@@ -365,4 +303,3 @@
 <?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?>
 </p>
 </form>
-<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10892
 http://sourceforge.net/p/phpwiki/code/10892
Author: vargenau
Date: 2022年01月12日 17:09:08 +0000 (2022年1月12日)
Log Message:
-----------
themes/default/templates/userprefs.tmpl: only one variable left
Modified Paths:
--------------
 trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2022年01月12日 17:08:23 UTC (rev 10891)
+++ trunk/themes/default/templates/userprefs.tmpl	2022年01月12日 17:09:08 UTC (rev 10892)
@@ -1,9 +1,5 @@
 <?php
-// Todo: Move the logic and code to the plugin
-// This is very experimental and the read-only part an ugly hack so far.
-foreach (explode(',','errmsg') as $var) {
- if (empty($$var)) $$var = false;
-}
+if (empty($errmsg)) $errmsg = '';
 
 $plugin = $request->getArg('pagename');
 $time = time();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.