Menu
▾
▴
[TWiki-Dev] [SVN] SvenDowideit r13669 - in twiki/branches/MAIN/twikiplugins/ClassicSkin: data/TWiki lib/TWiki/Contrib/ClassicSkin templates
|
From: <de...@de...> - 2007-05-08 21:32:10
|
Author: SvenDowideit
Date: 2007-05-08 16:32:11 -0500 (Tue, 08 May 2007)
New Revision: 13669
Removed:
twiki/branches/MAIN/twikiplugins/ClassicSkin/data/TWiki/ClassicSkinLogin.txt
Modified:
twiki/branches/MAIN/twikiplugins/ClassicSkin/lib/TWiki/Contrib/ClassicSkin/MANIFEST
twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/twiki.classic.tmpl
Log:
Item3954: move login display from topic INCLUDE to TMPL:DEF like in default skin - later we can refactor classic skin for re-use
Deleted: twiki/branches/MAIN/twikiplugins/ClassicSkin/data/TWiki/ClassicSkinLogin.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/ClassicSkin/data/TWiki/ClassicSkinLogin.txt 2007-05-08 21:31:39 UTC (rev 13668)
+++ twiki/branches/MAIN/twikiplugins/ClassicSkin/data/TWiki/ClassicSkinLogin.txt 2007-05-08 21:32:11 UTC (rev 13669)
@@ -1,3 +0,0 @@
-%META:TOPICINFO{author="TWikiContributor" date="0" format="1.1" version="$Rev$"}%
-%IF{"context authenticated" then='%MAKETEXT{"Hello [_1]" args="[[%WIKIUSERNAME%][%SPACEOUT{%WIKINAME%}%]]"}%%BR%%LOGOUT%' else='%LOGIN% %MAKETEXT{"or"}% [[%TWIKIWEB%.TWikiRegistration][%MAKETEXT{"Register"}%]]'}%
-
Modified: twiki/branches/MAIN/twikiplugins/ClassicSkin/lib/TWiki/Contrib/ClassicSkin/MANIFEST
===================================================================
--- twiki/branches/MAIN/twikiplugins/ClassicSkin/lib/TWiki/Contrib/ClassicSkin/MANIFEST 2007-05-08 21:31:39 UTC (rev 13668)
+++ twiki/branches/MAIN/twikiplugins/ClassicSkin/lib/TWiki/Contrib/ClassicSkin/MANIFEST 2007-05-08 21:32:11 UTC (rev 13669)
@@ -1,5 +1,4 @@
data/TWiki/ClassicSkin.txt 0644
-data/TWiki/ClassicSkinLogin.txt 0644
pub/TWiki/ClassicSkin/screenshot.gif 0644
pub/TWiki/ClassicSkin/fullscreen.gif 0644
lib/TWiki/Contrib/ClassicSkin.pm 0444
Modified: twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/twiki.classic.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/twiki.classic.tmpl 2007-05-08 21:31:39 UTC (rev 13668)
+++ twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/twiki.classic.tmpl 2007-05-08 21:32:11 UTC (rev 13669)
@@ -4,7 +4,9 @@
%TMPL:DEF{"LOG_IN"}%Log In%TMPL:END%
%TMPL:DEF{"LOG_OUT"}%Log Out%TMPL:END%
+%TMPL:DEF{"login"}% %TMPL:P{context="can_login" then="login_actions"}% %TMPL:END%
+%TMPL:DEF{"login_actions"}%%IF{"context authenticated" then='%MAKETEXT{"Hello [_1]!" args="[[%WIKIUSERNAME%][%SPACEOUT{%WIKINAME%}%]]"}%%BR%%LOGOUT%' else='%LOGIN% %MAKETEXT{"or"}% [[%TWIKIWEB%.TWikiRegistration][%MAKETEXT{"Register"}%]]'}%%TMPL:END%
%TMPL:DEF{"htmldoctype"}%<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%LANG%" lang="%LANG%"> %TMPL:END%
@@ -85,7 +87,7 @@
<td colspan="2">
<nop>%WEB% . { %TMPL:P{"webaction"}% }
</td><td align="right">
- <font size="-2">%INCLUDE{"%IF{"context can_login" then="%TWIKIWEB%.ClassicSkinLogin"}%" warn="off"}%</font>
+ <font size="-2">%TMPL:P{"login"}%</font>
</td>
</tr>
</table>%TMPL:END%
|