Menu
▾
▴
[TWiki-Dev] [SVN] SteffenPoulsen r14565 - in twiki/branches/MAIN/twikiplugins: ClassicSkin/data ClassicSkin/data/Main ClassicSkin/lib/TWiki/Contrib/ClassicSkin PatternSkin/data/Main PatternSkin/lib/TWiki/Contrib/PatternSkin TWikiUserMappingContrib/data/Main TWikiUserMappingContrib/lib/TWiki/Contrib/TWikiUserMappingContrib
|
From: <de...@de...> - 2007-08-20 22:25:18
|
Author: SteffenPoulsen
Date: 2007-08-20 17:25:15 -0500 (Mon, 20 Aug 2007)
New Revision: 14565
Added:
twiki/branches/MAIN/twikiplugins/ClassicSkin/data/Main/
twiki/branches/MAIN/twikiplugins/ClassicSkin/data/Main/ClassicSkinUserViewTemplate.txt
twiki/branches/MAIN/twikiplugins/PatternSkin/data/Main/PatternSkinUserViewTemplate.txt
Removed:
twiki/branches/MAIN/twikiplugins/TWikiUserMappingContrib/data/Main/UserViewTemplate.txt
Modified:
twiki/branches/MAIN/twikiplugins/ClassicSkin/lib/TWiki/Contrib/ClassicSkin/MANIFEST
twiki/branches/MAIN/twikiplugins/PatternSkin/lib/TWiki/Contrib/PatternSkin/MANIFEST
twiki/branches/MAIN/twikiplugins/TWikiUserMappingContrib/lib/TWiki/Contrib/TWikiUserMappingContrib/MANIFEST
Log:
Item4388: Cannot use just one UserViewTemplate, skins are not compatible - each skin must supply its own
Added: twiki/branches/MAIN/twikiplugins/ClassicSkin/data/Main/ClassicSkinUserViewTemplate.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/ClassicSkin/data/Main/ClassicSkinUserViewTemplate.txt (rev 0)
+++ twiki/branches/MAIN/twikiplugins/ClassicSkin/data/Main/ClassicSkinUserViewTemplate.txt 2007-08-20 22:25:15 UTC (rev 14565)
@@ -0,0 +1,19 @@
+%META:TOPICINFO{author="TWikiContributor" date="1145229574" format="1.1" version="1.1"}%
+%TMPL:INCLUDE{"view"}%
+
+%TMPL:DEF{"active_form"}%<a href='%SCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%?action=form&t=%GMTIME{"$epoch"}%' rel='nofollow' title='Edit personal data'>Edit personal data</a>%TMPL:END%
+%TMPL:DEF{"inactive_form"}% %TMPL:END%
+
+%TMPL:DEF{"inactive_edit"}%<strike>Edit text</strike>%TMPL:END%
+%TMPL:DEF{"create_topic"}%Cr<span class="twikiAccessKey">e</span>ate%TMPL:END%
+%TMPL:DEF{"edit_topic"}%<span class="twikiAccessKey">E</span>dit text%TMPL:END%
+%TMPL:DEF{"active_edit"}%<a href='%SCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%?action=text&t=%GMTIME{"$epoch"}%' rel='nofollow' title='Edit this topic text' accesskey='e'><b>%TMPL:P{context="new_topic" then="create_topic" else="edit_topic"}%</b></a>%TMPL:END%
+
+%TMPL:DEF{"content"}%
+%TMPL:P{"form"}%
+%TMPL:P{context="inactive" then="inactive_form" else="active_form"}%
+%BR%
+%TEXT%
+#TopicEnd
+%TMPL:P{"attachments"}%
+%TMPL:P{"topicinfo"}%%TMPL:END%
Property changes on: twiki/branches/MAIN/twikiplugins/ClassicSkin/data/Main/ClassicSkinUserViewTemplate.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: twiki/branches/MAIN/twikiplugins/ClassicSkin/lib/TWiki/Contrib/ClassicSkin/MANIFEST
===================================================================
--- twiki/branches/MAIN/twikiplugins/ClassicSkin/lib/TWiki/Contrib/ClassicSkin/MANIFEST 2007-08-20 21:10:12 UTC (rev 14564)
+++ twiki/branches/MAIN/twikiplugins/ClassicSkin/lib/TWiki/Contrib/ClassicSkin/MANIFEST 2007-08-20 22:25:15 UTC (rev 14565)
@@ -1,4 +1,5 @@
-data/TWiki/ClassicSkin.txt 0644
+data/Main/ClassicSkinUserViewTemplate.txt 0644
+data/TWiki/ClassicSkin.txt 0644
pub/TWiki/ClassicSkin/screenshot.gif 0644
pub/TWiki/ClassicSkin/fullscreen.gif 0644
lib/TWiki/Contrib/ClassicSkin.pm 0444
Added: twiki/branches/MAIN/twikiplugins/PatternSkin/data/Main/PatternSkinUserViewTemplate.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/data/Main/PatternSkinUserViewTemplate.txt (rev 0)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/data/Main/PatternSkinUserViewTemplate.txt 2007-08-20 22:25:15 UTC (rev 14565)
@@ -0,0 +1,30 @@
+%META:TOPICINFO{author="TWikiContributor" date="1145229574" format="1.1" version="1.1"}%
+%TMPL:INCLUDE{"view"}%
+
+
+%TMPL:DEF{"active_form"}%<!-- UserViewTemplate --><span class="patternButton"><a href="%SCRIPTURL{"edit"}%/%WEB%/%TOPIC%?action=form&t=%GMTIME{"$epoch"}%" rel="nofollow" title='%MAKETEXT{"Edit personal data"}%'>%MAKETEXT{"Edit personal data"}%</a></span>%TMPL:END%
+%TMPL:DEF{"inactive_form"}% %TMPL:END%
+
+
+
+%TMPL:DEF{"inactive_edit"}%<span class="patternButton"><a href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%" rel="nofollow" title='%MAKETEXT{"View topic"}%'>%MAKETEXT{"View topic"}%</a></span>%TMPL:P{"sep"}%<span class="patternButton"><strike>%MAKETEXT{"Edit text"}%</strike></span>%TMPL:END%
+
+
+
+%TMPL:DEF{"edit_topic"}%%MAKETEXT{"&Edit text"}%%TMPL:END%
+
+
+
+%TMPL:DEF{"active_edit"}%%TMPL:P{"sep"}%<span class="patternButton"><a href="%SCRIPTURL{"edit"}%/%WEB%/%TOPIC%?action=text&t=%GMTIME{"$epoch"}%" rel="nofollow" title='%MAKETEXT{"Edit this topic text"}%' accesskey="E">%TMPL:P{context="new_topic" then="create_topic" else="edit_topic"}%</a></span>%TMPL:P{context="WysiwygPluginEnabled" then="wysiwyg"}%%TMPL:END%
+
+
+
+%TMPL:DEF{"formattop"}%%TMPL:P{"form"}%%TMPL:END%
+
+
+
+%TMPL:DEF{"formatbottom"}%%TMPL:END%
+
+
+
+%TMPL:DEF{FORM:display:footer:editlink}%%TMPL:P{context="inactive" then="inactive_form" else="active_form"}%%TMPL:END%
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/lib/TWiki/Contrib/PatternSkin/MANIFEST
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/lib/TWiki/Contrib/PatternSkin/MANIFEST 2007-08-20 21:10:12 UTC (rev 14564)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/lib/TWiki/Contrib/PatternSkin/MANIFEST 2007-08-20 22:25:15 UTC (rev 14565)
@@ -1,5 +1,6 @@
lib/TWiki/Contrib/PatternSkin.pm 0444
data/_default/WebLeftBar.txt 0644
+data/Main/PatternSkinUserViewTemplate.txt 0644
data/Main/TWikiGuestLeftBar.txt 0644
data/Main/WebLeftBar.txt 0644
data/Sandbox/WebLeftBar.txt 0644
Deleted: twiki/branches/MAIN/twikiplugins/TWikiUserMappingContrib/data/Main/UserViewTemplate.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TWikiUserMappingContrib/data/Main/UserViewTemplate.txt 2007-08-20 21:10:12 UTC (rev 14564)
+++ twiki/branches/MAIN/twikiplugins/TWikiUserMappingContrib/data/Main/UserViewTemplate.txt 2007-08-20 22:25:15 UTC (rev 14565)
@@ -1,22 +0,0 @@
-%TMPL:INCLUDE{"view"}%
-
-%TMPL:DEF{"active_form"}%<a href='%SCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%?action=form&t=%GMTIME{"$epoch"}%' rel='nofollow' title='Edit personal data'>Edit personal data</a>%TMPL:END%
-%TMPL:DEF{"inactive_form"}% %TMPL:END%
-
-%TMPL:DEF{"inactive_edit"}%<strike>Edit text</strike>%TMPL:END%
-%TMPL:DEF{"create_topic"}%Cr<span class="twikiAccessKey">e</span>ate%TMPL:END%
-%TMPL:DEF{"edit_topic"}%<span class="twikiAccessKey">E</span>dit text%TMPL:END%
-%TMPL:DEF{"active_edit"}%<a href='%SCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%?action=text&t=%GMTIME{"$epoch"}%' rel='nofollow' title='Edit this topic text' accesskey='e'><b>%TMPL:P{context="new_topic" then="create_topic" else="edit_topic"}%</b></a>%TMPL:END%
-
-%TMPL:DEF{"formatbottom"}%%TMPL:END%
-
-%TMPL:DEF{"content"}%
-%TMPL:P{"form"}%
-%TMPL:P{context="inactive" then="inactive_form" else="active_form"}%
-%BR%
-%TEXT%
-#TopicEnd
-%TMPL:END%
-
-%TMPL:P{"attachments"}%
-%TMPL:P{"topicinfo"}%
Modified: twiki/branches/MAIN/twikiplugins/TWikiUserMappingContrib/lib/TWiki/Contrib/TWikiUserMappingContrib/MANIFEST
===================================================================
--- twiki/branches/MAIN/twikiplugins/TWikiUserMappingContrib/lib/TWiki/Contrib/TWikiUserMappingContrib/MANIFEST 2007-08-20 21:10:12 UTC (rev 14564)
+++ twiki/branches/MAIN/twikiplugins/TWikiUserMappingContrib/lib/TWiki/Contrib/TWikiUserMappingContrib/MANIFEST 2007-08-20 22:25:15 UTC (rev 14565)
@@ -7,7 +7,6 @@
data/Main/TWikiRegistrationAgent.txt 0644
data/Main/UserListByPhotograph.txt 0644
data/Main/UserListHeader.txt 0644
-data/Main/UserViewTemplate.txt 0644
data/Main/NobodyGroup.txt 0644
data/Main/UserList.txt 0644
data/Main/UserListByDateJoined.txt 0644
|