From db2a6b98333b98cea281f4cf6d42881353d71f88 Mon Sep 17 00:00:00 2001 From: rurban Date: Mon, 28 Jun 2004 16:10:28 +0000 Subject: [PATCH] minor template fixes git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3800 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- themes/Wordpress/templates/actionbar.tmpl | 4 ++-- themes/default/templates/head.tmpl | 5 +++-- themes/default/templates/online.tmpl | 4 ++-- themes/default/templates/userprefs.tmpl | 15 +++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/themes/Wordpress/templates/actionbar.tmpl b/themes/Wordpress/templates/actionbar.tmpl index 212f94946..6af136d4e 100644 --- a/themes/Wordpress/templates/actionbar.tmpl +++ b/themes/Wordpress/templates/actionbar.tmpl @@ -1,5 +1,5 @@ - +
isCurrent() ? _("Edit this page") : _("Edit old revision")); else - $EditB = Button("viewsource", _("View source")); + $EditB = Button("viewsource", _("View Source")); // $EditB = fmt("%s of this page", $EditB); ?> diff --git a/themes/default/templates/head.tmpl b/themes/default/templates/head.tmpl index a10c1e1c2..891d77b6f 100644 --- a/themes/default/templates/head.tmpl +++ b/themes/default/templates/head.tmpl @@ -1,5 +1,5 @@ get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?> @@ -65,7 +65,8 @@ _("FindPage"))?>" /> 'rss'))?>" /> - isSignedIn()) { diff --git a/themes/default/templates/online.tmpl b/themes/default/templates/online.tmpl index 1ab681463..c6400ce28 100644 --- a/themes/default/templates/online.tmpl +++ b/themes/default/templates/online.tmpl @@ -1,5 +1,5 @@ - + asXML() . ", "; } if (!count($REGISTERED)) echo(htmlentities(_(""))); - else echo(htmlentities(substr($s,0,-2))); + else echo(substr($s,0,-2)); ?>
diff --git a/themes/default/templates/userprefs.tmpl b/themes/default/templates/userprefs.tmpl index 8b3340c3e..2bdf5133c 100644 --- a/themes/default/templates/userprefs.tmpl +++ b/themes/default/templates/userprefs.tmpl @@ -1,5 +1,5 @@ - + getArg('pagename'); -if ($request->isActionPage($request->getArg('pagename')) and - $plugin != _("PreferencesInfo") and $plugin != _("_PreferencesInfo")) { - $isForm = true; +if ($request->isActionPage($request->getArg('pagename')) + and $isForm and $plugin == _("PreferencesInfo")) { + $isForm = false; } - $time = time(); $user = &$request->getUser(); $pref = &$request->_prefs; @@ -108,15 +107,15 @@ if ($errmsg) $msg = HTML(HTML::h4(array('class' => 'errors'), $errmsg),HTML::hr(
_user; $fill = " "; // See also plugin _AuthInfo + $authmethod = ENABLE_USER_NEW ? @$user->_authmethod : @$user->auth_how; ?> -get('userid'), " from " . (ENABLE_USER_NEW ? $request->_user->_authmethod : $request->_user->auth_how)), +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')) ? _("") : _("")), sprintf("%12s: [% 10s] %15s: [% 8s]\n", - _("Auth Level"),$user->_level,_("Auth Method"),$user->_authmethod), + _("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')), -- 2.45.0