svn commit: r484952 - in /incubator/ofbiz/trunk/applications/manufacturing: config/ webapp/manufacturing/routing/ widget/manufacturing/

[jacopoc]

Author: jacopoc
Date: Sat Dec  9 00:55:56 2006
New Revision: 484952

URL: http://svn.apache.org/viewvc?view=rev&rev=484952
Log:
Slightly improved navigation and usability of Calendar management screens in the manufacturing application.

Modified:
    incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl
    incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml

Modified: incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties?view=diff&rev=484952&r1=484951&r2=484952
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties Sat Dec  9 00:55:56 2006
@@ -28,6 +28,7 @@
 ManufacturingActualStartDateTime=Actual Start Date/Time
 ManufacturingActualEndDateTime=Actual End Date/Time
 ManufacturingCalendar=Calendar
+ManufacturingCalendars=Calendars
 ManufacturingCalendarCapacity=ManufacturingCalendarCapacity
 ManufacturingCalendarExceptionDate=Exception Day
 ManufacturingCalendarExceptionDayIdAlreadyExist=ManufacturingCalendarExceptionDayIdAlreadyExist
@@ -44,6 +45,7 @@
 ManufacturingCalendarWeekId=Calendar Week ID
 ManufacturingCalendarWeekIdNotExisting=Calendar Week ID does'nt exist
 ManufacturingCalendarWeek=Week
+ManufacturingCalendarWeeks=Weeks
 ManufacturingCostCalcs=Costs
 ManufacturingManageCostComponentCalc=Manage Cost Component Calc Entries
 ManufacturingListCostComponentCalc=List Cost Component Calc Entries

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl?view=diff&rev=484952&r1=484951&r2=484952
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/CalendarTabBar.ftl Sat Dec  9 00:55:56 2006
@@ -18,11 +18,14 @@
 <#assign unselectedClassName = "tabButton">
 <#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
 
+<div class='tabContainer'>
+    <a href="<@ofbizUrl>FindCalendar</@ofbizUrl>" class="${selectedClassMap.Calendar?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendars}</a>
+    <a href="<@ofbizUrl>ListCalendarWeek</@ofbizUrl>" class="${selectedClassMap.CalendarWeek?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendarWeeks}</a>
+</div>
 <#if techDataCalendar?has_content>
     <div class='tabContainer'>
-        <a href="<@ofbizUrl>EditCalendar?calendarId=${techDataCalendar.calendarId}</@ofbizUrl>" class="${selectedClassMap.calendar?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendar}</a>
+        <a href="<@ofbizUrl>EditCalendar?calendarId=${techDataCalendar.calendarId}</@ofbizUrl>" class="${selectedClassMap.calendar?default(unselectedClassName)}">${uiLabelMap.CommonEdit}</a>
         <a href="<@ofbizUrl>EditCalendarExceptionDay?calendarId=${techDataCalendar.calendarId}</@ofbizUrl>" class="${selectedClassMap.calendarExceptionDay?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendarExceptionDate}</a>
         <a href="<@ofbizUrl>EditCalendarExceptionWeek?calendarId=${techDataCalendar.calendarId}</@ofbizUrl>" class="${selectedClassMap.calendarExceptionWeek?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendarExceptionWeek}</a>
-        <a href="<@ofbizUrl>ListCalendarWeek</@ofbizUrl>" class="${selectedClassMap.CalendarWeek?default(unselectedClassName)}">${uiLabelMap.ManufacturingCalendarWeek}</a>
     </div>
 </#if>

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl?view=diff&rev=484952&r1=484951&r2=484952
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarWeek.ftl Sat Dec  9 00:55:56 2006
@@ -15,15 +15,13 @@
 under the License.
 -->
 
-    <div class="tabContainer">
-        <a href="<@ofbizUrl>ListCalendarWeek</@ofbizUrl>" class="tabButton">${uiLabelMap.CommonBackToList}</a>
-        <a href="<@ofbizUrl>EditCalendarWeek</@ofbizUrl>" class="tabButton">${uiLabelMap.ManufacturingNewCalendarWeek}</a>
-    </div>
-
         <#if calendarWeek?has_content>
