Item2060:Item1987:

* fixing css for tinymce where reset classes where too eager * fixes due to latest !TablePlugin * support for upcomming Foswiki:Extensions/MetaCommentPlugin * added testpage to check vertical rythm of typography git-svn-id: http://svn.foswiki.org/trunk/NatSkin@4917 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Sep 14, 2009 · fc073fe · fc073fe
1 parent 93a6168
commit fc073fe
Show file tree

Hide file tree

Showing 38 changed files with 815 additions and 214 deletions.
diff --git a/data/Main/NatSkinUserViewTemplate.txt b/data/Main/NatSkinUserViewTemplate.txt
diff --git a/data/Sandbox/NatSkinTest.txt b/data/Sandbox/NatSkinTest.txt
diff --git a/data/System/NatSkin.txt b/data/System/NatSkin.txt
@@ -139,6 +139,9 @@ allways open an extra window.
 |  Base Name: | nat |
 |  Screenshot: | <div style="overflow:hidden;height:200px"><a href="%ATTACHURL%/BlueNoteStyle.jpeg"><img src="%ATTACHURL%/BlueNoteStyle.jpeg" title="Clean"/></a></div> |
 |  Change&nbsp;History: | <!-- specify latest version first -->&nbsp; |
+|  14 Sep 2009: | fixing css for tinymce where reset classes where too eager; \
+                  fixes due to latest !TablePlugin; \
+                  support for Foswiki:Extensions/MetaCommentPlugin |
 |  20 Aug 2009: | Item1931: made it SafeWikiPlugin compatible, fixed xhtml issues; \
                   Item1844: fixed WebCreateNewTopicTemplate; \
                   reworked all of the typography using a 40x18 grid; \

diff --git a/data/System/NatSkinTopicDoesNotExistViewTemplate.txt b/data/System/NatSkinTopicDoesNotExistViewTemplate.txt
@@ -41,13 +41,13 @@
 %TWISTYBUTTON{id="createnewtopic" link="%BUTTON{"%MAKETEXT{"Create new topic"}%" icon="add"}%"}%
 %BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%BASEWEB%.%HOMETOPIC%" title="%MAKETEXT{"Get me out of here"}%"}%
 %CLEAR%
-%TWISTYTOGGLE{id="createnewtopic"}%
+%TWISTYTOGGLE{id="createnewtopic" mode="div"}%
 
 <div class='foswikiFormSteps'>%TMPL:P{"formstart"}%
 <!-- //formstartstep -->%TMPL:END%
 
 %TMPL:DEF{"formendstep"}%<!-- formendstep -->
 %TMPL:P{"formend"}%
 </div>
-%ENDTWISTY%
+%ENDTWISTYTOGGLE%
 <!-- //formendstep -->%TMPL:END%
diff --git a/data/System/NatSkinWebCreateNewTopicTemplate.txt b/data/System/NatSkinWebCreateNewTopicTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1247678045" format="1.1" reprev="1.7" version="1.7"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1251318288" format="1.1" reprev="1.8" version="1.8"}%
 %TMPL:INCLUDE{"view"}%
 %TMPL:DEF{"rightsidebar"}%%TMPL:END%
 %TMPL:DEF{"contentheader_container"}%%TMPL:END%
@@ -8,8 +8,8 @@
 <!-- //content -->%TMPL:END%
 
 %TMPL:DEF{"createform"}%<!-- createform -->
-%TMPL:P{"formstartstep"}%<!-- formstartstep// -->
 %TMPL:P{"formtitle"}%<!-- formtitle// -->
+%TMPL:P{"formstartstep"}%<!-- formstartstep// -->
 %TMPL:P{"topictitlestep"}%<!-- topictitlestep// -->
 %TWISTY{
   showlink="%MAKETEXT{"Show advanced options"}%" 
@@ -133,8 +133,7 @@ Topic name that the newly created topic will be a child of.
 <select name="templatetopic" class="foswikiSelect">
 %IF{"'%URLPARAM{"templatetopic"}%'" 
   then='<option selected="selected">%URLPARAM{"templatetopic"}%</option>'
-}%
-<option value="">%MAKETEXT{"Default template"}%</option>
+}%<option value="">%MAKETEXT{"Default template"}%</option>
 %SEARCH{
   "name~'*Template'" 
   scope="topic" 
@@ -143,8 +142,7 @@ Topic name that the newly created topic will be a child of.
   type="query" 
   nonoise="on" 
   format="<option value=\"$web.$topic\">$topic</option>"
-}%
-</select>
+}%</select>
 <div class="foswikiFormDescription">
 %MAKETEXT{"Initialize the new topic using a template."}%
 </div>

