svn commit: r533492 - /ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl

[jacopoc]

Author: jacopoc
Date: Sun Apr 29 02:15:49 2007
New Revision: 533492

URL: http://svn.apache.org/viewvc?view=rev&rev=533492
Log:
Applied patch from Adrian Crum with some fixes for the calendar drop down filters.
OFBIZ-941

Modified:
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl

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=533492&r1=533491&r2=533492
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl Sun Apr 29 02:15:49 2007
@@ -17,53 +17,41 @@
 under the License.
 -->
 
-<#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 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}:
+      <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>
+    &nbsp;|
+    <form style="display: inline;" 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>
+    &nbsp; |
+    <form style="display: inline;" 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>
 </div>