From: <de...@de...> - 2007-06-16 12:39:57
|
Author: CrawfordCurrie Date: 2007-06-16 07:39:55 -0500 (Sat, 16 Jun 2007) New Revision: 14176 Added: twiki/branches/MAIN/pub/TWiki/TWikiTemplates/default.css Modified: twiki/branches/MAIN/data/TWiki/TWikiSkins.txt twiki/branches/MAIN/data/TWiki/WebSearch.txt twiki/branches/MAIN/data/TWiki/WebSearchAdvanced.txt twiki/branches/MAIN/data/TWiki/WebTopicViewTemplate.txt twiki/branches/MAIN/templates/addform.tmpl twiki/branches/MAIN/templates/attach.tmpl twiki/branches/MAIN/templates/attachagain.tmpl twiki/branches/MAIN/templates/attachnew.tmpl twiki/branches/MAIN/templates/attachtables.tmpl twiki/branches/MAIN/templates/backlinks.tmpl twiki/branches/MAIN/templates/backlinksallwebs.tmpl twiki/branches/MAIN/templates/backlinksweb.tmpl twiki/branches/MAIN/templates/changeform.tmpl twiki/branches/MAIN/templates/changes.tmpl twiki/branches/MAIN/templates/css.tmpl twiki/branches/MAIN/templates/cssmediatypes.tmpl twiki/branches/MAIN/templates/edit.tmpl twiki/branches/MAIN/templates/editform.tmpl twiki/branches/MAIN/templates/edittext.tmpl twiki/branches/MAIN/templates/form.tmpl twiki/branches/MAIN/templates/formtables.tmpl twiki/branches/MAIN/templates/login.sudo.tmpl twiki/branches/MAIN/templates/login.tmpl twiki/branches/MAIN/templates/mailresetpassword.tmpl twiki/branches/MAIN/templates/messages.tmpl twiki/branches/MAIN/templates/moveattachment.tmpl twiki/branches/MAIN/templates/oopsaccessdenied.tmpl twiki/branches/MAIN/templates/oopsalerts.tmpl twiki/branches/MAIN/templates/oopsattention.tmpl twiki/branches/MAIN/templates/oopschangelanguage.tmpl twiki/branches/MAIN/templates/oopslanguagechanged.tmpl twiki/branches/MAIN/templates/oopsleaseconflict.tmpl twiki/branches/MAIN/templates/oopsmore.tmpl twiki/branches/MAIN/templates/oopssaveerr.tmpl twiki/branches/MAIN/templates/preview.tmpl twiki/branches/MAIN/templates/rdiff.tmpl twiki/branches/MAIN/templates/registerconfirm.tmpl twiki/branches/MAIN/templates/registernotify.tmpl twiki/branches/MAIN/templates/registernotifyadmin.tmpl twiki/branches/MAIN/templates/rename.tmpl twiki/branches/MAIN/templates/renamebase.tmpl twiki/branches/MAIN/templates/renameconfirm.tmpl twiki/branches/MAIN/templates/renamedelete.tmpl twiki/branches/MAIN/templates/renameweb.tmpl twiki/branches/MAIN/templates/renamewebbase.tmpl twiki/branches/MAIN/templates/renamewebconfirm.tmpl twiki/branches/MAIN/templates/renamewebdelete.tmpl twiki/branches/MAIN/templates/search.text.tmpl twiki/branches/MAIN/templates/search.tmpl twiki/branches/MAIN/templates/searchbookview.tmpl twiki/branches/MAIN/templates/searchformat.tmpl twiki/branches/MAIN/templates/searchmeta.tmpl twiki/branches/MAIN/templates/settings.tmpl twiki/branches/MAIN/templates/twiki.tmpl twiki/branches/MAIN/templates/view.plain.tmpl twiki/branches/MAIN/templates/view.print.tmpl twiki/branches/MAIN/templates/view.rss.tmpl twiki/branches/MAIN/templates/view.rssatom.tmpl twiki/branches/MAIN/templates/view.text.tmpl twiki/branches/MAIN/templates/view.tmpl twiki/branches/MAIN/templates/view.xml.tmpl twiki/branches/MAIN/templates/viewplain.tmpl twiki/branches/MAIN/templates/viewprint.tmpl twiki/branches/MAIN/tools/MANIFEST Log: Item4258: got rid of default bgcolor on table headers Item4259: added CSS for default templates and cleaned up the headers. Also fixed a couple of problems I discovered with the classes along the way, such as use of non-existent classes and construction of illegal class names during diff, and added a navigation comment to the top of all the default templates. Modified: twiki/branches/MAIN/data/TWiki/TWikiSkins.txt =================================================================== --- twiki/branches/MAIN/data/TWiki/TWikiSkins.txt 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/data/TWiki/TWikiSkins.txt 2007-06-16 12:39:55 UTC (rev 14176) @@ -9,7 +9,7 @@ TWiki uses TWikiTemplates files as the basis of all the screens it uses to interact with users. Each screen has an associated template file that contains the basic layout of the screen. This is then filled in by the code to generate what you see in the browser. -TWiki ships with a default set of template files that give a basic look-and-feel. TWiki also includes support for _skins_ that can be selected to give different, more sophisticated, look and feels. A default TWiki installation will usually start up with the PatternSkin already selected. Skins may also be defined by third parties and loaded into a TWiki installation to give more options. To see how TWiki looks when *no* skin is selected, [[%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?skin=not_a_skin][view this topic with a non-existant skin]]. +TWiki ships with a default set of template files that give a very basic, CSS-themable, look-and-feel. TWiki also includes support for _skins_ that can be selected to give different, more sophisticated, look and feels. A default TWiki installation will usually start up with the PatternSkin already selected. Skins may also be defined by third parties and loaded into a TWiki installation to give more options. To see how TWiki looks when *no* skin is selected, [[%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?skin=not_a_skin][view this topic with a non-existant skin]]. Topic text is not affected by the choice of skin, though a skin can be defined to use a CSS (Cascading Style Sheet), which can sometimes give a radically different appearance to the text. @@ -24,16 +24,18 @@ ---++ Changing the default TWiki skin -TWiki default ships with the skin PatternSkin activated. If you want to modify the layout, colors or even the templates to suit your own needs, have a look first at the topics PatternSkinCustomization and PatternSkinCssCookbook. +TWiki default ships with the skin PatternSkin activated. You can set the skin for the whole site, a single web or topic, or for each user individually, by setting the SKIN variable to the name of a skin. If the skin you select doesn't exist, then TWiki will pick up the default templates. ---++ Defining Skins -You may want to define your own skin, for example to comply with corporate web guidelines, or because you have a aesthetic vision that you want to share. +You may want to define your own skin, for example to comply with corporate web guidelines, or because you have a aesthetic vision that you want to share. There are a couple of places you an start doing this. The TWikiTemplates files used for skins are located in the =twiki/templates= directory and are named according to the skin: ==<scriptname>.<skin>.tmpl==. Skin files may also be defined in TWiki topics - see TWikiTemplates for details. To start creating a new skin, copy the default TWikiTemplates (like =view.tmpl=), or copy an existing skin to use as a base for your own skin. You should only need to copy the files you intend to customise, as TWiki can be configured to fall back to another skin if a template is not defined in your skin. Name the files as described above (for example =view.myskin.tmpl=. +If you use PatternSkin as your starting point, and you want to modify the layout, colors or even the templates to suit your own needs, have a look first at the topics PatternSkinCustomization and PatternSkinCssCookbook. + For your own TWiki skin you are encouraged to show a small 80x31 pixel <a href="http://twiki.org/"><img src="%PUBURL%/%TWIKIWEB%/TWikiLogos/T-logo-80x15.gif" alt="This site is powered by the TWiki collaboration platform" width="80" height="15" title="This site is powered by the TWiki collaboration platform" border="0" /></a> logo at the bottom of your skin: =<a href="http://twiki.org/"><img src="%<nop>PUBURL%/%<nop>TWIKIWEB%/TWikiLogos/T-logo-80x15.gif" alt="This site is powered by the TWiki collaboration platform" width="80" height="15" title="This site is powered by the TWiki collaboration platform" border="0" /></a>= Modified: twiki/branches/MAIN/data/TWiki/WebSearch.txt =================================================================== --- twiki/branches/MAIN/data/TWiki/WebSearch.txt 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/data/TWiki/WebSearch.txt 2007-06-16 12:39:55 UTC (rev 14176) @@ -25,15 +25,15 @@ <form action="%SCRIPTURLPATH{view}%/%INCLUDINGWEB%/%INCLUDINGTOPIC%"> <table id="twikiSearchTable" border="0" cellspacing="0" cellpadding="0"> <tr> -<td colspan="2" class="first"> +<td colspan="2" class="twikiFirstCol"> <input type="text" class="twikiInputField" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" /> <input type="submit" class="twikiSubmit" value='%MAKETEXT{"Search"}%' /><span class="twikiSmall"> [[%INCLUDINGWEB%.WebSearchAdvanced][%MAKETEXT{"Advanced search"}%]] | [[%TWIKIWEB%.SearchHelp][%MAKETEXT{"Help"}%]]</span> <div class="twikiSmall" style="padding:1em 0 0 0;">%MAKETEXT{"TIP: to search for all topics that contain =\"SOAP\"=, =\"WSDL\"=, a literal =\"web service\"=, but not =\"shampoo\"=, write:"}% <code>soap wsdl "web service" -shampoo</code></div> </td> </tr> <tr> -<th class="last">%MAKETEXT{"Search where:"}%</th> -<td class="last"> +<th class="twikiLast">%MAKETEXT{"Search where:"}%</th> +<td class="twikiLast"> <input type="radio" class="twikiRadioButton" id="textbody" name="scope" value="text" %IF{" '%URLPARAM{"scope"}%' = 'text' " then="checked=\"checked\"" else=""}% /><label for="textbody"> %MAKETEXT{"Text body"}%</label> <input type="radio" class="twikiRadioButton" id="topictitle" name="scope" value="topic" %IF{" '%URLPARAM{scope}%' = 'topic' " then="checked=\"checked\"" else=""}% /><label for="topictitle"> %MAKETEXT{"Topic title"}%</label> <input type="radio" class="twikiRadioButton" id="both" name="scope" value="all" %IF{" '%URLPARAM{"scope" default="all"}%' = 'all' " then="checked=\"checked\"" else=""}% /><label for="both"> %MAKETEXT{"Both body and title"}%</label> <hr /> <input type="checkbox" class="twikiCheckbox" id="web" name="web" %IF{" '%URLPARAM{web}%' = 'all'" then="checked=\"checked\"" else=""}% /><label for="web"> %MAKETEXT{"All public webs"}%</label> <span class="twikiSmall">%MAKETEXT{"(otherwise search [_1] Web only)" args="<nop>%INCLUDINGWEB%"}%</span> Modified: twiki/branches/MAIN/data/TWiki/WebSearchAdvanced.txt =================================================================== --- twiki/branches/MAIN/data/TWiki/WebSearchAdvanced.txt 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/data/TWiki/WebSearchAdvanced.txt 2007-06-16 12:39:55 UTC (rev 14176) @@ -33,7 +33,7 @@ <form action="%SCRIPTURLPATH{view}%/%INCLUDINGWEB%/%INCLUDINGTOPIC%"> <table id="twikiSearchTable" border="0" cellspacing="0" cellpadding="0"> <tr> -<td colspan="2" class="first"> +<td colspan="2" class="twikiFirstCol"> <input class="twikiInputField" type="text" name="search" value="%URLPARAM{ "search" encode="entity" }%" size="40" /> <input type="submit" class="twikiSubmit" value='%MAKETEXT{"Search"}%' /><span class="twikiSmall"> [[%INCLUDINGWEB%.WebSearch][%MAKETEXT{"Simple search"}%]] | [[%TWIKIWEB%.SearchHelp][%MAKETEXT{"Help"}%]]</span> <div class="twikiSmall" style="padding:1em 0 0 0;">%MAKETEXT{"TIP: to search for all topics that contain =\"SOAP\"=, =\"WSDL\"=, a literal =\"web service\"=, but not =\"shampoo\"=, write:"}% <code>soap wsdl "web service" -shampoo</code></div> @@ -78,8 +78,8 @@ </td> </tr> <tr> -<th class="last">%MAKETEXT{"Limit results to:"}%</th> -<td class="last"><input type="text" class="twikiInputField" id="limit" name="limit" size="3" value="%IF{" '%URLPARAM{"limit" default="all"}%' = 'all' " then="all" else="%URLPARAM{limit}%"}%" /><label for="limit"> %MAKETEXT{"Topics per web"}% </label><span class="twikiSmall">%MAKETEXT{"(=all= to show all topics)"}%</span> +<th class="twikiLast">%MAKETEXT{"Limit results to:"}%</th> +<td class="twikiLast"><input type="text" class="twikiInputField" id="limit" name="limit" size="3" value="%IF{" '%URLPARAM{"limit" default="all"}%' = 'all' " then="all" else="%URLPARAM{limit}%"}%" /><label for="limit"> %MAKETEXT{"Topics per web"}% </label><span class="twikiSmall">%MAKETEXT{"(=all= to show all topics)"}%</span> </td> </tr> </table> Modified: twiki/branches/MAIN/data/TWiki/WebTopicViewTemplate.txt =================================================================== --- twiki/branches/MAIN/data/TWiki/WebTopicViewTemplate.txt 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/data/TWiki/WebTopicViewTemplate.txt 2007-06-16 12:39:55 UTC (rev 14176) @@ -8,7 +8,7 @@ <div class="twikiPageForm"> <table id="twikiSearchTable" border="0" cellspacing="0" cellpadding="0"> <tr> -<td class="first"> +<td class="twikiFirstCol"> <form name="jumpAgain" action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%"> *%MAKETEXT{"Did you spell the [_1] correctly?" args="%TWIKIWEB%.WikiWord"}%* %MAKETEXT{"Remember, a [_1] is case sensitive." args="<nop>WikiWord"}% %BR% <input type="text" class="twikiInputField" name="topic" size="36" value="%BASETOPIC%" /> <input type="submit" class="twikiSubmit" value="Jump to topic" /> </form> Added: twiki/branches/MAIN/pub/TWiki/TWikiTemplates/default.css =================================================================== --- twiki/branches/MAIN/pub/TWiki/TWikiTemplates/default.css (rev 0) +++ twiki/branches/MAIN/pub/TWiki/TWikiTemplates/default.css 2007-06-16 12:39:55 UTC (rev 14176) @@ -0,0 +1,639 @@ +/* Simple CSS demonstrating use of css to theme the default TWiki templates. + * Note to installers; do *not* modify this file, and don;t assume it will + * remain unchanged in the future. If you want to create your own themed + * CSS, then create your own skin that overrides %TMPL:DEF{"templatestyle"}% + * and loads your own CSS file instead. + */ + +.twikiNewLink font { + color:inherit; +} + +.twikiNewLink a:link sup, +.twikiNewLink a:visited sup { + color:#666; + border-color:#ccc; +} + +.twikiNewLink a:hover sup { + background-color:#D6000F; + color:#FBF7E8; + border-color:#D6000F; +} + +.twikiNewLink { + border-color:#ccc; +} + +/* Form elements */ + +.twikiSubmit, +.twikiButton { + border-color:#ddd #aaa #aaa #ddd; + color:#333; + background-color:#fff; +} +.twikiSubmit:active, +.twikiButton:active { + border-color:#999 #ccc #ccc #999; + color:#000; +} + +.twikiInputField, +.twikiSelect { + border-color:#aaa #ddd #ddd #aaa; + color:#000; + background-color:#fff; +} + +.twikiTable, +.twikiTable td { + border-color:#ccc; +} +.twikiTable th { + background-color: #99BBEE; + border-color:#ccc;// #fff; +} +.twikiTable th a:link, +.twikiTable th a:visited, +.twikiTable th a font { + color:#fff; +} + +/* ----------------------------------------------------------- + TWiki styles + ----------------------------------------------------------- */ + +.twikiGrayText { + color:#8E9195; +} +.twikiGrayText a:link, +.twikiGrayText a:visited { + color:#8E9195; +} +.twikiGrayText a:hover { + color:#FBF7E8; +} + +.twikiAttachments table, +table.twikiFormTable { + border-color:#ccc; + background-color:#fff; +} +.twikiAttachments table { + background-color:#fff; +} +.twikiAttachments td, +.twikiAttachments th { + border-color:#ccc; +} +.twikiAttachments .twikiTable th font { + color:#06c; +} + +.twikiFormSteps { + background-color:#f8fbfc; + border-color:#E2DCC8; +} +.twikiFormStep { + border-color:#E2DCC8; +} +.twikiFormStep h3, +.twikiFormStep h4 { + background-color:transparent; +} +.twikiToc .twikiTocTitle { + color:#666; +} +.twikiBroadcastMessage { + background-color:yellow; +} +.twikiBroadcastMessage b, +.twikiBroadcastMessage strong { + color:#f00; +} +.twikiAlert, +.twikiAlert code { + color:#f00; +} +.twikiEmulatedLink { + color:#06c; +} +.twikiPageForm table { + border-color:#ccc; + background:#fff; +} +.twikiPageForm hr { + border-color:#ccc; + background-color:#ccc; + color:#ccc; +} +.twikiHelp { + background-color:#f8fbfc; + border-color:#D5E6F3; +} +.twikiAccessKey { + color:inherit; + border-color:#8E9195; +} +a:link .twikiAccessKey, +a:visited .twikiAccessKey, +a:hover .twikiAccessKey { + color:inherit; +} +.twikiImage img { + border-color:#eee; + background-color:#fff; +} + +/* WebSearch, WebSearchAdvanced */ +table#twikiSearchTable th, +table#twikiSearchTable td { + background-color:#fff; + border-color:#ccc; +} +table#twikiSearchTable th { + color:#000; +} +table#twikiSearchTable td.first { + background-color:#FCF8EC; +} + +.twikiChangeFormButton .twikiButton, +.twikiChangeFormButtonHolder .twikiButton { /* looks like a link */ + color:#06c; + background:none; +} + +tr.twikiDiffDebug td { + border-color:#ccc; +} + +/* Changed */ +.twikiDiffChangedHeader, +tr.twikiDiffDebug .twikiDiffChangedText, +tr.twikiDiffDebug .twikiDiffChangedText { + background:#9f9; /* green - do not change */ +} +/* Deleted */ +.twikiDiffDeletedHeader, +tr.twikiDiffDebug .twikiDiffDeletedMarker, +tr.twikiDiffDebug .twikiDiffDeletedText { + background-color:#f99; /* red - do not change */ +} +/* Added */ +.twikiDiffAddedHeader, +tr.twikiDiffDebug .twikiDiffAddedMarker, +tr.twikiDiffDebug .twikiDiffAddedText { + background-color:#ccf; /* violet - do not change */ +} +/* Unchanged */ +.twikiDiffUnchangedHeader, +tr.twikiDiffDebug .twikiDiffUnchangedText { + color:#8E9195; +} +.twikiDiffLineNumberHeader { + background-color:#ccc; +} + +.twikiLeft { + float:left; + position:relative; +} + +.twikiRight { + position:relative; + float:right; + display:inline; + margin:0; +} + +.twikiClear { + /* to clean up floats */ + margin:0; + padding:0; + height:0; + line-height:0px; + clear:both; + display:block; +} +.twikiHidden { + display:none; +} + +/* Links */ +/* somehow the twikiNewLink style have to be before the general link styles */ +.twikiNewLink { + border-width:0 0 1px 0; + border-style:solid; +} +.twikiNewLink a { + text-decoration:none; + margin-left:1px; +} +.twikiNewLink a sup { + text-align:center; + padding:0 2px; + vertical-align:baseline; + font-size:100%; + text-decoration:none; +} +.twikiNewLink a:link sup, +.twikiNewLink a:visited sup { + border-width:1px; + border-style:solid; + text-decoration:none; +} +.twikiNewLink a:hover sup { + text-decoration:none; +} + + +/* Form elements */ +form { + display:inline; + margin:0; + padding:0; +} +textarea, +input, +select { + vertical-align:middle; + border-style:ridge; + border-color:black; + font-family:"Lucida Grande", verdana, arial, sans-serif; +} + +input, +select option { + padding:1px; +} +.twikiSubmit, +.twikiButton, +.twikiCheckbox { + border-width:1px; + border-style:solid; + padding:.1em .3em; + font-size:94%; + font-weight:bold; + vertical-align:middle; +} +.twikiCheckbox, +.twikiRadioButton { + margin:0 .3em 0 0; + border:0; +} + +textarea { + padding:1px; + font-size:100%; +} +blockquote { + border-style:solid; + border-width:0 0 0 3px; + padding:.5em 1.25em; +} + +.twikiTable { + border-style:solid; + border-width:1px; + margin:2px 0; +} +.twikiTable td { + padding:.25em .5em; + border-style:none none solid none; + border-width:0 0 1px 0; +} +.twikiTable th { + border-style:none none none solid; + border-width:0 0 0 1px; + padding:.4em .5em; +} +.twikiTable th.twikiFirstCol { + border-left-style:none; +} +.twikiTable a:link, +.twikiTable a:visited { + text-decoration:underline; +} +.twikiTable a:hover { + text-decoration:underline; +} + +.twikiEditForm { + margin:0 0 .5em 0; +} + +/* ----------------------------------------------------------- + TWiki styles + ----------------------------------------------------------- */ + +.twikiLast, +.twikiForm .twikiLast, +.twikiTable .twikiLast { + border-bottom-style:none; + border-bottom-width:0; +} +#twikiLogin { + width:40em; + margin:0 auto; + text-align:center; +} +#twikiLogin .twikiFormSteps { + border-width:5px; +} +.twikiAttachments, +.twikiForm { + margin:1em 0; + padding:1px; /* fixes disappearing borders because of overflow:auto; in twikiForm */ +} +.twikiTable h2, .twikiFormTable h2, +.twikiTable h3, .twikiFormTable h3, +.twikiTable h4, .twikiFormTable h4, +.twikiTable h5, .twikiFormTable h5, +.twikiTable h6, .twikiFormTable h6 { + border:0; + margin-top:0; + margin-bottom:0; +} +.twikiFormTable th { + font-weight:normal; +} +.twikiFormTable .twikiTable th { + font-weight:bold; +} + +.twikiAttachments table, +table.twikiFormTable { + margin:5px 0; + border-collapse:collapse; + padding:0px; + border-spacing:0px; + empty-cells:show; + border-style:solid; + border-width:1px; +} +.twikiAttachments table { + line-height:1.4em; /*S1*/ + width:auto; + voice-family:"\"}\""; /* hide the following for Explorer 5.x */ + voice-family:inherit; + width:100%; +} +.twikiAttachments th { + border-style:none none solid solid; + border-width:1px; +} +.twikiAttachments th, +table.twikiFormTable th.twikiFormTableHRow { + padding:3px 6px; + height:2.5em; + vertical-align:middle; +} +table.twikiFormTable th.twikiFormTableHRow { + text-align:center; +} + +.twikiAttachments td, +table.twikiFormTable td { + padding:3px 6px; + height:1.4em; /*S1*/ + text-align:left; + vertical-align:top; +} +.twikiAttachments th.twikiFirstCol, +.twikiAttachments td.twikiFirstCol { + /* make more width for the icon column */ + width:26px; + text-align:center; +} +.twikiAttachments caption { + display:none; +} +table.twikiFormTable th.twikiFormTableHRow a:link, +table.twikiFormTable th.twikiFormTableHRow a:visited { + text-decoration:none; +} + +.twikiFormSteps { + text-align:left; + padding:.25em 0 0 0; + border-width:1px 0; + border-style:solid; +} +.twikiFormStep { + line-height:140%; + padding:1em 20px; /*S5*/ + border-width:0 0 1px 0; + border-style:solid; +} +.twikiFormStep h3, +.twikiFormStep h4 { + font-size:115%; + border:none; + margin:0; + padding:0; +} +.twikiFormStep h3 { + font-weight:bold; +} +.twikiFormStep h4 { + font-weight:normal; +} +.twikiFormStep p { + margin:.3em 0; +} + +.twikiToc { + margin:1em 0; + padding:.3em 0 .6em 0; +} +.twikiToc ul { + list-style:none; + padding:0 0 0 .5em; + margin:0; +} +.twikiToc li { + margin-left:1em; + padding-left:1em; + background-repeat:no-repeat; + background-position:0 .5em; +} +.twikiToc .twikiTocTitle { + margin:0; + padding:0; + font-weight:bold; +} + +.twikiSmall { + font-size:86%; line-height:110%; /*S3*/ +} +.twikiSmallish { + font-size:94%; /*S2*/ +} +.twikiNew { } +.twikiSummary { + font-size:86%; line-height:110%; /*S3*/ +} +.twikiEmulatedLink { + text-decoration:underline; +} +.twikiPageForm table { + border-width:1px; + border-style:solid; +} +.twikiPageForm table { + width:100%; +} +.twikiPageForm th, +.twikiPageForm td { + border:0; + padding:.5em 1em; +} +.twikiPageForm td {} +.twikiPageForm td.first { + padding-top:1em; +} +.twikiBroadcastMessage { + padding:.25em .5em; + margin:0 0 1em 0; +} +.twikiHelp { + padding:1em; + margin:0 0 -1px 0; + border-width:1px 0; + border-style:solid; +} +.twikiHelp ul, +.twikiHelp li { + margin:0; +} +.twikiHelp ul { + padding-left:2em; +} +.twikiAccessKey { + text-decoration:none; + border-width:0 0 1px 0; + border-style:solid; +} +a:hover .twikiAccessKey { + text-decoration:none; + border:none; +} +.twikiWebIndent { + margin:0 0 0 1em; +} +a.twikiLinkInHeaderRight { + float:right; + display:block; + margin:0 0 0 5px; +} +.twikiLinkLabel {} +.twikiImage img { + padding:3px; + border-width:1px; + border-style:solid; +} + +.twikiHierarchicalNavigation ul { + padding:0; + margin:0; + list-style:none; +} +.twikiHierarchicalNavigation .twikiCurrentTopic li { + font-weight:bold; +} +.twikiHierarchicalNavigation .twikiParentTopic li {} +.twikiHierarchicalNavigation .twikiChildTopics li {} + + +/* WebSearch, WebSearchAdvanced */ +#twikiSearchTable { + background:none; + border-bottom:0; +} +#twikiSearchTable th, +#twikiSearchTable td { + padding:1em; + border-width:0 0 1px 0; + border-style:solid; +} +#twikiSearchTable th { + width:20%; + text-align:right; +} +#twikiSearchTable td { + width:80%; +} + +.twikiEditboxStyleMono { + font-family:"Courier New", courier, monaco, monospace; +} +.twikiEditboxStyleProportional { + font-family:"Lucida Grande", verdana, arial, sans-serif; +} +.twikiChangeFormButtonHolder { + margin:.5em 0; + float:right; +} +.twikiChangeFormButton .twikiButton, +.twikiChangeFormButtonHolder .twikiButton { + padding:0; + margin:0; + border:none; + text-decoration:underline; + font-weight:normal; +} + +tr.twikiDiffDebug td { + border-width:1px; + border-style:solid; +} + +body { + margin: 0; + color: #000000; + background: #FFFFFF; + font-family: Arial, sans-serif; + font-weight: normal; + font-size: small; + line-height: 150%; +} + +/* + * The following additional classes are used by TWiki, but are not defined + * by this CSS + */ +/* +twikiAnchorLink +twikiConflict +twikiContentFooter +twikiContentHeader +TWikiCopyright +twikiDiffLineNumberHeader +twikiDiffTable +twikiEditFormCalendarButton +twikiEditFormCheckboxButton +twikiEditFormCheckboxField +twikiEditFormDateField +twikiEditFormError +twikiEditFormLabelField +twikiEditFormOption +twikiEditFormRadioField +twikiEditFormSelect +twikiEditFormTextAreaField +twikiEditTextarea +TWikiFooterNote +twikiForm +twikiFormTableRow +twikiLink +twikiMain +twikiMiddleContainer +twikiNoBreak +twikiSeparator +twikiTableEven +twikiTableOdd +twikiTextarea +twikiTextareaRawView +twikiTopRow +*/ \ No newline at end of file Modified: twiki/branches/MAIN/templates/addform.tmpl =================================================================== --- twiki/branches/MAIN/templates/addform.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/addform.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1 +1 @@ -<div class="twikiChangeFormButtonHolder"><input type="submit" name="action_addform" value='%MAKETEXT{"Add form"}%' class="twikiChangeFormButton" /></div><br class="twikiClear" /> +%{ This is a default template }%<div class="twikiChangeFormButtonHolder"><input type="submit" name="action_addform" value='%MAKETEXT{"Add form"}%' class="twikiChangeFormButton" /></div><br class="twikiClear" /> Modified: twiki/branches/MAIN/templates/attach.tmpl =================================================================== --- twiki/branches/MAIN/templates/attach.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/attach.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"notes"}% Modified: twiki/branches/MAIN/templates/attachagain.tmpl =================================================================== --- twiki/branches/MAIN/templates/attachagain.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/attachagain.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"attach"}% +%{ This is a default template }%%TMPL:INCLUDE{"attach"}% %TMPL:DEF{"titleaction"}%(attach) %TMPL:END% %TMPL:DEF{"headerhelp"}% %TMPL:END% Modified: twiki/branches/MAIN/templates/attachnew.tmpl =================================================================== --- twiki/branches/MAIN/templates/attachnew.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/attachnew.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"attach"}% +%{ This is a default template }%%TMPL:INCLUDE{"attach"}% %TMPL:DEF{"titleaction"}%(attach) %TMPL:END% %TMPL:DEF{"headerhelp"}% %TMPL:END% %TMPL:DEF{"webaction"}% Attach file to topic <b>%TOPIC%</b> %TMPL:END% Modified: twiki/branches/MAIN/templates/attachtables.tmpl =================================================================== --- twiki/branches/MAIN/templates/attachtables.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/attachtables.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%{ These templates define the tables used to display attachments. }% +%{ This is a default template }%%{ These templates define the tables used to display attachments. }% %{ Top table row definition for topic attachments and top table in attach screen }% %TMPL:DEF{ATTACH:files:header(toprow)}%| *I* | *%MAKETEXT{"Attachment"}%* | *%MAKETEXT{"Action"}%* | *%MAKETEXT{"Size"}%* | *%MAKETEXT{"Date"}%* | *%MAKETEXT{"Who"}%* | *%MAKETEXT{"Comment"}%* |%TMPL:END% Modified: twiki/branches/MAIN/templates/backlinks.tmpl =================================================================== --- twiki/branches/MAIN/templates/backlinks.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/backlinks.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,6 +1,4 @@ -%TMPL:INCLUDE{"search"}% - - +%{ This is a default template }%%TMPL:INCLUDE{"search"}% %TMPL:DEF{"searchweb"}%%SEARCH{ search="%TOPIC%([^A-Za-z0-9]|$)|%SPACEOUT{"%TOPIC%" separator=" *"}%([^A-Za-z0-9]|$)|%WEB%.%TOPIC%([^A-Za-z0-9]|$)" type="regex" scope="text" nosearch="on" excludetopic="%TOPIC%" web="%WEB%" }%%TMPL:END% Modified: twiki/branches/MAIN/templates/backlinksallwebs.tmpl =================================================================== --- twiki/branches/MAIN/templates/backlinksallwebs.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/backlinksallwebs.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"backlinks"}% +%{ This is a default template }%%TMPL:INCLUDE{"backlinks"}% Modified: twiki/branches/MAIN/templates/backlinksweb.tmpl =================================================================== --- twiki/branches/MAIN/templates/backlinksweb.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/backlinksweb.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"backlinks"}% +%{ This is a default template }%%TMPL:INCLUDE{"backlinks"}% Modified: twiki/branches/MAIN/templates/changeform.tmpl =================================================================== --- twiki/branches/MAIN/templates/changeform.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/changeform.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"topicaction"}% <input type="submit" class="twikiSubmit" name="submit" class="twikiSubmit" value=" Change form " /> %TMPL:END% Modified: twiki/branches/MAIN/templates/changes.tmpl =================================================================== --- twiki/branches/MAIN/templates/changes.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/changes.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:INCLUDE{"search"}% %TMPL:DEF{"titleaction"}%(changes) %TMPL:END% %TMPL:DEF{"searchbody"}%<br />%TMPL:P{"repeatedsearchblock"}%%TMPL:END% Modified: twiki/branches/MAIN/templates/css.tmpl =================================================================== --- twiki/branches/MAIN/templates/css.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/css.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,5 +1,3 @@ -<style type="text/css" media="all"> - /* to hide Twisty elements: */ - .twistyHidden { display:none; } - .twistyMakeVisible { display:none; } +%{ This is a default template }%<style> +@import url('%PUBURL%/%SYSTEMWEB%/TWikiTemplates/default.css'); </style>%TMPL:P{"templatestyle"}% \ No newline at end of file Modified: twiki/branches/MAIN/templates/cssmediatypes.tmpl =================================================================== --- twiki/branches/MAIN/templates/cssmediatypes.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/cssmediatypes.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -<style type="text/css" media="print"> +%{ This is a default template }%<style type="text/css" media="print"> a:link:after, a:visited:after { content: " (" attr(href) ") "; Modified: twiki/branches/MAIN/templates/edit.tmpl =================================================================== --- twiki/branches/MAIN/templates/edit.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/edit.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"templatescript"}%<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/TWikiJavascripts/twikiPref.js"></script> <script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/TWikiJavascripts/twikiCSS.js"></script> Modified: twiki/branches/MAIN/templates/editform.tmpl =================================================================== --- twiki/branches/MAIN/templates/editform.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/editform.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"edit"}% +%{ This is a default template }%%TMPL:INCLUDE{"edit"}% %TMPL:DEF{"focus"}%%TMPL:END% %TMPL:DEF{"titleaction"}%(edit form)%TMPL:END% Modified: twiki/branches/MAIN/templates/edittext.tmpl =================================================================== --- twiki/branches/MAIN/templates/edittext.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/edittext.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"edit"}% +%{ This is a default template }%%TMPL:INCLUDE{"edit"}% %TMPL:DEF{"titleaction"}%(edit text)%TMPL:END% Modified: twiki/branches/MAIN/templates/form.tmpl =================================================================== --- twiki/branches/MAIN/templates/form.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/form.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:DEF{"changeform"}%<input type="submit" name="action_replaceform" value='%MAKETEXT{"Replace form..."}%' class="twikiChangeFormButton twikiButton" />%TMPL:END% +%{ This is a default template }%%TMPL:DEF{"changeform"}%<input type="submit" name="action_replaceform" value='%MAKETEXT{"Replace form..."}%' class="twikiChangeFormButton twikiButton" />%TMPL:END% %TMPL:DEF{"mandatory"}%<span class="twikiAlert">*</span> %MAKETEXT{"indicates mandatory fields"}% %TMPL:END% Modified: twiki/branches/MAIN/templates/formtables.tmpl =================================================================== --- twiki/branches/MAIN/templates/formtables.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/formtables.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%{ These templates define the form attached at the bottom of viewed page. }% +%{ This is a default template }%%{ These templates define the form attached at the bottom of viewed page. }% %{ Header definition for topic attachments and top table in attach screen }% %TMPL:DEF{FORM:display:header}% Modified: twiki/branches/MAIN/templates/login.sudo.tmpl =================================================================== --- twiki/branches/MAIN/templates/login.sudo.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/login.sudo.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"login"}% +%{ This is a default template }%%TMPL:INCLUDE{"login"}% %TMPL:DEF{"webaction"}%Sudo TWiki User Authentication %TMPL:END% %TMPL:DEF{"topicaction"}% %TMPL:END% Modified: twiki/branches/MAIN/templates/login.tmpl =================================================================== --- twiki/branches/MAIN/templates/login.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/login.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"templatescript"}% <script type="text/javascript"> Modified: twiki/branches/MAIN/templates/mailresetpassword.tmpl =================================================================== --- twiki/branches/MAIN/templates/mailresetpassword.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/mailresetpassword.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> +%{ This is a default template }%From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> To: %FIRSTLASTNAME% <%EMAILADDRESS%> Subject: %MAKETEXT{"TWiki password reset for [_1]" args="%WIKINAME%"}% Modified: twiki/branches/MAIN/templates/messages.tmpl =================================================================== --- twiki/branches/MAIN/templates/messages.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/messages.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%{ +%{ This is a default template }%%{ SYSTEM MESSAGES NOTE: IF YOU ADD ANY MESSAGES TO THIS FILE, PLEASE MAKE SURE THEY ARE Modified: twiki/branches/MAIN/templates/moveattachment.tmpl =================================================================== --- twiki/branches/MAIN/templates/moveattachment.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/moveattachment.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:INCLUDE{"rename"}% %TMPL:DEF{"titleaction"}%(move attachment) %TMPL:END% Modified: twiki/branches/MAIN/templates/oopsaccessdenied.tmpl =================================================================== --- twiki/branches/MAIN/templates/oopsaccessdenied.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/oopsaccessdenied.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%{ Templates for access denied messages. One DEF is selected and inserted at %INSTANTIATE }% +%{ This is a default template }%%{ Templates for access denied messages. One DEF is selected and inserted at %INSTANTIATE }% %TMPL:INCLUDE{"oops"}% %TMPL:DEF{"titleaction"}%%MAKETEXT{"(access denied)"}% %TMPL:END% Modified: twiki/branches/MAIN/templates/oopsalerts.tmpl =================================================================== --- twiki/branches/MAIN/templates/oopsalerts.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/oopsalerts.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%{ Inline alerts, embedded in rendered text. }% +%{ This is a default template }%%{ Inline alerts, embedded in rendered text. }% %TMPL:INCLUDE{"messages"}% <span class='twikiAlert'> %INSTANTIATE% Modified: twiki/branches/MAIN/templates/oopsattention.tmpl =================================================================== --- twiki/branches/MAIN/templates/oopsattention.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/oopsattention.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"oops"}% +%{ This is a default template }%%TMPL:INCLUDE{"oops"}% %TMPL:DEF{"titleaction"}% %TMPL:END% %TMPL:DEF{"webaction"}%%TMPL:END% Modified: twiki/branches/MAIN/templates/oopschangelanguage.tmpl =================================================================== --- twiki/branches/MAIN/templates/oopschangelanguage.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/oopschangelanguage.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"titleaction"}% %MAKETEXT{"(change language)"}% %TMPL:END% %TMPL:DEF{"webaction"}%%TMPL:END% %TMPL:DEF{"heading"}%%MAKETEXT{"Change language"}%%TMPL:END% Modified: twiki/branches/MAIN/templates/oopslanguagechanged.tmpl =================================================================== --- twiki/branches/MAIN/templates/oopslanguagechanged.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/oopslanguagechanged.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"oops"}% +%{ This is a default template }%%TMPL:INCLUDE{"oops"}% %TMPL:DEF{"titleaction"}% %MAKETEXT{"(change language)"}% %TMPL:END% Modified: twiki/branches/MAIN/templates/oopsleaseconflict.tmpl =================================================================== --- twiki/branches/MAIN/templates/oopsleaseconflict.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/oopsleaseconflict.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%{ Templates for lease conflict messages. One DEF is selected and inserted at %INSTANTIATE }% +%{ This is a default template }%%{ Templates for lease conflict messages. One DEF is selected and inserted at %INSTANTIATE }% %TMPL:INCLUDE{"oops"}% %TMPL:DEF{"webaction"}% *%MAKETEXT{"Attention"}%* %TMPL:END% %TMPL:DEF{"heading"}%%MAKETEXT{"Conflict"}%%TMPL:END% Modified: twiki/branches/MAIN/templates/oopsmore.tmpl =================================================================== --- twiki/branches/MAIN/templates/oopsmore.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/oopsmore.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"oops"}% +%{ This is a default template }%%TMPL:INCLUDE{"oops"}% %TMPL:DEF{"titleaction"}%(more) %TMPL:END% %TMPL:DEF{"webaction"}% *Topic actions* %TMPL:END% %TMPL:DEF{"heading"}%More Actions on Topic [[%TOPIC%]]%TMPL:END% Modified: twiki/branches/MAIN/templates/oopssaveerr.tmpl =================================================================== --- twiki/branches/MAIN/templates/oopssaveerr.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/oopssaveerr.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%{ +%{ This is a default template }%%{ NOTE: not used by TWiki, but retained for compatibility with some plugins that use it. Modified: twiki/branches/MAIN/templates/preview.tmpl =================================================================== --- twiki/branches/MAIN/templates/preview.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/preview.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %{ this body redefinition needs to be, its the only place a background image is allowed (TODO: push up with parameter?) }% %TMPL:DEF{"bodystart"}% <body bgcolor="#ffffff" background="%PREVIEWBGIMAGE%"> Modified: twiki/branches/MAIN/templates/rdiff.tmpl =================================================================== --- twiki/branches/MAIN/templates/rdiff.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/rdiff.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:INCLUDE{"search"}% %TMPL:DEF{"titleaction"}%(%REVTITLE2% vs. %REVTITLE1%) %TMPL:END% Modified: twiki/branches/MAIN/templates/registerconfirm.tmpl =================================================================== --- twiki/branches/MAIN/templates/registerconfirm.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/registerconfirm.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> +%{ This is a default template }%From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> To: %FIRSTLASTNAME% <%EMAILADDRESS%> BCC: %WIKIWEBMASTER% Subject: %MAKETEXT{"How to activate your [_1] registration" args="%WIKITOOLNAME%"}% Modified: twiki/branches/MAIN/templates/registernotify.tmpl =================================================================== --- twiki/branches/MAIN/templates/registernotify.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/registernotify.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> +%{ This is a default template }%From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> To: %FIRSTLASTNAME% <%EMAILADDRESS%> Subject: %MAKETEXT{"[_1] - Registration for [_2] ([_3])" args="%WIKITOOLNAME%, %WIKINAME%, %EMAILADDRESS%"}% MIME-Version: 1.0 Modified: twiki/branches/MAIN/templates/registernotifyadmin.tmpl =================================================================== --- twiki/branches/MAIN/templates/registernotifyadmin.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/registernotifyadmin.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> +%{ This is a default template }%From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> To: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> Subject: %MAKETEXT{"[_1] - Registration for [_2] ([_3])" args="%WIKITOOLNAME%, %WIKINAME%, %EMAILADDRESS%"}% MIME-Version: 1.0 Modified: twiki/branches/MAIN/templates/rename.tmpl =================================================================== --- twiki/branches/MAIN/templates/rename.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/rename.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"renamebase"}% +%{ This is a default template }%%TMPL:INCLUDE{"renamebase"}% %TMPL:DEF{"titleaction"}%(rename) %TMPL:END% %TMPL:DEF{"webaction"}%Rename%TMPL:END% %TMPL:DEF{"newtopic"}%<input name="newtopic" value="%NEW_TOPIC%" size="36" />%TMPL:END% Modified: twiki/branches/MAIN/templates/renamebase.tmpl =================================================================== --- twiki/branches/MAIN/templates/renamebase.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/renamebase.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"templatescript"}%<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/TWikiJavascripts/twiki_renamebase.js"></script>%TMPL:END% Modified: twiki/branches/MAIN/templates/renameconfirm.tmpl =================================================================== --- twiki/branches/MAIN/templates/renameconfirm.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/renameconfirm.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"renamebase"}% +%{ This is a default template }%%TMPL:INCLUDE{"renamebase"}% %TMPL:DEF{"titleaction"}%(rename) %TMPL:END% %TMPL:DEF{"webaction"}%Confirm rename or move%TMPL:END% %TMPL:DEF{"newtopic"}%<input type="hidden" name="newtopic" value="%NEW_TOPIC%" />%NEW_TOPIC%%TMPL:END% Modified: twiki/branches/MAIN/templates/renamedelete.tmpl =================================================================== --- twiki/branches/MAIN/templates/renamedelete.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/renamedelete.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"renamebase"}% +%{ This is a default template }%%TMPL:INCLUDE{"renamebase"}% %TMPL:DEF{"templatescript"}%<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/TWikiJavascripts/twiki_renamebase.js"></script>%TMPL:END% %TMPL:DEF{"titleaction"}%(delete) %TMPL:END% %TMPL:DEF{"webaction"}%Delete%TMPL:END% Modified: twiki/branches/MAIN/templates/renameweb.tmpl =================================================================== --- twiki/branches/MAIN/templates/renameweb.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/renameweb.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"renamewebbase"}% +%{ This is a default template }%%TMPL:INCLUDE{"renamewebbase"}% %TMPL:DEF{"titleaction"}%(rename) %TMPL:END% %TMPL:DEF{"webaction"}%Rename%TMPL:END% %TMPL:DEF{"newsubweb"}%<input name="newsubweb" value="%NEW_SUBWEB%" size="36" />%TMPL:END% Modified: twiki/branches/MAIN/templates/renamewebbase.tmpl =================================================================== --- twiki/branches/MAIN/templates/renamewebbase.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/renamewebbase.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"templatescript"}%<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/TWikiJavascripts/twiki_renamebase.js"></script>%TMPL:END% Modified: twiki/branches/MAIN/templates/renamewebconfirm.tmpl =================================================================== --- twiki/branches/MAIN/templates/renamewebconfirm.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/renamewebconfirm.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"renamewebbase"}% +%{ This is a default template }%%TMPL:INCLUDE{"renamewebbase"}% %TMPL:DEF{"titleaction"}%(renameweb) %TMPL:END% %TMPL:DEF{"webaction"}%Confirm rename or move%TMPL:END% %TMPL:DEF{"newtopic"}%<input type="hidden" name="newsubweb" value="%NEW_SUBWEB%" />%NEW_SUBWEB%%TMPL:END% Modified: twiki/branches/MAIN/templates/renamewebdelete.tmpl =================================================================== --- twiki/branches/MAIN/templates/renamewebdelete.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/renamewebdelete.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"renamewebbase"}% +%{ This is a default template }%%TMPL:INCLUDE{"renamewebbase"}% %TMPL:DEF{"templatescript"}%<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/TWikiJavascripts/twiki_renamebase.js"></script>%TMPL:END% %TMPL:DEF{"titleaction"}%(delete) %TMPL:END% %TMPL:DEF{"webaction"}%Delete%TMPL:END% Modified: twiki/branches/MAIN/templates/search.text.tmpl =================================================================== --- twiki/branches/MAIN/templates/search.text.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/search.text.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%SPLIT% +%{ This is a default template }%%SPLIT% Search: %SEARCHSTRING% %SPLIT% Topics in <nop>%WEB% web: Modified: twiki/branches/MAIN/templates/search.tmpl =================================================================== --- twiki/branches/MAIN/templates/search.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/search.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"view"}% +%{ This is a default template }%%TMPL:INCLUDE{"view"}% %TMPL:DEF{"titleaction"}%(search result) %TMPL:END% %TMPL:DEF{"webaction"}% %WEBTOPICLIST% %TMPL:END% Modified: twiki/branches/MAIN/templates/searchbookview.tmpl =================================================================== --- twiki/branches/MAIN/templates/searchbookview.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/searchbookview.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"search"}% +%{ This is a default template }%%TMPL:INCLUDE{"search"}% %TMPL:DEF{"titleaction"}%(book view) %TMPL:END% Modified: twiki/branches/MAIN/templates/searchformat.tmpl =================================================================== --- twiki/branches/MAIN/templates/searchformat.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/searchformat.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"titleaction"}%(search result) %TMPL:END% %TMPL:DEF{"webaction"}% %WEBTOPICLIST% %TMPL:END% Modified: twiki/branches/MAIN/templates/searchmeta.tmpl =================================================================== --- twiki/branches/MAIN/templates/searchmeta.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/searchmeta.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,2 +1,2 @@ -%SPLIT%%SPLIT%%REPEAT%<a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPICNAME%">%TOPICNAME%</a> %REPEAT%%SPLIT%%SPLIT% +%{ This is a default template }%%SPLIT%%SPLIT%%REPEAT%<a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPICNAME%">%TOPICNAME%</a> %REPEAT%%SPLIT%%SPLIT% <!--Dummy tail--> \ No newline at end of file Modified: twiki/branches/MAIN/templates/settings.tmpl =================================================================== --- twiki/branches/MAIN/templates/settings.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/settings.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"edit"}% +%{ This is a default template }%%TMPL:INCLUDE{"edit"}% %TMPL:DEF{"titleaction"}%(set preferences) %TMPL:END% Modified: twiki/branches/MAIN/templates/twiki.tmpl =================================================================== --- twiki/branches/MAIN/templates/twiki.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/twiki.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -55,13 +55,12 @@ %TMPL:DEF{"standardheader"}%<form name="main" action="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%"> <table width="100%" border="0" cellpadding="3" cellspacing="0"> <tr> - <td bgcolor="%WEBBGCOLOR%" rowspan="2" valign="top" width="1%"> + <td rowspan="2" valign="middle" width="1%"> <noautolink> <a href="%WEBLOGOURL%" rel='nofollow'><img src="%WEBLOGOIMG%" border="0" alt="%WEBLOGOALT%" /></a> </noautolink> </td><td> - <a href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/%HOMETOPIC%">%WIKITOOLNAME%</a> - > <a href="%SCRIPTURLPATH{"view"}%/%WEB%/%HOMETOPIC%">%WEB%</a> + <div style="padding:3px;display:inline;background-color:%WEBBGCOLOR%"><a href="%SCRIPTURLPATH{"view"}%/%WEB%/%HOMETOPIC%">%WEB%</a></div> > %META{"parent" nowebhome="on" suffix=" >"}% <font size="+1"><b>%TOPIC%</b> %TMPL:P{"titleaction"}%</font> </td><td align="right"> @@ -69,27 +68,27 @@ %WIKIWEBLIST% </font> </td> </tr> - <tr bgcolor="%WEBBGCOLOR%"> + <tr> <td> - <nop>%WEB% . { %TMPL:P{"webaction"}% } + <nop>%TMPL:P{"webaction"}% </td><td align="right"> <font size="-2">%TMPL:P{"login"}%</font> </td> </tr> </table></form>%TMPL:END% -%TMPL:DEF{"simpleheader"}%<table width="100%" border="0" cellpadding="3" cellspacing="0"> +%TMPL:DEF{"simpleheader"}%<table width="100%" border="0" cellpadding="5" cellspacing="0"> <tr> - <td bgcolor="%WEBBGCOLOR%" rowspan="2" valign="top" width="1%"> + <td rowspan="2" valign="middle" width="1%"> <noautolink> <img src="%WEBLOGOIMG%" border="0" alt="%WEBLOGOALT%" /> </noautolink> </td><td> - <b>%WIKITOOLNAME% . %WEB% . </b><font size="+2"><b>%TOPIC%</b> %TMPL:P{"titleaction"}%</font> + <div style="padding:3px;display:inline;background-color:%WEBBGCOLOR%">%WEB% </div> . <font size="+2"><b>%TOPIC%</b> %TMPL:P{"titleaction"}%</font> </td><td> %TMPL:P{"headerhelp"}% </td> </tr> - <tr bgcolor="%WEBBGCOLOR%"> + <tr> <td colspan="2"> %TMPL:P{"webaction"}% </td> @@ -118,7 +117,7 @@ %TMPL:DEF{"topicinfo"}%<table width="100%" border="0" cellpadding="3" cellspacing="0"> <tr bgcolor="%WEBBGCOLOR%"> -<td valign="top"> Topic <b>%TOPIC%</b> . { %TMPL:P{"topicaction"}% } </td> </tr></table>%TMPL:END% +<td valign="top"> <b>%TOPIC%</b> %TMPL:P{"topicaction"}% </td> </tr></table>%TMPL:END% %TMPL:DEF{"main"}%%TMPL:P{"bodystyle"}%<div class="twikiMiddleContainer"><div class="twikiMain"> %TMPL:P{"simpleheader"}%%TMPL:P{"pagetitlestylewrapper"}% Modified: twiki/branches/MAIN/templates/view.plain.tmpl =================================================================== --- twiki/branches/MAIN/templates/view.plain.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/view.plain.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"titleaction"}% %REVTITLE% %TMPL:END% %TMPL:DEF{"webaction"}% %WEBTOPICLIST% %TMPL:END% Modified: twiki/branches/MAIN/templates/view.print.tmpl =================================================================== --- twiki/branches/MAIN/templates/view.print.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/view.print.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1 +1 @@ -%TMPL:INCLUDE{"viewprint"}% +%{ This is a default template }%%TMPL:INCLUDE{"viewprint"}% Modified: twiki/branches/MAIN/templates/view.rss.tmpl =================================================================== --- twiki/branches/MAIN/templates/view.rss.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/view.rss.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="%CHARSET%" ?> -<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://purl.org/rss/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:wiki="http://purl.org/rss/1.0/modules/wiki/" > +%{ This is a default template }%<?xml version="1.0" encoding="%CHARSET%" ?><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://purl.org/rss/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:wiki="http://purl.org/rss/1.0/modules/wiki/" > %TEXT% </rdf:RDF> Modified: twiki/branches/MAIN/templates/view.rssatom.tmpl =================================================================== --- twiki/branches/MAIN/templates/view.rssatom.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/view.rssatom.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="%CHARSET%"?> +%{ This is a default template }%<?xml version="1.0" encoding="%CHARSET%"?> <feed xmlns="http://www.w3.org/2005/Atom"> %TEXT% </feed> Modified: twiki/branches/MAIN/templates/view.text.tmpl =================================================================== --- twiki/branches/MAIN/templates/view.text.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/view.text.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1 +1 @@ -%TEXT% +%{ This is a default template }%%TEXT% Modified: twiki/branches/MAIN/templates/view.tmpl =================================================================== --- twiki/branches/MAIN/templates/view.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/view.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,3 +1,4 @@ +%{ This is a default template }% %TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"titleaction"}% %REVTITLE% %TMPL:END% Modified: twiki/branches/MAIN/templates/view.xml.tmpl =================================================================== --- twiki/branches/MAIN/templates/view.xml.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/view.xml.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1 +1 @@ -%TEXT% +%{ This is a default template }%%TEXT% Modified: twiki/branches/MAIN/templates/viewplain.tmpl =================================================================== --- twiki/branches/MAIN/templates/viewplain.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/viewplain.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,3 +1,3 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"content"}%%TEXT%%TMPL:END% \ No newline at end of file Modified: twiki/branches/MAIN/templates/viewprint.tmpl =================================================================== --- twiki/branches/MAIN/templates/viewprint.tmpl 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/templates/viewprint.tmpl 2007-06-16 12:39:55 UTC (rev 14176) @@ -1,4 +1,4 @@ -%TMPL:INCLUDE{"twiki"}% +%{ This is a default template }%%TMPL:INCLUDE{"twiki"}% %TMPL:DEF{"form"}%%META{"form"}%%TMPL:END% %TMPL:DEF{"attachments"}%%META{"attachments"}%%TMPL:END% Modified: twiki/branches/MAIN/tools/MANIFEST =================================================================== --- twiki/branches/MAIN/tools/MANIFEST 2007-06-16 12:34:30 UTC (rev 14175) +++ twiki/branches/MAIN/tools/MANIFEST 2007-06-16 12:39:55 UTC (rev 14176) @@ -721,7 +721,6 @@ pub/TWiki/TWikiDocGraphics/locktopicgray.gif 0644 pub/TWiki/TWikiDocGraphics/logout.gif 0644 pub/TWiki/TWikiDocGraphics/mail.gif 0644 -pub/TWiki/TWikiDocGraphics/map.gif 0644 pub/TWiki/TWikiDocGraphics/mdb.gif 0644 pub/TWiki/TWikiDocGraphics/minus.gif 0644 pub/TWiki/TWikiDocGraphics/monospace.gif 0644 @@ -876,6 +875,7 @@ pub/TWiki/TWikiLogos/T-logo.svg 0644 pub/TWiki/TWikiLogos/favicon.ico 0644 pub/TWiki/TWikiTemplates/testscreen.gif 0644 +pub/TWiki/TWikiTemplates/default.css 0644 pub/TWiki/WabiSabi/wabisabi.gif 0644 pub/TWiki/WebPreferences/Dakar.gif 0644 pub/TWiki/WebPreferences/favicon.ico 0644 |