svn commit: r1442197 - /ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl

[ashish-18]

Author: ashish
Date: Mon Feb  4 17:40:56 2013
New Revision: 1442197

URL: http://svn.apache.org/viewvc?rev=1442197&view=rev
Log:
No functional changes, Formatted the file as per best practice that we follow in FTL files. Thanks Deepak!

Modified:
    ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1442197&r1=1442196&r2=1442197&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Feb  4 17:40:56 2013
@@ -18,43 +18,43 @@ under the License.
 -->
 
 <#macro renderField text>
-    <#if text?exists>
-        ${text}<#lt/>
-    </#if>
+  <#if text?exists>
+    ${text}<#lt/>
+  </#if>
 </#macro>
 
 <#macro renderDisplayField type imageLocation idName description title class alert inPlaceEditorUrl="" inPlaceEditorParams="">
-    <#if type?has_content && type=="image">
-        <img src="${imageLocation}" alt=""><#lt/>
-    <#else>
-        <#if inPlaceEditorUrl?has_content || class?has_content || alert=="true" || title?has_content>
-            <span <#if idName?has_content>id="cc_${idName}"</#if> <#if title?has_content>title="${title}"</#if> <@renderClass class alert />><#t/>
-        </#if>
+  <#if type?has_content && type=="image">
+    <img src="${imageLocation}" alt=""><#lt/>
+  <#else>
+    <#if inPlaceEditorUrl?has_content || class?has_content || alert=="true" || title?has_content>
+      <span <#if idName?has_content>id="cc_${idName}"</#if> <#if title?has_content>title="${title}"</#if> <@renderClass class alert />><#t/>
+    </#if>
 
-        <#if description?has_content>
-            ${description?replace("\n", "<br />")}<#t/>
-        <#else>
-            &nbsp;<#t/>
-        </#if>
-        <#if inPlaceEditorUrl?has_content || class?has_content || alert=="true">
-            </span><#lt/>
-        </#if>
-        <#if inPlaceEditorUrl?has_content && idName?has_content>
-            <script language="JavaScript" type="text/javascript"><#lt/>
-            ajaxInPlaceEditDisplayField('cc_${idName}', '${inPlaceEditorUrl}', ${inPlaceEditorParams});<#lt/>
-            </script><#lt/>
-        </#if>
+    <#if description?has_content>
+      ${description?replace("\n", "<br />")}<#t/>
+    <#else>
+      &nbsp;<#t/>
     </#if>
+    <#if inPlaceEditorUrl?has_content || class?has_content || alert=="true">
+      </span><#lt/>
+    </#if>
+    <#if inPlaceEditorUrl?has_content && idName?has_content>
+      <script language="JavaScript" type="text/javascript"><#lt/>
+        ajaxInPlaceEditDisplayField('cc_${idName}', '${inPlaceEditorUrl}', ${inPlaceEditorParams});<#lt/>
+      </script><#lt/>
+    </#if>
+  </#if>
 </#macro>
 <#macro renderHyperlinkField></#macro>
 
 <#macro renderTextField name className alert value textSize maxlength id event action disabled clientAutocomplete ajaxUrl ajaxEnabled mask>
-    <#if mask?has_content>
-      <script type="text/javascript">
-        jQuery(function($){jQuery("#${id}").mask("${mask}");});
-      </script>
-    </#if>
-    <input type="text" name="${name?default("")?html}"<#t/>
+  <#if mask?has_content>
+    <script type="text/javascript">
+      jQuery(function($){jQuery("#${id}").mask("${mask}");});
+    </script>
+  </#if>
+  <input type="text" name="${name?default("")?html}"<#t/>
     <@renderClass className alert />
     <#if value?has_content> value="${value}"</#if><#rt/>
     <#if textSize?has_content> size="${textSize}"</#if><#rt/>
@@ -63,16 +63,16 @@ under the License.
     <#if id?has_content> id="${id}"</#if><#rt/>
     <#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/>
     <#if clientAutocomplete?has_content && clientAutocomplete=="false"> autocomplete="off"</#if><#rt/>
-    /><#t/>
-    <#if ajaxEnabled?has_content && ajaxEnabled>
-        <#assign defaultMinLength = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultMinLength")>
-        <#assign defaultDelay = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultDelay")>
-        <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}', false, ${defaultMinLength!2}, ${defaultDelay!300});</script><#lt/>
-    </#if>
+  /><#t/>
+  <#if ajaxEnabled?has_content && ajaxEnabled>
+    <#assign defaultMinLength = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultMinLength")>
+    <#assign defaultDelay = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultDelay")>
+    <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}', false, ${defaultMinLength!2}, ${defaultDelay!300});</script><#lt/>
+  </#if>
 </#macro>
 
 <#macro renderTextareaField name className alert cols rows id readonly value visualEditorEnable buttons language="">
-    <textarea name="${name}"<#t/>
+  <textarea name="${name}"<#t/>
     <@renderClass className alert />
     <#if cols?has_content> cols="${cols}"</#if><#rt/>
     <#if rows?has_content> rows="${rows}"</#if><#rt/>
@@ -81,24 +81,24 @@ under the License.
     <#if maxlength?has_content> maxlength="${maxlength}"</#if><#rt/>
     ><#t/>
     <#if value?has_content>${value}</#if><#t/>
-    </textarea><#lt/>
-    <#if visualEditorEnable?has_content>
-        <script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/elrte.min.js" type="text/javascript"></script><#rt/>
-        <#if language?has_content && language != "en">
-            <script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/>
-        </#if>
-        <link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css">
-        <script language="javascript" type="text/javascript">
-            var opts = {
-                cssClass : 'el-rte',
-                lang     : '${language!"en"}',
-                toolbar  : '${buttons?default("maxi")}',
-                doctype  : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
-                cssfiles : ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css']
-            }
-            jQuery('#${id?default("")}').elrte(opts);
-       </script>
-    </#if>
+  </textarea><#lt/>
+  <#if visualEditorEnable?has_content>
+    <script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/elrte.min.js" type="text/javascript"></script><#rt/>
+    <#if language?has_content && language != "en">
+      <script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/>
+    </#if>
+    <link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css">
+    <script language="javascript" type="text/javascript">
+      var opts = {
+         cssClass : 'el-rte',
+         lang     : '${language!"en"}',
+         toolbar  : '${buttons?default("maxi")}',
+         doctype  : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
+         cssfiles : ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css']
+      }
+      jQuery('#${id?default("")}').elrte(opts);
+    </script>
+  </#if>
 </#macro>
 
 <#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName mask="" event="" action="" step="" timeValues="">
@@ -111,319 +111,330 @@ under the License.
         <#if maxlength?has_content>  maxlength="${maxlength}"</#if>
         <#if id?has_content> id="${id}_i18n"</#if>/><#rt/>
     </#if>
