From: <Art...@nt...> - 2005-10-11 14:34:12
|
Author: ArthurClemens Date: 2005-10-11 07:32:49 -0700 (Tue, 11 Oct 2005) New Revision: 6976 Removed: twiki/branches/DEVELOP/pub/TWiki/PatternSkin/patternLeftBarPersonal_bg.gif Modified: twiki/branches/DEVELOP/data/Main/WebLeftBar.txt twiki/branches/DEVELOP/data/Sandbox/WebLeftBar.txt twiki/branches/DEVELOP/data/TWiki/WebLeftBar.txt twiki/branches/DEVELOP/data/TWiki/WebLeftBarCookbook.txt twiki/branches/DEVELOP/data/TWiki/WebLeftBarLogin.txt twiki/branches/DEVELOP/data/TWiki/WebLeftBarPersonalTemplate.txt twiki/branches/DEVELOP/data/Trash/WebLeftBar.txt twiki/branches/DEVELOP/data/_default/WebLeftBar.txt twiki/branches/DEVELOP/pub/TWiki/PatternSkin/colors.css twiki/branches/DEVELOP/pub/TWiki/PatternSkin/style.css twiki/branches/DEVELOP/templates/twiki.pattern.tmpl Log: Item240: recoding the left bar - update all WebLeftBars! Modified: twiki/branches/DEVELOP/data/Main/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/WebLeftBar.txt 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/data/Main/WebLeftBar.txt 2005-10-11 14:32:49 UTC (rev 6976) @@ -1,7 +1,5 @@ %META:TOPICINFO{author="TWikiContributor" date="1121074087" format="1.1" version="$Rev$"}% -%INCLUDE{"%IF{"context can_login" then="%TWIKIWEB%.WebLeftBarLogin"}%" warn="off"}% %INCLUDE{ "%TWIKIWEB%.WebLeftBarWebsList" }% - --- * <b><nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%</b> * [[%HOMETOPIC%][%MAKETEXT{"Home"}%]] Modified: twiki/branches/DEVELOP/data/Sandbox/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/Sandbox/WebLeftBar.txt 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/data/Sandbox/WebLeftBar.txt 2005-10-11 14:32:49 UTC (rev 6976) @@ -1,8 +1,6 @@ %META:TOPICINFO{author="AntonioTerceiro" date="1127484504" format="1.1" version="1.2"}% -%INCLUDE{"%IF{"context can_login" then="%TWIKIWEB%.WebLeftBarLogin"}%" warn="off"}% %INCLUDE{ "%TWIKIWEB%.WebLeftBarWebsList" }% --- - * <b>%MAKETEXT{"[_1] Web" args="<nop>%INCLUDINGWEB%"}%</b> * [[%HOMETOPIC%][%MAKETEXT{"Home"}%]] * [[WebTopicList][%MAKETEXT{"Index"}%]] Modified: twiki/branches/DEVELOP/data/TWiki/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/WebLeftBar.txt 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/data/TWiki/WebLeftBar.txt 2005-10-11 14:32:49 UTC (rev 6976) @@ -1,7 +1,5 @@ %META:TOPICINFO{author="TWikiContributor" date="1121074151" format="1.1" version="$Rev$"}% -%INCLUDE{"%IF{"context can_login" then="%TWIKIWEB%.WebLeftBarLogin"}%" warn="off"}% %INCLUDE{ "%TWIKIWEB%.WebLeftBarWebsList" }% - ---- * <b><nop>%INCLUDINGWEB% Web</b> * [[%HOMETOPIC%][%MAKETEXT{"Home"}%]] @@ -21,7 +19,7 @@ * TWikiDocGraphics * TWikiSkinBrowser * InstalledPlugins - +--- * <b>%MAKETEXT{"Admin Maintenance"}%</b> * AdminToolsCategory * InterWikis @@ -30,10 +28,10 @@ * TWikiAdminCookBook * %WIKIPREFSTOPIC% * %WEBPREFSTOPIC% - +--- * *DocumentationCategories* %SEARCH{"DocumentationCategory" scope="topic" excludetopic="%TOPIC%" nonoise="on" format=" * $web.$topic"}% - +--- * *ToolsCategories* %SEARCH{"ToolsCategory" scope="topic" excludetopic="%TOPIC%" nonoise="on" format=" * $web.$topic"}% Modified: twiki/branches/DEVELOP/data/TWiki/WebLeftBarCookbook.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/WebLeftBarCookbook.txt 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/data/TWiki/WebLeftBarCookbook.txt 2005-10-11 14:32:49 UTC (rev 6976) @@ -3,7 +3,7 @@ *Instructions and tips how to use WebLeftBarPersonalTemplate*. -!WebLeftBarPersonalTemplate is a topic template to create a personal left bar block for each user. The personal topic, <user>LeftBar is included in WebLeftBar, the left menu used in PatternSkin. It is only visible to you. You can put links to frequently visited topics there, or a dynamically generated list of topics. +!WebLeftBarPersonalTemplate is a topic template to create a personal left bar block for each user. The personal topic, <user>LeftBar is included in the left bar. Its contents are only visible to you. You may put there whatever suits you - links to frequently visited topics, or a dynamically generated list of topics. Each link is an item in a bullet list. So it can look like this: @@ -12,18 +12,16 @@ * WebIndex * WebChanges -(but with _your_ personal topics). +(or use your own personal topics). -The list is formatted with CSS, and the bullets themselves are not displayed, and also indents are flattened. To get an idea of the actual look, see the list above formatted as in the left bar (you need to have PatternSkin set to on): +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 PatternSkin set to on): -<div class="patternLeftBar" style="position:relative; top:0; left:0;"> -<div class="patternLeftBarContents"> +<div class="patternLeftBar" style="position:relative; top:0; left:0; padding:0; margin:0; border:0;"> <div class="patternLeftBarPersonal"> * *My links* * WebHome * WebIndex * WebChanges -</div> </div> </div> Modified: twiki/branches/DEVELOP/data/TWiki/WebLeftBarLogin.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/WebLeftBarLogin.txt 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/data/TWiki/WebLeftBarLogin.txt 2005-10-11 14:32:49 UTC (rev 6976) @@ -2,4 +2,5 @@ %STARTINCLUDE% <div class="patternLeftBarPersonal"> %IF{"context authenticated" then="%MAKETEXT{"Hello [_1]!" args="[[%WIKIUSERNAME%][%SPACEOUT{%WIKINAME%}%]]"}%%BR%%LOGOUT%" else="%LOGIN%"}% -<div id="patternLeftBarPersonalContent">%INCLUDE{"%MAINWEB%.%WIKINAME%LeftBar" warn="<a href=\"%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%MAINWEB%/%WIKINAME%LeftBar?templatetopic=%TWIKIWEB%.WebLeftBarPersonalTemplate&topicparent=%WIKINAME%\">%MAKETEXT{"Create personal sidebar"}%</a>"}%</div></div> \ No newline at end of file +<div id="patternLeftBarPersonalContent">%INCLUDE{"%MAINWEB%.%WIKINAME%LeftBar" warn="<a href=\"%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%MAINWEB%/%WIKINAME%LeftBar?templatetopic=%TWIKIWEB%.WebLeftBarPersonalTemplate&topicparent=%WIKINAME%\">%MAKETEXT{"Create personal sidebar"}%</a>"}%</div> +</div> \ No newline at end of file Modified: twiki/branches/DEVELOP/data/TWiki/WebLeftBarPersonalTemplate.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/WebLeftBarPersonalTemplate.txt 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/data/TWiki/WebLeftBarPersonalTemplate.txt 2005-10-11 14:32:49 UTC (rev 6976) @@ -4,7 +4,7 @@ %STARTINCLUDE% * *My links* * [[%WIKIUSERNAME%][My home page]] - * <a href="%SCRIPTURL%/search%SCRIPTSUFFIX%/Codev/?search=InterestedParties.*%USERNAME%&regex=on" target="_top"><img src="%PUBURL%/%TWIKIWEB%/TWikiDocGraphics/stargold.gif" style="width:16px; height:16px; border:0px;" alt="Show me topics of interest" /></a> -<div class="twikiSmall"><a href="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%?t=%GMTIME{"$year$mo$day$hours$minutes$seconds"}%">edit</a></div> + * +<a class="twikiSmall" href="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%?t=20051011134358">edit</a> %STOPINCLUDE% Modified: twiki/branches/DEVELOP/data/Trash/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/Trash/WebLeftBar.txt 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/data/Trash/WebLeftBar.txt 2005-10-11 14:32:49 UTC (rev 6976) @@ -1,11 +1,8 @@ %META:TOPICINFO{author="ArthurClemens" date="1093167095" format="1.0" version="1.1"}% -<div class="patternLeftBarPersonal" style="margin-top:0;"> -%INCLUDE{"%IF{"context can_login" then="%TWIKIWEB%.WebLeftBarLogin"}%" warn="off"}% +%INCLUDE{ "%TWIKIWEB%.WebLeftBarWebsList" }% +---- * <b>%MAKETEXT{"[_1] Web" args="<nop>%INCLUDINGWEB%"}%</b> * [[%HOMETOPIC%][%MAKETEXT{"[_1] Web Home" args="%INCLUDINGWEB%"}%]] * [[WebChanges][%MAKETEXT{"Changes"}%]] * [[WebIndex][%MAKETEXT{"Index"}%]] * [[WebSearch][%MAKETEXT{"Search"}%]] -</div> ----- -%INCLUDE{ "%TWIKIWEB%.WebLeftBarWebsList" }% Modified: twiki/branches/DEVELOP/data/_default/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/_default/WebLeftBar.txt 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/data/_default/WebLeftBar.txt 2005-10-11 14:32:49 UTC (rev 6976) @@ -1,7 +1,5 @@ %META:TOPICINFO{author="TWikiContributor" date="1112002813" format="1.0" version="$Rev$"}% -%INCLUDE{"%IF{"context can_login" then="%TWIKIWEB%.WebLeftBarLogin"}%" warn="off"}% %INCLUDE{ "%TWIKIWEB%.WebLeftBarWebsList" }% - ---- * <b>%MAKETEXT{"[_1] Web" args="<nop>%INCLUDINGWEB%"}%</b> * [[%HOMETOPIC%][%MAKETEXT{"Home"}%]] @@ -11,4 +9,4 @@ * [[WebNotify][%MAKETEXT{"Notifications"}%]] * [[WebStatistics][%MAKETEXT{"Statistics"}%]] * [[WebPreferences][%MAKETEXT{"Preferences"}%]] ----- + Modified: twiki/branches/DEVELOP/pub/TWiki/PatternSkin/colors.css =================================================================== --- twiki/branches/DEVELOP/pub/TWiki/PatternSkin/colors.css 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/pub/TWiki/PatternSkin/colors.css 2005-10-11 14:32:49 UTC (rev 6976) @@ -19,14 +19,15 @@ T8 grayed out text #8E9195 T9 alert #f00 T10 green 'new' #049804 + T11 dark gray #333 Background colors ---------------------------------------- BG1 white; attachment, form table background #fff BG2 link hover background color (red) #D6000F - BG3 light gray #e6e6e6 + BG3 light gray #efefef BG4 active form field (not implemented yet) #ffc - BG5 help background very light blue #E9F2F9 + BG5 info background very light blue #E9F1F7 BG6 patternTopicAction light yellow (same as T3) #FBF7E8 BG7 header background (very light yellow) #FDFAF1 BG8 accent on sorted table column #ccc @@ -37,9 +38,9 @@ Border colors ---------------------------------------- - BO1 light gray #e6e6e6 + BO1 light gray #efefef BO2 submit button border blue ('active') #88B6CF - BO3 help, personal side bar light blue border #CADDED + BO3 info light blue border #BFD8ED BO4 border color beige, header h2 bottom border #E2DCC8 BO5 header h3..h5 bottom border (75% of BO4) #E9E4D2 BO6 neutral gray border #ccc @@ -129,6 +130,80 @@ } /* ----------------------------------------------------------- + Plugin elements + ----------------------------------------------------------- */ + +/* TablePlugin */ +.twikiTable, +.twikiTable td, +.twikiTable th { + border-color:#ddd; /*BO7*/ +} +.twikiTable th a:link, +.twikiTable th a:visited, +.twikiTable th a font { + color:#06c; /*T2*/ +} +.twikiTable th a:hover, +.twikiTable th a:hover font { + background-color:transparent; + color:#D6000F; /*T4*/ + border-color:#D6000F; /*T4*/ +} + +/* TablePlugin - sorting of table columns */ +.patternTopic th.twikiSortedAscendingCol, +.patternTopic th.twikiSortedDescendingCol { + background-color:#ccc; /*BG8*/ +} +th.twikiSortedAscendingCol a:link, +th.twikiSortedAscendingCol a:link font, +th.twikiSortedAscendingCol a:visited, +th.twikiSortedAscendingCol a:visited font, +.twikiAttachments th.twikiSortedAscendingCol a:link, +.twikiAttachments th.twikiSortedAscendingCol a:link font, +.twikiAttachments th.twikiSortedAscendingCol a:visited, +.twikiAttachments th.twikiSortedAscendingCol a:visited font, +th.twikiSortedDescendingCol a:link, +th.twikiSortedDescendingCol a:link font, +th.twikiSortedDescendingCol a:visited, +th.twikiSortedDescendingCol a:visited font, +.twikiAttachments th.twikiSortedDescendingCol a:link, +.twikiAttachments th.twikiSortedDescendingCol a:link font, +.twikiAttachments th.twikiSortedDescendingCol a:visited, +.twikiAttachments th.twikiSortedDescendingCol a:visited font { + border-color:#666; /*T7*/ +} +th.twikiSortedAscendingCol a:hover, +th.twikiSortedAscendingCol a:hover font, +.twikiAttachments th.twikiSortedAscendingCol a:hover, +.twikiAttachments th.twikiSortedAscendingCol a:hover font, +th.twikiSortedDescendingCol a:hover, +th.twikiSortedDescendingCol a:hover font, +.twikiAttachments th.twikiSortedDescendingCol a:hover, +.twikiAttachments th.twikiSortedDescendingCol a:hover font { + border-color:#D6000F; /*T4*/ +} + +/* TwistyContrib */ +.twistyPlaceholder { + color:#8E9195; /*T8*/ +} +a:hover.twistyTrigger { + color:#FBF7E8; /*T3*/ +} + +/* TipsContrib */ +.patternTopic .tipsOfTheDay { + background-color:#E9F1F7; /*BG5*/ + border-color:#BFD8ED; /*BO3*/ +} +.patternTopic .tipsOfTheDay .tipsOfTheDayHeader { + background-color:#fff; + color:#333; /*T11*/ +} + +/* ----------------------------------------------------------- TWiki styles ----------------------------------------------------------- */ @@ -190,7 +265,7 @@ } .twikiAttachments th.twikiSortedAscendingCol, .twikiAttachments th.twikiSortedDescendingCol { - background-color:#e6e6e6; /*BG3*/ + background-color:#efefef; /*BG3*/ } .twikiToc .twikiTocTitle { color:#666; /*T7*/ @@ -217,19 +292,19 @@ color:#8E9195; /*T8*/ } .twikiPageForm td.first { - background:#e6e6e6; /*BG3*/ + background:#efefef; /*BG3*/ } .twikiPageForm hr { - border-color:#e6e6e6; /*BO1*/ - background-color:#e6e6e6; /*BO1*/ - color:#e6e6e6; /*BO1*/ + border-color:#efefef; /*BO1*/ + background-color:#efefef; /*BO1*/ + color:#efefef; /*BO1*/ } .twikiButton, .twikiSubmit { border-color:#ccc; /*BO6*/ } .twikiButton { - background-color:#e6e6e6; /*BG3*/ + background-color:#efefef; /*BG3*/ } .twikiSubmit { background-color:#FED764; /*BG12*/ @@ -239,8 +314,8 @@ background-color:transparent; } .twikiHelp { - background-color:#E9F2F9; /*BG5*/ - border-color:#CADDED; /*BO3*/ + background-color:#E9F1F7; /*BG5*/ + border-color:#BFD8ED; /*BO3*/ } .twikiAccessKey { color:inherit; @@ -253,68 +328,6 @@ } /* ----------------------------------------------------------- - Plugin elements - ----------------------------------------------------------- */ - -.twikiTable, -.twikiTable td, -.twikiTable th { - border-color:#ddd; /*BO7*/ -} -.twikiTable th a:link, -.twikiTable th a:visited, -.twikiTable th a font { - color:#06c; /*T2*/ -} -.twikiTable th a:hover, -.twikiTable th a:hover font { - background-color:transparent; - color:#D6000F; /*T4*/ - border-color:#D6000F; /*T4*/ -} -/* sorting of table columns */ -.patternTopic th.twikiSortedAscendingCol, -.patternTopic th.twikiSortedDescendingCol { - background-color:#ccc; /*BG8*/ -} -th.twikiSortedAscendingCol a:link, -th.twikiSortedAscendingCol a:link font, -th.twikiSortedAscendingCol a:visited, -th.twikiSortedAscendingCol a:visited font, -.twikiAttachments th.twikiSortedAscendingCol a:link, -.twikiAttachments th.twikiSortedAscendingCol a:link font, -.twikiAttachments th.twikiSortedAscendingCol a:visited, -.twikiAttachments th.twikiSortedAscendingCol a:visited font, -th.twikiSortedDescendingCol a:link, -th.twikiSortedDescendingCol a:link font, -th.twikiSortedDescendingCol a:visited, -th.twikiSortedDescendingCol a:visited font, -.twikiAttachments th.twikiSortedDescendingCol a:link, -.twikiAttachments th.twikiSortedDescendingCol a:link font, -.twikiAttachments th.twikiSortedDescendingCol a:visited, -.twikiAttachments th.twikiSortedDescendingCol a:visited font { - border-color:#666; /*T7*/ -} -th.twikiSortedAscendingCol a:hover, -th.twikiSortedAscendingCol a:hover font, -.twikiAttachments th.twikiSortedAscendingCol a:hover, -.twikiAttachments th.twikiSortedAscendingCol a:hover font, -th.twikiSortedDescendingCol a:hover, -th.twikiSortedDescendingCol a:hover font, -.twikiAttachments th.twikiSortedDescendingCol a:hover, -.twikiAttachments th.twikiSortedDescendingCol a:hover font { - border-color:#D6000F; /*T4*/ -} - -.twistyPlaceholder { - color:#8E9195; /*T8*/ -} -a:hover.twistyTrigger { - color:#FBF7E8; /*T3*/ -} - - -/* ----------------------------------------------------------- Pattern skin specific elements ----------------------------------------------------------- */ .patternTopicAction { @@ -373,11 +386,11 @@ } .patternLeftBar b, .patternLeftBar strong { - color:#333; + color:#333; /*T11*/ } .patternLeftBarPersonal { - background-color:transparent; - border-color:#CADDED; /*BO3*/ + background-color:#E9F1F7; + border-color:#BFD8ED; /*BO3*/ } .patternLeftBarPersonal a:link, .patternLeftBarPersonal a:visited { @@ -401,7 +414,7 @@ background-color:#fff; /*BG1*/ } .patternVersatileTable th { - background-color:#e6e6e6; + background-color:#efefef; } .patternVersatileTable th.patternMainCol, .patternVersatileTable td.patternMainCol { @@ -483,8 +496,8 @@ } .patternAccessKeyInfo { color:#666; /*T7*/ - background-color:#E9F2F9; /*BG5*/ - border-color:#CADDED; /*BO3*/ + background-color:#E9F1F7; /*BG5*/ + border-color:#BFD8ED; /*BO3*/ } .patternAccessKeyInfo a:link, .patternAccessKeyInfo a:visited { @@ -512,7 +525,7 @@ color:#8E9195; /*T8*/ } table#twikiSearchTable td.first { - background-color:#e6e6e6; /*BG3*/ + background-color:#efefef; /*BG3*/ } /* ----------------------------------------------------------- Deleted: twiki/branches/DEVELOP/pub/TWiki/PatternSkin/patternLeftBarPersonal_bg.gif =================================================================== (Binary files differ) Modified: twiki/branches/DEVELOP/pub/TWiki/PatternSkin/style.css =================================================================== --- twiki/branches/DEVELOP/pub/TWiki/PatternSkin/style.css 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/pub/TWiki/PatternSkin/style.css 2005-10-11 14:32:49 UTC (rev 6976) @@ -159,6 +159,9 @@ border-style:solid; padding:1px; } +input { + margin:.15em 0; +} textarea { font-family:"Lucida Grande", verdana, arial, sans-serif; } @@ -170,6 +173,7 @@ Plugin elements ----------------------------------------------------------- */ +/* TablePlugin */ .twikiTable { border-collapse: collapse; border-width:1px; @@ -198,8 +202,7 @@ border-style:solid; } -/* sorting of table columns */ - +/* TablePlugin - sorting of table columns */ th.twikiSortedAscendingCol a:link, th.twikiSortedAscendingCol a:link font, th.twikiSortedAscendingCol a:visited, @@ -250,6 +253,30 @@ border-style:solid; } +/* TipsContrib */ +.patternTopic .tipsOfTheDay { + border-width:1px; + border-style:solid; +} +.tipsOfTheDay .tipsTitle { + font-weight:bold; +} +.patternTopic .tipsOfTheDay .tipsOfTheDayHeader { + display:block; + padding:2px 5px; +} +.patternLeftBar .tipsOfTheDay .tipsOfTheDayHeader img { + display:none; +} +.patternTopic .tipsOfTheDayContents { + padding:5px; +} +.patternTopic .tipsOfTheDayContents a:link, +.patternTopic .tipsOfTheDayContents a:visited { + text-decoration:none; +} + +/* TwistyContrib */ a:link.twistyTrigger, a:visited.twistyTrigger { text-decoration:none; @@ -365,11 +392,9 @@ padding:.3em 0 .6em 0; } .twikiToc ul { - list-style:outside; + list-style:outside; /* list style image is set in twiki.pattern.tmpl */ padding:0 0 0 .5em; margin:0em; - /* list style image ref in twiki.pattern.tmpl */ - /*list-style-image:url(/twiki/pub/TWiki/PatternSkin/i_arrow_down.gif);*/ } .twikiToc li { margin-left:1em; @@ -424,6 +449,7 @@ .twikiRadioButton { border:none; vertical-align:middle; + margin:0 .3em 0 0; } .twikiHelp { padding:1em; @@ -511,6 +537,7 @@ .patternLeftBar { border-width:1px 1px 1px 0; border-style:solid; + font-size:94%; /*S4*/ } .patternLeftBar a:link, .patternLeftBar a:visited { @@ -525,23 +552,22 @@ padding-left:0; } .patternLeftBar .patternLeftBarContents { - font-size:94%; /*S4*/ font-weight:normal; - margin:-1px 0.5em 1.7em 1em; + margin:-1px 0 1em 0; + padding:0 .5em 0 1em; width:auto; overflow:hidden; } .patternLeftBar .patternLanguageOption { - padding:.25em 0 .25em 1em; + padding:.25em 0.25em .25em 1em; margin:-1px 0 0 0; - font-size:94%; /*S4*/ } .patternLeftBarPersonal { position:relative; z-index:3; - margin:0 -1px 1em -1em; + margin:-1px 0 .7em 0; padding:.25em 0 .25em 1em; - border-width:1px; + border-width:1px 0; border-style:solid; } .patternLeftBarPersonal a:hover { @@ -882,27 +908,3 @@ padding:.3em 0; } -/* TipsContrib support */ - -/* -Arthur, please check. Maybe we'd like -to remove the .patternMain prefix ... - --- MD, 2005-10-11 -*/ - -.patternMain .tipsOfTheDay { - background:#eeeeee; - border:1px solid #ccc; -} -.patternMain .tipsOfTheDay b { - background:#ffd8aa; - color:#333; - display:block; -} -.patternMain .tipsOfTheDay b { - padding:2px 5px; -} -.patternMain .tipsOfTheDayContents { - padding:5px; -} Modified: twiki/branches/DEVELOP/templates/twiki.pattern.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/twiki.pattern.tmpl 2005-10-11 14:27:32 UTC (rev 6975) +++ twiki/branches/DEVELOP/templates/twiki.pattern.tmpl 2005-10-11 14:32:49 UTC (rev 6976) @@ -114,10 +114,6 @@ .patternPrintPage .patternMain { background:#fff; } - .patternLeftBarPersonal, - .twikiHelp { - background-image:url("%PUBURL%/%TWIKIWEB%/PatternSkin/patternLeftBarPersonal_bg.gif"); - } .twikiPageForm table { background-image:url("%PUBURL%/%TWIKIWEB%/PatternSkin/twikiPageForm_bg.gif"); } @@ -183,7 +179,10 @@ -%TMPL:DEF{"leftbar"}%<div class="patternLeftBar">%IF{"context i18n_enabled" then="<div class=\"patternLanguageOption\">[[%SCRIPTURL%/oops%SCRIPTSUFFIX%/%WEB%/%TOPIC%?template=oopschangelanguage][%_{"Change language"}%]]</div>"}%<div class="patternLeftBarContents">%INCLUDE{"%WEB%.WebLeftBar"}%</div></div>%TMPL:END% +%TMPL:DEF{"leftbar"}%<div class="patternLeftBar">%IF{"context i18n_enabled" then="<div class=\"patternLanguageOption\">[[%SCRIPTURL%/oops%SCRIPTSUFFIX%/%WEB%/%TOPIC%?template=oopschangelanguage][%_{"Change language"}%]]</div>"}%%INCLUDE{"%IF{"context can_login" then="%TWIKIWEB%.WebLeftBarLogin"}%" warn="off"}% +<div class="patternLeftBarContents"> +%INCLUDE{"%WEB%.WebLeftBar"}% +</div></div>%TMPL:END% |