Author: ArthurClemens Date: 2005-10-16 13:47:15 -0700 (Sun, 16 Oct 2005) New Revision: 7072 Added: twiki/branches/DEVELOP/data/TWiki/WebLeftBarSearch.txt twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/arrowright-small.gif Modified: twiki/branches/DEVELOP/data/Main/WebLeftBar.txt twiki/branches/DEVELOP/data/Sandbox/WebLeftBar.txt twiki/branches/DEVELOP/data/TWiki/TWikiDocGraphics.txt twiki/branches/DEVELOP/data/TWiki/WebLeftBar.txt twiki/branches/DEVELOP/data/TWiki/WebTopBar.txt twiki/branches/DEVELOP/data/Trash/WebLeftBar.txt twiki/branches/DEVELOP/data/_default/WebLeftBar.txt twiki/branches/DEVELOP/locale/TWiki.pot twiki/branches/DEVELOP/locale/de.po twiki/branches/DEVELOP/locale/es.po twiki/branches/DEVELOP/locale/nl.po twiki/branches/DEVELOP/locale/pt.po twiki/branches/DEVELOP/pub/TWiki/PatternSkin/colors.css twiki/branches/DEVELOP/pub/TWiki/PatternSkin/style.css twiki/branches/DEVELOP/pub/TWiki/TWikiLogos/T-logo-80x15.gif twiki/branches/DEVELOP/tools/MANIFEST Log: Item706: seeing the discussion on Codev, this is the safest option: a jump box AND a search box. Added a general includable topic TWiki/WebLeftBarSearch that holds both boxes and the Change language link. Modified: twiki/branches/DEVELOP/data/Main/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/WebLeftBar.txt 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/data/Main/WebLeftBar.txt 2005-10-16 20:47:15 UTC (rev 7072) @@ -1,4 +1,5 @@ %META:TOPICINFO{author="TWikiContributor" date="1121074087" format="1.1" version="$Rev$"}% +%INCLUDE{ "%TWIKIWEB%.WebLeftBarSearch" }% * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][<nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b> * [[%HOMETOPIC%][ %ICON{"home"}% %MAKETEXT{"Home"}%]] * [[TWikiUsers][ %ICON{"person"}% %MAKETEXT{"Users"}%]] Modified: twiki/branches/DEVELOP/data/Sandbox/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/Sandbox/WebLeftBar.txt 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/data/Sandbox/WebLeftBar.txt 2005-10-16 20:47:15 UTC (rev 7072) @@ -1,4 +1,5 @@ %META:TOPICINFO{author="TWikiContributor" date="1127484504" format="1.1" version="1.2"}% +%INCLUDE{ "%TWIKIWEB%.WebLeftBarSearch" }% * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][<nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b> * [[%HOMETOPIC%][ %ICON{"home"}% %MAKETEXT{"Home"}%]] * [[%MAINWEB%.TWikiUsers][ %ICON{"person"}% %MAKETEXT{"Users"}%]] Modified: twiki/branches/DEVELOP/data/TWiki/TWikiDocGraphics.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/TWikiDocGraphics.txt 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/data/TWiki/TWikiDocGraphics.txt 2005-10-16 20:47:15 UTC (rev 7072) @@ -365,3 +365,4 @@ %META:FILEATTACHMENT{name="changes-small.gif" attr="" autoattached="1" comment="" date="1128926976" path="changes-small.gif" size="89" user="UnknownUser" version=""}% %META:FILEATTACHMENT{name="web-bg-small.gif" attr="" autoattached="1" comment="" date="1128926976" path="web-bg-small.gif" size="79" user="UnknownUser" version=""}% %META:FILEATTACHMENT{name="search-small.gif" attr="" autoattached="1" comment="" date="1128926976" path="search-small.gif" size="554" user="UnknownUser" version=""}% +%META:FILEATTACHMENT{name="arrowright-small.gif" attr="" autoattached="1" comment="" date="1128926976" path="arrowright-small.gif" size="100" user="UnknownUser" version=""}% Modified: twiki/branches/DEVELOP/data/TWiki/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/WebLeftBar.txt 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/data/TWiki/WebLeftBar.txt 2005-10-16 20:47:15 UTC (rev 7072) @@ -1,4 +1,5 @@ %META:TOPICINFO{author="TWikiContributor" date="1121074151" format="1.1" version="$Rev$"}% +%INCLUDE{ "%TWIKIWEB%.WebLeftBarSearch" }% * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][<nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b> * [[%HOMETOPIC%][ %ICON{"home"}% %MAKETEXT{"Home"}%]] * [[%MAINWEB%.TWikiUsers][ %ICON{"person"}% %MAKETEXT{"Users"}%]] Added: twiki/branches/DEVELOP/data/TWiki/WebLeftBarSearch.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/WebLeftBarSearch.txt 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/data/TWiki/WebLeftBarSearch.txt 2005-10-16 20:47:15 UTC (rev 7072) @@ -0,0 +1,7 @@ +<div class="patternForm"> +<div class="patternFormElements"><form name="jumpForm" action="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%"> <input type="text" id="jumpBox" name="topic" size="16" /></label><input type="image" id="jumpButton" src="%ICONPATH{arrowright}%" align="middle" border="0" alt='%MAKETEXT{"Search"}%' /></form></div> +<div class="patternFormContainer"><form name="quickSearchForm" action="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%INTURLENCODE{"%INCLUDINGWEB%/WebSearch"}%"><input id="quickSearchBox" type="text" name="search" value="%URLPARAM{ "search" encode="entity" scope="topic" }%" size="16" /><input type="image" id="quickSearchButton" src="%ICONPATH{searchtopic}%" align="middle" border="0" alt='%MAKETEXT{"Jump"}%' /></form></div> +<!-- START OF CHANGE LANGUAGE LINK --> +%IF{"context i18n_enabled" then='<div class="patternChangeLanguage">[[%SCRIPTURL%/oops%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%?template=oopschangelanguage][<img src="%ICONPATH{flag-gray-small}%" alt="%MAKETEXT{\"Change language\"}%" height="13" width="13" border="0" /> %MAKETEXT{"Change language"}%]]</div>'}% +<!-- END --> +</div> \ No newline at end of file Modified: twiki/branches/DEVELOP/data/TWiki/WebTopBar.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/WebTopBar.txt 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/data/TWiki/WebTopBar.txt 2005-10-16 20:47:15 UTC (rev 7072) @@ -3,6 +3,9 @@ <tr><td valign="middle"> <a href="%WEBLOGOURL%"><img src="%WEBLOGOIMG%" border="0" alt="%WEBLOGOALT%"/></a> </td></tr></table></div> +<!-- Optional change language / jump box and search box at in top bar */ <div class="twikiRight patternMetaNav"> -%IF{"context i18n_enabled" then='[[%SCRIPTURL%/oops%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%?template=oopschangelanguage][<img src="%PUBURL%/%TWIKIWEB%/TWikiDocGraphics/flag-gray-small.gif" width="13" height="13" alt="%MAKETEXT{\"Change language\"}%" border="0" /> %MAKETEXT{"Change language"}%]]'}%<form name="top" action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%"><input id="searchboxTop" type="text" name="search" value="%URLPARAM{ "search" encode="entity" scope="topic" }%" size="16" /><input type="image" id="goSearchTop" value="GoSearch" name="GoSearch" src="%PUBURL%/%TWIKIWEB%/TWikiDocGraphics/search-small.gif" align="middle" border="0" style="width:13px; height:13px;" /></form> -</div> +%IF{"context i18n_enabled" then='[[%SCRIPTURL%/oops%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%?template=oopschangelanguage][<img src="%PUBURL%/%TWIKIWEB%/TWikiDocGraphics/flag-gray-small.gif" width="13" height="13" alt="%MAKETEXT{\"Change language\"}%" border="0" /> %MAKETEXT{"Change language"}%]]'}% + <form name="jumpForm" action="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%"> <input type="text" id="jumpBox" name="topic" size="16" /></label><input type="image" id="jumpButton" src="%PUBURL%/%TWIKIWEB%/TWikiDocGraphics/arrowright-small.gif" align="middle" border="0" style="width:13px; height:13px;" /></form> + <form name="quickSearchForm" action="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%INTURLENCODE{"%INCLUDINGWEB%/WebSearch"}%"><input id="quickSearchSearchBox" type="text" name="search" value="%URLPARAM{ "search" encode="entity" scope="topic" }%" size="16" /><input type="image" id="quickSearchButton" src="%PUBURL%/%TWIKIWEB%/TWikiDocGraphics/search-small.gif" align="middle" border="0" style="width:13px; height:13px;" /></form> +</div> --> \ No newline at end of file Modified: twiki/branches/DEVELOP/data/Trash/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/Trash/WebLeftBar.txt 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/data/Trash/WebLeftBar.txt 2005-10-16 20:47:15 UTC (rev 7072) @@ -1,4 +1,5 @@ %META:TOPICINFO{author="ArthurClemens" date="1093167095" format="1.0" version="1.1"}% +%INCLUDE{ "%TWIKIWEB%.WebLeftBarSearch" }% * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][<nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b> * [[%HOMETOPIC%][ %ICON{"home"}% %MAKETEXT{"Home"}%]] * [[WebTopicList][ %ICON{"index"}% %MAKETEXT{"Index"}%]] Modified: twiki/branches/DEVELOP/data/_default/WebLeftBar.txt =================================================================== --- twiki/branches/DEVELOP/data/_default/WebLeftBar.txt 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/data/_default/WebLeftBar.txt 2005-10-16 20:47:15 UTC (rev 7072) @@ -1,4 +1,5 @@ %META:TOPICINFO{author="TWikiContributor" date="1112002813" format="1.0" version="$Rev$"}% +%INCLUDE{ "%TWIKIWEB%.WebLeftBarSearch" }% * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][<nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b> * [[%HOMETOPIC%][ %ICON{"home"}% %MAKETEXT{"Home"}%]] * [[WebTopicList][ %ICON{"index"}% %MAKETEXT{"Index"}%]] Modified: twiki/branches/DEVELOP/locale/TWiki.pot =================================================================== --- twiki/branches/DEVELOP/locale/TWiki.pot 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/locale/TWiki.pot 2005-10-16 20:47:15 UTC (rev 7072) @@ -576,7 +576,7 @@ msgid "Change from:" msgstr "" -#: data/TWiki/WebTopBar.txt:7 templates/oopschangelanguage.tmpl:21 +#: data/TWiki/WebLeftBarSearch.txt:7 templates/oopschangelanguage.tmpl:21 #: templates/oopschangelanguage.tmpl:4 templates/oopslanguagechanged.tmpl:4 msgid "Change language" msgstr "" @@ -1511,6 +1511,7 @@ #: data/TWiki/WebTopicNonWikiTemplate.txt:15 #: data/TWiki/WebTopicViewTemplate.txt:15 data/Trash/WebLeftBar.txt:5 #: data/_default/WebHome.txt:12 data/_default/WebLeftBar.txt:5 +#: data/TWiki/WebLeftBarSearch msgid "Search" msgstr "" @@ -2381,3 +2382,9 @@ #: templates/attachtables.pattern.tmpl:50 msgid "view" msgstr "" + +#: data/TWiki/WebLeftBarSearch +msgid "Jump" +msgstr "" + + Modified: twiki/branches/DEVELOP/locale/de.po =================================================================== --- twiki/branches/DEVELOP/locale/de.po 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/locale/de.po 2005-10-16 20:47:15 UTC (rev 7072) @@ -624,7 +624,7 @@ msgid "Change from:" msgstr "Geändert von:" -#: data/TWiki/WebTopBar.txt:7 templates/oopschangelanguage.tmpl:21 +#: data/TWiki/WebLeftBarSearch.txt templates/oopschangelanguage.tmpl:21 #: templates/oopschangelanguage.tmpl:4 templates/oopslanguagechanged.tmpl:4 msgid "Change language" msgstr "Sprache wechseln" @@ -1641,6 +1641,7 @@ #: data/TWiki/WebTopicNonWikiTemplate.txt:15 #: data/TWiki/WebTopicViewTemplate.txt:15 data/Trash/WebLeftBar.txt:5 #: data/_default/WebHome.txt:12 data/_default/WebLeftBar.txt:5 +#: data/TWiki/WebLeftBarSearch msgid "Search" msgstr "Suchen" @@ -2629,5 +2630,6 @@ msgid "view" msgstr "Ansehen" -#~ msgid "Jump:" -#~ msgstr "Sprung:" +#: data/TWiki/WebLeftBarSearch +msgid "Jump" +msgstr "Sprung" Modified: twiki/branches/DEVELOP/locale/es.po =================================================================== --- twiki/branches/DEVELOP/locale/es.po 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/locale/es.po 2005-10-16 20:47:15 UTC (rev 7072) @@ -608,7 +608,7 @@ msgid "Change from:" msgstr "Cambiar desde:" -#: data/TWiki/WebTopBar.txt:7 templates/oopschangelanguage.tmpl:21 +#: data/TWiki/WebLeftBarSearch.txt templates/oopschangelanguage.tmpl:21 #: templates/oopschangelanguage.tmpl:4 templates/oopslanguagechanged.tmpl:4 msgid "Change language" msgstr "" @@ -1547,6 +1547,7 @@ #: data/TWiki/WebTopicNonWikiTemplate.txt:15 #: data/TWiki/WebTopicViewTemplate.txt:15 data/Trash/WebLeftBar.txt:5 #: data/_default/WebHome.txt:12 data/_default/WebLeftBar.txt:5 +#: data/TWiki/WebLeftBarSearch msgid "Search" msgstr "Buscar" @@ -2422,3 +2423,7 @@ msgid "view" msgstr "vea" +#: data/TWiki/WebLeftBarSearch +msgid "Jump" +msgstr "" + Modified: twiki/branches/DEVELOP/locale/nl.po =================================================================== --- twiki/branches/DEVELOP/locale/nl.po 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/locale/nl.po 2005-10-16 20:47:15 UTC (rev 7072) @@ -576,10 +576,10 @@ msgid "Change from:" msgstr "" -#: data/TWiki/WebTopBar.txt:7 templates/oopschangelanguage.tmpl:21 +#: data/TWiki/WebLeftBarSearch.txt templates/oopschangelanguage.tmpl:21 #: templates/oopschangelanguage.tmpl:4 templates/oopslanguagechanged.tmpl:4 msgid "Change language" -msgstr "" +msgstr "Taal veranderen" #: templates/renamebase.pattern.tmpl:71 #: templates/renamewebbase.pattern.tmpl:75 @@ -1511,6 +1511,7 @@ #: data/TWiki/WebTopicNonWikiTemplate.txt:15 #: data/TWiki/WebTopicViewTemplate.txt:15 data/Trash/WebLeftBar.txt:5 #: data/_default/WebHome.txt:12 data/_default/WebLeftBar.txt:5 +#: data/TWiki/WebLeftBarSearch msgid "Search" msgstr "" @@ -2386,3 +2387,7 @@ #~ msgid "Web" #~ msgstr "Web" + +#: data/TWiki/WebLeftBarSearch +msgid "Jump" +msgstr "Springen" \ No newline at end of file Modified: twiki/branches/DEVELOP/locale/pt.po =================================================================== --- twiki/branches/DEVELOP/locale/pt.po 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/locale/pt.po 2005-10-16 20:47:15 UTC (rev 7072) @@ -622,7 +622,7 @@ msgid "Change from:" msgstr "Alterar de:" -#: data/TWiki/WebTopBar.txt:7 templates/oopschangelanguage.tmpl:21 +#: data/TWiki/WebLeftBarSearch.txt templates/oopschangelanguage.tmpl:21 #: templates/oopschangelanguage.tmpl:4 templates/oopslanguagechanged.tmpl:4 msgid "Change language" msgstr "Alterar idioma" @@ -1624,6 +1624,7 @@ #: data/TWiki/WebTopicNonWikiTemplate.txt:15 #: data/TWiki/WebTopicViewTemplate.txt:15 data/Trash/WebLeftBar.txt:5 #: data/_default/WebHome.txt:12 data/_default/WebLeftBar.txt:5 +#: data/TWiki/WebLeftBarSearch msgid "Search" msgstr "Busca" @@ -2600,11 +2601,12 @@ msgid "view" msgstr "ver" -#~ msgid "Jump:" -#~ msgstr "Pular para:" - #~ msgid "Web" #~ msgstr "Web" #~ msgid "Notes:" #~ msgstr "Notas:" + +#: data/TWiki/WebLeftBarSearch +msgid "Jump" +msgstr "Pular para" \ No newline at end of file Modified: twiki/branches/DEVELOP/pub/TWiki/PatternSkin/colors.css =================================================================== --- twiki/branches/DEVELOP/pub/TWiki/PatternSkin/colors.css 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/pub/TWiki/PatternSkin/colors.css 2005-10-16 20:47:15 UTC (rev 7072) @@ -195,11 +195,9 @@ /* TipsContrib */ .tipsOfTheDay { - background-color:#E8EEF7; /*BG5*/ - border-color:#BFD8ED; /*BO3*/ + background-color:#E8EEF7; /*BG5*/ } .patternTopic .tipsOfTheDayHeader { - background-color:#fff; color:#333; /*T11*/ } /* TipsContrib - in left bar */ @@ -379,6 +377,19 @@ .patternTopBarContents .patternSearchBox td { color:#8E9195; /*T8*/ } +.patternMetaNav { + color:#8E9195; /*T8*/ +} +.patternMetaNav a:link, +.patternMetaNav a:visited { + color:#8E9195; /*T7*/ +} +.patternMetaNav a:hover { + color:#FBF7E8; /*C3*/ +} +.patternMetaNav input { + background-color:#FEFBF3; /*BG9*/ +} /* Left bar */ .patternLeftBar { border-color:#E2DCC8; /*BO4*/ @@ -400,6 +411,13 @@ .patternLeftBar strong { color:#333; /*T11*/ } +.patternLeftBar input#quickSearchBox, +.patternLeftBar input#jumpBox { + border-color:#E2DCC8; +} +.patternLeftBar .patternChangeLanguage { + color:#8E9195; /*T8*/ +} .patternLeftBarPersonal { background-color:#E8EEF7; border-color:#BFD8ED; /*BO3*/ @@ -493,20 +511,6 @@ color:inherit; } -.patternMetaNav { - color:#8E9195; /*T8*/ -} -.patternMetaNav a:link, -.patternMetaNav a:visited { - color:#7A4707; /*T6*/ /* same as patternLeftBar */ -} -.patternMetaNav a:hover { - color:#FBF7E8; /*C3*/ /* same as patternLeftBar */ -} -.patternMetaNav input { - background-color:#FEFBF3; /*BG9*/ -} - /* Edit page */ .patternEditPage textarea#topic { Modified: twiki/branches/DEVELOP/pub/TWiki/PatternSkin/style.css =================================================================== --- twiki/branches/DEVELOP/pub/TWiki/PatternSkin/style.css 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/pub/TWiki/PatternSkin/style.css 2005-10-16 20:47:15 UTC (rev 7072) @@ -11,9 +11,9 @@ Sizes ---------------------------------------- S1 line-height 1.4em - S2 small font size, twikiSmall 85% - S3 horizontal bar padding (h2, patternTop) 5px - S4 somewhat smaller font size 94% + S2 somewhat smaller font size 94% + S3 small font size, twikiSmall 85% + S4 horizontal bar padding (h2, patternTop) 5px S5 form and attachment padding 20px --------------------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ voice-family:inherit; font-size:small; } -html>body { +html>body { /* Mozilla */ font-size:small; } p { @@ -257,16 +257,12 @@ .tipsOfTheDayContents .tipsOfTheDayTitle { font-weight:bold; } -.tipsOfTheDay { - border-width:1px; - border-style:solid; -} .patternTopic .tipsOfTheDayHeader { display:block; - padding:2px 5px; + padding:3px 5px; } .patternTopic .tipsOfTheDayText { - padding:5px; + padding:0 5px 5px 5px; } .patternTopic .tipsOfTheDayText a:link, .patternTopic .tipsOfTheDayText a:visited { @@ -308,7 +304,7 @@ } .patternContent .twikiAttachments, .patternContent .twikiForm { - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ padding:20px; /*S5*/ border-width:1px 0 0 0; border-style:solid; @@ -417,14 +413,14 @@ } .twikiSmall { - font-size:85%; /*S2*/ + font-size:85%; /*S3*/ } .twikiSmallish { - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ } .twikiNew { } .twikiSummary { - font-size:85%; /*S2*/ + font-size:85%; /*S3*/ } .twikiEmulatedLink { text-decoration:underline; @@ -495,7 +491,7 @@ } .patternTopicAction { - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ line-height:1.5em; margin:0 0 3em 0; padding:.5em 20px; /*S5*/ @@ -517,11 +513,13 @@ padding:.2em 0; } .patternMoved { - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ margin-bottom:1em; } .patternWebIndicator {} -.patternPage {} +.patternPage { + font-size:100%; +} .patternMiddleContainer {} .patternMain { padding:0 1.5em 1em 2em; @@ -547,14 +545,36 @@ .patternTopBarContents .patternSearchBox td { height:50px; vertical-align:middle; - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ } +.patternMetaNav { + font-size:85%; /*S3*/ +} +.patternMetaNav a:link, +.patternMetaNav a:visited { + text-decoration:none; +} +.patternMetaNav .patternSeparator { + margin:0 .5em; +} +.patternMetaNav input#quickSearchBox, +.patternMetaNav input#jumpBox { + margin:0 0 0 .85em; + padding:0; + height:1.2em; /* 85% of default line-height 1.4 */ +} +.patternMetaNav input#quickSearchButton, +.patternMetaNav input#jumpButton { + margin:0 0 0 2px; + border:0; +} /* Left bar */ .patternLeftBar { border-width:1px 1px 1px 0; border-style:solid; - font-size:94%; /*S4*/ + overflow:hidden; + font-size:94%; /*S2*/ } .patternLeftBar a img { margin:1px 0 0 0; @@ -572,12 +592,39 @@ padding-left:0; } .patternLeftBar .patternLeftBarContents { - font-weight:normal; margin:-1px 0 1em 0; padding:0 .5em 0 1em; - width:auto; - overflow:hidden; + width:89%; } +.patternLeftBar .patternForm { + margin:.5em 0 1em 0; +} +html>body .patternLeftBar .patternForm { /* Hide from IE */ + margin:1.25em 0 1em 0; +} +.patternLeftBar .patternFormElements { + margin:0 0 3px 0; + width:100%; +} +.patternLeftBar input#quickSearchBox, +.patternLeftBar input#jumpBox { + margin:0; + height:12px; /* with padding and border this adds up to 16px height - same as button */ + width:80%; + border-width:1px; + border-style:solid; + font-size:85%; /*S3*/ +} +.patternLeftBar input#quickSearchButton, +.patternLeftBar input#jumpButton { + margin:0 0 0 4px; + padding:0; + border:0; +} +.patternLeftBar .patternChangeLanguage { + margin:.2em 0 0 0; + font-size:85%; /*S3*/ +} .patternLeftBarPersonal { margin:-1px 0 .7em 0; padding:.25em 0 .25em 1em; @@ -604,7 +651,7 @@ } .patternBottomBarContents { padding:.5em 2.5em 1.5em .25em; - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ } /* table used in various places */ @@ -617,14 +664,14 @@ border-width:1px; border-style:solid; margin:1em 0; - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ } .patternVersatileTable th, .patternVersatileTable td { vertical-align:middle; border-width:1px 0 0 0; border-style:solid; - padding:5px 1em 5px 1.25em; /*S3*/ + padding:5px 1em 5px 1.25em; /*S4*/ } @@ -635,7 +682,7 @@ } .patternTop { - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ } .patternTop table { border:none; @@ -717,26 +764,6 @@ z-index:2; } -.patternMetaNav { - font-size:85%; /*S2*/ -} -.patternMetaNav a:link, -.patternMetaNav a:visited { - text-decoration:none; -} -.patternMetaNav .patternSeparator { - margin:0 .5em; -} -.patternMetaNav input#searchboxTop { - padding:0; - margin:0 0 0 1.5em; - height:1.2em; /* 85% of default line-height 1.4 */ -} -.patternMetaNav input#goSearchTop { - margin:0 0 0 2px; - border:0; -} - /* Edit page */ .twikiChangeFormButtonHolder { @@ -796,7 +823,7 @@ margin:1em 0; } #moveattachment { - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ } .patternPrevious table { width:auto; @@ -841,8 +868,8 @@ .patternSearchResults {} .patternSearchResultsHeader { - padding:.25em 5px .15em 5px; /*S3*/ - margin:0 -5px .25em -5px; /*S3*/ + padding:.25em 5px .15em 5px; /*S4*/ + margin:0 -5px .25em -5px; /*S4*/ font-weight:bold; border-width:0 0 1px 0; border-style:solid; @@ -874,7 +901,7 @@ .patternSearchResults .twikiNew { border-width:1px; border-style:solid; - font-size:85%; /*S2*/ + font-size:85%; /*S3*/ padding:0 1px; font-weight:bold; } @@ -893,14 +920,14 @@ } .patternSearchResultCount { margin:.25em 0 1.5em 0; - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ } .patternViewPage .patternSearchResultsBegin { /* for changes template with noheader="on" */ height:1px; border-width:0 0 1px 0; border-style:solid; - padding:0 5px; /*S3*/ - margin:0 -5px; /*S3*/ + padding:0 5px; /*S4*/ + margin:0 -5px; /*S4*/ } /* Search results in book view format */ @@ -909,8 +936,8 @@ margin-bottom:1em; } .patternBookViewList .twikiTopRow { - padding:.2em 5px; /*S3*/ - margin:2.5em -5px .15em -5px; /*S3*/ + padding:.2em 5px; /*S4*/ + margin:2.5em -5px .15em -5px; /*S4*/ } .patternBookViewList .twikiBottomRow { font-size:100%; @@ -935,7 +962,7 @@ } .patternPrintPage .patternTopicFooter { margin:2em 0 2em 0; - font-size:94%; /*S4*/ + font-size:94%; /*S2*/ } /* Diff */ Added: twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/arrowright-small.gif =================================================================== (Binary files differ) Property changes on: twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/arrowright-small.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: twiki/branches/DEVELOP/pub/TWiki/TWikiLogos/T-logo-80x15.gif =================================================================== (Binary files differ) Modified: twiki/branches/DEVELOP/tools/MANIFEST =================================================================== --- twiki/branches/DEVELOP/tools/MANIFEST 2005-10-16 17:54:37 UTC (rev 7071) +++ twiki/branches/DEVELOP/tools/MANIFEST 2005-10-16 20:47:15 UTC (rev 7072) @@ -606,7 +606,8 @@ pub/TWiki/TWikiDocGraphics/home.gif 0660 pub/TWiki/TWikiDocGraphics/lock.gif 0660 pub/TWiki/TWikiDocGraphics/up.gif 0660 -pub/TWiki/TWikiDocGraphics/watch.gif +pub/TWiki/TWikiDocGraphics/watch.gif 0660 +pub/TWiki/TWikiDocGraphics/qrrowright-small.gif 0660 pub/TWiki/TWikiLogos/T-logo-124x35-t.gif 0660 pub/TWiki/TWikiLogos/T-logo-140x40-t.gif 0660 pub/TWiki/TWikiLogos/T-logo-158x45-t.gif 0660 |