OFBiz › OFBiz - Commits

svn commit: r533297 - in /ofbiz/trunk/applications/workeffort: config/ webapp/workeffort/calendar/ widget/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jacopoc
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r533297 - in /ofbiz/trunk/applications/workeffort: config/ webapp/workeffort/calendar/ widget/

jacopoc
Author: jacopoc
Date: Fri Apr 27 22:35:06 2007
New Revision: 533297

URL: http://svn.apache.org/viewvc?view=rev&rev=533297
Log:
Layout enhancements to the workeffort calendar screens by Adrian Crum (OFBIZ-929).

Modified:
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
    ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties?view=diff&rev=533297&r1=533296&r2=533297
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties Fri Apr 27 22:35:06 2007
@@ -180,6 +180,7 @@
 WorkEffortCalendarEventContacts=Calendar Event Contacts
 WorkEffortCalendarEventDetails=Calendar Event Details
 WorkEffortCalendarEventRoles=Calendar Event Roles
+WorkEffortCalendarFindEntries=Find Calendar Entries
 WorkEffortCalendarMonthView=Calendar Month View
 WorkEffortCalendarUpComingEventsView=Calendar Up-Coming Events View
 WorkEffortCalendarWeekView=Calendar Week View

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl?view=diff&rev=533297&r1=533296&r2=533297
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl Fri Apr 27 22:35:06 2007
@@ -16,17 +16,20 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
 
-<div class="tabContainer">
-    <a href="<@ofbizUrl>day<#if eventsParam?has_content>?${eventsParam}</#if></@ofbizUrl>" class="${selectedClassMap.day?default(unselectedClassName)}">${uiLabelMap.WorkEffortDayView}</a>
-    <a href="<@ofbizUrl>week<#if eventsParam?has_content>?${eventsParam}</#if></@ofbizUrl>" class="${selectedClassMap.week?default(unselectedClassName)}">${uiLabelMap.WorkEffortWeekView}</a>
-    <a href="<@ofbizUrl>month<#if eventsParam?has_content>?${eventsParam}</#if></@ofbizUrl>" class="${selectedClassMap.month?default(unselectedClassName)}">${uiLabelMap.WorkEffortMonthView}</a>
-    <a href="<@ofbizUrl>upcoming<#if eventsParam?has_content>?${eventsParam}</#if></@ofbizUrl>" class="${selectedClassMap.upcoming?default(unselectedClassName)}">${uiLabelMap.WorkEffortUpcomingEvents}</a>
-</div>
+<#assign selected = page.tabButtonItem?default("void")>
 
 <div>
     <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT&currentStatusId=CAL_TENTATIVE</@ofbizUrl>" class="buttontext">${uiLabelMap.WorkEffortNewEvent}</a>
 </div>
 <br/>
