Item264: fixing various minor styling issues

git-svn-id: http://svn.foswiki.org/trunk@1251 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Dec 10, 2008 · e864c0d · e864c0d
1 parent b6d0c96
commit e864c0d
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 57 deletions.
diff --git a/PatternSkin/data/System/PatternSkinColorSettings.txt b/PatternSkin/data/System/PatternSkinColorSettings.txt
@@ -127,7 +127,7 @@ Edit this topic, and change the color as you like.
 ---++++ DIFF_HEADER_BACKGROUND Diff header (dark gray)
    * Local DIFF_HEADER_BACKGROUND = #ccc
 ---++++ NOTIFICATION_BACKGROUND Info, broadcast message and notifications
-   * Local NOTIFICATION_BACKGROUND = #ffe67b
+   * Local NOTIFICATION_BACKGROUND = #fff0c4
 ---++++ INFO_BACKGROUND
    * Local INFO_BACKGROUND = #f5fbfe
 
@@ -148,7 +148,7 @@ Edit this topic, and change the color as you like.
    * Local IMAGE_BORDER = #eee
 ---++++ FORM_STEP_BORDER Form step border
    * Local FORM_STEP_BORDER = %SEPARATOR_BORDER%
----++++ NOTIFICATION_BORDER Broadcast message
+---++++ NOTIFICATION_BORDER Notification messages
    * Local NOTIFICATION_BORDER = #ffdf4c
 
 ---++++ Table colors
