Skip to content

Commit 6092089

Browse files
MichaelDaumMichaelDaum
MichaelDaum
authored and
MichaelDaum
committed
Item2332:Item2296:
 * added jquery-ui theme * various template fixes * various css fixes * fixed menu using latest jQuery superfish/supersubs git-svn-id: http://svn.foswiki.org/trunk/NatSkin@5564 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
1 parent e39bd1a commit 6092089

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+607
-234
lines changed

‎data/Sandbox/NatSkinTest.txt‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
%META:TOPICINFO{author="ProjectContributor" date="1252423607" format="1.1" version="1.19"}%
1+
%META:TOPICINFO{author="ProjectContributor" comment="save topic" date="1257351150" format="1.1" reprev="1.20" version="1.20"}%
22
---+!! %TOPIC%
3-
%IF{"$'showgrid'='on'"
4-
then="$percntBUTTON{\"Hide grid\" icon=\"table_delete\" class=\"foswikiRight\" href=\"%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%\"}$percnt"
5-
else="$percntBUTTON{\"Show grid\" icon=\"table_add\" class=\"foswikiRight\" href=\"%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?showgrid=on\"}$percnt"
6-
}%
3+
%BUTTON{"Toggle grid" icon="table" class="foswikiRight" onclick="jQuery('.natMain').toggleClass('showgrid-40x18')"}%
4+
75
uismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim
86
ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl
97
ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in
@@ -14,15 +12,6 @@ feugiat nulla facilisis at vero eros et accumsan et
1412

1513
%TOC{title="On this page"}%
1614

17-
<literal>
18-
<style type="text/css">
19-
.%IF{"$'showgrid'!='on'" then="DIS"}%natMain {
20-
background:transparent url(%PUBURLPATH%/%SYSTEMWEB%/NatSkin/grid-40x18.png) repeat scroll 0 0 !important;
21-
}
22-
</style>
23-
</literal>
24-
25-
2615
*left*: Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh
2716
euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim
2817
ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl

‎data/System/AjaxWebSelector.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%META:TOPICINFO{author="ProjectContributor" date="1243950128" format="1.1" reprev="1.4" version="1.4"}%
1+
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1257465875" format="1.1" reprev="1.5" version="1.5"}%
22
---+!! %TOPIC%
33
%TOC%
44