+
+<div class="button-bar button-style-1">
+    <ul>
+      <li<#if selected = "day"> class="selected"</#if>><a href="<@ofbizUrl>day<#if eventsParam?has_content>?${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.WorkEffortDayView}</a></li>
+      <li<#if selected = "week"> class="selected"</#if>><a href="<@ofbizUrl>week<#if eventsParam?has_content>?${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.WorkEffortWeekView}</a></li>
+      <li<#if selected = "month"> class="selected"</#if>><a href="<@ofbizUrl>month<#if eventsParam?has_content>?${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.WorkEffortMonthView}</a></li>
+      <li<#if selected = "upcoming"> class="selected"</#if>><a href="<@ofbizUrl>upcoming<#if eventsParam?has_content>?${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.WorkEffortUpcomingEvents}</a></li>
+    </ul>
+    <br class="clear"/>
+</div>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl?view=diff&rev=533297&r1=533296&r2=533297
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Fri Apr 27 22:35:06 2007
@@ -17,23 +17,16 @@
 under the License.
 -->
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside">
-  <tr>
-    <td width="100%">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
-        <tr>
-          <td align="left" class="boxhead">${uiLabelMap.WorkEffortCalendarDayView}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="monthheadertable">
-  <tr>
-    <td width="100%" class="monthheadertext">${start?date?string("EEEE")?cap_first} ${start?date?string.long}</td>
-    <td nowrap class="previousnextmiddle"><a href="<@ofbizUrl>day?start=${prev.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>" class="previousnext">${uiLabelMap.WorkEffortPreviousDay}</a> | <a href="<@ofbizUrl>day?start=${next.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>" class="previousnext">${uiLabelMap.WorkEffortNextDay}</a> | <a href="<@ofbizUrl>day?start=${now.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>" class="previousnext">${uiLabelMap.CommonToday}</a></td>
-  </tr>
-</table>
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <h2>${start?date?string("EEEE")?cap_first} ${start?date?string.long}</h2>
+      <li><a href="<@ofbizUrl>day?start=${next.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.WorkEffortNextDay}</a></li>
+      <li><a href="<@ofbizUrl>day?start=${now.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.CommonToday}</a></li>
+      <li><a href="<@ofbizUrl>day?start=${prev.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.WorkEffortPreviousDay}</a></li>
+    </ul>
+    <br class="clear"/>
+  </div>
 <#if periods?has_content>
 
 <#if (maxConcurrentEntries = 0)>
@@ -82,5 +75,6 @@
   </#list>                  
 </table>
 <#else>              
-  <p>${uiLabelMap.WorkEffortFailedCalendarEntries}!</p>
+  <div class="screenlet-body">${uiLabelMap.WorkEffortFailedCalendarEntries}!</div
 </#if>
