svn commit: r522825 - in /ofbiz/trunk: applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml applications/accounting/widget/FixedAssetScreens.xml framework/images/webapp/images/calendarTable.css

[jacopoc]

Author: jacopoc
Date: Tue Mar 27 02:13:47 2007
New Revision: 522825

URL: http://svn.apache.org/viewvc?view=rev&rev=522825
Log:
Applied patch from Adrian Crum (OFBIZ-844) to update fixed asset calendar style sheets.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
    ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
    ofbiz/trunk/framework/images/webapp/images/calendarTable.css

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?view=diff&rev=522825&r1=522824&r2=522825
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Tue Mar 27 02:13:47 2007
@@ -134,24 +134,23 @@
     </form>
 
     <!-- list availability/occupation period on a fixed asset -->
-    <form name="listFixedAssetCalendar" type="list"  default-required-field-style="calendar" list-name="weeks"  target="updateFixedAssetProductCalendar"
-        default-title-style="calendarHeader" default-title-area-style="calendarHeader" default-widget-style="calendarContent" default-tooltip-style="tabletext">
+    <form name="listFixedAssetCalendar" type="list" list-name="weeks" target="updateFixedAssetProductCalendar" default-table-style="calendar-table">
 
-        <field name="week" title="${uiLabelMap.Common${month}} ${year}" widget-area-style="calendarWeek" widget-style="calendarWeek"><display description="${uiLabelMap.CommonWeek} ${week}"/></field>
-        <field name="Monday" title="" widget-style="calendarDayNumber"><display/></field>
-        <field name="MondayData" title="${uiLabelMap.CommonMonday}"><display/></field>
-        <field name="Tuesday" title="" widget-style="calendarDayNumber"><display/></field>
-        <field name="TuesdayData" title="${uiLabelMap.CommonTuesday}"><display/></field>
-        <field name="Wednesday" title="" widget-style="calendarDayNumber"><display/></field>
-        <field name="WednesdayData" title="${uiLabelMap.CommonWednesday}"><display/></field>
-        <field name="Thursday" title="" widget-style="calendarDayNumber"><display/></field>
-        <field name="ThursdayData" title="${uiLabelMap.CommonThursday}"><display/></field>
-        <field name="Friday" title="" widget-style="calendarDayNumber"><display/></field>
-        <field name="FridayData" title="${uiLabelMap.CommonFriday}"><display/></field>
-        <field name="Saturday" title="" widget-style="calendarDayNumber"><display/></field>
-        <field name="SaturdayData" title="${uiLabelMap.CommonSaturday}"><display/></field>
-        <field name="Sunday" title="" widget-style="calendarDayNumber"><display/></field>
-        <field name="SundayData" title="${uiLabelMap.CommonSunday}"><display/></field>
+        <field name="week" title="${uiLabelMap.Common${month}} ${year}" widget-area-style="calendarWeek"><display description="${uiLabelMap.CommonWeek} ${week}"/></field>
+        <field name="Monday" title=""><display/></field>
+        <field name="MondayData" title="${uiLabelMap.CommonMonday}" widget-style="calendarContent"><display/></field>
+        <field name="Tuesday" title=""><display/></field>
+        <field name="TuesdayData" title="${uiLabelMap.CommonTuesday}" widget-style="calendarContent"><display/></field>
+        <field name="Wednesday" title=""><display/></field>
+        <field name="WednesdayData" title="${uiLabelMap.CommonWednesday}" widget-style="calendarContent"><display/></field>
+        <field name="Thursday" title=""><display/></field>
+        <field name="ThursdayData" title="${uiLabelMap.CommonThursday}" widget-style="calendarContent"><display/></field>
+        <field name="Friday" title=""><display/></field>
+        <field name="FridayData" title="${uiLabelMap.CommonFriday}" widget-style="calendarContent"><display/></field>
+        <field name="Saturday" title=""><display/></field>
+        <field name="SaturdayData" title="${uiLabelMap.CommonSaturday}" widget-style="calendarContent"><display/></field>
+        <field name="Sunday" title=""><display/></field>
+        <field name="SundayData" title="${uiLabelMap.CommonSunday}" widget-style="calendarContent"><display/></field>
     </form>
     <!-- update the availability on a date basis of a fixed asset -->
     <form name="updateFixedAssetCalendar" type="single"  target="updateFixedAssetCalendar" title="Update the fixed Asset calendar" default-map-name="fixedAssetCalendar">

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?view=diff&rev=522825&r1=522824&r2=522825
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Tue Mar 27 02:13:47 2007
@@ -105,7 +105,7 @@
     <screen name="ListFixedAssetCalendar">
         <section>
             <actions>