@@ -211,13 +211,13 @@ webSelector = {
211211
</verbatim>
212212

213213
---++ Test
214-
%<nop>INCLUDE{"%TOPIC%"}%
214+
%INCLUDE{"%TOPIC%"}%
215215

216216
<div>
217217
%BUTTON{"Goto webspace" onclick="webSelector.show();" icon="page_white_go"}%
218218
%CLEAR%
219219
</div>
220220

221-
%META:FILEATTACHMENT{name="webselector.css" attachment="webselector.css" attr="" author="micha" comment="Generated by !AttachContentPlugin" date="1243950128" path="webselector.css" size="649" version="8"}%
222-
%META:FILEATTACHMENT{name="webselector.js" attachment="webselector.js" attr="" author="micha" comment="Generated by !AttachContentPlugin" date="1243950128" path="webselector.js" size="3199" version="29"}%
221+
%META:FILEATTACHMENT{name="webselector.css" attachment="webselector.css" attr="" comment="" date="1257465874" path="webselector.css" size="647" user="ProjectContributor" version="1"}%
222+
%META:FILEATTACHMENT{name="webselector.js" attachment="webselector.js" attr="" comment="" date="1257465874" path="webselector.js" size="3182" user="ProjectContributor" version="1"}%
223223
%META:TOPICMOVED{by="micha" date="1243614912" from="Sandbox.AjaxWebSelector" to="System.AjaxWebSelector"}%

‎data/System/NatSkin.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,16 @@ allways open an extra window.
137137
| Version: | %$VERSION% |
138138
| Description: | Userfriendly Foswiki skin providing a flexible theming engine for professional webdesigns |
139139
| Base Name: | nat |
140-
| Screenshot: | <div style="overflow:hidden;height:200px"><a href="%ATTACHURL%/BlueNoteStyle.jpeg"><img src="%ATTACHURL%/BlueNoteStyle.jpeg" title="Clean"/></a></div> |
140+
| Screenshot: | <div style="overflow:hidden;height:200px"><a href="%PUBURLPATH%/%WEB%/NatSkin/BlueNoteStyle.jpeg"><img src="%PUBURLPATH%/%WEB%/NatSkin/BlueNoteStyle.jpeg" title="JazzyNoteTheme"/></a></div> |
141141
| Change&nbsp;History: | <!-- specify latest version first -->&nbsp; |
142+
| 17 Nov 2009: | fixed print cover; \
143+
fixed jazzyblue for ie6; \
144+
added autocomplete for reparenting; \
145+
fixed webbuttons for latest jQuery superfish; \
146+
added jQuery-ui theme matching jazzyblue; \
147+
added <nop>WebTopicListViewTempalte using MAKEINDEX; \
148+
added support for tag renaming in latest !ClassificationPlugin; \
149+
maketext fixes |
142150
| 14 Sep 2009: | fixing css for tinymce where reset classes where too eager; \
143151
fixes due to latest !TablePlugin; \
144152
support for Foswiki:Extensions/MetaCommentPlugin |

‎data/System/NatSkinTopicDoesNotExistViewTemplate.txt‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,22 @@
2626
<!-- //content -->%TMPL:END%
2727

2828
%TMPL:DEF{"similar"}%<!-- similar -->
29-
%SEARCH{"%BASETOPIC%"
30-
header="<h2 >%MAKETEXT{"Similar topics"}%</h2>"
31-
limit="100"
32-
scope="topic"
33-
web="%BASEWEB%"
34-
nonoise="on"
35-
order="modified"
36-
reverse="on"
37-
}%
29+
&nbsp;
30+
%SEARCH{"%BASETOPIC%"
31+
header="<h2 >%MAKETEXT{"Similar topics"}%</h2>"
32+
limit="100"
33+
scope="topic"
34+
web="%BASEWEB%"
35+
nonoise="on"
36+
order="modified"
37+
reverse="on"
38+
}%
39+
3840
<!-- //similar -->%TMPL:END%
3941

4042
%TMPL:DEF{"formstartstep"}%<!-- formstartstep -->
4143
%TWISTYBUTTON{id="createnewtopic" link="%BUTTON{"%MAKETEXT{"Create new topic"}%" icon="add"}%"}%
44+
%BUTTON{"%MAKETEXT{"Search in all webs"}%" icon="find" target="%SCRIPTURLPATH{"view"}%/%BASEWEB%/WebSearch?scope=topic;web=all;search=%BASETOPIC%" }%
4245
%BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%BASEWEB%.%HOMETOPIC%" title="%MAKETEXT{"Get me out of here"}%"}%
4346
%CLEAR%
4447
%TWISTYTOGGLE{id="createnewtopic" mode="div"}%
@@ -48,6 +51,7 @@
4851

4952
%TMPL:DEF{"formendstep"}%<!-- formendstep -->
5053
%TMPL:P{"formend"}%
51-
</div>
54+
55+
</div><!-- foswikiFormSteps -->
5256
%ENDTWISTYTOGGLE%
5357
<!-- //formendstep -->%TMPL:END%

‎data/System/NatSkinWebCreateNewTopicTemplate.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Topic name that the newly created topic will be a child of.
133133
<select name="templatetopic" class="foswikiSelect">
134134
%IF{"'%URLPARAM{"templatetopic"}%'"
135135
then='<option selected="selected">%URLPARAM{"templatetopic"}%</option>'
136-
}%<option value="">%MAKETEXT{"Default template"}%</option>
136+
}%<option value="%IF{"istopic 'WebTopicEditTemplate'" then="WebTopicEditTemplate"}%">%MAKETEXT{"Default template"}%</option>
137137
%SEARCH{
138138
"name~'*Template'"
139139
scope="topic"

‎data/System/NatSkinWebTopicListViewTemplate.txt‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
1-
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1250500470" format="1.1" reprev="1.3" version="1.3"}%
1+
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1257265212" format="1.1" reprev="1.4" version="1.4"}%
22
%TMPL:INCLUDE{"WebTopicListView"}%
33
%TMPL:DEF{"content"}%
44
---+ %TOPIC%
5-
%MAKEINDEX{"%TOPICLIST{"$name" separator=","}%" cols="3" header="$anchors" format="[[%BASEWEB%.$item][$item]]"}%
5+
<noautolink>
6+
%MAKEINDEX{
7+
"$percntTOPICLIST{
8+
\"($dollarpercntGETTOPICTITLE{\\"$dollarname\\"}$dollarpercnt);$dollarpercntGETTOPICTITLE{\\"$dollarname\\"}$dollarpercnt;$dollarname\"
9+
separator=\"$n\"
10+
}$percnt"
11+
pattern="(.*);(.*);(.*)"
12+
split="\n"
13+
cols="3"
14+
header="$anchors"
15+
format="[[%BASEWEB%.$3][$2]]"
16+
}%
17+
</noautolink>
618
%TMPL:END%
19+
%TMPL:DEF{"sidebar"}%%TMPL:END%
720

