Author: mrisaliti
Date: Fri Jan 25 13:30:59 2008
New Revision: 615352
URL: http://svn.apache.org/viewvc?rev=615352&view=rev
Log:
Calendar forms (ftl/widgets screen) has now the same look and feel (Part of
issue OFBIZ-1596)
Modified:
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/upcoming.ftl
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
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?rev=615352&r1=615351&r2=615352&view=diff
==============================================================================
---
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl
(original)
+++
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/CalendarTabBar.ftl
Fri Jan 25 13:30:59 2008
@@ -17,14 +17,14 @@
under the License.
-->
-<#assign selected = page.tabButtonItem?default("void")>
+<#assign selected = tabButtonItem?default("void")>
<div>
<a
href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT¤tStatusId=CAL_TENTATIVE</@ofbizUrl>"
class="buttontext">${uiLabelMap.WorkEffortNewEvent}</a>
</div>
<br/>
-<div class="button-bar button-style-1">
+<div class="button-bar tab-bar">
<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>
@@ -32,4 +32,4 @@
<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>
+</div>
\ No newline at end of file
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?rev=615352&r1=615351&r2=615352&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Fri
Jan 25 13:30:59 2008
@@ -20,7 +20,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <h2>${start?date?string("EEEE")?cap_first} ${start?date?string.long}</h2>
+ <li class="head3">${start?date?string("EEEE")?cap_first}
${start?date?string.long}</li>
<li><a href="<@ofbizUrl>day?start=${next.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.WorkEffortNextDay}</a></li>
<li><a href="<@ofbizUrl>day?start=${nowTimestamp.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonToday}</a></li>
<li><a href="<@ofbizUrl>day?start=${prev.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.WorkEffortPreviousDay}</a></li>
@@ -36,7 +36,7 @@
<#else>
<#assign entryWidth = (100 / (maxConcurrentEntries))>
</#if>
-<table width="100%" cellspacing="1" border="0" cellpadding="1"
class="calendar">
+<table width="100%" cellspacing="1" border="0" cellpadding="1"
class="calendar">
<tr>
<td nowrap class="monthdayheader">${uiLabelMap.CommonTime}<br/>
<img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>"
alt="" height="1" width="88"></td>
@@ -75,6 +75,6 @@
</#list>
</table>
<#else>
- <div
class="screenlet-body">${uiLabelMap.WorkEffortFailedCalendarEntries}!</div
+ <div
class="screenlet-body">${uiLabelMap.WorkEffortFailedCalendarEntries}!</div>
</#if>
-</div>
+</div>
\ No newline at end of file
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?rev=615352&r1=615351&r2=615352&view=diff
==============================================================================
---
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl
(original)
+++
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl
Fri Jan 25 13:30:59 2008
@@ -24,7 +24,7 @@
<div class="screenlet-body">
<form style="display: inline;"
action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" name="partyform"
method="post">
<input type="hidden" name="start" value="${start.time?string("#")}"/>
- ${uiLabelMap.WorkEffortByPartyId}:
+ <span class="label">${uiLabelMap.WorkEffortByPartyId}</span>
<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}"/>
@@ -32,7 +32,7 @@
|
<form style="display: inline;"
action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" method="post">
<input type="hidden" name="start" value="${start.time?string("#")}"/>
- ${uiLabelMap.WorkEffortByFacility}:
+ <span class="label">${uiLabelMap.WorkEffortByFacility}</span>
<select name="facilityId">
<option value=""></option>
<#list allFacilities as facility>
@@ -41,10 +41,11 @@
</select>
<input type="submit" value="${uiLabelMap.CommonView}"/>
</form>
- |
- <form style="display: inline;"
action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" method="post">
+ <br/>
+
+ <form action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>"
method="post">
<input type="hidden" name="start" value="${start.time?string("#")}"/>
- ${uiLabelMap.WorkEffortByFixedAsset}:
+ <span class="label">${uiLabelMap.WorkEffortByFixedAsset}</span>
<select name="fixedAssetId">
<option value=""></option>
<#list allFixedAssets as fixedAsset>
@@ -54,4 +55,4 @@
<input type="submit" value="${uiLabelMap.CommonView}"/>
</form>
</div>
-</div>
+</div>
\ No newline at end of file
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?rev=615352&r1=615351&r2=615352&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
Fri Jan 25 13:30:59 2008
@@ -20,7 +20,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <h2>${start?date?string("MMMM yyyy")?cap_first}</h2>
+ <li class="head3">${start?date?string("MMMM yyyy")?cap_first}</li>
<li><a href='<@ofbizUrl>month?start=${next.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.WorkEffortNextMonth}</a></li>
<li><a href='<@ofbizUrl>month?start=${nowTimestamp.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.WorkEffortThisMonth}</a></li>
<li><a href='<@ofbizUrl>month?start=${prev.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.WorkEffortPreviousMonth}</a></li>
@@ -83,4 +83,4 @@
<#else>
<div
class="screenlet-body">${uiLabelMap.WorkEffortFailedCalendarEntries}!</div>
</#if>
-</div>
+</div>
\ No newline at end of file
Modified:
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl?rev=615352&r1=615351&r2=615352&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
Fri Jan 25 13:30:59 2008
@@ -24,9 +24,9 @@
<#if days?has_content>
<table class="basic-table hover-bar" cellspacing="0">
<tr class="header-row">
- <th>${uiLabelMap.CommonStartDateTime}</th>
- <th>${uiLabelMap.CommonEndDateTime}</th>
- <th>${uiLabelMap.WorkEffortEventName}</th>
+ <td>${uiLabelMap.CommonStartDateTime}</td>
+ <td>${uiLabelMap.CommonEndDateTime}</td>
+ <td>${uiLabelMap.WorkEffortEventName}</td>
</tr>
<#list days as day>
<#assign workEfforts = day.calendarEntries>
@@ -48,4 +48,4 @@
<#else>
<div class="screenlet-body">${uiLabelMap.WorkEffortNoEventsFound}.</div>
</#if>
-</div>
+</div>
\ No newline at end of file
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?rev=615352&r1=615351&r2=615352&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
(original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Fri
Jan 25 13:30:59 2008
@@ -20,7 +20,7 @@
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <h2>${uiLabelMap.CommonWeek} ${start?date?string("w")}</h2>
+ <li class="head3">${uiLabelMap.CommonWeek} ${start?date?string("w")}</li>
<li><a href="<@ofbizUrl>week?start=${next.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.WorkEffortNextWeek}</a></li>
<li><a href="<@ofbizUrl>week?start=${nowTimestamp.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.WorkEffortThisWeek}</a></li>
<li><a href="<@ofbizUrl>week?start=${prev.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.WorkEffortPreviousWeek}</a></li>
@@ -35,7 +35,7 @@
<#else>
<#assign entryWidth = (100 / (maxConcurrentEntries))>
</#if>
-<table width="100%" cellspacing="1" border="0" cellpadding="1"
class="calendar">
+<table width="100%" cellspacing="1" border="0" cellpadding="1"
class="calendar">
<tr>
<td nowrap class="monthdayheader">${uiLabelMap.CommonTime}<br/>
<img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>"
alt="" height="1" width="88"></td>
@@ -79,4 +79,4 @@
<#else>
<div
class="screenlet-body">${uiLabelMap.WorkEffortFailedCalendarEntries}!</div>
</#if>
-</div>
+</div>
\ No newline at end of file
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=615352&r1=615351&r2=615352&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Fri Jan 25
13:30:59 2008
@@ -100,4 +100,4 @@
</widgets>
</section>
</screen>
-</screens>
+</screens>
\ No newline at end of file