-                <set field="layoutSettings.extraHead" value="&lt;link rel='stylesheet' href='/images/calendarTable.css' type='text/css'&gt;" global="true"/>
+                <set field="layoutSettings.styleSheets[]" value="/images/calendarTable.css" global="true"/>
                 <set field="titleProperty" value="PageTitleListFixedAssetCalendar"/>
                 <set field="tabButtonItem" value="ListFixedAssetCalendar"/>
                 <set field="labelTitleProperty" value="AccountingFixedAssetCalendar"/>
@@ -116,15 +116,15 @@
             <widgets>
                 <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
+                        <container style="button-bar">
                             <link target="ListFixedAssetCalendar?fixedAssetId=${fixedAssetId}&amp;month=-3" text="${uiLabelMap.CommonPrevious} ${uiLabelMap.CommonQuarter}" style="buttontext"/>
                             <link target="ListFixedAssetCalendar?fixedAssetId=${fixedAssetId}&amp;month=-1" text="${uiLabelMap.CommonPrevious} ${uiLabelMap.CommonMonth}" style="buttontext"/>
                             <link target="ListFixedAssetCalendar?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.CommonThis} ${uiLabelMap.CommonMonth}" style="buttontext"/>
                             <link target="ListFixedAssetCalendar?fixedAssetId=${fixedAssetId}&amp;month=1" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonMonth}" style="buttontext"/>
                             <link target="ListFixedAssetCalendar?fixedAssetId=${fixedAssetId}&amp;month=3" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonQuarter}" style="buttontext"/>
-                            <include-form name="listFixedAssetCalendar" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
-                            <label style="tabletext" text="${uiLabelMap.AccountingFixedAssetMessage1}"></label>
                         </container>
+                        <include-form name="listFixedAssetCalendar" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
+                        <label text="${uiLabelMap.AccountingFixedAssetMessage1}"></label>
                         <!--
                         <container>
                             <label style="head1">${uiLabelMap.AccountingUpdateAvailability}</label>

Modified: ofbiz/trunk/framework/images/webapp/images/calendarTable.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/calendarTable.css?view=diff&rev=522825&r1=522824&r2=522825
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/calendarTable.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/calendarTable.css Tue Mar 27 02:13:47 2007
@@ -18,35 +18,36 @@
 */
 
 /* calendar table styles */
-.calendarTable    {
-    font-family: Tahoma, Verdana, Arial;
-    font-size: 11px;
-    font-weight: bold;
-    color: #FFFFFF;
-    padding: 4px;
-    background: #FFFFFF;    
-    border: 1px;
-    vertical-align: top;
+.calendar-table {
+/*    font-size: 1.1em;
+    font-weight: bold; */
+    color: #000000;
+    background-color: #FFFFFF;    
+    border-right: 0.1em solid #000000;
+    border-top: 0.1em solid #000000;
 }
 
-.calendarHeader {
-    background: #1E3C66;    
-        outline-color: #1E3C66;
-        border: 0;    
+.calendar-table td {
+    border-bottom: 0.1em solid #000000;
+    border-left: 0.1em solid #000000;
+    padding: 0.1em;
 }
 
-.calendarDayNumber {
-    color: #000000;
-    background: #FFFFFF;    
-    }
+.calendar-table .header-row,
+.calendar-table .header-row:hover {
+    background-color: #1E3C66;    
+    color: #FFFFFF;
+    font-weight: bold;
+    outline-color: #1E3C66;
+}
 
-.calendarWeek {
-    padding: 4px;
+.calendar-table .calendarWeek {
+    padding: 0.4em;
     background: #AFC8D4;
-    }
+}
     
-.calendarContent    {
+.calendar-table .calendarContent {
     color: #5886C6;
     font-weight: normal;
     text-decoration: none;
-    }
\ No newline at end of file
+}