Skip to content

Commit 7436dee

Browse files
ArthurClemensArthurClemens
ArthurClemens
authored and
ArthurClemens
committed
Item264: rename leftbar to sidebar (because the left bar can now be at the right too)
1 parent fbc38e7 commit 7436dee

File tree

44 files changed

+319
-350
lines changed

Some content is hidden

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

44 files changed

+319
-350
lines changed

‎BlogPlugin/pub/TWiki/BlogPlugin/patternstyle.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ html body {
2121
#patternOuter {
2222
margin-left:270px;
2323
}
24-
#patternLeftBar {
24+
#patternSideBar {
2525
width:270px;
2626
margin-left:-270px;
2727
font-size:95%;
@@ -34,7 +34,7 @@ html body {
3434
.blogAbout {
3535
font-size:100%;
3636
}
37-
.patternLeftBarContents {
37+
.patternSideBarContents {
3838
width:auto;
3939
}
4040
.blogSideBar {
@@ -63,7 +63,7 @@ html body {
6363
.blogSideBar .patternFormField {
6464
width:100%;
6565
}
66-
#patternLeftBarContents .blogSideBarSection h1 a {
66+
#patternSideBarContents .blogSideBarSection h1 a {
6767
color:#a00; /*T5*/
6868
}
6969

‎MoveableTypeSkin/pub/TWiki/MoveableTypeMantisDesign/TWiki.css

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ a:hover.twistyTrigger {
8585
color:#333;
8686
}
8787
/* TipsContrib - in left bar */
88-
#patternLeftBar .tipsOfTheDay a:link,
89-
#patternLeftBar .tipsOfTheDay a:visited {
88+
#patternSideBar .tipsOfTheDay a:link,
89+
#patternSideBar .tipsOfTheDay a:visited {
9090
color:#a00;
9191
}
92-
#patternLeftBar .tipsOfTheDay a:hover {
92+
#patternSideBar .tipsOfTheDay a:hover {
9393
color:#FBF7E8;
9494
}
9595

@@ -374,9 +374,9 @@ tr.twikiDiffDebug .twikiDiffUnchangedText {
374374
background-repeat:no-repeat;
375375
background-position:0 .35em;
376376
}
377-
/*#patternLeftBarContents .patternLeftBarPersonal,*/
377+
/*#patternSideBarContents .patternLeftBarPersonal,*/
378378
#twikiLogin,
379-
#patternLeftBarContents .tipsOfTheDayContents {
379+
#patternSideBarContents .tipsOfTheDayContents {
380380
QQbackground-image:url(gradient_blue.gif);
381381
background-repeat:repeat-x;
382382
}
@@ -600,18 +600,18 @@ blockquote {
600600
text-decoration:none;
601601
}
602602
/* TipsContrib - in left bar */
603-
#patternLeftBar .tipsOfTheDay {
603+
#patternSideBar .tipsOfTheDay {
604604
}
605-
#patternLeftBar .tipsOfTheDayHeader img {
605+
#patternSideBar .tipsOfTheDayHeader img {
606606
/* hide lamp icon */
607607
display:none;
608608
}
609-
#patternLeftBar .tipsOfTheDayContents {
609+
#patternSideBar .tipsOfTheDayContents {
610610
padding:.25em .25em .5em .25em;
611611
height:1%; /* or Win IE won't display a background */
612612
overflow:hidden;
613613
}
614-
#patternLeftBar .tipsOfTheDayHeader {
614+
#patternSideBar .tipsOfTheDayHeader {
615615
display:block;
616616
font-weight:normal;
617617
}

‎MoveableTypeSkin/pub/TWiki/MoveableTypeSample2Design/TWiki.css

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ a:hover.twistyTrigger {
8585
color:#333;
8686
}
8787
/* TipsContrib - in left bar */
88-
#patternLeftBar .tipsOfTheDay a:link,
89-
#patternLeftBar .tipsOfTheDay a:visited {
88+
#patternSideBar .tipsOfTheDay a:link,
89+
#patternSideBar .tipsOfTheDay a:visited {
9090
color:#a00;
9191
}
92-
#patternLeftBar .tipsOfTheDay a:hover {
92+
#patternSideBar .tipsOfTheDay a:hover {
9393
color:#FBF7E8;
9494
}
9595