diff --git a/data/System/NatSkinWebTopicListViewTemplate.txt b/data/System/NatSkinWebTopicListViewTemplate.txt
@@ -0,0 +1,8 @@
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1250500470" format="1.1" reprev="1.3" version="1.3"}%
+%TMPL:INCLUDE{"WebTopicListView"}%
+%TMPL:DEF{"content"}%
+---+ %TOPIC%
+%MAKEINDEX{"%TOPICLIST{"$name" separator=","}%" cols="3" header="$anchors" format="[[%BASEWEB%.$item][$item]]"}%
+%TMPL:END%
+
+%META:TOPICMOVED{by="micha" date="1250500443" from="System.PatternSkinWebTopicListViewTemplate" to="System.NatSkinWebTopicListViewTemplate"}%
diff --git a/data/System/WebCreateNewWeb.txt b/data/System/WebCreateNewWeb.txt
@@ -1,22 +1,21 @@
-%META:TOPICINFO{author="ProjectContributor" date="1241699224" format="1.1" reprev="1.4" version="1.4"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1251882245" format="1.1" reprev="1.5" version="1.5"}%
 %META:TOPICPARENT{name="ManagingWebs"}%
----+!! %TOPIC%
+---+!! %MAKETEXT{"Create a new web"}%
 <div class="foswikiFormSteps">
-  <h2>Create a new web</h2>
-  <form name="admin" action="%SCRIPTURLPATH{manage}%/%WEB%/%TOPIC%" method="post">
+  <form id="createNewWeb" name="admin" action="%SCRIPTURLPATH{manage}%/%WEB%/%TOPIC%" method="post">
   <input name="newtopic" type="hidden" value="%URLPARAM{"newtopic"}%" />
   <input name="action" type="hidden" value="createweb" />
   <input name="WEBBGCOLOR" type="hidden" value="#ffffff" />
   <div class="foswikiFormStep">
-    <h3>Name:</h3>
-    <input name="newweb" class="foswikiInputField" type="text" value="%URLPARAM{"newweb"}%" size="60" />
+    <h3>%MAKETEXT{"Name"}%:</h3>
+    <input name="newweb" class="foswikiInputField required" type="text" value="%URLPARAM{"newweb"}%" size="60" />
     <div class="foswikiFormDescription">
       The name must start with an upper case letter, followed by upper or lower case letters or numbers.
       Specify a short name to avoid long URLs.
     </div>
   </div>
   <div class="foswikiFormStep">
-    <h3>Description:</h3>
+    <h3>%MAKETEXT{"Description"}%:</h3>
     <input type="text" class="foswikiInputField" name="SITEMAPWHAT" value="" size="60" />
     <div class="foswikiFormDescription">
       Enter a short description of the web. 
@@ -25,22 +24,22 @@
     </div>
   </div>
   %TWISTY{
-    showlink="%MAKETEXT{"Show advanced options"}%" 
-    hidelink="%MAKETEXT{"Hide advanced options"}%"
+    showlink="%MAKETEXT{"Show additional settings"}%" 
+    hidelink="%MAKETEXT{"Hide additional settings"}%"
     showimgleft="%ICONURLPATH{toggleopen-small}%"
     hideimgleft="%ICONURLPATH{toggleclose-small}%"
     mode="div"
   }%
 ---
   <div class="foswikiFormStep">
-    <h3>Template web:</h3>
+    <h3>%MAKETEXT{"Template web"}%:</h3>
     <select name="baseweb" class="foswikiSelect">
     %WEBLIST{ "<option $marker>$name</option>" webs="webtemplate,public" selection="_default" separator=" "}%
     </select>
     <div class="foswikiFormDescription">Select a TemplateWeb which you want the new web to be based on.</div>
   </div>
   <div class="foswikiFormStep">
-    <h3>Sitemap:</h3>
+    <h3>%MAKETEXT{"Sitemap"}%:</h3>
     <label><input type="radio" name="SITEMAPLIST" value="on" checked="checked" /> *show* on sitemap </label> %BR%
     <label><input type="radio" name="SITEMAPLIST" value="" /> *hide* from sitemap </label>
     <div class="foswikiFormDescription">
@@ -49,20 +48,47 @@
     </div>
   </div>
   <div class="foswikiFormStep">
-    <h3>Global search:</h3>
-    <label><input type="radio" name="NOSEARCHALL" value="on" /> *include* in global search </label>%BR%
-    <label><input type="radio" name="NOSEARCHALL" value="" checked="checked" /> *exclude* from global search </label>
+    <h3>%MAKETEXT{"Global search"}%:</h3>
+    <label><input type="radio" name="NOSEARCHALL" value="on" checked="checked" /> *include* in global search </label>%BR%
+    <label><input type="radio" name="NOSEARCHALL" value="" /> *exclude* from global search </label>
     <div class="foswikiFormDescription">
       Specify if you want to exclude the web from a global search. Note, that you will have to
       enter this web explicitly to search in it.
     </div>
   </div>
+  <div class="foswikiFormStep">
+    <h3>%MAKETEXT{"Web color"}%:</h3>
+    <input name="WEBBGCOLOR" class="foswikiInputField jqFarbtastic" type="text" value="#efefef" size="20" /> 
+    <div class="foswikiFormDescription">
+      Displayed on %SYSTEMWEB%.SiteMap.
+    </div>
+  </div>
   %ENDTWISTY%
   <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
     %BUTTON{"%MAKETEXT{"Submit"}%" icon="add" type="save"}%
     %CLEAR%
   </div>
 </div>
 </form>
+%JQREQUIRE{"farbtastic"}%
+%JQREQUIRE{"validate"}%
+%ADDTOHEAD{
+text="
+  <script type='text/javascript'>
+    (function($) {
+      $(function() {
+        $('#createNewWeb').validate();
+      });
+    })(jQuery);
+  </script>
+"
+  requires="JQUERYPLUGIN::VALIDATE"
+}%
 
 %ICON{"help"}% Get help on [[%SYSTEMWEB%.ManagingWebs][managing webs]].
+
+%META:PREFERENCE{name="DISPLAYTOPICACTIONS" title="DISPLAYTOPICACTIONS" type="Local" value="off"}%
+%META:PREFERENCE{name="DISPLAYBREADCRUMBS" title="DISPLAYBREADCRUMBS" type="Local" value="off"}%
+%META:PREFERENCE{name="DISPLAYREVISIONINFO" title="DISPLAYREVISIONINFO" type="Local" value="off"}%
+%META:PREFERENCE{name="DISPLAYFORM" title="DISPLAYFORM" type="Local" value="off"}%
+%META:PREFERENCE{name="DISPLAYATTACHMENTS" title="DISPLAYATTACHMENTS" type="Local" value="off"}%
diff --git a/lib/Foswiki/Contrib/NatSkin.pm b/lib/Foswiki/Contrib/NatSkin.pm
@@ -1,6 +1,6 @@
 package Foswiki::Contrib::NatSkin;
 use vars qw($VERSION $RELEASE);
 $VERSION = '$Rev$';
-$RELEASE = '3.93';
+$RELEASE = '3.95';
 
 1;
diff --git a/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES b/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES
@@ -7,5 +7,5 @@ Foswiki::Plugins::SetVariablePlugin,>=4287,perl,Required
 Foswiki::Plugins::UploadPlugin,>=1340,perl,Required
 Foswiki::Plugins::NatEditPlugin,>=1993,perl,Required
 Foswiki::Plugins::JQueryPlugin,>=3740,perl,Required
-Foswiki::Plugins::NatSkinPlugin,>=4359,perl,Required
+Foswiki::Plugins::NatSkinPlugin,>=4916,perl,Required
 Foswiki::Plugins::RenderPlugin,>=3644,perl,Required
diff --git a/lib/Foswiki/Contrib/NatSkin/MANIFEST b/lib/Foswiki/Contrib/NatSkin/MANIFEST
@@ -1,6 +1,7 @@
 data/Main/NatSkinUserViewTemplate.txt 0644
 data/Main/WebLinks.txt 0644
 data/Main/WikiGuestSideBar.txt 0644
+data/Sandbox/NatSkinTest.txt 0644
 data/System/AjaxWebSelector.txt 0644
 data/System/JazzyNoteTheme.txt 0644
 data/System/MySideBarTemplate.txt 0644
@@ -14,6 +15,7 @@ data/System/NatSkinTemplates.txt 0644
 data/System/NatSkinTopicDoesNotExistViewTemplate.txt 0644
 data/System/NatSkin.txt 0644
 data/System/NatSkinWebCreateNewTopicTemplate.txt 0644
+data/System/NatSkinWebTopicListViewTemplate.txt 0644
 data/System/SiteBottomBar.txt 0644
 data/System/SiteButtons.txt 0644
 data/System/SiteHtmlHead.txt 0644
@@ -55,8 +57,6 @@ pub/System/NatSkin/BaseThin.css 0644
 pub/System/NatSkin/BaseThin.css.gz 0644
 pub/System/NatSkin/blank.gif 0644
 pub/System/NatSkin/BlueNoteStyle.jpeg 0644
-pub/System/NatSkin/login.js 0644
-pub/System/NatSkin/login.js.gz 0644
 pub/System/NatSkin/edit.js 0644
 pub/System/NatSkin/edit.js.gz 0644
 pub/System/NatSkin/external.png 0644
@@ -122,6 +122,8 @@ pub/System/NatSkin/icons/time.png 0644
 pub/System/NatSkin/icons/user.png 0644
 pub/System/NatSkin/icons/wrench.png 0644
 pub/System/NatSkin/iepngfix.htc 0644
+pub/System/NatSkin/login.js 0644
+pub/System/NatSkin/login.js.gz 0644
 pub/System/NatSkin/Makefile 0644
 pub/System/NatSkin/Makefile.include 0644
 pub/System/NatSkin/menuarrow.gif 0644