+</div>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl?view=diff&rev=533297&r1=533296&r2=533297
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl Fri Apr 27 22:35:06 2007
@@ -16,49 +16,54 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-        <td width="34%" align="center">
-            <div class="tabletext">
-                <form action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" name="partyform" method="post">
-                    <input type="hidden" name="start" value="${start.time?string("#")}"/>
-                    ${uiLabelMap.WorkEffortByPartyId}:
-                    <input type="text" name="partyId" value="${requestParameters.partyId?if_exists}" class="inputBox"/>
-                    <a href="javascript:call_fieldlookup2(document.partyform.partyId,'<@ofbizUrl>LookupPartyName</@ofbizUrl>');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'></a>
-                    <input type="submit" value="${uiLabelMap.CommonView}" class="smallSubmit"/>
-                </form>
-            </div>
-        </td>
-        <td width="32%" align="center">
-            <div class="tabletext">
-                <form action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" method="post">
-                    <input type="hidden" name="start" value="${start.time?string("#")}"/>
-                    ${uiLabelMap.WorkEffortByFacility}:
-                    <select name="facilityId" class="selectBox">
-                        <option value=""></option>
-                        <#list allFacilities as facility>
-                            <option value="${facility.facilityId}"<#if requestParameters.facilityId?has_content && requestParameters.facilityId == facility.facilityId>${uiLabelMap.WorkEffortSelected}</#if>>${facility.facilityName}</option>
-                        </#list>
-                    </select>
-                    <input type="submit" value="${uiLabelMap.CommonView}" class="smallSubmit"/>
-                </form>
-            </div>
-        </td>
-        <td width="32%" align="center">
-            <div class="tabletext">
-                <form action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" method="post">
-                    <input type="hidden" name="start" value="${start.time?string("#")}"/>
-                    ${uiLabelMap.WorkEffortByFixedAsset}:
-                    <select name="fixedAssetId" class="selectBox">
-                        <option value=""></option>
-                        <#list allFixedAssets as fixedAsset>
-                            <option value="${fixedAsset.fixedAssetId}"<#if requestParameters.fixedAssetId?has_content && requestParameters.fixedAssetId == fixedAsset.fixedAssetId>${uiLabelMap.WorkEffortSelected}</#if>>${fixedAsset.fixedAssetId}</option>
-                        </#list>
-                    </select>
-                    <input type="submit" value="${uiLabelMap.CommonView}" class="smallSubmit"/>
-                </form>
-            </div>
-        </td>
-    </tr>
-</table>
-<div class="tabletext">&nbsp;</div>
+
+<#assign hideFields = parameters.hideFields?default("N")>
+<#assign delimchar = "?">
+<#if parameters.targetRequestUri?contains("?")><#assign delimchar = "&"></#if>
+
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <h3>${uiLabelMap.WorkEffortCalendarFindEntries}</h3>
+      <#if hideFields = "Y">
+        <li><a href="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>">${uiLabelMap.CommonShowLookupFields}</a></li>
+      <#else>
+        <li><a href="<@ofbizUrl>${parameters.targetRequestUri}${delimchar}hideFields=Y</@ofbizUrl>">${uiLabelMap.CommonHideFields}</a></li>
+      </#if>
+    </ul>
+    <br class="clear"/>
+  </div>
+  <#if hideFields = "N">
+    <div class="screenlet-body">
+      <form action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" name="partyform" method="post">
+        <input type="hidden" name="start" value="${start.time?string("#")}"/>
+        ${uiLabelMap.WorkEffortByPartyId}:
+        <input type="text" name="partyId" value="${requestParameters.partyId?if_exists}"/>
+        <a href="javascript:call_fieldlookup2(document.partyform.partyId,'<@ofbizUrl>LookupPartyName</@ofbizUrl>');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'></a>
+        <input type="submit" value="${uiLabelMap.CommonView}"/>
+      </form>
+      <form action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" method="post">
+        <input type="hidden" name="start" value="${start.time?string("#")}"/>
+        ${uiLabelMap.WorkEffortByFacility}:
+        <select name="facilityId">
+          <option value=""></option>
+          <#list allFacilities as facility>
+            <option value="${facility.facilityId}"<#if requestParameters.facilityId?has_content && requestParameters.facilityId == facility.facilityId>${uiLabelMap.WorkEffortSelected}</#if>>${facility.facilityName}</option>
+          </#list>
+        </select>
+        <input type="submit" value="${uiLabelMap.CommonView}"/>
+      </form>
+      <form action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" method="post">
+        <input type="hidden" name="start" value="${start.time?string("#")}"/>
+        ${uiLabelMap.WorkEffortByFixedAsset}:
+        <select name="fixedAssetId">
+          <option value=""></option>
+          <#list allFixedAssets as fixedAsset>
+            <option value="${fixedAsset.fixedAssetId}"<#if requestParameters.fixedAssetId?has_content && requestParameters.fixedAssetId == fixedAsset.fixedAssetId>${uiLabelMap.WorkEffortSelected}</#if>>${fixedAsset.fixedAssetId}</option>
+          </#list>
+        </select>
+        <input type="submit" value="${uiLabelMap.CommonView}"/>
+      </form>
+    </div>
+  </#if>
+</div>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl?view=diff&rev=533297&r1=533296&r2=533297
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl Fri Apr 27 22:35:06 2007
@@ -22,23 +22,16 @@
 <#setting locale="en">
 <#assign locale="en">
 
-<table border='0' width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
-  <tr>
-    <td width='100%'>
-      <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
-        <tr>
-          <td align="left" class="boxhead">${uiLabelMap.WorkEffortCalendarMonthView}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="monthheadertable">
-  <tr>
-    <td width="100%" class="monthheadertext">${start?date?string("MMMM yyyy")?cap_first}</td>
-    <td nowrap class="previousnextmiddle"><a href='<@ofbizUrl>month?start=${prev.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>' class="previousnext">${uiLabelMap.WorkEffortPreviousMonth}</a> | <a href='<@ofbizUrl>month?start=${next.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>' class="previousnext">${uiLabelMap.WorkEffortNextMonth}</a> | <a href='<@ofbizUrl>month?start=${now.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>' class="previousnext">${uiLabelMap.WorkEffortThisMonth}</a></td>
-  </tr>
-</table>
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <h2>${start?date?string("MMMM yyyy")?cap_first}</h2>
+      <li><a href='<@ofbizUrl>month?start=${next.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>'>${uiLabelMap.WorkEffortNextMonth}</a></li>
+      <li><a href='<@ofbizUrl>month?start=${now.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>'>${uiLabelMap.WorkEffortThisMonth}</a></li>
+      <li><a href='<@ofbizUrl>month?start=${prev.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>'>${uiLabelMap.WorkEffortPreviousMonth}</a></li>
+    </ul>
+    <br class="clear"/>
+  </div>
 <#if periods?has_content>
 <table width="100%" cellspacing="1" border="0" cellpadding="1" class="calendar">
   <tr class="bg">