@@ -374,9 +374,9 @@ tr.twikiDiffDebug .twikiDiffUnchangedText {
374374
background-repeat:no-repeat;
375375
background-position:0 .35em;
376376
}
377-
/*#patternLeftBarContents .patternLeftBarPersonal,*/
377+
/*#patternSideBarContents .patternLeftBarPersonal,*/
378378
#twikiLogin,
379-
#patternLeftBarContents .tipsOfTheDayContents {
379+
#patternSideBarContents .tipsOfTheDayContents {
380380
QQbackground-image:url(gradient_blue.gif);
381381
background-repeat:repeat-x;
382382
}
@@ -600,18 +600,18 @@ blockquote {
600600
text-decoration:none;
601601
}
602602
/* TipsContrib - in left bar */
603-
#patternLeftBar .tipsOfTheDay {
603+
#patternSideBar .tipsOfTheDay {
604604
}
605-
#patternLeftBar .tipsOfTheDayHeader img {
605+
#patternSideBar .tipsOfTheDayHeader img {
606606
/* hide lamp icon */
607607
display:none;
608608
}
609-
#patternLeftBar .tipsOfTheDayContents {
609+
#patternSideBar .tipsOfTheDayContents {
610610
padding:.25em .25em .5em .25em;
611611
height:1%; /* or Win IE won't display a background */
612612
overflow:hidden;
613613
}
614-
#patternLeftBar .tipsOfTheDayHeader {
614+
#patternSideBar .tipsOfTheDayHeader {
615615
display:block;
616616
font-weight:normal;
617617
}

‎MoveableTypeSkin/pub/TWiki/MoveableTypeSample3Design/TWiki.css

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ a:hover.twistyTrigger {
8585
color:#333;
8686
}
8787
/* TipsContrib - in left bar */
88-
#patternLeftBar .tipsOfTheDay a:link,
89-
#patternLeftBar .tipsOfTheDay a:visited {
88+
#patternSideBar .tipsOfTheDay a:link,
89+
#patternSideBar .tipsOfTheDay a:visited {
9090
color:#a00;
9191
}
92-
#patternLeftBar .tipsOfTheDay a:hover {
92+
#patternSideBar .tipsOfTheDay a:hover {
9393
color:#FBF7E8;
9494
}
9595

@@ -374,9 +374,9 @@ tr.twikiDiffDebug .twikiDiffUnchangedText {
374374
background-repeat:no-repeat;
375375
background-position:0 .35em;
376376
}
377-
/*#patternLeftBarContents .patternLeftBarPersonal,*/
377+
/*#patternSideBarContents .patternLeftBarPersonal,*/
378378
#twikiLogin,
379-
#patternLeftBarContents .tipsOfTheDayContents {
379+
#patternSideBarContents .tipsOfTheDayContents {
380380
QQbackground-image:url(gradient_blue.gif);
381381
background-repeat:repeat-x;
382382
}
@@ -600,18 +600,18 @@ blockquote {
600600
text-decoration:none;
601601
}
602602
/* TipsContrib - in left bar */
603-
#patternLeftBar .tipsOfTheDay {
603+
#patternSideBar .tipsOfTheDay {
604604
}
605-
#patternLeftBar .tipsOfTheDayHeader img {
605+
#patternSideBar .tipsOfTheDayHeader img {
606606
/* hide lamp icon */
607607
display:none;
608608
}
609-
#patternLeftBar .tipsOfTheDayContents {
609+
#patternSideBar .tipsOfTheDayContents {
610610
padding:.25em .25em .5em .25em;
611611
height:1%; /* or Win IE won't display a background */
612612
overflow:hidden;
613613
}
614-
#patternLeftBar .tipsOfTheDayHeader {
614+
#patternSideBar .tipsOfTheDayHeader {
615615
display:block;
616616
font-weight:normal;
617617
}

‎MoveableTypeSkin/pub/TWiki/MoveableTypeSampleDesign/TWiki.css

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ a:hover.twistyTrigger {
8585
color:#333;
8686
}
8787
/* TipsContrib - in left bar */
88-
#patternLeftBar .tipsOfTheDay a:link,
89-
#patternLeftBar .tipsOfTheDay a:visited {
88+
#patternSideBar .tipsOfTheDay a:link,
89+
#patternSideBar .tipsOfTheDay a:visited {
9090
color:#a00;
9191
}
92-
#patternLeftBar .tipsOfTheDay a:hover {
92+
#patternSideBar .tipsOfTheDay a:hover {
9393
color:#FBF7E8;
9494
}
9595