-              <div class="head1">${uiLabelMap.ManufacturingUpdateCalendarWeek} </div>
+            <div class="head1">${uiLabelMap.ManufacturingUpdateCalendarWeek} </div>
+            <div>
+                <a href="<@ofbizUrl>EditCalendarWeek</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendarWeek}</a>
+            </div>
             <br/>
-              <form name="calendarWeekform" method="post" action="<@ofbizUrl>UpdateCalendarWeek</@ofbizUrl>">
+            <form name="calendarWeekform" method="post" action="<@ofbizUrl>UpdateCalendarWeek</@ofbizUrl>">
             <table width="90%" border="0" cellpadding="2" cellspacing="0">
               <tr>
                   <td width="26%" align="right" valign="top" ><div class="tabletext">${uiLabelMap.ManufacturingCalendarWeekId}</div></td>
@@ -31,7 +29,10 @@
                 <input type="hidden" name="calendarWeekId" value="${calendarWeek.calendarWeekId}">
                   <td width="74%" valign="top" colspan="5"><div class="tabletext"><b>${calendarWeek.calendarWeekId?if_exists}</b> (${uiLabelMap.CommonNotModifRecreat})</td>
         <#else>
-              <div class="head1">${uiLabelMap.ManufacturingCreateCalendarWeek} </div>
+            <div class="head1">${uiLabelMap.ManufacturingCreateCalendarWeek} </div>
+            <div>
+                <a href="<@ofbizUrl>EditCalendarWeek</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendarWeek}</a>
+            </div>
             <br/>
               <form name="calendarWeekform" method="post" action="<@ofbizUrl>CreateCalendarWeek</@ofbizUrl>">
             <table width="90%" border="0" cellpadding="2" cellspacing="0">

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl?view=diff&rev=484952&r1=484951&r2=484952
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl Sat Dec  9 00:55:56 2006
@@ -15,11 +15,6 @@
 under the License.
 -->
 
-<div class='tabContainer'>
-        <a href="<@ofbizUrl>FindCalendar</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.ManufacturingCalendar}</a>
-        <a href="<@ofbizUrl>ListCalendarWeek</@ofbizUrl>" class="tabButton">${uiLabelMap.ManufacturingCalendarWeek}</a>
-</div>
-
 <div><a href="<@ofbizUrl>EditCalendar</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendar}</a></div>
 
 <br/>

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl?view=diff&rev=484952&r1=484951&r2=484952
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/ListCalendarWeek.ftl Sat Dec  9 00:55:56 2006
@@ -15,10 +15,6 @@
 under the License.
 -->
 
-<div class="tabContainer">
-    <a href="<@ofbizUrl>FindCalendar</@ofbizUrl>" class="tabButton">${uiLabelMap.ManufacturingCalendar}</a>
-    <a href="<@ofbizUrl>ListCalendarWeek</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.ManufacturingCalendarWeek}</a>
-</div>
 <div class="head1">${uiLabelMap.ManufacturingListCalendarWeek}&nbsp; </div>
 <div>
     <a href="<@ofbizUrl>EditCalendarWeek</@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingNewCalendarWeek}</a>

Modified: incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?view=diff&rev=484952&r1=484951&r2=484952
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Sat Dec  9 00:55:56 2006
@@ -74,7 +74,7 @@
             <actions>
                 <set field="title" value="Find a Calendar"/>
                 <set field="titleProperty" value="PageTitleFindCalendar"/>
-                <set field="tabButtonItem" value="calendar"/>
+                <set field="tabButtonItem" value="Calendar"/>
                 <!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
                 <set field="headerItem" value="calendar"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
@@ -98,7 +98,7 @@
             <actions>
                 <set field="title" value="List Calendar Weeks"/>
                 <set field="titleProperty" value="PageTitleListCalendarWeek"/>
-                <set field="tabButtonItem" value="calendar"/>
+                <set field="tabButtonItem" value="CalendarWeek"/>
                 <!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
                 <set field="headerItem" value="calendar"/>
 
@@ -120,7 +120,7 @@
             <actions>
                 <set field="title" value="Edit a Calendar Week"/>
                 <set field="titleProperty" value="PageTitleEditCalendarWeek"/>
-                <set field="tabButtonItem" value="calendar"/>
+                <set field="tabButtonItem" value="CalendarWeek"/>
                 <!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
                 <set field="headerItem" value="calendar"/>