@@ -93,5 +86,6 @@
 </table>
 
 <#else>
-<p>${uiLabelMap.WorkEffortFailedCalendarEntries}!</p>
+  <div class="screenlet-body">${uiLabelMap.WorkEffortFailedCalendarEntries}!</div>
 </#if>
+</div>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl?view=diff&rev=533297&r1=533296&r2=533297
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Fri Apr 27 22:35:06 2007
@@ -17,23 +17,16 @@
 under the License.
 -->
 
-<table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside">
-  <tr>
-    <td width="100%">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
-        <tr>
-          <td align="left" class="boxhead">${uiLabelMap.WorkEffortCalendarWeekView}</td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="monthheadertable">
-  <tr>
-    <td width="100%" class="monthheadertext">${uiLabelMap.CommonWeek} ${start?date?string("w")}</td>
-    <td nowrap class="previousnextmiddle"><a href="<@ofbizUrl>week?start=${prev.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>" class="previousnext">${uiLabelMap.WorkEffortPreviousWeek}</a> | <a href="<@ofbizUrl>week?start=${next.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>" class="previousnext">${uiLabelMap.WorkEffortNextWeek}</a> | <a href="<@ofbizUrl>week?start=${now.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>" class="previousnext">${uiLabelMap.WorkEffortThisWeek}</a></td>
-  </tr>
-</table>
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <h2>${uiLabelMap.CommonWeek} ${start?date?string("w")}</h2>
+      <li><a href="<@ofbizUrl>week?start=${next.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.WorkEffortNextWeek}</a></li>
+      <li><a href="<@ofbizUrl>week?start=${now.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.WorkEffortThisWeek}</a></li>
+      <li><a href="<@ofbizUrl>week?start=${prev.time?string("#")}<#if eventsParam?has_content>&${eventsParam}</#if></@ofbizUrl>">${uiLabelMap.WorkEffortPreviousWeek}</a></li>
+    </ul>
+    <br class="clear"/>
+  </div>
 <#if periods?has_content>
 <#if maxConcurrentEntries = 0>
   <#assign entryWidth = 100>
@@ -84,5 +77,6 @@
   </#list>
 </table>
 <#else>              
-  <p>${uiLabelMap.WorkEffortFailedCalendarEntries}!</p>
+  <div class="screenlet-body">${uiLabelMap.WorkEffortFailedCalendarEntries}!</div>
 </#if>
+</div>

Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?view=diff&rev=533297&r1=533296&r2=533297
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Fri Apr 27 22:35:06 2007
@@ -146,10 +146,10 @@
                             </actions>
                             <widgets>
                                 <platform-specific>
-                                    <html><html-template location="component://workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl"/></html>
+                                    <html><html-template location="component://workeffort/webapp/workeffort/calendar/eventsByForms.ftl"/></html>
                                 </platform-specific>
                                 <platform-specific>
-                                    <html><html-template location="component://workeffort/webapp/workeffort/calendar/eventsByForms.ftl"/></html>
+                                    <html><html-template location="component://workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl"/></html>
                                 </platform-specific>
                                 <decorator-section-include name="body"/>
                             </widgets>


Free forum by Nabble Edit this page