-        <#-- the style attribute is a little bit messy but when using disply:none the timepicker is shown on a wrong place -->
-        <input type="text" name="${name}" style="height:1px;width:1px;border:none;background-color:transparent" <#if event?has_content && action?has_content> ${event}="${action}"</#if> <@renderClass className alert /><#rt/>
-        <#if title?has_content> title="${title}"</#if>
-        <#if value?has_content> value="${value}"</#if>
-        <#if size?has_content> size="${size}"</#if><#rt/>
-        <#if maxlength?has_content>  maxlength="${maxlength}"</#if>
-        <#if id?has_content> id="${id}"</#if>/><#rt/>
-      <#if dateType!="time" >
-          <script type="text/javascript">
-              <#-- If language specific lib is found, use date / time converter else just copy the value fields -->
-              if (Date.CultureInfo != undefined) {
-                  var initDate = <#if value?has_content>jQuery("#${id}_i18n").val()<#else>""</#if>;
-                  if (initDate != "") {
-                      var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
-                      <#-- bad hack because the JS date parser doesn't understand dots in the date / time string -->
-                      if (initDate.indexOf('.') != -1) {
-                          initDate = initDate.substring(0, initDate.indexOf('.'));
-                      }
-                      var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
-                      var dateObj = Date.parseExact(initDate, ofbizTime);
-                      var formatedObj = dateObj.toString(dateFormat);
-                      jQuery("#${id}_i18n").val(formatedObj);
-                  }
-
-                  jQuery("#${id}").change(function() {
-                      var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
-                      var newValue = ""
-                      if (this.value != "") {
-                          var dateObj = Date.parseExact(this.value, ofbizTime);
-                          var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
-                          newValue = dateObj.toString(dateFormat);
-                      }
-                      jQuery("#${id}_i18n").val(newValue);
-                  });
-                  jQuery("#${id}_i18n").change(function() {
-                      var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>,
-                          newValue = "",
-                          dateObj = Date.parseExact(this.value, dateFormat),
-                          ofbizTime;
-                      if (this.value != "" && dateObj !== null) {
-                          ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
-                          newValue = dateObj.toString(ofbizTime);
-                      }
-                      else { // invalid input
-                          jQuery("#${id}_i18n").val("");
-                      }
-                      jQuery("#${id}").val(newValue);
-                  });
-              } else {
-                  <#-- fallback if no language specific js date file is found -->
-                  jQuery("#${id}").change(function() {
-                      jQuery("#${id}_i18n").val(this.value);
-                  });
-                  jQuery("#${id}_i18n").change(function() {
-                      jQuery("#${id}").val(this.value);
-                  });
-              }
-
-              <#if shortDateInput?exists && shortDateInput>
-                 jQuery("#${id}").datepicker({
-              <#else>
-                 jQuery("#${id}").datetimepicker({
-                    showSecond: true,
-                    <#-- showMillisec: true, -->
-                    timeFormat: 'hh:mm:ss',
-                    stepHour: 1,
-                    stepMinute: 1,
-                    stepSecond: 1,
-              </#if>
-                    showOn: 'button',
-                    buttonImage: '',
-                    buttonText: '',
-                    buttonImageOnly: false,
-                    dateFormat: 'yy-mm-dd'
-                  })
-              <#if mask?has_content>.mask("${mask}")</#if>
-              ;
-          </script>
+    <#-- the style attribute is a little bit messy but when using disply:none the timepicker is shown on a wrong place -->
+    <input type="text" name="${name}" style="height:1px;width:1px;border:none;background-color:transparent" <#if event?has_content && action?has_content> ${event}="${action}"</#if> <@renderClass className alert /><#rt/>
+      <#if title?has_content> title="${title}"</#if>
+      <#if value?has_content> value="${value}"</#if>
+      <#if size?has_content> size="${size}"</#if><#rt/>
+      <#if maxlength?has_content>  maxlength="${maxlength}"</#if>
+      <#if id?has_content> id="${id}"</#if>/><#rt/>
+    <#if dateType!="time" >
+      <script type="text/javascript">
+        <#-- If language specific lib is found, use date / time converter else just copy the value fields -->
+        if (Date.CultureInfo != undefined) {
+          var initDate = <#if value?has_content>jQuery("#${id}_i18n").val()<#else>""</#if>;
+          if (initDate != "") {
+            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
+            <#-- bad hack because the JS date parser doesn't understand dots in the date / time string -->
+            if (initDate.indexOf('.') != -1) {
+              initDate = initDate.substring(0, initDate.indexOf('.'));
+            }
+            var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+            var dateObj = Date.parseExact(initDate, ofbizTime);
+            var formatedObj = dateObj.toString(dateFormat);
+            jQuery("#${id}_i18n").val(formatedObj);
+          }
+
+          jQuery("#${id}").change(function() {
+            var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+            var newValue = ""
+            if (this.value != "") {
+              var dateObj = Date.parseExact(this.value, ofbizTime);
+              var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
+              newValue = dateObj.toString(dateFormat);
+            }
+            jQuery("#${id}_i18n").val(newValue);
+          });
+          jQuery("#${id}_i18n").change(function() {
+            var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>,
+            newValue = "",
+            dateObj = Date.parseExact(this.value, dateFormat),
+            ofbizTime;
+            if (this.value != "" && dateObj !== null) {
+              ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+              newValue = dateObj.toString(ofbizTime);
+            }
+            else { // invalid input
+              jQuery("#${id}_i18n").val("");
+            }
+            jQuery("#${id}").val(newValue);
+          });
+        } else {
+          <#-- fallback if no language specific js date file is found -->
+          jQuery("#${id}").change(function() {
+          jQuery("#${id}_i18n").val(this.value);
+        });
+        jQuery("#${id}_i18n").change(function() {
+          jQuery("#${id}").val(this.value);
+        });
+      }
+
+      <#if shortDateInput?exists && shortDateInput>
+        jQuery("#${id}").datepicker({
+      <#else>
+        jQuery("#${id}").datetimepicker({
+          showSecond: true,
+          <#-- showMillisec: true, -->
+          timeFormat: 'hh:mm:ss',
+          stepHour: 1,
+          stepMinute: 1,
+          stepSecond: 1,
       </#if>
-      <#if timeDropdown?has_content && timeDropdown=="time-dropdown">
-          <select name="${timeHourName}" <#if classString?has_content>class="${classString}"</#if>><#rt/>
-          <#if isTwelveHour>
-            <#assign x=11>
-            <#list 0..x as i>
-              <option value="${i}"<#if hour1?has_content><#if i=hour1> selected="selected"</#if></#if>>${i}</option><#rt/>
-            </#list>
-          <#else>
-            <#assign x=23>
-            <#list 0..x as i>
-              <option value="${i}"<#if hour2?has_content><#if i=hour2> selected="selected"</#if></#if>>${i}</option><#rt/>
-            </#list>
-          </#if>
-          </select>:<select name="${timeMinutesName}" <#if classString?has_content>class="${classString}"</#if>><#rt/>
-            <#assign values = Static["org.ofbiz.base.util.StringUtil"].toList(timeValues)>
-            <#list values as i>
-              <option value="${i}"<#if minutes?has_content><#if i?number== minutes ||((i?number==(60 -step?number)) && (minutes &gt; 60 - (step?number/2))) || ((minutes &gt; i?number )&& (minutes &lt; i?number+(step?number/2))) || ((minutes &lt; i?number )&& (minutes &gt; i?number-(step?number/2)))> selected="selected"</#if></#if>>${i}</option><#rt/>
-            </#list>
-          </select>
-        <#rt/>
+          showOn: 'button',
+          buttonImage: '',
+          buttonText: '',
+          buttonImageOnly: false,
+          dateFormat: 'yy-mm-dd'
+        })
+        <#if mask?has_content>.mask("${mask}")</#if>
+        ;
+      </script>
+    </#if>
+    <#if timeDropdown?has_content && timeDropdown=="time-dropdown">
+      <select name="${timeHourName}" <#if classString?has_content>class="${classString}"</#if>><#rt/>
         <#if isTwelveHour>
-            <select name="${ampmName}" <#if classString?has_content>class="${classString}"</#if>><#rt/>
-              <option value="AM" <#if amSelected == "selected">selected="selected"</#if> >AM</option><#rt/>
-              <option value="PM" <#if pmSelected == "selected">selected="selected"</#if>>PM</option><#rt/>
-            </select>
-          <#rt/>
+          <#assign x=11>
+          <#list 0..x as i>
+            <option value="${i}"<#if hour1?has_content><#if i=hour1> selected="selected"</#if></#if>>${i}</option><#rt/>
+          </#list>
+        <#else>
+          <#assign x=23>
+          <#list 0..x as i>
+            <option value="${i}"<#if hour2?has_content><#if i=hour2> selected="selected"</#if></#if>>${i}</option><#rt/>
+          </#list>
         </#if>
+        </select>:<select name="${timeMinutesName}" <#if classString?has_content>class="${classString}"</#if>><#rt/>
+          <#assign values = Static["org.ofbiz.base.util.StringUtil"].toList(timeValues)>
+          <#list values as i>
+            <option value="${i}"<#if minutes?has_content><#if i?number== minutes ||((i?number==(60 -step?number)) && (minutes &gt; 60 - (step?number/2))) || ((minutes &gt; i?number )&& (minutes &lt; i?number+(step?number/2))) || ((minutes &lt; i?number )&& (minutes &gt; i?number-(step?number/2)))> selected="selected"</#if></#if>>${i}</option><#rt/>
+          </#list>
+        </select>
+        <#rt/>
+        <#if isTwelveHour>
+          <select name="${ampmName}" <#if classString?has_content>class="${classString}"</#if>><#rt/>
+            <option value="AM" <#if amSelected == "selected">selected="selected"</#if> >AM</option><#rt/>
+            <option value="PM" <#if pmSelected == "selected">selected="selected"</#if>>PM</option><#rt/>
+          </select>
+        <#rt/>
       </#if>
+    </#if>
     <input type="hidden" name="${compositeType}" value="Timestamp"/>
   </span>
 </#macro>
 
 <#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch>
-<span class="ui-widget">
-<select name="${name?default("")}<#rt/>" <@renderClass className alert /><#if id?has_content> id="${id}"</#if><#if multiple?has_content> multiple="multiple"</#if><#if otherFieldSize gt 0> onchange="process_choice(this,document.${formName}.${otherFieldName})"</#if><#if event?has_content> ${event}="${action}"</#if><#if size?has_content> size="${size}"</#if>>
-<#if firstInList?has_content && currentValue?has_content && !multiple?has_content>
- <option selected="selected" value="${currentValue}">${explicitDescription}</option><#rt/>
- <option value="${currentValue}">---</option><#rt/>
-</#if>
-<#if allowEmpty?has_content || !options?has_content>
-<option value="">&nbsp;</option>
-</#if>
-<#list options as item>
-<#if multiple?has_content>
- <option<#if currentValue?has_content && item.selected?has_content> selected="${item.selected}" <#elseif !currentValue?has_content && noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> selected="selected" </#if> value="${item.key}">${item.description}</option><#rt/>
-<#else>
- <option<#if currentValue?has_content && currentValue == item.key && dDFCurrent?has_content && "selected" == dDFCurrent> selected="selected"<#elseif !currentValue?has_content && noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> selected="selected"</#if> value="${item.key}">${item.description}</option><#rt/>
-</#if>
-</#list>
-</select>
-</span>
-<#if otherFieldName?has_content>
-<noscript><input type='text' name='${otherFieldName}' /></noscript>
-<script type='text/javascript' language='JavaScript'><!--
-disa = ' disabled';
-if(other_choice(document.${formName}.${fieldName}))
-    disa = '';
-document.write("<input type='text' name='${otherFieldName}' value='${otherValue?js_string}' size='${otherFieldSize}'"+disa+" onfocus='check_choice(document.${formName}.${fieldName})' />");
-if(disa && document.styleSheets)
-   document.${formName}.${fieldName}.style.visibility  = 'hidden';
-//--></script>
-</#if>
-
-<#if ajaxEnabled>
-<script language="JavaScript" type="text/javascript">
-    ajaxAutoCompleteDropDown();
-    jQuery(function() {
+  <span class="ui-widget">
+    <select name="${name?default("")}<#rt/>" <@renderClass className alert /><#if id?has_content> id="${id}"</#if><#if multiple?has_content> multiple="multiple"</#if><#if otherFieldSize gt 0> onchange="process_choice(this,document.${formName}.${otherFieldName})"</#if><#if event?has_content> ${event}="${action}"</#if><#if size?has_content> size="${size}"</#if>>
+      <#if firstInList?has_content && currentValue?has_content && !multiple?has_content>
+        <option selected="selected" value="${currentValue}">${explicitDescription}</option><#rt/>
+        <option value="${currentValue}">---</option><#rt/>
+      </#if>
+      <#if allowEmpty?has_content || !options?has_content>
+        <option value="">&nbsp;</option>
+      </#if>
+      <#list options as item>
+        <#if multiple?has_content>
+          <option<#if currentValue?has_content && item.selected?has_content> selected="${item.selected}" <#elseif !currentValue?has_content && noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> selected="selected" </#if> value="${item.key}">${item.description}</option><#rt/>
+        <#else>
+          <option<#if currentValue?has_content && currentValue == item.key && dDFCurrent?has_content && "selected" == dDFCurrent> selected="selected"<#elseif !currentValue?has_content && noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> selected="selected"</#if> value="${item.key}">${item.description}</option><#rt/>
+        </#if>
+      </#list>
+    </select>
+  </span>
+  <#if otherFieldName?has_content>
+    <noscript><input type='text' name='${otherFieldName}' /></noscript>
+    <script type='text/javascript' language='JavaScript'><!--
+      disa = ' disabled';
+      if(other_choice(document.${formName}.${fieldName}))
+        disa = '';
+      document.write("<input type='text' name='${otherFieldName}' value='${otherValue?js_string}' size='${otherFieldSize}'"+disa+" onfocus='check_choice(document.${formName}.${fieldName})' />");
+      if(disa && document.styleSheets)
+      document.${formName}.${fieldName}.style.visibility  = 'hidden';
+    //--></script>
+  </#if>
+
+  <#if ajaxEnabled>
+    <script language="JavaScript" type="text/javascript">
+      ajaxAutoCompleteDropDown();
+      jQuery(function() {
         jQuery("#${id}").combobox();
-    });
-</script>
-</#if>
-
+      });
+    </script>
+  </#if>
 </#macro>
 
 <#macro renderCheckField items className alert id allChecked currentValue name event action>
-<#list items as item>
-<span <@renderClass className alert />><#rt/>
-<input type="checkbox"<#if (item_index == 0)> id="${id}"</#if><#rt/>
-<#if allChecked?has_content && allChecked> checked="checked" <#elseif allChecked?has_content && !allChecked><#elseif currentValue?has_content && currentValue==item.value> checked="checked"</#if> name="${name?default("")?html}" value="${item.value?default("")?html}"<#if event?has_content> ${event}="${action}"</#if>/><#rt/>
-${item.description?default("")}</span>
-</#list>
+  <#list items as item>
+    <span <@renderClass className alert />><#rt/>
+      <input type="checkbox"<#if (item_index == 0)> id="${id}"</#if><#rt/>
+        <#if allChecked?has_content && allChecked> checked="checked" <#elseif allChecked?has_content && !allChecked>
+          <#elseif currentValue?has_content && currentValue==item.value> checked="checked"</#if>
+          name="${name?default("")?html}" value="${item.value?default("")?html}"<#if event?has_content> ${event}="${action}"</#if>/><#rt/>
+        ${item.description?default("")}
+    </span>
+  </#list>
 </#macro>
 
 <#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event action>
-<#list items as item>
-<span <@renderClass className alert />><#rt/>
-<input type="radio"<#if currentValue?has_content><#if currentValue==item.key> checked="checked"</#if><#elseif noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> checked="checked"</#if> name="${name?default("")?html}" value="${item.key?default("")?html}"<#if event?has_content> ${event}="${action}"</#if>/><#rt/>
-${item.description}</span>
-</#list>
+  <#list items as item>
+    <span <@renderClass className alert />><#rt/>
+      <input type="radio"<#if currentValue?has_content><#if currentValue==item.key> checked="checked"</#if>
+        <#elseif noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> checked="checked"</#if>
+        name="${name?default("")?html}" value="${item.key?default("")?html}"<#if event?has_content> ${event}="${action}"</#if>/><#rt/>
+      ${item.description}
+    </span>
+  </#list>
 </#macro>
 
 <#macro renderSubmitField buttonType className alert formName title name event action imgSrc confirmation containerId ajaxUrl>
-<#if buttonType=="text-link">
- <a <@renderClass className alert /> href="javascript:document.${formName}.submit()" <#if confirmation?has_content>onclick="return confirm('${confirmation?js_string}');"</#if>><#if title?has_content>${title}</#if> </a>
-<#elseif buttonType=="image">
- <input type="image" src="${imgSrc}" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if title?has_content> alt="${title}"</#if><#if event?has_content> ${event}="${action}"</#if> <#if confirmation?has_content>onclick="return confirm('${confirmation?js_string}');"</#if>/>
-<#else>
-<input type="<#if containerId?has_content>button<#else>submit</#if>" <@renderClass className alert /><#if name?exists> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if><#if containerId?has_content> onclick="<#if confirmation?has_content>if (confirm('${confirmation?js_string}')) </#if>ajaxSubmitFormUpdateAreas('${containerId}', '${ajaxUrl}')"<#else><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}');"</#if></#if>/></#if>
+  <#if buttonType=="text-link">
+    <a <@renderClass className alert /> href="javascript:document.${formName}.submit()" <#if confirmation?has_content>onclick="return confirm('${confirmation?js_string}');"</#if>><#if title?has_content>${title}</#if> </a>
+  <#elseif buttonType=="image">
+    <input type="image" src="${imgSrc}" <@renderClass className alert /><#if name?has_content> name="${name}"</#if>
+    <#if title?has_content> alt="${title}"</#if><#if event?has_content> ${event}="${action}"</#if>
+    <#if confirmation?has_content>onclick="return confirm('${confirmation?js_string}');"</#if>/>
+  <#else>
+    <input type="<#if containerId?has_content>button<#else>submit</#if>" <@renderClass className alert />
+    <#if name?exists> name="${name}"</#if><#if title?has_content> value="${title}"</#if><#if event?has_content> ${event}="${action}"</#if>
+    <#if containerId?has_content> onclick="<#if confirmation?has_content>if (confirm('${confirmation?js_string}')) </#if>ajaxSubmitFormUpdateAreas('${containerId}', '${ajaxUrl}')"
+      <#else><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}');"</#if>
+    </#if>/>
+  </#if>
 </#macro>
 
 <#macro renderResetField className alert name title>
-    <input type="reset" <@renderClass className alert /> name="${name}"<#if title?has_content> value="${title}"</#if>/>
+  <input type="reset" <@renderClass className alert /> name="${name}"<#if title?has_content> value="${title}"</#if>/>
 </#macro>
 
 <#macro renderHiddenField name value id event action>
-    <input type="hidden" name="${name}"<#if value?has_content> value="${value}"</#if><#if id?has_content> id="${id}"</#if><#if event?has_content && action?has_content> ${event}="${action}"</#if>/>
+  <input type="hidden" name="${name}"<#if value?has_content> value="${value}"</#if><#if id?has_content> id="${id}"</#if><#if event?has_content && action?has_content> ${event}="${action}"</#if>/>
 </#macro>
 
 <#macro renderIgnoredField></#macro>
 
 <#macro renderFieldTitle style title id fieldHelpText="">
-    <span<#if fieldHelpText?has_content> title="${fieldHelpText}"</#if><#if style?has_content> class="${style}"</#if><#if id?has_content> id="${id}"</#if>><#t/>
+  <span<#if fieldHelpText?has_content> title="${fieldHelpText}"</#if><#if style?has_content> class="${style}"</#if><#if id?has_content> id="${id}"</#if>><#t/>
     ${title}<#t/>
-    </span><#t/>
+  </span><#t/>
 </#macro>
 
 <#macro renderSingleFormFieldTitle></#macro>
 
 <#macro renderFormOpen linkUrl formType targetWindow containerId containerStyle autocomplete name viewIndexField viewSizeField viewIndex viewSize useRowSubmit>
-
-    <form method="post" action="${linkUrl}"<#if formType=="upload"> enctype="multipart/form-data"</#if><#if targetWindow?has_content> target="${targetWindow}"</#if><#if containerId?has_content> id="${containerId}"</#if> class=<#if containerStyle?has_content>"${containerStyle}"<#else>"basic-form"</#if> onsubmit="javascript:submitFormDisableSubmits(this)"<#if autocomplete?has_content> autocomplete="${autocomplete}"</#if> name="${name}"><#lt/>
+  <form method="post" action="${linkUrl}"<#if formType=="upload"> enctype="multipart/form-data"</#if><#if targetWindow?has_content> target="${targetWindow}"</#if><#if containerId?has_content> id="${containerId}"</#if> class=<#if containerStyle?has_content>"${containerStyle}"<#else>"basic-form"</#if> onsubmit="javascript:submitFormDisableSubmits(this)"<#if autocomplete?has_content> autocomplete="${autocomplete}"</#if> name="${name}"><#lt/>
     <#if useRowSubmit?has_content && useRowSubmit>
-        <input type="hidden" name="_useRowSubmit" value="Y"/>
-        <#if linkUrl?index_of("VIEW_INDEX") &lt;= 0 && linkUrl?index_of(viewIndexField) &lt;= 0>
-            <input type="hidden" name="${viewIndexField}" value="${viewIndex}"/>
-        </#if>
-        <#if linkUrl?index_of("VIEW_SIZE") &lt;= 0 && linkUrl?index_of(viewSizeField) &lt;= 0>
-            <input type="hidden" name="${viewSizeField}" value="${viewSize}"/>
-        </#if>
+      <input type="hidden" name="_useRowSubmit" value="Y"/>
+      <#if linkUrl?index_of("VIEW_INDEX") &lt;= 0 && linkUrl?index_of(viewIndexField) &lt;= 0>
+        <input type="hidden" name="${viewIndexField}" value="${viewIndex}"/>
+      </#if>
+      <#if linkUrl?index_of("VIEW_SIZE") &lt;= 0 && linkUrl?index_of(viewSizeField) &lt;= 0>
+        <input type="hidden" name="${viewSizeField}" value="${viewSize}"/>
+      </#if>
     </#if>
 </#macro>
 <#macro renderFormClose focusFieldName formName containerId hasRequiredField>
-    </form><#lt/>
-    <#if focusFieldName?has_content>
-        <script language="JavaScript" type="text/javascript">
-          var form = document.${formName};
-          form.${focusFieldName}.focus();
-          <#-- enable the validation plugin for all generated forms
-               only enable the validation if min one field is marked as 'required' -->
-          if (jQuery(form).find(".required").size() > 0) {
-            jQuery(form).validate();
+  </form><#lt/>
+  <#if focusFieldName?has_content>
+    <script language="JavaScript" type="text/javascript">
+      var form = document.${formName};
+      form.${focusFieldName}.focus();
+      <#-- enable the validation plugin for all generated forms
+      only enable the validation if min one field is marked as 'required' -->
+      if (jQuery(form).find(".required").size() > 0) {
+        jQuery(form).validate();
+      }
+    </script><#lt/>
+  </#if>
+  <#if containerId?has_content && hasRequiredField?has_content>
+    <script type="text/javascript">
+      jQuery("#${containerId}").validate({
+        submitHandler:
+          function(form) {
+            form.submit();
           }
-        </script><#lt/>
-    </#if>
-    <#if containerId?has_content && hasRequiredField?has_content>
-      <script type="text/javascript">
-          jQuery("#${containerId}").validate({
-             submitHandler:
-                 function(form) {
-                 form.submit();
-             }
-          });
-      </script>
-    </#if>
+      });
+    </script>
+  </#if>
 </#macro>
 <#macro renderMultiFormClose>
-    </form><#lt/>
+  </form><#lt/>
 </#macro>
 
 <#macro renderFormatListWrapperOpen formName style columnStyles>
-    <table cellspacing="0" class="<#if style?has_content>${style}<#else>basic-table form-widget-table dark-grid</#if>"><#lt/>
+  <table cellspacing="0" class="<#if style?has_content>${style}<#else>basic-table form-widget-table dark-grid</#if>"><#lt/>
 </#macro>
 
 <#macro renderFormatListWrapperClose formName>
-    </table><#lt/>
+  </table><#lt/>
 </#macro>
 
 <#macro renderFormatHeaderRowOpen style>
-    <tr class="<#if style?has_content>${style}<#else>header-row</#if>">
+  <tr class="<#if style?has_content>${style}<#else>header-row</#if>">
 </#macro>
 <#macro renderFormatHeaderRowClose>
-    </tr>
+  </tr>
 </#macro>
 <#macro renderFormatHeaderRowCellOpen style positionSpan>
-    <td <#if positionSpan?has_content && positionSpan gt 1 >colspan="${positionSpan}"</#if><#if style?has_content>class="${style}"</#if>>
+  <td <#if positionSpan?has_content && positionSpan gt 1 >colspan="${positionSpan}"</#if><#if style?has_content>class="${style}"</#if>>
 </#macro>
 <#macro renderFormatHeaderRowCellClose>
-    </td>
+  </td>
 </#macro>
 
 <#macro renderFormatHeaderRowFormCellOpen style>
-    <td <#if style?has_content>class="${style}"</#if>>
+  <td <#if style?has_content>class="${style}"</#if>>
 </#macro>
 <#macro renderFormatHeaderRowFormCellClose>
-    </td>
+  </td>
 </#macro>
 <#macro renderFormatHeaderRowFormCellTitleSeparator style isLast>
-<#if style?has_content><span class="${style}"></#if> - <#if style?has_content></span></#if>
+  <#if style?has_content><span class="${style}"></#if> - <#if style?has_content></span></#if>
 </#macro>
 
 <#macro renderFormatItemRowOpen formName itemIndex altRowStyles evenRowStyle oddRowStyle>
-    <tr <#if itemIndex?has_content><#if itemIndex%2==0><#if evenRowStyle?has_content>class="${evenRowStyle}<#if altRowStyles?has_content> ${altRowStyles}</#if>"<#elseif altRowStyles?has_content>class="${altRowStyles}"</#if><#else><#if oddRowStyle?has_content>class="${oddRowStyle}<#if altRowStyles?has_content> ${altRowStyles}</#if>"<#elseif altRowStyles?has_content>class="${altRowStyles}"</#if></#if></#if> >
+  <tr <#if itemIndex?has_content><#if itemIndex%2==0><#if evenRowStyle?has_content>class="${evenRowStyle}<#if altRowStyles?has_content> ${altRowStyles}</#if>"<#elseif altRowStyles?has_content>class="${altRowStyles}"</#if><#else><#if oddRowStyle?has_content>class="${oddRowStyle}<#if altRowStyles?has_content> ${altRowStyles}</#if>"<#elseif altRowStyles?has_content>class="${altRowStyles}"</#if></#if></#if> >
 </#macro>
 <#macro renderFormatItemRowClose formName>
-    </tr>
+  </tr>
 </#macro>
 <#macro renderFormatItemRowCellOpen fieldName style positionSpan>
-    <td <#if positionSpan?has_content && positionSpan gt 1>colspan="${positionSpan}"</#if><#if style?has_content>class="${style}"</#if>>
+  <td <#if positionSpan?has_content && positionSpan gt 1>colspan="${positionSpan}"</#if><#if style?has_content>class="${style}"</#if>>
 </#macro>
 <#macro renderFormatItemRowCellClose fieldName>
-    </td>
+  </td>
 </#macro>
 <#macro renderFormatItemRowFormCellOpen style>
-    <td<#if style?has_content> class="${style}"</#if>>
+  <td<#if style?has_content> class="${style}"</#if>>
 </#macro>
 <#macro renderFormatItemRowFormCellClose>
-    </td>
+  </td>
 </#macro>
 
 <#macro renderFormatSingleWrapperOpen formName style>
-    <table cellspacing="0" <#if style?has_content>class="${style}"</#if>>
+  <table cellspacing="0" <#if style?has_content>class="${style}"</#if>>
 </#macro>
 <#macro renderFormatSingleWrapperClose formName>
-    </table>
+  </table>
 </#macro>
 
 <#macro renderFormatFieldRowOpen>
-    <tr>
+  <tr>
 </#macro>
 <#macro renderFormatFieldRowClose>
-    </tr>
+  </tr>
 </#macro>
 <#macro renderFormatFieldRowTitleCellOpen style>
-    <td class="<#if style?has_content>${style}<#else>label</#if>">
+  <td class="<#if style?has_content>${style}<#else>label</#if>">
 </#macro>
 <#macro renderFormatFieldRowTitleCellClose>
-    </td>
+  </td>
 </#macro>
 <#macro renderFormatFieldRowSpacerCell></#macro>
 <#macro renderFormatFieldRowWidgetCellOpen positionSpan style>
-    <td<#if positionSpan?has_content && positionSpan gt 0> colspan="${1+positionSpan*3}"</#if><#if style?has_content> class="${style}"</#if>>
+  <td<#if positionSpan?has_content && positionSpan gt 0> colspan="${1+positionSpan*3}"</#if><#if style?has_content> class="${style}"</#if>>
 </#macro>
 <#macro renderFormatFieldRowWidgetCellClose>
-    </td>
+  </td>
 </#macro>
 
 <#--
@@ -445,127 +456,129 @@ ${item.description}</span>
 <#macro renderFormatEmptySpace>&nbsp;</#macro>
 
 <#macro renderTextFindField name value defaultOption opEquals opBeginsWith opContains opIsEmpty opNotEqual className alert size maxlength autocomplete titleStyle hideIgnoreCase ignCase ignoreCase>
-<#if opEquals?has_content>
-<select <#if name?has_content>name="${name}_op"</#if>    class="selectBox"><#rt/>
-<option value="equals"<#if defaultOption=="equals"> selected="selected"</#if>>${opEquals}</option><#rt/>
-<option value="like"<#if defaultOption=="like"> selected="selected"</#if>>${opBeginsWith}</option><#rt/>
-<option value="contains"<#if defaultOption=="contains"> selected="selected"</#if>>${opContains}</option><#rt/>
-<option value="empty"<#rt/><#if defaultOption=="empty"> selected="selected"</#if>>${opIsEmpty}</option><#rt/>
-<option value="notEqual"<#if defaultOption=="notEqual"> selected="selected"</#if>>${opNotEqual}</option><#rt/>
-</select>
-<#else>
-<input type="hidden" name=<#if name?has_content> "${name}_op"</#if>    value="${defaultOption}"/><#rt/>
-</#if>
- <input type="text" <@renderClass className alert /> name="${name}"<#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
-<#if titleStyle?has_content><span class="${titleStyle}" ><#rt/></#if>
-<#if hideIgnoreCase>
- <input type="hidden" name="${name}_ic" value=<#if ignCase>"Y"<#else> ""</#if>/><#rt/>
- <#else>
- <input type="checkbox" name="${name}_ic" value="Y" <#if ignCase> checked="checked"</#if> /> ${ignoreCase}<#rt/>
-</#if><#if titleStyle?has_content></span></#if>
+  <#if opEquals?has_content>
+    <select <#if name?has_content>name="${name}_op"</#if>    class="selectBox"><#rt/>
+      <option value="equals"<#if defaultOption=="equals"> selected="selected"</#if>>${opEquals}</option><#rt/>
+      <option value="like"<#if defaultOption=="like"> selected="selected"</#if>>${opBeginsWith}</option><#rt/>
+      <option value="contains"<#if defaultOption=="contains"> selected="selected"</#if>>${opContains}</option><#rt/>
+      <option value="empty"<#rt/><#if defaultOption=="empty"> selected="selected"</#if>>${opIsEmpty}</option><#rt/>
+      <option value="notEqual"<#if defaultOption=="notEqual"> selected="selected"</#if>>${opNotEqual}</option><#rt/>
+    </select>
+  <#else>
+    <input type="hidden" name=<#if name?has_content> "${name}_op"</#if>    value="${defaultOption}"/><#rt/>
+  </#if>
+    <input type="text" <@renderClass className alert /> name="${name}"<#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
+    <#if titleStyle?has_content><span class="${titleStyle}" ><#rt/></#if>
+    <#if hideIgnoreCase>
+      <input type="hidden" name="${name}_ic" value=<#if ignCase>"Y"<#else> ""</#if>/><#rt/>
+    <#else>
+      <input type="checkbox" name="${name}_ic" value="Y" <#if ignCase> checked="checked"</#if> /> ${ignoreCase}<#rt/>
+    </#if>
+    <#if titleStyle?has_content></span>
+  </#if>
 </#macro>
 
 <#macro renderDateFindField className alert name localizedInputTitle value size maxlength dateType formName defaultDateTimeString imgSrc localizedIconTitle titleStyle defaultOptionFrom defaultOptionThru opEquals opSameDay opGreaterThanFromDayStart opGreaterThan opGreaterThan opLessThan opUpToDay opUpThruDay opIsEmpty>
-<span class="view-calendar">
-<input id="${name?html}_fld0_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name?html}_fld0_value"</#if><#if localizedInputTitle?has_content> title="${localizedInputTitle}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
-<#if dateType != "time">
-    <script type="text/javascript">
-          <#if dateType == "date">
-             jQuery("#${name?html}_fld0_value").datepicker({
-          <#else>
-             jQuery("#${name?html}_fld0_value").datetimepicker({
-                showSecond: true,
-                <#-- showMillisec: true, -->
-                timeFormat: 'hh:mm:ss',
-                stepHour: 1,
-                stepMinute: 5,
-                stepSecond: 10,
-          </#if>
-                showOn: 'button',
-                buttonImage: '',
-                buttonText: '',
-                buttonImageOnly: false,
-                dateFormat: 'yy-mm-dd'
-              });
+  <span class="view-calendar">
+    <input id="${name?html}_fld0_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name?html}_fld0_value"</#if><#if localizedInputTitle?has_content> title="${localizedInputTitle}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
+    <#if dateType != "time">
+      <script type="text/javascript">
+        <#if dateType == "date">
+          jQuery("#${name?html}_fld0_value").datepicker({
+        <#else>
+          jQuery("#${name?html}_fld0_value").datetimepicker({
+            showSecond: true,
+            <#-- showMillisec: true, -->
+            timeFormat: 'hh:mm:ss',
+            stepHour: 1,
+            stepMinute: 5,
+            stepSecond: 10,
+        </#if>
+            showOn: 'button',
+            buttonImage: '',
+            buttonText: '',
+            buttonImageOnly: false,
+            dateFormat: 'yy-mm-dd'
+          });
       </script>
-<#rt/>
-</#if>
-<#if titleStyle?has_content>
-<span class="${titleStyle}"><#rt/>
-</#if>
-<select<#if name?has_content> name="${name}_fld0_op"</#if> class="selectBox"><#rt/>
-<option value="equals"<#if defaultOptionFrom=="equals"> selected="selected"</#if>>${opEquals}</option><#rt/>
-<option value="sameDay"<#if defaultOptionFrom=="sameDay"> selected="selected"</#if>>${opSameDay}</option><#rt/>
-<option value="greaterThanFromDayStart"<#if defaultOptionFrom=="greaterThanFromDayStart"> selected="selected"</#if>>${opGreaterThanFromDayStart}</option><#rt/>
-<option value="greaterThan"<#if defaultOptionFrom=="greaterThan"> selected="selected"</#if>>${opGreaterThan}</option><#rt/>
-</select><#rt/>
-<#if titleStyle?has_content>
- </span><#rt/>
-</#if>
-<#rt/>
-<input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
-<#if dateType != "time">
-    <script type="text/javascript">
-          <#if dateType == "date">
-             jQuery("#${name?html}_fld1_value").datepicker({
-          <#else>
-             jQuery("#${name?html}_fld1_value").datetimepicker({
-                showSecond: true,
-                <#-- showMillisec: true, -->
-                timeFormat: 'hh:mm:ss',
-                stepHour: 1,
-                stepMinute: 5,
-                stepSecond: 10,
-          </#if>
-                showOn: 'button',
-                buttonImage: '',
-                buttonText: '',
-                buttonImageOnly: false,
-                dateFormat: 'yy-mm-dd'
-              });
+      <#rt/>
+    </#if>
+    <#if titleStyle?has_content>
+      <span class="${titleStyle}"><#rt/>
+    </#if>
+    <select<#if name?has_content> name="${name}_fld0_op"</#if> class="selectBox"><#rt/>
+      <option value="equals"<#if defaultOptionFrom=="equals"> selected="selected"</#if>>${opEquals}</option><#rt/>
+      <option value="sameDay"<#if defaultOptionFrom=="sameDay"> selected="selected"</#if>>${opSameDay}</option><#rt/>
+      <option value="greaterThanFromDayStart"<#if defaultOptionFrom=="greaterThanFromDayStart"> selected="selected"</#if>>${opGreaterThanFromDayStart}</option><#rt/>
+      <option value="greaterThan"<#if defaultOptionFrom=="greaterThan"> selected="selected"</#if>>${opGreaterThan}</option><#rt/>
+    </select><#rt/>
+    <#if titleStyle?has_content>
+      </span><#rt/>
+    </#if>
+    <#rt/>
+    <input id="${name?html}_fld1_value" type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if localizedInputTitle?exists> title="${localizedInputTitle?html}"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if>/><#rt/>
+    <#if dateType != "time">
+      <script type="text/javascript">
+        <#if dateType == "date">
+          jQuery("#${name?html}_fld1_value").datepicker({
+        <#else>
+          jQuery("#${name?html}_fld1_value").datetimepicker({
+            showSecond: true,
+            <#-- showMillisec: true, -->
+            timeFormat: 'hh:mm:ss',
+            stepHour: 1,
+            stepMinute: 5,
+            stepSecond: 10,
+        </#if>
+            showOn: 'button',
+            buttonImage: '',
+            buttonText: '',
+            buttonImageOnly: false,
+            dateFormat: 'yy-mm-dd'
+          });
       </script>
-<#rt/>
-</#if>
-<#if titleStyle?has_content>
- <span class="${titleStyle}"><#rt/>
-</#if>
-<select name=<#if name?has_content>"${name}_fld1_op"</#if> class="selectBox"><#rt/>
-<option value="opLessThan"<#if defaultOptionThru=="opLessThan"> selected="selected"</#if>>${opLessThan}</option><#rt/>
-<option value="upToDay"<#if defaultOptionThru=="upToDay"> selected="selected"</#if>>${opUpToDay}</option><#rt/>
-<option value="upThruDay"<#if defaultOptionThru=="upThruDay"> selected="selected"</#if>>${opUpThruDay}</option><#rt/>
-<option value="empty"<#if defaultOptionFrom=="empty"> selected="selected"</#if>>${opIsEmpty}</option><#rt/>
-</select><#rt/>
-<#if titleStyle?has_content>
-</span>
-</#if>
-</span>
+      <#rt/>
+    </#if>
+    <#if titleStyle?has_content>
+      <span class="${titleStyle}"><#rt/>
+    </#if>
+    <select name=<#if name?has_content>"${name}_fld1_op"</#if> class="selectBox"><#rt/>
+      <option value="opLessThan"<#if defaultOptionThru=="opLessThan"> selected="selected"</#if>>${opLessThan}</option><#rt/>
+      <option value="upToDay"<#if defaultOptionThru=="upToDay"> selected="selected"</#if>>${opUpToDay}</option><#rt/>
+      <option value="upThruDay"<#if defaultOptionThru=="upThruDay"> selected="selected"</#if>>${opUpThruDay}</option><#rt/>
+      <option value="empty"<#if defaultOptionFrom=="empty"> selected="selected"</#if>>${opIsEmpty}</option><#rt/>
+    </select><#rt/>
+    <#if titleStyle?has_content>
+      </span>
+    </#if>
+  </span>
 </#macro>
 
 <#macro renderRangeFindField className alert name value size maxlength autocomplete titleStyle defaultOptionFrom opEquals opGreaterThan opGreaterThanEquals opLessThan opLessThanEquals value2 defaultOptionThru>
-<input type="text" <@renderClass className alert /> <#if name?has_content>name="${name}_fld0_value"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
-<#if titleStyle?has_content>
- <span class="${titleStyle}" ><#rt/>
-</#if>
-<select <#if name?has_content>name="${name}_fld0_op"</#if> class="selectBox"><#rt/>
-<option value="equals"<#if defaultOptionFrom=="equals"> selected="selected"</#if>>${opEquals}</option><#rt/>
-<option value="greaterThan"<#if defaultOptionFrom=="greaterThan"> selected="selected"</#if>>${opGreaterThan}</option><#rt/>
-<option value="greaterThanEqualTo"<#if defaultOptionFrom=="greaterThanEqualTo"> selected="selected"</#if>>${opGreaterThanEquals}</option><#rt/>
-</select><#rt/>
-<#if titleStyle?has_content>
-</span><#rt/>
-</#if>
-<br /><#rt/>
-<input type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
-<#if titleStyle?has_content>
- <span class="${titleStyle}" ><#rt/>
-</#if>
-<select name=<#if name?has_content>"${name}_fld1_op"</#if> class="selectBox"><#rt/>
-<option value="lessThan"<#if defaultOptionThru=="lessThan"> selected="selected"</#if>>${opLessThan?html}</option><#rt/>
-<option value="lessThanEqualTo"<#if defaultOptionThru=="lessThanEqualTo"> selected="selected"</#if>>${opLessThanEquals?html}</option><#rt/>
-</select><#rt/>
-<#if titleStyle?has_content>
- </span>
-</#if>
+  <input type="text" <@renderClass className alert /> <#if name?has_content>name="${name}_fld0_value"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
+  <#if titleStyle?has_content>
+    <span class="${titleStyle}" ><#rt/>
+  </#if>
+  <select <#if name?has_content>name="${name}_fld0_op"</#if> class="selectBox"><#rt/>
+    <option value="equals"<#if defaultOptionFrom=="equals"> selected="selected"</#if>>${opEquals}</option><#rt/>
+    <option value="greaterThan"<#if defaultOptionFrom=="greaterThan"> selected="selected"</#if>>${opGreaterThan}</option><#rt/>
+    <option value="greaterThanEqualTo"<#if defaultOptionFrom=="greaterThanEqualTo"> selected="selected"</#if>>${opGreaterThanEquals}</option><#rt/>
+  </select><#rt/>
+  <#if titleStyle?has_content>
+    </span><#rt/>
+  </#if>
+  <br /><#rt/>
+  <input type="text" <@renderClass className alert /><#if name?has_content> name="${name}_fld1_value"</#if><#if value2?has_content> value="${value2}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
+  <#if titleStyle?has_content>
+    <span class="${titleStyle}" ><#rt/>
+  </#if>
+  <select name=<#if name?has_content>"${name}_fld1_op"</#if> class="selectBox"><#rt/>
+    <option value="lessThan"<#if defaultOptionThru=="lessThan"> selected="selected"</#if>>${opLessThan?html}</option><#rt/>
+    <option value="lessThanEqualTo"<#if defaultOptionThru=="lessThanEqualTo"> selected="selected"</#if>>${opLessThanEquals?html}</option><#rt/>
+  </select><#rt/>
+  <#if titleStyle?has_content>
+    </span>
+  </#if>
 </#macro>
 
 <#--
@@ -602,62 +615,68 @@ Parameter: initiallyCollapsed, Not used.
 Parameter: lastViewName, String, optional - If the ajaxEnabled parameter is true, the contents of lastViewName will be appended to the Ajax URL.
 -->
 <#macro renderLookupField name formName fieldFormName className="" alert="false" value="" size="" maxlength="" id="" event="" action="" readonly=false autocomplete="" descriptionFieldName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled=javaScriptEnabled presentation="layer" width="" height="" position="" fadeBackground="true" clearText="" showDescription="" initiallyCollapsed="" lastViewName="main" >
-<#if Static["org.ofbiz.widget.ModelWidget"].widgetBoundaryCommentsEnabled(context)>
-<!-- @renderLookupField -->
-</#if>
-<#if (!ajaxUrl?has_content) && ajaxEnabled>
+  <#if Static["org.ofbiz.widget.ModelWidget"].widgetBoundaryCommentsEnabled(context)>
+  <!-- @renderLookupField -->
+  </#if>
+  <#if (!ajaxUrl?has_content) && ajaxEnabled>
     <#local ajaxUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, response, fieldFormName)/>
     <#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y" />
-</#if>
-<#if (!showDescription?has_content)>
+  </#if>
+  <#if (!showDescription?has_content)>
     <#local showDescriptionProp = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.lookup.showDescription", "N")>
     <#if "Y" == showDescriptionProp>
-        <#local showDescription = "true" />
+      <#local showDescription = "true" />
     <#else>
-        <#local showDescription = "false" />
+      <#local showDescription = "false" />
     </#if>
-</#if>
-<#if ajaxEnabled?has_content && ajaxEnabled>
+  </#if>
+  <#if ajaxEnabled?has_content && ajaxEnabled>
     <script type="text/javascript">
-    jQuery(document).ready(function(){
+      jQuery(document).ready(function(){
         if (!jQuery('form[name="${formName}"]').length) {
-            alert("Developer: for lookups to work you must provide a form name!")
+          alert("Developer: for lookups to work you must provide a form name!")
         }
-    });
+      });
     </script>
-</#if>
-<span class="field-lookup">
-<#if size?has_content && size=="0"><input type="hidden" <#if name?has_content> name="${name}"/></#if><#else><input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if readonly?has_content && readonly> readonly="readonly"</#if><#rt/><#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#if>
-<#if presentation?has_content && descriptionFieldName?has_content && presentation == "window">
-     <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},document.${formName?html}.${descriptionFieldName},'${fieldFormName}', '${presentation}'<#rt/>
-    <#if targetParameterIter?has_content>
-     <#list targetParameterIter as item>
-    ,document.${formName}.${item}.value<#rt>
-     </#list>
-    </#if>
-    );"></a><#rt>
-<#elseif presentation?has_content && presentation == "window">
-     <a href="javascript:call_fieldlookup2(document.${formName?html}.${name?html},'${fieldFormName}', '${presentation}'<#rt/>
-    <#if targetParameterIter?has_content>
-     <#list targetParameterIter as item>
-    ,document.${formName}.${item}.value<#rt>
-     </#list>
-    </#if>
-    );"></a><#rt>
-<#else>
-    <#if ajaxEnabled?has_content && ajaxEnabled>
-      <#assign defaultMinLength = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultMinLength")>
-      <#assign defaultDelay = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultDelay")>
-      <#local ajaxUrl = ajaxUrl + "&amp;_LAST_VIEW_NAME_=" + lastViewName />
-      <#if !ajaxUrl?contains("searchValueFieldName=")>
+  </#if>
+  <span class="field-lookup">
+    <#if size?has_content && size=="0">
+      <input type="hidden" <#if name?has_content> name="${name}"/></#if>
+    <#else>
+      <input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if>
+        <#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/>
+        <#if readonly?has_content && readonly> readonly="readonly"</#if><#rt/><#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/>
+        <#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#if>
+    <#if presentation?has_content && descriptionFieldName?has_content && presentation == "window">
+      <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},document.${formName?html}.${descriptionFieldName},'${fieldFormName}', '${presentation}'<#rt/>
+      <#if targetParameterIter?has_content>
+        <#list targetParameterIter as item>
+          ,document.${formName}.${item}.value<#rt>
+        </#list>
+      </#if>
+      );"></a><#rt>
+    <#elseif presentation?has_content && presentation == "window">
+      <a href="javascript:call_fieldlookup2(document.${formName?html}.${name?html},'${fieldFormName}', '${presentation}'<#rt/>
+      <#if targetParameterIter?has_content>
+        <#list targetParameterIter as item>
+          ,document.${formName}.${item}.value<#rt>
+        </#list>
+      </#if>
+      );"></a><#rt>
+    <#else>
+      <#if ajaxEnabled?has_content && ajaxEnabled>
+        <#assign defaultMinLength = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultMinLength")>
+        <#assign defaultDelay = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.autocompleter.defaultDelay")>
+        <#local ajaxUrl = ajaxUrl + "&amp;_LAST_VIEW_NAME_=" + lastViewName />
+        <#if !ajaxUrl?contains("searchValueFieldName=")>
           <#if descriptionFieldName?has_content && showDescription == "true">
             <#local ajaxUrl = ajaxUrl + "&amp;searchValueFieldName=" + descriptionFieldName />
           <#else>
             <#local ajaxUrl = ajaxUrl + "&amp;searchValueFieldName=" + name />
           </#if>
+        </#if>
       </#if>
-    </#if>
-  <script type="text/javascript">
+      <script type="text/javascript">
         jQuery(document).ready(function(){
           var options = {
             requestUrl : "${fieldFormName}",
@@ -675,114 +694,158 @@ Parameter: lastViewName, String, optiona
             defaultMinLength : "${defaultMinLength!2}",
             defaultDelay : "${defaultDelay!300}",
             args :
-                 <#rt/>
-                 <#if targetParameterIter?has_content>
-                   <#assign isFirst = true>
-                   <#lt/>[<#rt/>
-                   <#list targetParameterIter as item>
-                     <#if isFirst>
+              <#rt/>
+                <#if targetParameterIter?has_content>
+                  <#assign isFirst = true>
+                  <#lt/>[<#rt/>
+                  <#list targetParameterIter as item>
+                    <#if isFirst>
                       <#lt/>document.${formName}.${item}<#rt/>
                       <#assign isFirst = false>
                     <#else>
                       <#lt/> ,document.${formName}.${item}<#rt/>
                     </#if>
-                   </#list>
-                   <#lt/>]<#rt/>
-                 <#else>[]
-                 </#if>
-                 <#lt/>
+                  </#list>
+                  <#lt/>]<#rt/>
+                <#else>[]
+                </#if>
+                <#lt/>
           };
           new Lookup(options).init();
         });
-    </script>
-</#if>
-<#if readonly?has_content && readonly>
-  <a id="${id}_clear"
-      style="background:none;margin-left:5px;margin-right:15px;"
-      class="clearField"
-      href="javascript:void(0);"
-      onclick="javascript:document.${formName}.${name}.value='';
-              jQuery('#' + jQuery('#${id}_clear').next().attr('id').replace('_button','') + '_${id}_lookupDescription').html('');
-              <#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">
-      <#if clearText?has_content>${clearText}<#else>${uiLabelMap.CommonClear}</#if>
-  </a>
-</#if>
-</span>
-<#if ajaxEnabled?has_content && ajaxEnabled && (presentation?has_content && presentation == "window")>
-      <#if ajaxUrl?index_of("_LAST_VIEW_NAME_") < 0>
-        <#local ajaxUrl = ajaxUrl + "&amp;_LAST_VIEW_NAME_=" + lastViewName />
-      </#if>
+      </script>
+    </#if>
+    <#if readonly?has_content && readonly>
+      <a id="${id}_clear"
+        style="background:none;margin-left:5px;margin-right:15px;"
+        class="clearField"
+        href="javascript:void(0);"
+        onclick="javascript:document.${formName}.${name}.value='';
+          jQuery('#' + jQuery('#${id}_clear').next().attr('id').replace('_button','') + '_${id}_lookupDescription').html('');
+          <#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">
+          <#if clearText?has_content>${clearText}<#else>${uiLabelMap.CommonClear}</#if>
+      </a>
+    </#if>
+  </span>
+  <#if ajaxEnabled?has_content && ajaxEnabled && (presentation?has_content && presentation == "window")>
+    <#if ajaxUrl?index_of("_LAST_VIEW_NAME_") < 0>
+      <#local ajaxUrl = ajaxUrl + "&amp;_LAST_VIEW_NAME_=" + lastViewName />
+    </#if>
     <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}', ${showDescription}, ${defaultMinLength!2}, ${defaultDelay!300});</script><#t/>
-</#if>
+  </#if>
 </#macro>
 
 <#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel paginateViewSizeLabel>
-<#if listSize gt viewSize>
-<div class="${paginateStyle}">&nbsp; <ul>
-<li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
-<li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li>
-<#if listSize gt 0 && javaScriptEnabled><li class="nav-page-select">${pageLabel} <select name="page" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectUrl}')<#else>location.href='${selectUrl}'+this.value;</#if>"><#rt/>
-<#assign x=listSize/viewSize?floor>
-<#if listSize gt (viewIndex*viewSize)><#assign x=x+1></#if>
-<#list 1..x as i>
-<#if i == (viewIndex+1)><option selected="selected" value="<#else><option value="</#if>${i-1}">${i}</option>
-</#list>
-</select></li></#if>
-<li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxNextUrl}')<#else>${nextUrl}</#if>">${paginateNextLabel}</a><#else>-disabled"><span>${paginateNextLabel}</span></#if></li>
-<li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxLastUrl}')<#else>${lastUrl}</#if>">${paginateLastLabel}</a><#else>-disabled"><span>${paginateLastLabel}</span></#if></li>
-<#if javaScriptEnabled><li class="nav-pagesize"><select name="pageSize" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectSizeUrl}')<#else>location.href='${selectSizeUrl}';</#if>"><#rt/>
-<#assign availPageSizes = [viewSize, 20, 30, 50, 100, 200]>
-<#list availPageSizes as ps>
-  <option<#if viewSize == ps> selected="selected" </#if> value="${ps}">${ps}</option>
-</#list>
-</select> ${paginateViewSizeLabel}</li></#if>
-<li class="nav-displaying">${commonDisplaying}</li>
-</ul></div>
-</#if>
+  <#if listSize gt viewSize>
+    <div class="${paginateStyle}">&nbsp;
+      <ul>
+        <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
+        <li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li>
+        <#if listSize gt 0 && javaScriptEnabled><li class="nav-page-select">${pageLabel} <select name="page" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectUrl}')<#else>location.href='${selectUrl}'+this.value;</#if>"><#rt/>
+          <#assign x=listSize/viewSize?floor>
+          <#if listSize gt (viewIndex*viewSize)><#assign x=x+1></#if>
+            <#list 1..x as i>
+              <#if i == (viewIndex+1)><option selected="selected" value="<#else><option value="</#if>${i-1}">${i}</option>
+            </#list>
+          </select></li>
+        </#if>
+        <li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxNextUrl}')<#else>${nextUrl}</#if>">${paginateNextLabel}</a><#else>-disabled"><span>${paginateNextLabel}</span></#if></li>
+        <li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxLastUrl}')<#else>${lastUrl}</#if>">${paginateLastLabel}</a><#else>-disabled"><span>${paginateLastLabel}</span></#if></li>
+        <#if javaScriptEnabled><li class="nav-pagesize"><select name="pageSize" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectSizeUrl}')<#else>location.href='${selectSizeUrl}';</#if>"><#rt/>
+          <#assign availPageSizes = [viewSize, 20, 30, 50, 100, 200]>
+          <#list availPageSizes as ps>
+            <option<#if viewSize == ps> selected="selected" </#if> value="${ps}">${ps}</option>
+          </#list>
+          </select> ${paginateViewSizeLabel}</li>
+        </#if>
+        <li class="nav-displaying">${commonDisplaying}</li>
+      </ul>
+    </div>
+  </#if>
 </#macro>
 
-<#macro renderFileField className alert name value size maxlength autocomplete><input type="file" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#macro>
-<#macro renderPasswordField className alert name value size maxlength id autocomplete><input type="password" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/></#macro>
+<#macro renderFileField className alert name value size maxlength autocomplete>
+  <input type="file" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
+</#macro>
+<#macro renderPasswordField className alert name value size maxlength id autocomplete>
+  <input type="password" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/>
+</#macro>
 <#macro renderImageField value description alternate style event action><img<#if value?has_content> src="${value}"</#if><#if description?has_content> title="${description}"</#if> alt="<#if alternate?has_content>${alternate}"</#if><#if style?has_content> class="${style}"</#if><#if event?has_content> ${event?html}="${action}" </#if>/></#macro>
 
 <#macro renderBanner style leftStyle rightStyle leftText text rightText>
-<table width="100%">  <tr><#rt/>
-<#if leftText?has_content><td align="left"><#if leftStyle?has_content><div class="${leftStyle}"></#if>${leftText}<#if leftStyle?has_content></div></#if></td><#rt/></#if>
-<#if text?has_content><td align="center"><#if style?has_content><div class="${style}"></#if>${text}<#if style?has_content></div></#if></td><#rt/></#if>
-<#if rightText?has_content><td align="right"><#if rightStyle?has_content><div class="${rightStyle}"></#if>${rightText}<#if rightStyle?has_content></div></#if></td><#rt/></#if>
-</tr> </table>
+  <table width="100%">
+    <tr><#rt/>
+      <#if leftText?has_content><td align="left"><#if leftStyle?has_content><div class="${leftStyle}"></#if>${leftText}<#if leftStyle?has_content></div></#if></td><#rt/></#if>
+      <#if text?has_content><td align="center"><#if style?has_content><div class="${style}"></#if>${text}<#if style?has_content></div></#if></td><#rt/></#if>
+      <#if rightText?has_content><td align="right"><#if rightStyle?has_content><div class="${rightStyle}"></#if>${rightText}<#if rightStyle?has_content></div></#if></td><#rt/></#if>
+    </tr>
+  </table>
 </#macro>
 
 <#macro renderContainerField id className><div id="${id}" class="${className}"/></#macro>
 
 <#macro renderFieldGroupOpen style id title collapsed collapsibleAreaId collapsible expandToolTip collapseToolTip>
-<#if style?has_content || id?has_content || title?has_content><div class="fieldgroup<#if style?has_content> ${style}</#if>"<#if id?has_content> id="${id}"</#if>>
-<div class="fieldgroup-title-bar">
- <#if collapsible><ul><li class="<#if collapsed>collapsed"><a onclick="javascript:toggleCollapsiblePanel(this, '${collapsibleAreaId}', '${expandToolTip}', '${collapseToolTip}');">
-   <#else>expanded"><a onclick="javascript:toggleCollapsiblePanel(this, '${collapsibleAreaId}', '${expandToolTip}', '${collapseToolTip}');"></#if>
-     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<#if title?has_content>${title}</#if></a></li></ul>
- <#else><#if title?has_content>${title}</#if></#if><#rt/>
-</div>
-<div id="${collapsibleAreaId}" class="fieldgroup-body" <#if collapsed && collapsible> style="display: none;"</#if>>
-</#if>
+  <#if style?has_content || id?has_content || title?has_content><div class="fieldgroup<#if style?has_content> ${style}</#if>"<#if id?has_content> id="${id}"</#if>>
+    <div class="fieldgroup-title-bar">
+      <#if collapsible>
+        <ul>
+          <li class="<#if collapsed>collapsed">
+                      <a onclick="javascript:toggleCollapsiblePanel(this, '${collapsibleAreaId}', '${expandToolTip}', '${collapseToolTip}');">
+                    <#else>expanded">
+                      <a onclick="javascript:toggleCollapsiblePanel(this, '${collapsibleAreaId}', '${expandToolTip}', '${collapseToolTip}');">
+                    </#if>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<#if title?has_content>${title}</#if></a>
+          </li>
+        </ul>
+      <#else>
+        <#if title?has_content>${title}</#if>
+      </#if><#rt/>
+    </div>
+    <div id="${collapsibleAreaId}" class="fieldgroup-body" <#if collapsed && collapsible> style="display: none;"</#if>>
+  </#if>
 </#macro>
 
 <#macro renderFieldGroupClose style id title><#if style?has_content || id?has_content || title?has_content></div></div></#if></#macro>
 
-<#macro renderHyperlinkTitle name title showSelectAll="N"><#if title?has_content>${title}<br /></#if><#if showSelectAll="Y"><input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${name}');"/></#if></#macro>
-<#macro renderSortField style title linkUrl ajaxEnabled><a<#if style?has_content> class="${style}"</#if> href="<#if ajaxEnabled?has_content && ajaxEnabled>javascript:ajaxUpdateAreas('${linkUrl}')<#else>${linkUrl}</#if>">${title}</a></#macro>
+<#macro renderHyperlinkTitle name title showSelectAll="N">
+  <#if title?has_content>${title}<br /></#if>
+  <#if showSelectAll="Y"><input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${name}');"/></#if>
+</#macro>
+<#macro renderSortField style title linkUrl ajaxEnabled>
+  <a<#if style?has_content> class="${style}"</#if> href="<#if ajaxEnabled?has_content && ajaxEnabled>javascript:ajaxUpdateAreas('${linkUrl}')<#else>${linkUrl}</#if>">${title}</a>
+</#macro>
 <#macro formatBoundaryComment boundaryType widgetType widgetName><!-- ${boundaryType}  ${widgetType}  ${widgetName} --></#macro>
 
-<#macro renderTooltip tooltip tooltipStyle><#if tooltip?has_content><span class="<#if tooltipStyle?has_content>${tooltipStyle}<#else>tooltip</#if>">${tooltip}</span><#rt/></#if></#macro>
+<#macro renderTooltip tooltip tooltipStyle>
+  <#if tooltip?has_content><span class="<#if tooltipStyle?has_content>${tooltipStyle}<#else>tooltip</#if>">${tooltip}</span><#rt/></#if>
+</#macro>
 
 <#macro renderClass className="" alert="">
-<#if className?has_content || (alert?has_content && alert=="true")> class="${className}<#if alert?has_content && alert=="true"> alert</#if>" </#if>
+  <#if className?has_content || (alert?has_content && alert=="true")> class="${className}<#if alert?has_content && alert=="true"> alert</#if>" </#if>
 </#macro>
 
 <#macro renderAsterisks requiredField requiredStyle>
-<#if requiredField=="true"><#if !requiredStyle?has_content>*</#if></#if>
+  <#if requiredField=="true"><#if !requiredStyle?has_content>*</#if></#if>
 </#macro>
 
-<#macro makeHiddenFormLinkForm actionUrl name parameters targetWindow><form method="post" action="${actionUrl}" <#if targetWindow?has_content>target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${name}"><#list parameters as parameter><input name="${parameter.name}" value="${parameter.value}" type="hidden"/></#list></form></#macro>
-<#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description confirmation><a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="javascript:document.${hiddenFormName}.submit()"<#if action?has_content && event?has_content> ${event}="${action}"</#if><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if>><#if imgSrc?has_content><img src="${imgSrc}" alt=""/></#if>${description}</a></#macro>
-<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc title alternate linkUrl targetWindow description confirmation><a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="${linkUrl}"<#if targetWindow?has_content> target="${targetWindow}"</#if><#if action?has_content && event?has_content> ${event}="${action}"</#if><#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if><#if imgSrc?length == 0 && title?has_content> title="${title}"</#if>><#if imgSrc?has_content><img src="${imgSrc}" alt="${alternate}" title="${title}"/></#if>${description}</a></#macro>
+<#macro makeHiddenFormLinkForm actionUrl name parameters targetWindow>
+  <form method="post" action="${actionUrl}" <#if targetWindow?has_content>target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${name}">
+    <#list parameters as parameter>
+      <input name="${parameter.name}" value="${parameter.value}" type="hidden"/>
+    </#list>
+  </form>
+</#macro>
+<#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc description confirmation>
+  <a <#if linkStyle?has_content>class="${linkStyle}"</#if> href="javascript:document.${hiddenFormName}.submit()"
+    <#if action?has_content && event?has_content> ${event}="${action}"</#if>
+    <#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if>>
+      <#if imgSrc?has_content><img src="${imgSrc}" alt=""/></#if>${description}</a>
+</#macro>
+<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc title alternate linkUrl targetWindow description confirmation>
+    <a <#if linkStyle?has_content>class="${linkStyle}"</#if>
+      href="${linkUrl}"<#if targetWindow?has_content> target="${targetWindow}"</#if>
+      <#if action?has_content && event?has_content> ${event}="${action}"</#if>
+      <#if confirmation?has_content> onclick="return confirm('${confirmation?js_string}')"</#if>
+      <#if imgSrc?length == 0 && title?has_content> title="${title}"</#if>>
+        <#if imgSrc?has_content><img src="${imgSrc}" alt="${alternate}" title="${title}"/></#if>${description}</a>
+  </#macro>