@@ -544,6 +544,9 @@ table.foswikiFormTable th.foswikiFormTableHRow font {
 .foswikiNotification {
    background-color:%NOTIFICATION_BACKGROUND%;
 }
+.foswikiNotification {
+   border-color:%NOTIFICATION_BORDER%;
+}
 #foswikiLogin .patternLoginNotification {
    background-color:%MAIN_TEXT_BACKGROUND%;
    border-color:%ALERT_BORDER%;
@@ -983,6 +986,11 @@ a.foswikiButton:active {
    background-position:16px -84px;
 }
 
+.foswikiBroadcastMessage {
+   background-image:url(background_alert.gif);
+   background-repeat:repeat-x;
+}
+
 /* common settings */
 .patternLeftBarPersonal li,
 li.patternLogOut,

diff --git a/PatternSkin/data/System/PatternSkinElements.txt b/PatternSkin/data/System/PatternSkinElements.txt
@@ -1,8 +1,6 @@
 %META:TOPICINFO{author="ProjectContributor" date="1165884692" format="1.1" reprev="1.1" version="1.1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
-<!--
 <div class="foswikiBroadcastMessage"> <strong>NOTE:</strong> Edit and Attach will be disabled today between 05:00 PM and 06:00 PM PDT (00:00 to 01:00 GMT) for a scheduled Foswiki maintenance.</div>
--->
 
 <div class="foswikiNotification">This is a notification. 
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 

diff --git a/PatternSkin/lib/Foswiki/Contrib/PatternSkin/MANIFEST b/PatternSkin/lib/Foswiki/Contrib/PatternSkin/MANIFEST
@@ -93,7 +93,6 @@ templates/search.pattern.tmpl 0444
 templates/searchbase.pattern.tmpl 0444
 templates/searchbookview.pattern.tmpl 0444
 templates/searchformat.pattern.tmpl 0444
-templates/searchmeta.pattern.tmpl 0444
 templates/settings.pattern.tmpl 0444
 templates/view.pattern.tmpl 0444
 templates/viewbottombar.pattern.tmpl 0444

diff --git a/PatternSkin/pub/System/PatternSkin/colors.css b/PatternSkin/pub/System/PatternSkin/colors.css
@@ -293,8 +293,7 @@ table.foswikiFormTable td.foswikiFormTableRow {
    background-color:#eef7fa;
    border-color:#fff;
 }
-.foswikiAttachments .foswikiButton h3,
-.foswikiForm .foswikiButton h3 {
+.patternTwistyButton h3 {
 	color:#d1400e;
 }
 .foswikiAttachments table,
@@ -339,7 +338,10 @@ table.foswikiFormTable th.foswikiFormTableHRow font {
 }
 .foswikiBroadcastMessage,
 .foswikiNotification {
-   background-color:#ffe67b;
+   background-color:#fff0c4;
+}
+.foswikiNotification {
+   border:2px solid #ffdf4c;
 }
 #foswikiLogin .patternLoginNotification {
    background-color:#fff;
@@ -460,7 +462,8 @@ a:hover .foswikiAccessKey {
 .patternActionButtons a:hover {
    color:#fff;
 }
-.patternTopicAction .foswikiAccessKey {
+.patternTopicAction a:link .foswikiAccessKey,
+.patternTopicAction a:visited .foswikiAccessKey {
    color:#fff;
    border-color:#fff;
 }
@@ -779,8 +782,7 @@ a.foswikiButton:active {
 .patternButtonShrink:active {
    background-position:16px -84px;
 }
-.foswikiBroadcastMessage,
-.foswikiNotification {
+.foswikiBroadcastMessage {
    background-image:url(background_alert.gif);
    background-repeat:repeat-x;
 }

diff --git a/PatternSkin/pub/System/PatternSkin/pattern.js b/PatternSkin/pub/System/PatternSkin/pattern.js
@@ -21,14 +21,14 @@ var Pattern = {
 		var countStr = " " + "<span class='patternSmallLinkToHeader'>" + ' '  + count + "<\/span>";
 		var showElem = document.getElementById('topicattachmentslistshow');
 		if (showElem != undefined) {
-			var elems = foswiki.getElementsByClassName(showElem, 'patternToggleHeader');
+			var elems = foswiki.getElementsByClassName(showElem, 'patternAtachmentHeader');
 			if (elems && elems[0]) {
 				elems[0].innerHTML += countStr;
 			}
 		}
 		var hideElem = document.getElementById('topicattachmentslisthide');
 		if (hideElem != undefined) {
-			var elems = foswiki.getElementsByClassName(hideElem, 'patternToggleHeader');
+			var elems = foswiki.getElementsByClassName(hideElem, 'patternAtachmentHeader');
 			if (elems && elems[0]) {
 				elems[0].innerHTML += countStr;
 			}

diff --git a/PatternSkin/pub/System/PatternSkin/style.css b/PatternSkin/pub/System/PatternSkin/style.css
@@ -29,20 +29,12 @@ html body {
 html>body { /* Mozilla */
 	font-size:small;	
 }
-p {
-	margin:1em 0 0 0;
-}
-table {
-}
 th {
 	line-height:1.15em;
 }
 label {
 	padding:.15em .3em .15em 0; /* same vertical padding as foswikiInputField */
 }
-strong, b {
-	font-weight:bold;
-}
 hr {
 	height:1px;
 	border:none;
@@ -67,8 +59,8 @@ html>body pre { /* hide from IE */
 }
 ol, ul {
 	margin-top:0;
+	margin-bottom:1em;
 }
-ol li, ul li {}
 blockquote {
 	padding:.5em 1.25em;
 	border-style:solid;
@@ -80,10 +72,6 @@ h1 {
 	padding:0.25em 0 0 0;
 	margin:0 0 .5em 0;
 }
-h2, h3, h4, h5, h6 {
-	padding:0;
-	margin:1em 0 .1em 0;
-}
 h1, h2, h3, h4, h5, h6 {
 	font-weight:normal;
 	line-height:1em;
@@ -98,7 +86,7 @@ h2, h3, h4, h5, h6 {
 	display:block;
 	/* give header a background color for easy scanning:*/
 	padding:.25em 10px;
-	margin:1.25em -10px .35em -10px;
+	margin:1em -10px .35em -10px;
 	height:auto;	
 }
 /*
@@ -184,6 +172,7 @@ select {
 .foswikiButtonCancel,
 a.foswikiButton,
 a.foswikiSubmit,
+a.foswikiButtonCancel,
 .foswikiCheckbox {
 	border-width:1px;
 	border-style:solid;
@@ -210,6 +199,10 @@ a.foswikiButton,
 a.foswikiButton:hover,
 a.foswikiButton:link:active,
 a.foswikiButton:visited:active,
+a.foswikiButtonCancel,
+a.foswikiButtonCancel:hover,
+a.foswikiButtonCancel:link:active,
+a.foswikiButtonCancel:visited:active,
 a.foswikiSubmit,
 a.foswikiSubmit:hover,
 a.foswikiSubmit:link:active,
@@ -343,8 +336,6 @@ a.foswikiSubmit:visited:active {
 .foswikiForm {
 	margin:1em 0;
 	padding:1px; /* fixes disappearing borders because of overflow:auto; in foswikiForm */
-	border-width:2px 0 0 0;
-	border-style:solid;
 	height:1%; /* for IE */
 }
 .foswikiTable h2, .foswikiFormTable h2,
@@ -377,6 +368,8 @@ a.foswikiSubmit:visited:active {
 	font-size:94%; /*S2*/
 	padding:1em 20px; /*S5*/ /* top:use less padding for the toggle link; bottom:use less space in case the table is folded in  */
 	margin:0;
+	border-width:2px 0 0 0;
+	border-style:solid;
 }
 .foswikiAttachments .foswikiTable,
 table.foswikiFormTable {
@@ -428,18 +421,21 @@ table.foswikiFormTable th.foswikiFormTableHRow a:visited {
 	text-decoration:none;
 }
 .foswikiAttachments h3,
-.foswikiForm h3 {
-	font-size:115%;
+.foswikiForm h3,
+.patternTwistyButton h3 {
+	font-size:1.15em;
 	font-weight:bold;
 	display:inline;
 	margin:0;
 	padding:0;
 }
-.foswikiAttachments .foswikiButton h3,
-.foswikiForm .foswikiButton h3 {
+.patternTwistyButton h3 {
+	/* always add class foswikiButton as well */
 	padding:.1em .2em;
 }
-.patternToggleHeader {}
+.patternAtachmentHeader {
+	/* behaviour class */
+}
 .foswikiForm h3 a:link,
 .foswikiForm h3 a:visited {
 	text-decoration:none;
@@ -548,18 +544,20 @@ table.foswikiFormTable th.foswikiFormTableHRow a:visited {
 }
 .foswikiBroadcastMessage,
 .foswikiNotification {
-	padding:.5em 20px; /*S5*/
+	padding:1em 20px; /*S5*/
 }
 .foswikiNotification {
 	margin:1em 0;
+	border-style:solid;
+	border-width:2px;
 }
 .foswikiBroadcastMessage {
 	margin:0 0 1.25em 0;
 }
 .foswikiHelp {
 	height:1%; /* for IE */
 	padding:1em;
-	margin:0;
+	margin:.25em 0 0 0;
 	border-style:solid;
 	border-width:2px;
 }
@@ -568,6 +566,9 @@ table.foswikiFormTable th.foswikiFormTableHRow a:visited {
 	padding-left:20px;
 }
 .foswikiAccessKey {
+	border:none;
+}
+a:hover .foswikiAccessKey {
 	text-decoration:none;
 	border-width:0 0 1px 0;
 	border-style:solid;
@@ -658,7 +659,9 @@ table.foswikiFormTable th.foswikiFormTableHRow a:visited {
 }
 
 /* bottom paddings */
-#patternMainContents,
+#patternMainContents {
+	padding-bottom:4em;
+}
 #patternBottomBarContents {
 	padding-bottom:2em;
 }
@@ -805,15 +808,6 @@ html>body #patternSideBarContents li { /* Mozilla */
 .patternToolBar span a:active {
 	outline:none;
 }
-.patternToolBar span.foswikiAccessKey {
-	padding:0;
-	margin:0;
-	float:none;
-}
-.patternToolBar a:hover .foswikiAccessKey {
-	border-width:0 0 1px 0;
-	border-style:solid;
-}
 .patternToolBar span s,
 .patternToolBar span strike {
 	text-decoration:none;
@@ -849,6 +843,11 @@ html>body #patternSideBarContents li { /* Mozilla */
 .patternTopicAction .patternActionButtons span strike {
 	text-decoration:none;
 }
+.patternActionButtons a.foswikiButton,
+.patternActionButtons a.foswikiSubmit,
+.patternActionButtons a.foswikiButtonCancel {
+	padding:.1em .2em;
+}
 .patternNoViewPage .patternTopicAction {
 	margin-top:-1px;
 }
@@ -993,6 +992,12 @@ h4.patternSearchResultsHeader {
 .patternEditPage #patternMainContents {
 	padding:0 0 2em 0;
 }
+.patternEditPage .patternTop {
+	font-size:94%;
+}
+.patternEditPage .patternEditTopic {
+	margin:.25em 0 0 0;
+}
 .patternEditPage .foswikiForm {
 	margin:2.25em 0 0 0;
 	border:none;

diff --git a/PatternSkin/templates/attachtables.pattern.tmpl b/PatternSkin/templates/attachtables.pattern.tmpl
@@ -4,7 +4,7 @@
 
 %TMPL:DEF{"commonattachtableattributes"}%valign="middle" dataalign="center,left,left,right,left,left,left,center" datavalign="top" headercolor="#0066cc" databg="#ffffff" headerbg="#ffffff" headerbgsorted="#eeeeee" databgsorted="#f5f5f5" tablerules="rows" %TMPL:END%
 
-%TMPL:DEF{"topicattachmentwisty"}%%TWISTY{id="topicattachmentslist" mode="div" remember="on" showlink="<h3 class='patternToggleHeader'>&#9658; %MAKETEXT{"Attachments"}%</h3>" hidelink="<h3 class='patternToggleHeader'>&#9660; %MAKETEXT{"Attachments"}%</h3>" linkclass="foswikiButton"}%%TMPL:END%
+%TMPL:DEF{"topicattachmentwisty"}%%TWISTY{id="topicattachmentslist" mode="div" remember="on" showlink="<h3 class='patternAtachmentHeader'>&#9658; %MAKETEXT{"Attachments"}%</h3>" hidelink="<h3 class='patternAtachmentHeader'>&#9660; %MAKETEXT{"Attachments"}%</h3>" linkclass="foswikiButton patternTwistyButton"}%%TMPL:END%
 
 %{ Header definition for topic attachments and top table in attach screen }%
 %TMPL:DEF{ATTACH:files:header(basic)}%<div class="foswikiAttachments">

diff --git a/PatternSkin/templates/edit.pattern.tmpl b/PatternSkin/templates/edit.pattern.tmpl
@@ -14,8 +14,7 @@ foswiki.Event.addLoadEvent(initForm);
 </script>%TMPL:END%
 
 
-%TMPL:DEF{"toolbar"}%<div class="patternTop">%TWISTYBUTTON{id="edithelp" mode="div" remember="on" link="%MAKETEXT{"Edit help"}%" showimgleft="%ICONURLPATH{toggleopen}%"
-hideimgleft="%ICONURLPATH{toggleclose}%"}%</div><!--//patternTop-->%TMPL:END%
+%TMPL:DEF{"toolbar"}%<div class="patternTop">%TWISTYBUTTON{id="edithelp" mode="div" remember="on" showlink="<h3>&#9658; %MAKETEXT{"Edit help"}%</h3>" hidelink="<h3>&#9660; %MAKETEXT{"Edit help"}%</h3>" linkclass="foswikiButton patternTwistyButton"}%</div><!--//patternTop-->%TMPL:END%
 
 
 %TMPL:DEF{"bodyclassname"}%patternNoViewPage patternEditPage%TMPL:END%
@@ -45,7 +44,7 @@ hideimgleft="%ICONURLPATH{toggleclose}%"}%</div><!--//patternTop-->%TMPL:END%
 
 %TMPL:DEF{"button_preview"}%<input type="submit" class="foswikiButton" name="action_preview" id="preview" %MAKETEXT{"value='Preview' accesskey='p'"}% onclick="enableTWikiMandatoryChecks()" />%TMPL:END%
 
-%TMPL:DEF{"button_cancel"}%<input type="submit" class="foswikiButton foswikiButtonCancel" name="action_cancel" id="cancel" title='%MAKETEXT{"Cancel editing and discard changes"}%' %MAKETEXT{"value='Cancel' accesskey='c'"}% onclick="suppressSaveValidation()" />%TMPL:END%
+%TMPL:DEF{"button_cancel"}%<input type="submit" class="foswikiButtonCancel" name="action_cancel" id="cancel" title='%MAKETEXT{"Cancel editing and discard changes"}%' %MAKETEXT{"value='Cancel' accesskey='c'"}% onclick="suppressSaveValidation()" />%TMPL:END%
 
 
 %TMPL:DEF{"actionbuttons_help"}%<div class="patternSaveHelp">%TMPL:P{"accesskeys_help"}%</div><!--/patternSaveHelp-->%TMPL:END%
@@ -62,7 +61,7 @@ hideimgleft="%ICONURLPATH{toggleclose}%"}%</div><!--//patternTop-->%TMPL:END%
 %TMPL:DEF{"pagehelp"}%%TWISTYTOGGLE{id="edithelp" mode="div" remember="on" noscript="hide"}%<div class="foswikiHelp">%TMPL:P{"help"}%%TMPL:P{"actionbuttons_help"}%</div>%ENDTWISTYTOGGLE%%TMPL:END%
 
 
-%TMPL:DEF{"textarea"}%<textarea class="foswikiTextarea foswikiEditboxStyleProportional" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%' onkeydown='handleKeyDown(event)'>%TEXT%</textarea>
+%TMPL:DEF{"textarea"}%<div class="patternEditTopic"><textarea class="foswikiTextarea foswikiEditboxStyleProportional" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%' onkeydown='handleKeyDown(event)'>%TEXT%</textarea></div><!--/patternEditTopic-->
 %TMPL:P{"sig_textareabuttons"}%%TMPL:END%
 
 

diff --git a/PatternSkin/templates/login.pattern.tmpl b/PatternSkin/templates/login.pattern.tmpl
@@ -2,7 +2,7 @@
 
 %TMPL:DEF{"bodyclassname"}%patternNoViewPage patternLoginPage%TMPL:END%
 
-%TMPL:DEF{"bottombar"}%%TMPL:END%
+%TMPL:DEF{"bottombarcontents"}%%TMPL:END%
 
 %TMPL:DEF{"form"}%<div id="foswikiLogin">
 <div class="foswikiFormSteps">%TMPL:P{"formstart"}%%TMPL:P{"titlestep"}%
@@ -11,4 +11,4 @@
 %TMPL:P{"seealsostep"}%
 </div><!-- /foswikiFormSteps-->
 %TMPL:P{"loginasadministratorstep"}%
-</div><!-- /foswikiLogin-->%TMPL:END%
+</div><!-- /foswikiLogin-->%TMPL:END%
diff --git a/PatternSkin/templates/preview.pattern.tmpl b/PatternSkin/templates/preview.pattern.tmpl
@@ -1,6 +1,7 @@
 %TMPL:INCLUDE{"preview"}%
+%TMPL:INCLUDE{"viewbottombar"}%
 
-
+%TMPL:DEF{"bottombarcontents"}%%TMPL:END%
 %TMPL:DEF{"bodyclassname"}%patternNoViewPage patternPreviewPage%TMPL:END%
 
 
@@ -9,7 +10,7 @@
 
 %TMPL:DEF{"action_buttons"}%%TMPL:P{"button_save"}%&nbsp;%TMPL:P{"button_quietsave"}%&nbsp;%TMPL:P{"button_checkpoint"}% %MAKETEXT{"or"}% %TMPL:P{"button_discard"}%%TMPL:END%
 
-%TMPL:DEF{"button_discard"}%<input id="discard" type="submit" class="foswikiButton foswikiButtonCancel" name="action_cancel" %MAKETEXT{"value='Discard' accesskey='d'"}% />%TMPL:END%
+%TMPL:DEF{"button_discard"}%<input id="discard" type="submit" class="foswikiButtonCancel" name="action_cancel" %MAKETEXT{"value='Discard' accesskey='d'"}% />%TMPL:END%
 
 %TMPL:DEF{"accesskeys_help"}%%ICON{info}% <a class="foswikiPopUp" target="AccessKeys" href="%SCRIPTURL{"view"}%/%SYSTEMWEB%/AccessKeys">%MAKETEXT{"Access keys"}%</a>: %MAKETEXT{"S = Save, Q = Quiet save, K = Save and Continue, D = Discard"}%%TMPL:END%
 

diff --git a/PatternSkin/templates/settings.pattern.tmpl b/PatternSkin/templates/settings.pattern.tmpl
@@ -19,7 +19,7 @@ foswiki.Event.addLoadEvent(initForm);
 %TMPL:DEF{"saveoptions"}%%TMPL:END%
 %TMPL:DEF{"sig"}%%TMPL:END%
 
-%TMPL:DEF{"action_buttons"}%%TMPL:P{"button_save"}% %MAKETEXT{"or"}% %TMPL:P{"canceltopicaction"}%%TMPL:END%
+%TMPL:DEF{"action_buttons"}%%TMPL:P{"button_save"}%&nbsp; %MAKETEXT{"or"}% %TMPL:P{"button_cancel"}%%TMPL:END%
 
 
 %TMPL:DEF{"accesskeys_help"}%%ICON{info}% <a class="foswikiPopUp" target="AccessKeys" href="%SCRIPTURL{"view"}%/%SYSTEMWEB%/AccessKeys">%MAKETEXT{"Access keys"}%</a>: %MAKETEXT{"S = Save, C = Cancel"}%%TMPL:END%