Menu
▾
▴
[TWiki-Dev] [SVN] ArthurClemens r15687 - in twiki/branches/TWikiRelease04x02: templates twikiplugins/PatternSkin/templates
|
From: <de...@de...> - 2007-11-21 20:19:45
|
Author: ArthurClemens Date: 2007-11-21 14:19:49 -0600 (Wed, 21 Nov 2007) New Revision: 15687 Trac url: http://develop.twiki.org/trac/changeset/15687 Modified: twiki/branches/TWikiRelease04x02/templates/login.sudo.tmpl twiki/branches/TWikiRelease04x02/templates/login.tmpl twiki/branches/TWikiRelease04x02/twikiplugins/PatternSkin/templates/login.pattern.tmpl Log: Item4993: split out button to admin login to separate form; fix validation errors Modified: twiki/branches/TWikiRelease04x02/templates/login.sudo.tmpl =================================================================== --- twiki/branches/TWikiRelease04x02/templates/login.sudo.tmpl 2007-11-21 20:19:48 UTC (rev 15686) +++ twiki/branches/TWikiRelease04x02/templates/login.sudo.tmpl 2007-11-21 20:19:49 UTC (rev 15687) @@ -13,6 +13,6 @@ %TMPL:DEF{"passwordnote"}%%TMPL:END% -%TMPL:DEF{"loginasadministratorlink"}%%TMPL:END% +%TMPL:DEF{"loginasadministratorform"}%%TMPL:END% %TMPL:DEF{"authrealm"}%<span class="twikiUnvisited">%MAKETEXT{"Enter the TWiki Administrator user or login as set in [_1]" args="[[%SCRIPTURL{configure}%][configure]]"}%</span>%TMPL:END% \ No newline at end of file Modified: twiki/branches/TWikiRelease04x02/templates/login.tmpl =================================================================== --- twiki/branches/TWikiRelease04x02/templates/login.tmpl 2007-11-21 20:19:48 UTC (rev 15686) +++ twiki/branches/TWikiRelease04x02/templates/login.tmpl 2007-11-21 20:19:49 UTC (rev 15687) @@ -5,7 +5,7 @@ %TMPL:DEF{"LOG_IN_BANNER"}%%TMPL:END% %TMPL:DEF{"LOGGED_IN_BANNER"}%%MAKETEXT{"[_1] is currently logged in" args="%USERSWEB%.%WIKINAME%"}%%TMPL:END% %TMPL:DEF{"NEW_USER_NOTE"}%%MAKETEXT{"Enter a new username and password to change identity"}%%TMPL:END% -%TMPL:DEF{"UNRECOGNISED_USER"}%%MAKETEXT{"Oops: we could not recognize you. Try again or [[[_1]][reset your password]]." args="%SYSTEMWEB%.ResetPassword"}%%TMPL:END% +%TMPL:DEF{"UNRECOGNISED_USER"}%%MAKETEXT{"Oops: we could not recognize you. Try again or [_1]." args="[[%SYSTEMWEB%.ResetPassword][reset your password]]"}%%TMPL:END% %TMPL:DEF{"titleaction"}%%MAKETEXT{"([_1] login)" args="<nop>%WIKITOOLNAME%"}%%TMPL:END% @@ -30,10 +30,9 @@ %TMPL:DEF{"usernamefield"}%<input tabindex='1' type='text' class='twikiInputField' size='40' name='username' value='%URLPARAM{"usernamestep"}%' />%TMPL:END% -%TMPL:DEF{"usernamestep"}%<p> *%MAKETEXT{"Username"}%* %BR% -%TMPL:P{"usernamefield"}% %BR% -%TMPL:P{"usernamenote"}% %BR% -%TMPL:END% +%TMPL:DEF{"usernamestep"}%<p> *%MAKETEXT{"Username"}%* +%BR%%TMPL:P{"usernamefield"}% +%BR%%TMPL:P{"usernamenote"}%</p>%TMPL:END% %TMPL:DEF{"usernamenote"}%%TMPL:P{"authrealm"}%%TMPL:END% @@ -43,19 +42,18 @@ %TMPL:P{context="can_remember_login" then="rememberbox"}%%TMPL:END% -%TMPL:DEF{"passwordstep"}%<p> *%MAKETEXT{"Password"}%* %BR% -%TMPL:P{"passwordfieldnoteremember"}% -</p>%TMPL:END% +%TMPL:DEF{"passwordstep"}%<p> *%MAKETEXT{"Password"}%* +%BR%%TMPL:P{"passwordfieldnoteremember"}% </p>%TMPL:END% %TMPL:DEF{"passwordnote"}%<span class="twikiUnvisited">[[%SYSTEMWEB%.ResetPassword][%MAKETEXT{"I forgot my password"}%]]</span>%TMPL:END% -%TMPL:DEF{"rememberbox"}%<p><input tabindex='3' id="remember" name="remember" type="checkbox" value="1" /><label for="remember"> %MAKETEXT{"Remember me on this computer"}%</label></p>%TMPL:END% +%TMPL:DEF{"rememberbox"}%%BR%<input tabindex='3' id="remember" name="remember" type="checkbox" value="1" /><label for="remember"> %MAKETEXT{"Remember me on this computer"}%</label>%TMPL:END% -%TMPL:DEF{"submitstep"}%%TMPL:P{"submit"}%%TMPL:END% +%TMPL:DEF{"submitstep"}%<p>%TMPL:P{"submit"}%</p>%TMPL:END% -%TMPL:DEF{"submit"}%<p><input tabindex='4' type='submit' class='twikiSubmit' value='%MAKETEXT{"Logon"}%' /></p>%TMPL:END% +%TMPL:DEF{"submit"}%<input tabindex='4' type='submit' class='twikiSubmit' value='%MAKETEXT{"Logon"}%' />%TMPL:END% -%TMPL:DEF{"loginasadministratorlink"}%<input type="submit" name="sudo" value="%MAKETEXT{"administrator login"}%" class="twikiEmulatedLink" style="margin:0px;padding:0px;border:none;background-color:transparent;vertical-align:middle;float:right"}%" />%TMPL:END% +%TMPL:DEF{"loginasadministratorform"}%<form action='%SCRIPTURLPATH{"login"}%/%WEB%/%TOPIC%' name='adminloginform' method='post'><input type="submit" name="sudo" value="%MAKETEXT{"Administrator login"}%" class="twikiEmulatedLink" style="margin:0px;padding:0px;border:none;background-color:transparent;vertical-align:middle;" />%TMPL:P{"formend"}%%TMPL:END% %TMPL:DEF{"seealsonote"}%%MAKETEXT{"If you have any questions, please contact [_1]" args="%WIKIWEBMASTER%"}%%TMPL:END% @@ -63,14 +61,16 @@ <fieldset> %TMPL:P{"titlestep"}% %TMPL:P{"notestep"}%%TMPL:P{"errorstep"}% -%TMPL:P{"usernamestep"}%%TMPL:P{"passwordstep"}%%TMPL:P{"submitstep"}% +%TMPL:P{"usernamestep"}% +%TMPL:P{"passwordstep"}% +%TMPL:P{"submitstep"}% </fieldset> -%TMPL:P{"loginasadministratorlink"}% %TMPL:P{"formend"}% +%TMPL:P{"loginasadministratorform"}% %TMPL:END% %TMPL:DEF{"content"}% %TMPL:P{"form"}% %TMPL:P{"seealsonote"}% %TMPL:P{"topicinfo"}% -%TMPL:END% +%TMPL:END% \ No newline at end of file Modified: twiki/branches/TWikiRelease04x02/twikiplugins/PatternSkin/templates/login.pattern.tmpl =================================================================== --- twiki/branches/TWikiRelease04x02/twikiplugins/PatternSkin/templates/login.pattern.tmpl 2007-11-21 20:19:48 UTC (rev 15686) +++ twiki/branches/TWikiRelease04x02/twikiplugins/PatternSkin/templates/login.pattern.tmpl 2007-11-21 20:19:49 UTC (rev 15687) @@ -5,12 +5,12 @@ %TMPL:DEF{"pagetitle"}%%TMPL:END% %TMPL:DEF{"script:skintemplate"}%<style type="text/css" media="all"> -@import url("%PUBURL%/%SYSTEMWEB%/TwistyContrib/twist.css"); +@import url("%PUBURL%/%TWIKIWEB%/TwistyContrib/twist.css"); </style> -<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TWikiJavascripts/twikilib.js"></script> -<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TWikiJavascripts/twikiPref.js"></script> -<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TWikiJavascripts/twikiCSS.js"></script> -<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TwistyContrib/twist.compressed.js"></script> +<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TWikiJavascripts/twikilib.js"></script> +<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TWikiJavascripts/twikiPref.js"></script> +<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TWikiJavascripts/twikiCSS.js"></script> +<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TwistyContrib/twist.compressed.js"></script> <script type="text/javascript"> // <![CDATA[ var styleText = '<style type="text/css" media="all">.twikiMakeVisible{display:inline;}.twikiMakeVisibleInline{display:inline;}.twikiMakeVisibleBlock{display:block;}.twikiMakeHidden{display:none;}</style>'; @@ -28,10 +28,6 @@ %TMPL:DEF{"errorstep"}%%IF{"$BANNER" then='<div class="twikiNotification twikiAlert twikiUnvisited patternLoginNotification">%BANNER%%IF{"$ERROR" then='<!--%TMPL:P{"error"}%-->'}%</div>'}%%TMPL:END% -%TMPL:DEF{"loginasadministratorstep"}%<div class="twikiFormStep"> -%TMPL:P{"loginasadministratorlink"}% -</div><!-- /twikiFormStep-->%TMPL:END% - %TMPL:DEF{"usernamestep"}%<div class="twikiFormStep"> ---+++ %MAKETEXT{"Username"}% @@ -41,23 +37,25 @@ %TMPL:DEF{"usernamefieldhelp"}%%TWISTY{mode="span" showlink="%MAKETEXT{"Help"}%" hidelink="%MAKETEXT{"Hide help"}%" remember="on"}% <div class="twikiHelp">%TMPL:P{"usernamenote"}%</div> %ENDTWISTY%%TMPL:END% - %TMPL:DEF{"passwordstep"}%<div class="twikiFormStep"> ---+++ %MAKETEXT{"Password"}% %TMPL:P{"passwordfieldnoteremember"}% </div><!-- /twikiFormStep-->%TMPL:END% -%TMPL:DEF{"submitstep"}%<div class="twikiFormStep twikiLast">%TMPL:P{"submit"}%</div><!-- /twikiFormStep-->%TMPL:END% +%TMPL:DEF{"submitstep"}%<div class="twikiFormStep">%TMPL:P{"submit"}%</div><!-- /twikiFormStep-->%TMPL:END% +%TMPL:DEF{"seealsostep"}%<div class="twikiFormStep twikiGrayText twikiLast">%TMPL:P{"seealsonote"}%</div><!-- /twikiFormStep-->%TMPL:END% + +%TMPL:DEF{"loginasadministratorstep"}%<div style="text-align:right">%TMPL:P{"loginasadministratorform"}%</div>%TMPL:END% + %TMPL:DEF{"form"}%<div id="twikiLogin"> -%TMPL:P{"formstart"}% -<div class="twikiFormSteps">%TMPL:P{"titlestep"}% -%TMPL:P{"usernamestep"}%%TMPL:P{"passwordstep"}%%TMPL:P{"submitstep"}%<p>%TMPL:P{"loginasadministratorlink"}%</p> -</div><!-- /twikiFormSteps--> +<div class="twikiFormSteps">%TMPL:P{"formstart"}%%TMPL:P{"titlestep"}% +%TMPL:P{"usernamestep"}%%TMPL:P{"passwordstep"}%%TMPL:P{"submitstep"}% %TMPL:P{"formend"}% - -<span class="twikiGrayText">%TMPL:P{"seealsonote"}%</span> +%TMPL:P{"seealsostep"}% +</div><!-- /twikiFormSteps--> +%TMPL:P{"loginasadministratorstep"}% </div><!-- /twikiLogin-->%TMPL:END% %TMPL:DEF{"content"}%%TMPL:P{"form"}%%TMPL:END% |