svn commit: r497718 - in /ofbiz/trunk/framework: common/webcommon/includes/ common/widget/ images/webapp/images/ webtools/webapp/webtools/includes/

[jonesde]

Author: jonesde
Date: Thu Jan 18 22:56:36 2007
New Revision: 497718

URL: http://svn.apache.org/viewvc?view=rev&rev=497718
Log:
Applied patch from Adrian Crum in Jira #OFBIZ-605 to combine the maincss.css and tabstyles.css files; part of a larger effort to clean up the css and related style/formatting stuff in the OFBiz HTML

Modified:
    ofbiz/trunk/framework/common/webcommon/includes/header.ftl
    ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
    ofbiz/trunk/framework/common/webcommon/includes/simple.ftl
    ofbiz/trunk/framework/common/widget/CommonScreens.xml
    ofbiz/trunk/framework/images/webapp/images/maincss.css
    ofbiz/trunk/framework/images/webapp/images/tabstyles.css
    ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl

Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?view=diff&rev=497718&r1=497717&r2=497718
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Thu Jan 18 22:56:36 2007
@@ -38,7 +38,6 @@
         </#list>
     <#else>
         <link rel="stylesheet" href="<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>" type="text/css"/>
-        <link rel="stylesheet" href="<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>" type="text/css"/>
     </#if>
     ${layoutSettings.extraHead?if_exists}
 </head>

Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?view=diff&rev=497718&r1=497717&r2=497718
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Thu Jan 18 22:56:36 2007
@@ -23,7 +23,6 @@
     <script language="javascript" src="<@ofbizContentUrl>/images/calendar1.js</@ofbizContentUrl>" type="text/javascript"></script>
     <script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script>
     <link rel="stylesheet" href="<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>" type="text/css"/>
-    <link rel="stylesheet" href="<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>" type="text/css"/>
 
     <script language="JavaScript" type="text/javascript">
         // This code inserts the value lookedup by a popup window back into the associated form element

Modified: ofbiz/trunk/framework/common/webcommon/includes/simple.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/simple.ftl?view=diff&rev=497718&r1=497717&r2=497718
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/simple.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/simple.ftl Thu Jan 18 22:56:36 2007
@@ -30,7 +30,6 @@
         </#list>
     <#else>
         <link rel="stylesheet" href="<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>" type="text/css"/>
-        <link rel="stylesheet" href="<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>" type="text/css"/>
     </#if>
     ${layoutSettings.extraHead?if_exists}
 </head>

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?view=diff&rev=497718&r1=497717&r2=497718
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Jan 18 22:56:36 2007
@@ -90,10 +90,8 @@
     <screen name="GlobalDecorator">
         <section>
             <actions>
-                <!-- The two default (global) stylesheets are added to the list
-                     of stylesheets to the first and second position -->
+                <!-- The default (global) stylesheet is added to the list of stylesheets to the first position -->
                 <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/>
-                <set field="layoutSettings.styleSheets[+1]" value="/images/tabstyles.css" global="true"/>
             </actions>
             <widgets>
                 <!-- render header -->
@@ -179,10 +177,8 @@
     <screen name="SimpleDecorator">
         <section>
             <actions>
-                <!-- The two default (global) stylesheets are added to the list
-                     of stylesheets to the first and second position -->
+                <!-- The default (global) stylesheet -->
                 <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/>
-                <set field="layoutSettings.styleSheets[+1]" value="/images/tabstyles.css" global="true"/>
             </actions>
             <widgets>
                 <!-- render header -->

Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?view=diff&rev=497718&r1=497717&r2=497718
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Thu Jan 18 22:56:36 2007
@@ -1129,3 +1129,218 @@
 color: red;
 border: 2px solid red;
 }