@@ -374,9 +374,9 @@ tr.twikiDiffDebug .twikiDiffUnchangedText {
374374
background-repeat:no-repeat;
375375
background-position:0 .35em;
376376
}
377-
/*#patternLeftBarContents .patternLeftBarPersonal,*/
377+
/*#patternSideBarContents .patternLeftBarPersonal,*/
378378
#twikiLogin,
379-
#patternLeftBarContents .tipsOfTheDayContents {
379+
#patternSideBarContents .tipsOfTheDayContents {
380380
QQbackground-image:url(gradient_blue.gif);
381381
background-repeat:repeat-x;
382382
}
@@ -600,18 +600,18 @@ blockquote {
600600
text-decoration:none;
601601
}
602602
/* TipsContrib - in left bar */
603-
#patternLeftBar .tipsOfTheDay {
603+
#patternSideBar .tipsOfTheDay {
604604
}
605-
#patternLeftBar .tipsOfTheDayHeader img {
605+
#patternSideBar .tipsOfTheDayHeader img {
606606
/* hide lamp icon */
607607
display:none;
608608
}
609-
#patternLeftBar .tipsOfTheDayContents {
609+
#patternSideBar .tipsOfTheDayContents {
610610
padding:.25em .25em .5em .25em;
611611
height:1%; /* or Win IE won't display a background */
612612
overflow:hidden;
613613
}
614-
#patternLeftBar .tipsOfTheDayHeader {
614+
#patternSideBar .tipsOfTheDayHeader {
615615
display:block;
616616
font-weight:normal;
617617
}

‎PatternSkin/data/System/PatternSkinColorSettings.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Do not change the text below this line unless you know what you are doing!
219219
background:none;
220220
border-color:%LAYOUT_ELEMENT_BORDER%;
221221
}
222-
#patternLeftBar,
222+
#patternSideBar,
223223
#patternWrapper {
224224
background:%SIDE_BAR_BACKGROUND%;
225225
}
@@ -608,26 +608,26 @@ a:hover .twikiAccessKey {
608608
}
609609

610610
/* Left bar */
611-
#patternLeftBarContents {
611+
#patternSideBarContents {
612612
color:%GENERAL_TEXT%;
613613
}
614-
#patternLeftBarContents hr {
614+
#patternSideBarContents hr {
615615
color:%FORM_STEP_BORDER%;
616616
background-color:%FORM_STEP_BORDER%;
617617
}
618-
#patternLeftBarContents a:link,
619-
#patternLeftBarContents a:visited {
618+
#patternSideBarContents a:link,
619+
#patternSideBarContents a:visited {
620620
color:%SIDE_BAR_LINK_TEXT%;
621621
}
622-
#patternLeftBarContents a:hover {
622+
#patternSideBarContents a:hover {
623623
color:%LINK_TEXT_HOVER%;
624624
}
625-
#patternLeftBarContents .patternLeftBarPersonal,
626-
#patternLeftBarContents .patternWebIndicator {
625+
#patternSideBarContents .patternLeftBarPersonal,
626+
#patternSideBarContents .patternWebIndicator {
627627
border-color:#dadada;
628628
}
629-
#patternLeftBarContents b,
630-
#patternLeftBarContents strong {
629+
#patternSideBarContents b,
630+
#patternSideBarContents strong {
631631
color:%HEADER_TEXT%;
632632
}
633633

‎PatternSkin/data/System/PatternSkinCss.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ If you want to learn how to create your own look or skin based on !PatternSkin,
1717

1818
* All !PatternSkin specific classes have the prefix =pattern=: patternEditPage, patternTopicAction, etcetera.
1919
* Foswiki specific classes (emitted by the Foswiki engine) have the prefix =twiki=: twikiButton, twikiToc, etcetera. See for a complete list CascadingStyleSheets.
20-
* Positional containers are referred by id, for instance =#patternLeftBar=.
20+
* Positional containers are referred by id, for instance =#patternSideBar=.
2121

2222
---++ Namespaces
2323

@@ -47,8 +47,8 @@ If you want to learn how to create your own look or skin based on !PatternSkin,
4747
* #patternPage - html content container
4848
* Left bar:
4949
* #patternWrapper
50-
* #patternLeftBar - left bar area
51-
* #patternLeftBarContents - used for left menu
50+
* #patternSideBar - left bar area
51+
* #patternSideBarContents - used for left menu
5252
* #patternOuter - wrapper container
5353
* #patternFloatWrap - wrapper container
5454
* #patternMain - center area

‎PatternSkin/data/System/PatternSkinCssCookbookNoTopBar.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ You can write this line in %SYSTEMWEB%.DefaultPreferences, in %USERSWEB%.SitePre
1515
Add the dynamic link to the logo image to the topic text:
1616
<verbatim>
1717
<style type="text/css" media="all">
18-
#patternLeftBar { background-image:url("%PUBURLPATH%/%WEB%/%WEBPREFSTOPIC%/logo.gif"); }
18+
#patternSideBar { background-image:url("%PUBURLPATH%/%WEB%/%WEBPREFSTOPIC%/logo.gif"); }
1919
</style>
2020
</verbatim>
2121
<div class="twikiHelp">
2222
%ICON{info}% If you don't write this overloading style in a template and use an external =.css= file, you need to set the image to the absolute url:
2323
<pre>
2424
&lt;style type="text/css" media="all">
25-
#patternLeftBar { background-image:url("<nop>%PUBURLPATH%/<nop>%WEB%/<nop>%WEBPREFSTOPIC%/logo.gif"); }
25+
#patternSideBar { background-image:url("<nop>%PUBURLPATH%/<nop>%WEB%/<nop>%WEBPREFSTOPIC%/logo.gif"); }
2626
&lt;/style>
2727
</pre>
2828
You can always write a =&lt;style>= in a topic - all current browsers support this - but the page won't validate as valid XHTML.
2929
</div>
3030