821
%META:TOPICMOVED{by="micha" date="1250500443" from="System.PatternSkinWebTopicListViewTemplate" to="System.NatSkinWebTopicListViewTemplate"}%

‎data/System/WebTopicListViewTemplate.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
%META:TOPICINFO{author="ProjectContributor" comment="save topic" date="1250498619" format="1.1" reprev="1.1" version="1.1"}%
2+
%TMPL:INCLUDE{"view"}%
3+
%TMPL:DEF{"content"}%
4+
%TOPICLIST{" 1 [[%BASEWEB%.$name][$name]]"}%
5+
%TMPL:END%

‎lib/Foswiki/Contrib/NatSkin/Config.spec‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# ---+ Extensions
2+
# ---++ NatSkin
3+
# **PERL**
4+
# This setting is required to enable executing natsearch from the bin directory
5+
$Foswiki::cfg{SwitchBoard}{natsearch} = ['Foswiki::Plugins::NatSkinPlugin::Search', 'searchCgi', {natsearch => 1}];
6+
7+
1;
8+

‎lib/Foswiki/Contrib/NatSkin/MANIFEST‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
data/Main/NatSkinUserViewTemplate.txt 0644
21
data/Main/WebLinks.txt 0644
32
data/Main/WikiGuestSideBar.txt 0644
43
data/Sandbox/NatSkinTest.txt 0644
@@ -26,6 +25,8 @@ data/System/SiteSideBar.txt 0644
2625
data/System/SiteTopicActions.txt 0644
2726
data/System/WebCreateNewWeb.txt 0644
2827
data/System/WebLinks.txt 0644
28+
data/System/WebTopicListViewTemplate.txt 0644
29+
lib/Foswiki/Contrib/NatSkin/Config.spec 0644
2930
lib/Foswiki/Contrib/NatSkin.pm 0644
3031
pub/System/JazzyNoteTheme/bullet-toc.gif 0644
3132
pub/System/JazzyNoteTheme/button-bg.png 0644
@@ -34,17 +35,25 @@ pub/System/JazzyNoteTheme/foswiki-header.png 0644
3435
pub/System/JazzyNoteTheme/foswiki-header-tile.png 0644
3536
pub/System/JazzyNoteTheme/GrayBlend.gif 0644
3637
pub/System/JazzyNoteTheme/GrayBlend.png 0644
38+
pub/System/JazzyNoteTheme/images/ui-bg_diagonals-medium_100_FEF8EB_40x40.png 0644
39+
pub/System/JazzyNoteTheme/images/ui-bg_flat_0_aaaaaa_40x100.png 0644
40+
pub/System/JazzyNoteTheme/images/ui-icons_222222_256x240.png 0644
41+
pub/System/JazzyNoteTheme/images/ui-icons_228ef1_256x240.png 0644
42+
pub/System/JazzyNoteTheme/images/ui-icons_ef8c08_256x240.png 0644
43+
pub/System/JazzyNoteTheme/images/ui-icons_ffd27a_256x240.png 0644
44+
pub/System/JazzyNoteTheme/images/ui-icons_ffffff_256x240.png 0644
3745
pub/System/JazzyNoteTheme/JazzyNoteBorder.css 0644
3846
pub/System/JazzyNoteTheme/JazzyNoteBorder.css.gz 0644
3947
pub/System/JazzyNoteTheme/JazzyNoteButtons.css 0644
4048
pub/System/JazzyNoteTheme/JazzyNoteButtons.css.gz 0644
41-
pub/System/JazzyNoteTheme/JazzyNoteStyle.css 0644
49+
pub/System/JazzyNoteTheme/JazzyNoteStyle.css~ 0644
4250
pub/System/JazzyNoteTheme/JazzyNoteStyle.css.gz 0644
4351
pub/System/JazzyNoteTheme/JazzyNoteThin.css 0644
4452
pub/System/JazzyNoteTheme/JazzyNoteThin.css.gz 0644
4553
pub/System/JazzyNoteTheme/login_keys.png 0644
4654
pub/System/JazzyNoteTheme/Makefile 0644
4755
pub/System/JazzyNoteTheme/menucorner.gif 0644
56+
pub/System/JazzyNoteTheme/menushadow.png 0644
4857
pub/System/NatSkin/attach.js 0644
4958
pub/System/NatSkin/attach.js.gz 0644
5059
pub/System/NatSkin/BaseBorder.css 0644

‎pub/System/JazzyNoteTheme/JazzyNoteBorder.css.gz‎

-19 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)