+
+/* ==== Styles Copied From tabstyles.css === */
+
+.treewrapper {
+margin-left: 10px;
+}
+
+.treeitem {
+color: blue;
+font-family: Arial, Helvetica, sans-serif;
+font-size: 10pt;
+font-weight: bold;
+border: #888888 solid 1px;
+}
+
+DIV.centerarea {
+margin-left: 10px;
+margin-right: 10px;
+margin-top: 10px;
+}
+
+.whitearea {
+background-color: #FFFFFF;
+}
+
+.blackarea {
+background-color: #000000;
+}
+
+.mainblock {
+background-color: #D4D0C8;
+vertical-align: top;
+}
+
+.tabdownblock {
+background-color: #B4B0AA;
+}
+
+.tabdowncenter {
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/images/tabs/tab_down_fill.gif);
+background-color: #B4B0AA;
+font-size: 15pt;
+text-align: center;
+vertical-align: middle;
+color: #000000;
+}
+
+.tabdownleft {
+background-image: url(/images/tabs/tab_down_left.gif);
+background-color: #B4B0AA;
+
+}
+
+.tabdownright {
+background-image: url(/images/tabs/tab_down_right.gif);
+background-color: #B4B0AA;
+}
+
+.tabupcenter {
+font-family: Arial, Helvetica, sans-serif;
+background-image: url(/images/tabs/tab_up_fill.gif);
+background-color: #D4D0C8;
+font-size: 15pt;
+text-align: center;
+vertical-align: middle;
+color: #000000;
+}
+
+.tabupleft {
+background-image: url(/images/tabs/tab_up_left.gif);
+background-color: #D4D0C8;
+border-width: 0px;
+padding: 0px;
+}
+
+.tabupright {
+background-image: url(/images/tabs/tab_up_right.gif);
+background-color: #D4D0C8;
+}
+
+A.tablink,A.tablink:hover,A.tablinkselected,A.tablinkselected:hover {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 8pt;
+font-weight: bold;
+text-align: center;
+text-decoration: none;
+color: #000000;
+}
+
+A.tablink:hover,A.tablink:active,A.tablinkselected {
+color: #000099;
+}
+
+.apptitle {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+background-color: #000099;
+line-height: 2;
+font-size: 10pt;
+font-weight: bold;
+color: #FFFFFF;
+display: block;
+width: 100%;
+}
+
+DIV.row {
+background-color: #B4B0AA;
+margin-top: 0; margin-right: auto; margin-bottom: 0; margin-left: auto;
+padding: 0; text-align: center;
+}
+
+DIV.col {
+border: none; float: left; margin: 0; padding: 0; width: auto;
+}
+
+DIV.col-fill {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px; font-weight: bold; text-decoration: none;
+background-color: #B4B0AA; color: #000099;
+margin: 0; padding: 0; border: none; text-align: center; width: 0;
+}
+
+DIV.col-right {
+border: none; float: right; margin: 0; padding: 0; width: auto;
+}
+
+DIV.contentarea {
+background-color: #FFFFFF;
+border: solid black 1px;
+margin-top: 10px;
+padding: 10px;
+}
+
+DIV.endcolumns {
+  clear: both;
+}
+
+DIV.simple-right-small {
+float: right;
+width: 20px;
+text-align: right;
+}
+
+DIV.simple-right-half {
+float: right;
+width: 50%;
+text-align: right;
+}
+
+DIV.screenlet {
+background-color: #FFFFFF;
+border: 1px solid #999999;
+margin-bottom: 10px;
+height:auto !important;
+height:1%
+}
+DIV.screenlet-header {
+background-color: #000099;
+padding-top: 1px;
+padding-bottom: 3px;
+padding-right: 4px;
+padding-left: 4px;
+height:auto !important;
+height:1%
+}
+DIV.screenlet-body {
+background-color: #FFFFFF;
+padding: 4px;
+height:auto !important;
+height:1%
+}
+
+#column-container {
+position: relative;
+background-color: #FFFFFF;
+margin: auto;
+width: 100%;
+}
+
+#column-container .left {
+float: left; margin-right: 10px;
+/* alt: position: absolute; top: 0px; left: 0px; */
+width: 220px;
+}
+#column-container .right {
+float: right; margin-left: 10px;
+width: 220px;
+}
+
+#column-container .leftonly {
+margin-left: 230px;
+width: auto;
+}
+#column-container .rightonly {
+margin-right: 230px;
+width: auto;
+}
+#column-container .center {
+margin-left: 230px;
+margin-right: 230px;
+width: auto;
+}
+#column-container .nocolumns {
+width: auto;
+}
+
+DIV.column-left-wide {
+float: left;
+width: 300px;
+background-color: #CCCCCC;
+border: black solid 2px;
+overflow: auto;
+}
+
+

