svn commit: r939769 - in /ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar: day.ftl month.ftl upcoming.ftl

[buscob]

Author: buscob
Date: Fri Apr 30 18:27:17 2010
New Revision: 939769

URL: http://svn.apache.org/viewvc?rev=939769&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3723 - XHTML validation errors round 2+ (workeffort)
https://issues.apache.org/jira/browse/OFBIZ-3723
day.ftl
Line 28: attribute value without "

month.ftl
Line 19: style tag is not allowed outside head, attribute must be used instead

upcoming.ftl
Line 49: invalid div close

Modified:
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl

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=939769&r1=939768&r2=939769&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Fri Apr 30 18:27:17 2010
@@ -25,7 +25,7 @@ under the License.
 <table cellspacing="0" class="basic-table calendar">
   <tr class="header-row">
     <td>${uiLabelMap.CommonTime}</td>
-    <td colspan=${maxConcurrentEntries}>${uiLabelMap.WorkEffortCalendarEntries}</td>
+    <td colspan="${maxConcurrentEntries}">${uiLabelMap.WorkEffortCalendarEntries}</td>
   </tr>
   <#list periods as period>
     <#assign currentPeriod = false/>

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=939769&r1=939768&r2=939769&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl Fri Apr 30 18:27:17 2010
@@ -16,18 +16,9 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<style type="text/css">
-.calendar tr td {
-height: 8em;
-width: 10em;
-vertical-align: top;
-padding: 0.5em;
-}
-.calendar .header-row td {
-height: auto;
-}
-</style>
 
+<#assign styleTd = "style='height: 8em; width: 10em; vertical-align: top; padding: 0.5em;'">
+  
 <#if periods?has_content>
 <table cellspacing="0" class="basic-table calendar">
   <tr class="header-row">
@@ -43,11 +34,11 @@ height: auto;
     <#assign indexMod7 = period_index % 7>
     <#if indexMod7 = 0>
       <tr>
-        <td class="label">
+        <td class="label" ${styleTd}>
           <a href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&amp;start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.CommonWeek} ${period.start?date?string("w")}</a>
         </td>
     </#if>
-    <td<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
+    <td ${styleTd} <#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
       <span class="h1"><a href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&amp;start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
       <a class="add-new" href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=month&amp;form=edit&amp;start=${parameters.start?if_exists}&amp;parentTypeId=${parentTypeId?if_exists}&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
       <br class="clear"/>

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=939769&r1=939768&r2=939769&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl Fri Apr 30 18:27:17 2010
@@ -45,5 +45,4 @@ under the License.
     </table>
   <#else>
     <div class="screenlet-body">${uiLabelMap.WorkEffortNoEventsFound}.</div>
-  </#if>
-</div>
\ No newline at end of file
+  </#if>
\ No newline at end of file