|
From: <var...@us...> - 2021-12-16 16:45:19
|
Revision: 10798
http://sourceforge.net/p/phpwiki/code/10798
Author: vargenau
Date: 2021-12-16 16:45:16 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
templates/signin.tmpl: formatting
Modified Paths:
--------------
trunk/themes/Crao/templates/signin.tmpl
trunk/themes/MonoBook/templates/signin.tmpl
trunk/themes/Sidebar/templates/signin.tmpl
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/default/templates/signin.tmpl
trunk/themes/shamino_com/templates/signin.tmpl
trunk/themes/smaller/templates/signin.tmpl
Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/Crao/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798)
@@ -7,9 +7,9 @@
<?php if (empty($NOFORM)) { ?>
<form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
<?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
-<?php } ?>
-<?php if ($user->isSignedIn()) {
- $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
+<?php }
+if ($user->isSignedIn()) {
+ $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
?>
<span>
<?php echo fmt("You are signed in as %s", WikiLink($user->getId(), 'auto')) ?>
@@ -33,7 +33,7 @@
'size' => 12,
'maxlength' => 256,
'onchange' => "SignIn(this.form);"));
- $SignInInput->addTooltip(_("Enter your UserId to sign in"))
+ $SignInInput->addTooltip(_("Enter your UserId to sign in"));
?>
<script type="text/javascript"> <!--
function SignIn(form) {
Modified: trunk/themes/MonoBook/templates/signin.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/MonoBook/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798)
@@ -1,20 +1,20 @@
-<?php // On MonoBook we do away with only GET urls, no form.
+<?php
$sp = HTML::raw(" "); $id = $user->UserName();
?>
<div class="portlet" id="p-personal"><div class="pBody">
- <ul>
- <?php if ($user->isAuthenticated()) { ?>
+<ul>
+<?php if ($user->isAuthenticated()) { ?>
<li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
<li><?php echo WikiLink($id . "/Discussion", 'auto' , _("My Discussion")) ?></li>
<li><?php echo WikiLink(__("UserPreferences"), "", _("My Preferences")) ?></li>
<li><?php echo WikiLink(__("MyRecentChanges"), "", _("My Changes")) ?></li>
<li><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'),$sp,_("Logout"),$sp) ?></li>
- <?php } else { ?>
- <?php // Login or Register ?>
- <?php if ($id) { ?>
+ <?php } else {
+if ($id) { ?>
<li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
<?php } ?>
<li id="pt-login"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[login]').'=1'),$sp,_("Sign In"),$sp) ?></li>
- <?php } ?>
- </ul>
-</div></div>
+<?php } ?>
+</ul>
+</div>
+</div>
Modified: trunk/themes/Sidebar/templates/signin.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/Sidebar/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798)
@@ -1,22 +1,22 @@
<header role="banner">
-<div class="portlet" id="p-personal"><div class="pBody"><ul>
+<div class="portlet" id="p-personal"><div class="pBody">
+<ul>
<?php if ($user->isAuthenticated()) {
- $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); ?>
- <li id="pt-mypages"><?php echo WikiLink(__("RecentChangesMyPages"), 'auto', HTML($sp,"MyPages",$sp)) ?></li>
- <li id="pt-mychanges"><?php echo WikiLink(__("MyRecentChanges"), 'auto', HTML($sp,"MyChanges",$sp)) ?></li>
- <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
- <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li>
+ $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); ?>
+ <li id="pt-mypages"><?php echo WikiLink(__("RecentChangesMyPages"), 'auto', HTML($sp,"MyPages",$sp)) ?></li>
+ <li id="pt-mychanges"><?php echo WikiLink(__("MyRecentChanges"), 'auto', HTML($sp,"MyChanges",$sp)) ?></li>
+ <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
+ <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li>
<?php } elseif (ALLOW_ANON_USER) {
$sp = HTML::raw(" "); $id = $user->getAuthenticatedId();
- if ($id) { ?>
+if ($id) { ?>
<li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li>
<?php } ?>
- <?php // Login ?>
<li id="pt-login"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[login]').'=1'),$sp,_("Sign In"),$sp) ?></li>
<?php } else { ?>
<li id="pt-login"><a id="login"><?php echo _("Login required...") ?></a></li>
<?php } ?>
- </ul>
- </div>
+</ul>
</div>
+</div>
</header>
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/Wordpress/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798)
@@ -8,8 +8,7 @@
<li>
<form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
<?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
-<?php } ?>
-<?php
+<?php }
if ($user->isAuthenticated()) {
$SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
?>
@@ -31,10 +30,10 @@
</noscript>
<?php } else {
$SignInInput = HTML::input(array('type' => 'text',
- 'name' => "auth[userid]",
- 'size' => 12,
- 'maxlength' => 256,
- 'onchange' => "SignIn(this.form,false);"));
+ 'name' => "auth[userid]",
+ 'size' => 12,
+ 'maxlength' => 256,
+ 'onchange' => "SignIn(this.form,false);"));
$SignInInput->addTooltip(_("Enter your UserId to sign in"));
$userid = $user->getId();
if ($user->isSignedIn()) {
Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/default/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798)
@@ -7,12 +7,12 @@
<?php if (empty($NOFORM)) { ?>
<form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
<?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
-<?php } ?>
-<?php
+<?php }
if ($user->isAuthenticated()) {
$Sep = $WikiTheme->getButtonSeparator();
$SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
- $SignOutJS = JavaScript(' document.write(\'<input type="hidden" name="auth[logout]" value="0" />\');
+ $SignOutJS = JavaScript('
+ document.write(\'<input type="hidden" name="auth[logout]" value="0" />\');
function SignOut() {
var form = document.forms["'.$FORMNAME.'"];
form.elements["auth[logout]"].value = 1;
@@ -21,14 +21,17 @@
document.write(\''.AsXML($SignOutB).'\');');
?>
<?php echo fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?>
- <?php echo $SEP?><?php echo $SignOutJS?>
- <noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript>
+ <?php echo $SEP?>
+ <?php echo $SignOutJS?>
+ <noscript>
+ <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
+ </noscript>
<?php } else {
$SignInInput = HTML::input(array('type' => 'text',
- 'name' => "auth[userid]",
- 'size' => 12,
- 'maxlength' => 256,
- 'onchange' => "SignIn(this.form,false);"));
+ 'name' => "auth[userid]",
+ 'size' => 12,
+ 'maxlength' => 256,
+ 'onchange' => "SignIn(this.form,false);"));
$SignInInput->addTooltip(_("Enter your UserId to sign in"));
$userid = $user->getId();
if ($user->isSignedIn()) {
Modified: trunk/themes/shamino_com/templates/signin.tmpl
===================================================================
--- trunk/themes/shamino_com/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/shamino_com/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798)
@@ -1,5 +1,4 @@
<?php
-// signin only implicitly by clicking "Edit"
if (empty($FORMNAME))
$FORMNAME = 'signin';
else
@@ -20,10 +19,15 @@
}
document.write(\''.AsXML($SignOutB).'\');');
?>
- <span class="signin"><?php echo fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?>
- <?php echo $SEP?><?php echo $SignOutJS?></span>
+ <span class="signin">
+ <?php echo fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?>
+ <?php echo $SEP?>
+ <?php echo $SignOutJS?>
+ </span>
<noscript>
- <span class="signin"><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></span>
+ <span class="signin">
+ <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
+ </span>
</noscript>
<?php } ?>
<?php if (empty($NOFORM)) { ?>
Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797)
+++ trunk/themes/smaller/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798)
@@ -7,12 +7,12 @@
<?php if (empty($NOFORM)) { ?>
<form style="display:inline" method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>">
<?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?>
-<?php } ?>
-<?php
+<?php }
if ($user->isAuthenticated()) {
$Sep = $WikiTheme->getButtonSeparator();
$SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction');
- $SignOutJS = JavaScript(' document.write(\'<input type="hidden" name="auth[logout]" value="0" />\');
+ $SignOutJS = JavaScript('
+ document.write(\'<input type="hidden" name="auth[logout]" value="0" />\');
function SignOut() {
var form = document.forms["'.$FORMNAME.'"];
form.elements["auth[logout]"].value = 1;
@@ -21,14 +21,16 @@
document.write(\''.AsXML($SignOutB).'\');');
?>
<?php echo $SignOutJS?>
- <noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript>
+ <noscript>
+ <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?>
+ </noscript>
<?php } else {
$SignInInput = HTML::input(array('type' => 'text',
- 'name' => "auth[userid]",
- 'size' => 12,
- 'maxlength' => 256,
- 'onchange' => "SignIn(this.form,false);"));
- if ($user->isSignedIn()) { // cookie
+ 'name' => "auth[userid]",
+ 'size' => 12,
+ 'maxlength' => 256,
+ 'onchange' => "SignIn(this.form,false);"));
+ if ($user->isSignedIn()) {
$SignInInput->setAttr('value', $user->getId());
}
$SignInInput->addTooltip(_("Enter your UserId to sign in"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|