3131
<style type="text/css" media="all">
32-
#patternLeftBar { background-image:url("%PUBURLPATH%/%WEB%/%WEBPREFSTOPIC%/logo.gif"); }
32+
#patternSideBar { background-image:url("%PUBURLPATH%/%WEB%/%WEBPREFSTOPIC%/logo.gif"); }
3333
</style>
3434

3535

‎PatternSkin/data/System/PatternSkinCustomization.txt

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ view
8484
css
8585
viewtopbar
8686
%TWIKIWEB%.WebTopBar
87-
viewleftbar
87+
viewsidebar
8888
%WEB%.WebLeftBar
8989
viewtopicactionbuttons
9090
viewbottombar
@@ -226,13 +226,10 @@ You can remove these items from %TWIKIWEB%.WebTopBar.
226226
The view template is populated with page elements using template inclusions:
227227

228228
<pre>
229-
%<nop>TMPL:INCLUDE{"page"}%
230-
%<nop>TMPL:INCLUDE{"viewtopbar"}%
231-
%<nop>TMPL:INCLUDE{"viewtoolbar"}%
232-
%<nop>TMPL:INCLUDE{"viewleftbar"}%
233-
%<nop>TMPL:INCLUDE{"viewrightbar"}%
229+
%<nop>TMPL:INCLUDE{"view"}%
234230
%<nop>TMPL:INCLUDE{"viewtopicactionbuttons"}%
235-
%<nop>TMPL:INCLUDE{"viewbottombar"}%
231+
%<nop>TMPL:INCLUDE{"viewtopbar"}%
232+
%<nop>TMPL:INCLUDE{"viewsidebar"}%
236233
</pre>
237234

238235
Each included template draws a part of the screen.%BR%
@@ -262,41 +259,17 @@ See PatternSkinCssCookbookNoTopBar
262259

263260
---++ Left bar
264261

265-
---+++ I want to hide the left bar
262+
---+++ I want to hide the side bar
266263

267264
*Using templates:* %BR%
268-
Omit =%<nop>TMPL:INCLUDE{"viewleftbar"}%= to hide the left bar, or in a custom template clear it using
265+
Omit =%<nop>TMPL:INCLUDE{"viewsidebar"}%= to hide the side bar, or in a custom template clear it using
269266
<blockquote><verbatim>
270-
%TMPL:DEF{"leftbar"}%%TMPL:END%
271-
%TMPL:DEF{"leftbardimensions"}%%TMPL:END%
267+
%TMPL:DEF{"sidebar"}%%TMPL:END%
272268
</verbatim></blockquote>
273269

274270
*Using style sheets:* %BR%
275271
See PatternSkinCssCookbookNoLeftBar
276272

277-
---+++ I want to make the left bar wider
278-
279-
*Using templates:* %BR%
280-
281-
The left bar is 12 em wide by default.
282-
283-
*Using templates:* %BR%
284-
Using either a template or a topic template, copy this definition in your custom template:
285-
286-
<blockquote>
287-
<verbatim>
288-
%TMPL:DEF{"leftbardimensions"}%#patternOuter {
289-
margin-left:12em;
290-
}
291-
#patternLeftBar {
292-
width:12em;
293-
margin-left:-12em;
294-
}%TMPL:END%
295-
</verbatim>
296-
And change the number from 12em to a different value (3 occurrences).
297-
</blockquote>
298-
299-
300273

301274
---++ Buttons
302275

‎PatternSkin/data/System/WebLeftBarCookbook.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Each link is an item in a bullet list. So it can look like this:
1616

1717
The list is formatted with CSS. To get an idea of the actual look, see the list above formatted as in the left bar (you need to have =SKIN= set to PatternSkin):
1818

19-
<div class="patternLeftBar" style="position:relative; top:0; left:0; padding:0; margin:0; border:0;">
19+
<div class="patternSideBar" style="position:relative; top:0; left:0; padding:0; margin:0; border:0;">
2020
<div class="patternLeftBarPersonal">
2121
* *My links*
2222
* WebHome

0 commit comments

Comments
 (0)