Menu
▾
▴
[TWiki-Dev] [SVN] r9267 - in twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin: data/Main data/TWiki templates
|
From: <Mic...@nt...> - 2006-03-13 16:15:56
|
Author: MichaelDaum
Date: 2006-03-13 08:12:54 -0800 (Mon, 13 Mar 2006)
New Revision: 9267
Modified:
twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/Main/WebLinks.txt
twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/NatSkin.txt
twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/TWikiWebLinks.txt
twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/TWikiWebSideBar.txt
twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/WebLinks.txt
twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/defaultbody.nat.tmpl
Log:
Item1854: WebLinks components; fixed atom feed link at the page bottom
released as v2.995
Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/Main/WebLinks.txt
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/Main/WebLinks.txt 2006-03-13 16:00:54 UTC (rev 9266)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/Main/WebLinks.txt 2006-03-13 16:12:54 UTC (rev 9267)
@@ -1,11 +1,9 @@
%META:TOPICINFO{author="TWikiContributor" date="1132161897" format="1.1" version="1.1"}%
-<ul>
-%STARTINCLUDE%
- <li> [[%TWIKIWEB%.WelcomeGuest][Welcome]] </li>
- <li> [[%TWIKIWEB%.TWikiRegistration][Registration]] </li>
- <li> [[%MAINWEB%.TWikiUsers][Users]] </li>
- <li> [[%MAINWEB%.TWikiGroups][Groups]] </li>
- <li> [[%TWIKIWEB%.ChangePassword][Password]] </li>
- %WEBCOMPONENT{"TWikiWebLinks"}%
+%STARTINCLUDE% <!-- -->
+ * [[%TWIKIWEB%.WelcomeGuest][Welcome]]
+ * [[%TWIKIWEB%.TWikiRegistration][Registration]]
+ * [[%MAINWEB%.TWikiUsers][Users]]
+ * [[%MAINWEB%.TWikiGroups][Groups]]
+ * [[%TWIKIWEB%.ChangePassword][Password]]
+%WEBCOMPONENT{"TWikiWebLinks"}%
%STOPINCLUDE%
-</ul>
Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/NatSkin.txt
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/NatSkin.txt 2006-03-13 16:00:54 UTC (rev 9266)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/NatSkin.txt 2006-03-13 16:12:54 UTC (rev 9267)
@@ -68,14 +68,14 @@
Please see the TWiki:Plugins/PhotonSkin for an explanation of the possible search parameters
(TODO: maby move that stuff in here).
----++ About the WebSideBar
-The WebSideBar is used to generate a navigation appearing next to
+---++ About the <nop>WebSideBar
+The <nop>WebSideBar is used to generate a navigation appearing next to
the main topic area. Each web in your <nop>%WIKITOOLNAME% might optionaly have a
-separate WebSideBar. The default [[%TWIKIWEB%.WebSideBar]] can be used to add a default
-section common to all WebSideBars.
-If the WebSideBar isn't defined the default [[%TWIKIWEB%.WebSideBar]]
-is used. Each user might define a personalized WebSideBar called =%<nop>WIKINAME%SideBar= that is
-appended to the WebSideBar. The TWiki:Plugins/RedDotPlugin is used to make customizing the WebSideBar
+separate <nop>WebSideBar. The default [[%TWIKIWEB%.WebSideBar]] can be used to add a default
+section common to all <nop>WebSideBars.
+If the <nop>WebSideBar isn't defined the default [[%TWIKIWEB%.WebSideBar]]
+is used. Each user might define a personalized <nop>WebSideBar called =%<nop>WIKINAME%SideBar= that is
+appended to the <nop>WebSideBar. The TWiki:Plugins/RedDotPlugin is used to make customizing the <nop>WebSideBar
easier appended to the different parts that make up the complete sidebar. These are hidden if
you don't have write access to the respective topic fragments.
@@ -105,7 +105,7 @@
The result can be configured per session, user, web or for the complete site.
The screenshots below only display a limitted set of all possible combinations.
-This skin includes an enhanced navigation mechanism named WebSideBar. This
+This skin includes an enhanced navigation mechanism named <nop>WebSideBar. This
combines the best of the old <nop>WebMenu idea from the <nop>GnuSkin and the
<nop>WebLeftBar known from the TWiki:Plugins/PatternSkin by providing all the
flexibility of the <nop>WebLeftBar including the MySideBar feature and an
@@ -160,7 +160,7 @@
| Skin Author: | TWiki:Main/MichaelDaum |
| Copyright ©: | 2003-2006, Michael Daum |
| License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-| Skin Version: | v2.994 |
+| Skin Version: | v2.995 |
| Dependencies: | TWiki:Plugins/NatSkinPlugin |
| Description: | Driven by cascading stylesheets, Comes with 12 alternative styles, <nop>MoveableType and Wordpress Look-n-Feel |
| Base Name: | nat |
@@ -177,6 +177,8 @@
<div class="screenshotter"><a href="%ATTACHURL%/StormyThin.jpeg"><img src="%ATTACHURL%/StormyThin.jpeg" title="StormyThin" /></a></div> \
|
| Change History: | <!-- specify latest version first --> |
+| 2006-03-13: | fixed <nop>WebLinks components; \
+ fixed atom feed link at the page bottom |
| 2006-03-11: | reworked sidebar using the new WEBCOMPONET logic; \
docu restructuring - more needed; \
using messages.tmpl as far as possible |
@@ -220,7 +222,7 @@
removed absolute urls; removed EDITURL; \
fixed sidebar help for cairo and beijing; \
fixed squeezed main page; \
- added the concept of <nop>WebComponents, that is the WebSideBar and the WebButtons; \
+ added the concept of <nop>WebComponents, that is the <nop>WebSideBar and the WebButtons; \
the <nop>WebButtons are customizable the way the <nop>WebSideBar already is |
| 2005-12-01: | added transparent borders and corners to the Kubrick style; \
improved <nop>PlasticLoveVariation; \
@@ -248,7 +250,7 @@
fixed way how the oops dialogues switch off the sidebar |
| 2005-10-09: | new release NatSkin-2.51: \
reinvention of the NatSkinStyleBrowser; \
- reworked the standard WebSideBar; \
+ reworked the standard <nop>WebSideBar; \
extensive usage of the new conditional content tags \
interfacing the skin state machine, i.e. switch the \
sidebar from the left to the right etc.; \
@@ -277,7 +279,7 @@
__Related topic:__ TWiki:TWiki/TWikiSkins, TWiki:TWiki/TWikiSkinBrowser, TWiki:Plugins/NatSkinDev, NatSkinPlugin
--- TWiki:Main/MichaelDaum - 11 Mar 2006
+-- TWiki:Main/MichaelDaum - 13 Mar 2006
%META:FILEATTACHMENT{name="favicon.ico" attr="" comment="" date="1113468984" path="favicon.ico" size="4710" user="TWikiContributor" version="1.1"}%
Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/TWikiWebLinks.txt
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/TWikiWebLinks.txt 2006-03-13 16:00:54 UTC (rev 9266)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/TWikiWebLinks.txt 2006-03-13 16:12:54 UTC (rev 9267)
@@ -1,10 +1,8 @@
%META:TOPICINFO{author="TWikiContributor" date="1132161897" format="1.1" version="1.1"}%
-<ul>
-%STARTINCLUDE%
- <li> [[WebTopicList][Index]] </li>
- <li> [[WebChanges][Changes]] </li>
- <li> [[WebNotify][Notifications]] </li>
- <li> [[WebStatistics][Statistics]] </li>
- <li> [[WebPreferences][Preferences]] </li>
+%STARTINCLUDE% <!-- -->
+ * [[WebTopicList][Index]]
+ * [[WebChanges][Changes]]
+ * [[WebNotify][Notifications]]
+ * [[WebStatistics][Statistics]]
+ * [[WebPreferences][Preferences]]
%STOPINCLUDE%
-</ul>
Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/TWikiWebSideBar.txt
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/TWikiWebSideBar.txt 2006-03-13 16:00:54 UTC (rev 9266)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/TWikiWebSideBar.txt 2006-03-13 16:12:54 UTC (rev 9267)
@@ -4,38 +4,41 @@
<h1>Navigation%REDDOT{"%TWIKIWEB%.TWikiWebSideBar"}%</h1>
</div>
<style type="text/css">
+
%IFSKINSTATETHEN{style="Pattern"}%
%$nopFORMATLIST{"%$nopWEBLIST{"$name" separator=" "}% TestCases" split=" " separator="$n" format="h2.navButton$1 a {background:$percntVAR{\"WEBBGCOLOR\" web=\"$1\"}$percnt;}"}%
%FISKINSTATE%
+
.navButton {%IFSKINSTATE{buttons="on" then="display:none"}%}
.navButton%BASEWEB% {display:block}
</style>
<h2 class="navButton navButtonMain">%WEBLINK{"Main"}%</h2>
+
%IFDEFINEDTHEN{"%BASEWEB%" as="Main"}%
-<ul>
- %$nopWEBCOMPONENT{"WebLinks"}%
-</ul>
+%$nopWEBCOMPONENT{"WebLinks"}%
%FIDEFINED%
-%FORMATLIST{"%WEBLIST{webs="public" separator=" "}%" exclude="Main|TWiki|Trash" split=" " separator="$n" format="<h2 class=\"navButton navButton$1\">$percntWEBLINK{\"$1\"}$percnt</h2><ul style=\"$percntIFDEFINED{\"$percntBASEWEB$percnt\" as=\"$1\" else=\"display:none\"}$percnt\">$percntWEBCOMPONENT{\"WebLinks\"}$percnt</ul>"}%
+
+%FORMATLIST{"%WEBLIST{webs="public" separator=" "}%" exclude="Main|TWiki|Trash" split=" " separator="$n" format="<h2 class=\"navButton navButton$1\">$percntWEBLINK{\"$1\"}$percnt</h2><div style=\"$percntIFDEFINED{\"$percntBASEWEB$percnt\" as=\"$1\" else=\"display:none\"}$percnt\">$percntWEBCOMPONENT{\"WebLinks\"}$percnt</div>"}%
+
%IFDEFINEDTHEN{"%BASEWEB%" as="Trash"}%
<h2 class="navButton navButtonTrash">%WEBLINK{"Trash"}%</h2>
-<ul>
- <li> [[Trash.TrashAttachment][Attachments]] </li>
- %$nopWEBCOMPONENT{"WebLinks"}%
-</ul>
+ * [[Trash.TrashAttachment][Attachments]]
+%$nopWEBCOMPONENT{"WebLinks"}%
%FIDEFINED%
+
<h2 class="navButton navButton%TWIKIWEB%">%WEBLINK{web="%TWIKIWEB%" name="System"}%</h2>
+
%IFDEFINEDTHEN{"%BASEWEB%" as="TWiki"}%
-<ul>
- %$nopWEBCOMPONENT{"WebLinks"}%
-</ul>
+%$nopWEBCOMPONENT{"WebLinks"}%
%FIDEFINED%
+
%IFSKINSTATETHEN{searchbox="pos2"}%
<p/>
<div class="natSearchBox natSearchBoxPos2">
%TMPL:P{"searchbox"}%
</div>
%FISKINSTATE%
+
<div class="natSideBarPersonal">
%INCLUDE{"%CALC{"$IF($EXISTS(%MAINWEB%.%WIKINAME%SideBar),%MAINWEB%.%WIKINAME%SideBar,%TWIKIWEB%.MySideBar)"}%"}%
</div>
Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/WebLinks.txt
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/WebLinks.txt 2006-03-13 16:00:54 UTC (rev 9266)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/data/TWiki/WebLinks.txt 2006-03-13 16:12:54 UTC (rev 9267)
@@ -1,8 +1,6 @@
%META:TOPICINFO{author="TWikiContributor" date="1132161897" format="1.1" version="1.1"}%
-<ul>
-%STARTINCLUDE%
- <li> [[%TWIKIWEB%.InstalledPlugins][Plugins]] </li>
- %WEBCOMPONENT{"TWikiWebLinks"}%
- <li> [[%TWIKIWEB%.TWikiPreferences][SitePreferences]] </li>
+%STARTINCLUDE% <!-- -->
+ * [[%TWIKIWEB%.InstalledPlugins][Plugins]]
+%WEBCOMPONENT{"TWikiWebLinks"}% <!-- -->
+ * [[%TWIKIWEB%.TWikiPreferences][SitePreferences]]
%STOPINCLUDE%
-</ul>
Modified: twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/defaultbody.nat.tmpl
===================================================================
--- twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/defaultbody.nat.tmpl 2006-03-13 16:00:54 UTC (rev 9266)
+++ twiki/branches/TWikiRelease04x00/twikiplugins/NatSkin/templates/defaultbody.nat.tmpl 2006-03-13 16:12:54 UTC (rev 9267)
@@ -49,7 +49,7 @@
%WEBSYNDICATION%
%ELSEDEFINED%
Syndicate this site
- <a class="natFeedIcon" href="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/WebRss">RSS</a><a class="natFeedIcon" href="%SCRIPTURL%/view/%SCRIPTSUFFIX%/%WEB%/WebAtom">ATOM</a>
+ <a class="natFeedIcon" href="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/WebRss">RSS</a><a class="natFeedIcon" href="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/WebAtom">ATOM</a>
%FIDEFINED%
</div>
</div>
|