Modified: ofbiz/trunk/framework/images/webapp/images/tabstyles.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/tabstyles.css?view=diff&rev=497718&r1=497717&r2=497718
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/tabstyles.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/tabstyles.css Thu Jan 18 22:56:36 2007
@@ -1,228 +0,0 @@
-/*
- * Copyright 2001-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-.treewrapper {
-margin-left: 10px;
-}
-
-.treeitem {
-color: blue;
-font-family: Arial, Helvetica, sans-serif;
-font-size: 10pt;
-font-weight: bold;
-border: #888888 solid 1px;
-}
-
-DIV.centerarea {
-margin-left: 10px;
-margin-right: 10px;
-margin-top: 10px;
-}
-
-.whitearea {
-background-color: #FFFFFF;
-}
-
-.blackarea {
-background-color: #000000;
-}
-
-.mainblock {
-background-color: #D4D0C8;
-vertical-align: top;
-}
-
-.tabdownblock {
-background-color: #B4B0AA;
-}
-
-.tabdowncenter {
-font-family: Arial, Helvetica, sans-serif;
-background-image: url(/images/tabs/tab_down_fill.gif);
-background-color: #B4B0AA;
-font-size: 15pt;
-text-align: center;
-vertical-align: middle;
-color: #000000;
-}
-
-.tabdownleft {
-background-image: url(/images/tabs/tab_down_left.gif);
-background-color: #B4B0AA;
-
-}
-
-.tabdownright {
-background-image: url(/images/tabs/tab_down_right.gif);
-background-color: #B4B0AA;
-}
-
-.tabupcenter {
-font-family: Arial, Helvetica, sans-serif;
-background-image: url(/images/tabs/tab_up_fill.gif);
-background-color: #D4D0C8;
-font-size: 15pt;
-text-align: center;
-vertical-align: middle;
-color: #000000;
-}
-
-.tabupleft {
-background-image: url(/images/tabs/tab_up_left.gif);
-background-color: #D4D0C8;    
-border-width: 0px;
-padding: 0px;
-}
-
-.tabupright {
-background-image: url(/images/tabs/tab_up_right.gif);
-background-color: #D4D0C8;
-}
-
-A.tablink,A.tablink:hover,A.tablinkselected,A.tablinkselected:hover {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size: 8pt;
-font-weight: bold;
-text-align: center;
-text-decoration: none;
-color: #000000;
-}
-
-A.tablink:hover,A.tablink:active,A.tablinkselected {
-color: #000099;
-}
-
-.apptitle {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-background-color: #000099;
-line-height: 2;
-font-size: 10pt;
-font-weight: bold;
-color: #FFFFFF;
-display: block;
-width: 100%;
-}
-
-DIV.row {  
-background-color: #B4B0AA;
-margin-top: 0; margin-right: auto; margin-bottom: 0; margin-left: auto;
-padding: 0; text-align: center;
-}
-
-DIV.col {
-border: none; float: left; margin: 0; padding: 0; width: auto;
-}
-
-DIV.col-fill {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size: 10px; font-weight: bold; text-decoration: none;
-background-color: #B4B0AA; color: #000099;
-margin: 0; padding: 0; border: none; text-align: center; width: 0;
-}
-
-DIV.col-right {
-border: none; float: right; margin: 0; padding: 0; width: auto;
-}
-
-DIV.contentarea {
-background-color: #FFFFFF;
-border: solid black 1px;
-margin-top: 10px;
-padding: 10px;
-}
-
-DIV.endcolumns {
-  clear: both;
-}  
-
-DIV.simple-right-small {
-float: right;
-width: 20px;
-text-align: right;
-}
-
-DIV.simple-right-half {
-float: right;
-width: 50%;
-text-align: right;
-}
-
-DIV.screenlet {
-background-color: #FFFFFF;
-border: 1px solid #999999;
-margin-bottom: 10px;
-height:auto !important;
-height:1%
-}
-DIV.screenlet-header {
-background-color: #000099;
-padding-top: 1px;
-padding-bottom: 3px;
-padding-right: 4px;
-padding-left: 4px;
-height:auto !important;
-height:1%
-}
-DIV.screenlet-body {
-background-color: #FFFFFF;
-padding: 4px;
-height:auto !important;
-height:1%
-}
-
-#column-container {
-position: relative;
-background-color: #FFFFFF;
-margin: auto;
-width: 100%;
-}
-
-#column-container .left {
-float: left; margin-right: 10px;
-/* alt: position: absolute; top: 0px; left: 0px; */
-width: 220px;
-}
-#column-container .right {
-float: right; margin-left: 10px;
-width: 220px;
-}
-
-#column-container .leftonly {
-margin-left: 230px;
-width: auto;
-}
-#column-container .rightonly {
-margin-right: 230px;
-width: auto;
-}
-#column-container .center {
-margin-left: 230px;
-margin-right: 230px;
-width: auto;
-}
-#column-container .nocolumns {
-width: auto;
-}
-
-DIV.column-left-wide {
-float: left;
-width: 300px;
-background-color: #CCCCCC;
-border: black solid 2px;
-overflow: auto;
-}
-
-

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl?view=diff&rev=497718&r1=497717&r2=497718
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/includes/header.ftl Thu Jan 18 22:56:36 2007
@@ -30,7 +30,6 @@
     <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script>
     <script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script>
     <link rel="stylesheet" href="<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>" type="text/css">
-    <link rel="stylesheet" href="<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>" type="text/css">    
 </head>
 
 <body>