svn commit: r942474 [2/3] - in /ofbiz/branches/release09.04: applications/accounting/webapp/accounting/common/ applications/accounting/webapp/accounting/fixedasset/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/accou...

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

svn commit: r942474 [2/3] - in /ofbiz/branches/release09.04: applications/accounting/webapp/accounting/common/ applications/accounting/webapp/accounting/fixedasset/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/accou...

lektran
Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductParties.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductParties.ftl Sat May  8 22:08:40 2010
@@ -1,90 +1,90 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#if productId?exists && product?exists>
-  <table cellspacing="0" class="basic-table">
-    <tr class="header-row">
-      <td>${uiLabelMap.PartyPartyId}</td>
-      <td>${uiLabelMap.PartyRole}</td>
-      <td>${uiLabelMap.CommonFromDateTime}</td>
-      <td>${uiLabelMap.CommonThruDateTime}</td>
-      <td>&nbsp;</td>
-    </tr>
-    <#assign line = 0>
-    <#assign rowClass = "2">
-    <#list productRoles as productRole>
-      <#assign line = line + 1>
-      <#assign curRoleType = productRole.getRelatedOneCache("RoleType")>
-      <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
-        <td><a href="/partymgr/control/viewprofile?partyId=${(productRole.partyId)?if_exists}" target="_blank" class="buttontext">${(productRole.partyId)?if_exists}</a></td>
-        <td>${(curRoleType.get("description",locale))?if_exists}</td>
-        <#assign hasntStarted = false>
-        <#if (productRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
-        <td<#if hasntStarted> class="alert"</#if>>${(productRole.fromDate)?if_exists}</td>
-        <td align="center">
-          <form method="post" action="<@ofbizUrl>updatePartyToProduct</@ofbizUrl>" name="lineForm${line}">
-            <#assign hasExpired = false>
-            <#if (productRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if>
-            <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}">
-            <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}">
-            <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}">
-            <input type="hidden" name="fromDate" value="${(productRole.getTimestamp("fromDate"))?if_exists}">
-            <input type="text" size="25" name="thruDate" value="${(productRole. getTimestamp("thruDate"))?if_exists}"<#if hasExpired> class="alert"</#if>>
-            <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-            <input type="submit" value="${uiLabelMap.CommonUpdate}">
-          </form>
-        </td>
-        <td align="center">
-          <form action="<@ofbizUrl>removePartyFromProduct</@ofbizUrl>" method="post">
-             <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}">
-             <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}">
-             <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}">
-             <input type="hidden" name="fromDate" value="${productRole.getString("fromDate")}">
-             <input type="submit" value="${uiLabelMap.CommonDelete}">
-          </form>
-        </td>
-      </tr>
-      <#-- toggle the row color -->
-      <#if rowClass == "2">
-          <#assign rowClass = "1">
-      <#else>
-          <#assign rowClass = "2">
-      </#if>
-    </#list>
-  </table>
-  <br/>
-  <h2>${uiLabelMap.ProductAssociatePartyToProduct}:</h2>
-  <br/>
-  <form method="post" action="<@ofbizUrl>addPartyToProduct</@ofbizUrl>" name="addNewForm">
-    <input type="hidden" name="productId" value="${productId}">
-    <input type="text" size="20" maxlength="20" name="partyId" value="">
-    <#-- TODO: Add PartyId lookup screen
-    <a href="javascript:call_fieldlookup2(document.addNewForm.partyId,'LookupCustomerName');">
-      <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
-    </a> -->
-    <select name="roleTypeId" size="1">
-    <#list roleTypes as roleType>
-        <option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> ${uiLabelMap.ProductSelected}</#if>>${(roleType.get("description",locale))?if_exists}</option>
-    </#list>
-    </select>
-    <input type="text" size="25" name="fromDate">
-    <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
-    <input type="submit" value="${uiLabelMap.CommonAdd}">
-  </form>
-</#if>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if productId?exists && product?exists>
+  <table cellspacing="0" class="basic-table">
+    <tr class="header-row">
+      <td>${uiLabelMap.PartyPartyId}</td>
+      <td>${uiLabelMap.PartyRole}</td>
+      <td>${uiLabelMap.CommonFromDateTime}</td>
+      <td>${uiLabelMap.CommonThruDateTime}</td>
+      <td>&nbsp;</td>
+    </tr>
+    <#assign line = 0>
+    <#assign rowClass = "2">
+    <#list productRoles as productRole>
+      <#assign line = line + 1>
+      <#assign curRoleType = productRole.getRelatedOneCache("RoleType")>
+      <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+        <td><a href="/partymgr/control/viewprofile?partyId=${(productRole.partyId)?if_exists}" target="_blank" class="buttontext">${(productRole.partyId)?if_exists}</a></td>
+        <td>${(curRoleType.get("description",locale))?if_exists}</td>
+        <#assign hasntStarted = false>
+        <#if (productRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+        <td<#if hasntStarted> class="alert"</#if>>${(productRole.fromDate)?if_exists}</td>
+        <td align="center">
+          <form method="post" action="<@ofbizUrl>updatePartyToProduct</@ofbizUrl>" name="lineForm${line}">
+            <#assign hasExpired = false>
+            <#if (productRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if>
+            <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}">
+            <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}">
+            <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}">
+            <input type="hidden" name="fromDate" value="${(productRole.getTimestamp("fromDate"))?if_exists}">
+            <input type="text" size="25" name="thruDate" value="${(productRole. getTimestamp("thruDate"))?if_exists}"<#if hasExpired> class="alert"</#if>>
+            <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+            <input type="submit" value="${uiLabelMap.CommonUpdate}">
+          </form>
+        </td>
+        <td align="center">
+          <form action="<@ofbizUrl>removePartyFromProduct</@ofbizUrl>" method="post">
+             <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}">
+             <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}">
+             <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}">
+             <input type="hidden" name="fromDate" value="${productRole.getString("fromDate")}">
+             <input type="submit" value="${uiLabelMap.CommonDelete}">
+          </form>
+        </td>
+      </tr>
+      <#-- toggle the row color -->
+      <#if rowClass == "2">
+          <#assign rowClass = "1">
+      <#else>
+          <#assign rowClass = "2">
+      </#if>
+    </#list>
+  </table>
+  <br/>
+  <h2>${uiLabelMap.ProductAssociatePartyToProduct}:</h2>
+  <br/>
+  <form method="post" action="<@ofbizUrl>addPartyToProduct</@ofbizUrl>" name="addNewForm">
+    <input type="hidden" name="productId" value="${productId}">
+    <input type="text" size="20" maxlength="20" name="partyId" value="">
+    <#-- TODO: Add PartyId lookup screen
+    <a href="javascript:call_fieldlookup2(document.addNewForm.partyId,'LookupCustomerName');">
+      <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/>
+    </a> -->
+    <select name="roleTypeId" size="1">
+    <#list roleTypes as roleType>
+        <option value="${(roleType.roleTypeId)?if_exists}" <#if roleType.roleTypeId.equals("_NA_")> ${uiLabelMap.ProductSelected}</#if>>${(roleType.get("description",locale))?if_exists}</option>
+    </#list>
+    </select>
+    <input type="text" size="25" name="fromDate">
+    <a href="javascript:call_cal(document.addNewForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
+    <input type="submit" value="${uiLabelMap.CommonAdd}">
+  </form>
+</#if>

Propchange: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductParties.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductParties.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductParties.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductInventorySummary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Modified: ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl Sat May  8 22:08:40 2010
@@ -1,50 +1,50 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<#if latestGeoPoint?has_content>
-  <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content>
-    ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}<br>
-    ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude}
-    <#if latestGeoPoint.elevation?has_content>
-      <br>${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr}
-    </#if>
-    <#if latestGeoPoint.dataSourceId?has_content>
-      <#if latestGeoPoint.dataSourceId == "GEOPT_GOOGLE">
-        <div id="map" style="border:1px solid #979797; background-color:#e5e3df; width:400px; height:300px; margin:2em auto;">
-          <div style="padding:1em; color:gray;">${uiLabelMap.CommonLoading}</div>
-        </div>
-        <#assign defaultUrl = "https." + request.getServerName()>
-        <#assign defaultGogleMapKey = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", defaultUrl)>
-        <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=${defaultGogleMapKey}"
-            type="text/javascript">
-        </script>
-        <script type="text/javascript">
-          loadGoogleMap("${latestGeoPoint.latitude}",
-                        "${latestGeoPoint.longitude}",
-                        "<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${locationSeqId}</@ofbizUrl>",
-                        "${uiLabelMap.ProductFacilityLocation} ${uiLabelMap.CommonOf} ${facilityId}/${locationSeqId}")
-        </script>
-      <#elseif  latestGeoPoint.dataSourceId == "GEOPT_YAHOO">
-      <#elseif  latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT">
-      <#elseif  latestGeoPoint.dataSourceId == "GEOPT_MAPTP">
-      </#if>
-    </#if>
-  </#if>
-<#else>
-  <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2>
-</#if>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if latestGeoPoint?has_content>
+  <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content>
+    ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}<br>
+    ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude}
+    <#if latestGeoPoint.elevation?has_content>
+      <br>${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr}
+    </#if>
+    <#if latestGeoPoint.dataSourceId?has_content>
+      <#if latestGeoPoint.dataSourceId == "GEOPT_GOOGLE">
+        <div id="map" style="border:1px solid #979797; background-color:#e5e3df; width:400px; height:300px; margin:2em auto;">
+          <div style="padding:1em; color:gray;">${uiLabelMap.CommonLoading}</div>
+        </div>
+        <#assign defaultUrl = "https." + request.getServerName()>
+        <#assign defaultGogleMapKey = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", defaultUrl)>
+        <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=${defaultGogleMapKey}"
+            type="text/javascript">
+        </script>
+        <script type="text/javascript">
+          loadGoogleMap("${latestGeoPoint.latitude}",
+                        "${latestGeoPoint.longitude}",
+                        "<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${locationSeqId}</@ofbizUrl>",
+                        "${uiLabelMap.ProductFacilityLocation} ${uiLabelMap.CommonOf} ${facilityId}/${locationSeqId}")
+        </script>
+      <#elseif  latestGeoPoint.dataSourceId == "GEOPT_YAHOO">
+      <#elseif  latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT">
+      <#elseif  latestGeoPoint.dataSourceId == "GEOPT_MAPTP">
+      </#if>
+    </#if>
+  </#if>
+<#else>
+  <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2>
+</#if>

Propchange: ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl Sat May  8 22:08:40 2010
@@ -1,46 +1,46 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#--
-     The form widget of type multi can have only one submit button, and hence only one operation on the selected labels.
-     To support more than one action, we can create another submit button outside the form and use a javascript
-     function to change the target of the multi form and submit it.
-
-     In this case, the multi form has two actions:  Print as labels, which generates a PDF of selected labels, and
-     mark as accepted, which updates the selected shipment route segments.  The label printing button is handled
-     normally in the form widget.  The mark action is handled here using the technique described above.  If more
-     actions are required, we can create more submit buttons in this file with their own action-changing submit functions.
-
-     Note that the facilityId in the form action is a trick to pass the facilityId on to the next request.
-     Also note that for layout purposes, the submit button in the form widget can be converted and moved here so that all
-     the buttons can be arranged as desired.
-
--->
-
-
-<script>
-<!--
-  function markAsAccepted() {
-    document.Labels.action = "<@ofbizUrl>BatchUpdateShipmentRouteSegments?facilityId=${parameters.facilityId}</@ofbizUrl>";
-    document.Labels.submit();
-  }
-//-->
-</script>
-
-<input type="submit" class="smallSubmit" value="${uiLabelMap.ProductMarkAsAccepted}" onClick="javascript:markAsAccepted()"/>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#--
+     The form widget of type multi can have only one submit button, and hence only one operation on the selected labels.
+     To support more than one action, we can create another submit button outside the form and use a javascript
+     function to change the target of the multi form and submit it.
+
+     In this case, the multi form has two actions:  Print as labels, which generates a PDF of selected labels, and
+     mark as accepted, which updates the selected shipment route segments.  The label printing button is handled
+     normally in the form widget.  The mark action is handled here using the technique described above.  If more
+     actions are required, we can create more submit buttons in this file with their own action-changing submit functions.
+
+     Note that the facilityId in the form action is a trick to pass the facilityId on to the next request.
+     Also note that for layout purposes, the submit button in the form widget can be converted and moved here so that all
+     the buttons can be arranged as desired.
+
+-->
+
+
+<script>
+<!--
+  function markAsAccepted() {
+    document.Labels.action = "<@ofbizUrl>BatchUpdateShipmentRouteSegments?facilityId=${parameters.facilityId}</@ofbizUrl>";
+    document.Labels.submit();
+  }
+//-->
+</script>
+
+<input type="submit" class="smallSubmit" value="${uiLabelMap.ProductMarkAsAccepted}" onClick="javascript:markAsAccepted()"/>

Propchange: ofbiz/branches/release09.04/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/applications/product/webapp/facility/shipment/VerifyPick.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/framework/bi/webapp/bi/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/bi/webapp/bi/main.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/bi/webapp/bi/main.ftl (original)
+++ ofbiz/branches/release09.04/framework/bi/webapp/bi/main.ftl Sat May  8 22:08:40 2010
@@ -15,41 +15,41 @@ software distributed under the License i
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->
-<h1>${uiLabelMap.BusinessIntelligenceIntegratedFramework}</h1>
-<p>
- ${uiLabelMap.BusinessIntelligenceNote1}
- ${uiLabelMap.BusinessIntelligenceNote2}
- ${uiLabelMap.BusinessIntelligenceNote3}
- ${uiLabelMap.BusinessIntelligenceNote4}
- ${uiLabelMap.BusinessIntelligenceNote5}
- ${uiLabelMap.BusinessIntelligenceNote6}
- ${uiLabelMap.BusinessIntelligenceNote7}
- ${uiLabelMap.BusinessIntelligenceNote8}
- ${uiLabelMap.BusinessIntelligenceNote9}
- ${uiLabelMap.BusinessIntelligenceNote10}
- ${uiLabelMap.BusinessIntelligenceNote11}
- ${uiLabelMap.BusinessIntelligenceNote12}
-</p>
-<h2>${uiLabelMap.BusinessIntelligenceCurrentStatus}</h2>
-<p>
- ${uiLabelMap.BusinessIntelligenceNote13}
- ${uiLabelMap.BusinessIntelligenceNote14}
- ${uiLabelMap.BusinessIntelligenceNote15}
- ${uiLabelMap.BusinessIntelligenceNote16}
- ${uiLabelMap.BusinessIntelligenceNote17}
- ${uiLabelMap.BusinessIntelligenceNote18}
-</p>
-<h2>${uiLabelMap.BusinessIntelligenceQuickStartGuide}</h2>
-<p>
- ${uiLabelMap.BusinessIntelligenceNote19}
- ${uiLabelMap.BusinessIntelligenceNote20}
- ${uiLabelMap.BusinessIntelligenceNote21}
- ${uiLabelMap.BusinessIntelligenceNote22}
- ${uiLabelMap.BusinessIntelligenceNote23}
- ${uiLabelMap.BusinessIntelligenceNote24}
- ${uiLabelMap.BusinessIntelligenceNote25}
- ${uiLabelMap.BusinessIntelligenceNote26}
- ${uiLabelMap.BusinessIntelligenceNote27}
- ${uiLabelMap.BusinessIntelligenceNote28}
-</p>
+-->
+<h1>${uiLabelMap.BusinessIntelligenceIntegratedFramework}</h1>
+<p>
+ ${uiLabelMap.BusinessIntelligenceNote1}
+ ${uiLabelMap.BusinessIntelligenceNote2}
+ ${uiLabelMap.BusinessIntelligenceNote3}
+ ${uiLabelMap.BusinessIntelligenceNote4}
+ ${uiLabelMap.BusinessIntelligenceNote5}
+ ${uiLabelMap.BusinessIntelligenceNote6}
+ ${uiLabelMap.BusinessIntelligenceNote7}
+ ${uiLabelMap.BusinessIntelligenceNote8}
+ ${uiLabelMap.BusinessIntelligenceNote9}
+ ${uiLabelMap.BusinessIntelligenceNote10}
+ ${uiLabelMap.BusinessIntelligenceNote11}
+ ${uiLabelMap.BusinessIntelligenceNote12}
+</p>
+<h2>${uiLabelMap.BusinessIntelligenceCurrentStatus}</h2>
+<p>
+ ${uiLabelMap.BusinessIntelligenceNote13}
+ ${uiLabelMap.BusinessIntelligenceNote14}
+ ${uiLabelMap.BusinessIntelligenceNote15}
+ ${uiLabelMap.BusinessIntelligenceNote16}
+ ${uiLabelMap.BusinessIntelligenceNote17}
+ ${uiLabelMap.BusinessIntelligenceNote18}
+</p>
+<h2>${uiLabelMap.BusinessIntelligenceQuickStartGuide}</h2>
+<p>
+ ${uiLabelMap.BusinessIntelligenceNote19}
+ ${uiLabelMap.BusinessIntelligenceNote20}
+ ${uiLabelMap.BusinessIntelligenceNote21}
+ ${uiLabelMap.BusinessIntelligenceNote22}
+ ${uiLabelMap.BusinessIntelligenceNote23}
+ ${uiLabelMap.BusinessIntelligenceNote24}
+ ${uiLabelMap.BusinessIntelligenceNote25}
+ ${uiLabelMap.BusinessIntelligenceNote26}
+ ${uiLabelMap.BusinessIntelligenceNote27}
+ ${uiLabelMap.BusinessIntelligenceNote28}
+</p>

Propchange: ofbiz/branches/release09.04/framework/bi/webapp/bi/main.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/framework/bi/webapp/bi/main.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/bi/webapp/bi/main.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/geolocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/geolocation.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/geolocation.ftl (original)
+++ ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/geolocation.ftl Sat May  8 22:08:40 2010
@@ -1,48 +1,48 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<#if geoPoint?has_content>
-  <#if geoPoint.latitude?has_content && geoPoint.longitude?has_content>
-    ${uiLabelMap.CommonLatitude}${geoPoint.latitude}<br>
-    ${uiLabelMap.CommonLongitude}${geoPoint.longitude}
-    <#if geoPoint.elevation?has_content>
-      <br>${uiLabelMap.CommonElevation}${geoPoint.elevation} ${elevationUomAbbr}
-    </#if>
-    <#if geoPoint.dataSourceId?has_content>
-      <#if geoPoint.dataSourceId == "GEOPT_GOOGLE">
-        <div id="map" style="border:1px solid #979797; background-color:#e5e3df; width:400px; height:300px; margin:2em auto;">
-          <div style="padding:1em; color:gray;">${uiLabelMap.CommonLoading}</div>
-        </div>
-        <#assign defaultUrl = "https." + request.getServerName()>
-        <#assign defaultGogleMapKey = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", defaultUrl)>
-        <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=${defaultGogleMapKey}"
-            type="text/javascript">
-        </script>
-        <script type="text/javascript">
-          loadGoogleMap("${geoPoint.latitude}",
-                        "${geoPoint.longitude}")
-        </script>
-      <#elseif  geoPoint.dataSourceId == "GEOPT_YAHOO">
-      <#elseif  geoPoint.dataSourceId == "GEOPT_MICROSOFT">
-      <#elseif  geoPoint.dataSourceId == "GEOPT_MAPTP">
-      </#if>
-    </#if>
-  </#if>
-<#else>
-  <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2>
-</#if>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if geoPoint?has_content>
+  <#if geoPoint.latitude?has_content && geoPoint.longitude?has_content>
+    ${uiLabelMap.CommonLatitude}${geoPoint.latitude}<br>
+    ${uiLabelMap.CommonLongitude}${geoPoint.longitude}
+    <#if geoPoint.elevation?has_content>
+      <br>${uiLabelMap.CommonElevation}${geoPoint.elevation} ${elevationUomAbbr}
+    </#if>
+    <#if geoPoint.dataSourceId?has_content>
+      <#if geoPoint.dataSourceId == "GEOPT_GOOGLE">
+        <div id="map" style="border:1px solid #979797; background-color:#e5e3df; width:400px; height:300px; margin:2em auto;">
+          <div style="padding:1em; color:gray;">${uiLabelMap.CommonLoading}</div>
+        </div>
+        <#assign defaultUrl = "https." + request.getServerName()>
+        <#assign defaultGogleMapKey = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", defaultUrl)>
+        <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=${defaultGogleMapKey}"
+            type="text/javascript">
+        </script>
+        <script type="text/javascript">
+          loadGoogleMap("${geoPoint.latitude}",
+                        "${geoPoint.longitude}")
+        </script>
+      <#elseif  geoPoint.dataSourceId == "GEOPT_YAHOO">
+      <#elseif  geoPoint.dataSourceId == "GEOPT_MICROSOFT">
+      <#elseif  geoPoint.dataSourceId == "GEOPT_MAPTP">
+      </#if>
+    </#if>
+  </#if>
+<#else>
+  <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2>
+</#if>

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/geolocation.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/geolocation.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/geolocation.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/commonMacros.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/commonMacros.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/includes/helplink.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/branches/release09.04/framework/common/webcommon/includes/helplink.ftl Sat May  8 22:08:40 2010
@@ -1,40 +1,40 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
-  <#assign helpTopic = webSiteId + "_" + requestAttributes._CURRENT_VIEW_ />
-  <#assign helpUrlTopic = helpUrlsMap["HelpNotFound"]/>
-  <#assign helpUrlPrefix = "" />
-  <#assign helpUrlSuffix = "" />
-
-<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files
-${helpTopic}
--->
-
-  <#if helpUrlsMap["Prefix"] != "Prefix">
-    <#assign helpUrlPrefix = helpUrlsMap["Prefix"] />
-  </#if>
-  <#if helpUrlsMap["Suffix"] != "Suffix">
-    <#assign helpUrlSuffix = helpUrlsMap["Suffix"] />
-  </#if>
-  <#if helpUrlsMap[helpTopic] != helpTopic >
-    <#assign helpUrlTopic = helpUrlsMap[helpTopic] />
-  </#if>
-  <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li>
-</#if>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
+  <#assign helpTopic = webSiteId + "_" + requestAttributes._CURRENT_VIEW_ />
+  <#assign helpUrlTopic = helpUrlsMap["HelpNotFound"]/>
+  <#assign helpUrlPrefix = "" />
+  <#assign helpUrlSuffix = "" />
+
+<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files
+${helpTopic}
+-->
+
+  <#if helpUrlsMap["Prefix"] != "Prefix">
+    <#assign helpUrlPrefix = helpUrlsMap["Prefix"] />
+  </#if>
+  <#if helpUrlsMap["Suffix"] != "Suffix">
+    <#assign helpUrlSuffix = helpUrlsMap["Suffix"] />
+  </#if>
+  <#if helpUrlsMap[helpTopic] != helpTopic >
+    <#assign helpUrlTopic = helpUrlsMap[helpTopic] />
+  </#if>
+  <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li>
+</#if>

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/helplink.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/helplink.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/helplink.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/listVisualThemes.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/listVisualThemes.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/lookupFooter.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/includes/lookupFooter.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/framework/common/webcommon/viewBlocked.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/viewBlocked.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/webcommon/viewBlocked.ftl (original)
+++ ofbiz/branches/release09.04/framework/common/webcommon/viewBlocked.ftl Sat May  8 22:08:40 2010
@@ -1,32 +1,32 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<center>
-  <div class="screenlet login-screenlet">
-    <div class="screenlet-title-bar">
-      <h3>${uiLabelMap.CommonViewBlocked}</h3>
-    </div>
-    <div class="screenlet-body">
-        ${errorMessage?if_exists}
-        <br/>
-    </div>
-  </div>
-</center>
-
-
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<center>
+  <div class="screenlet login-screenlet">
+    <div class="screenlet-title-bar">
+      <h3>${uiLabelMap.CommonViewBlocked}</h3>
+    </div>
+    <div class="screenlet-body">
+        ${errorMessage?if_exists}
+        <br/>
+    </div>
+  </div>
+</center>
+
+

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/viewBlocked.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/viewBlocked.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/common/webcommon/viewBlocked.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/framework/example/webapp/example/reports/fonts.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/example/webapp/example/reports/fonts.fo.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/example/webapp/example/reports/fonts.fo.ftl (original)
+++ ofbiz/branches/release09.04/framework/example/webapp/example/reports/fonts.fo.ftl Sat May  8 22:08:40 2010
@@ -1,55 +1,55 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <fo:layout-master-set>
-      <fo:simple-page-master master-name="portrait"
-                page-width="210mm"   page-height="297mm"
-                margin-top="0mm"  margin-bottom="0mm"
-                margin-left="15mm" margin-right="9mm">
-            <fo:region-body margin-top="19mm" margin-bottom="15mm"/>
-      </fo:simple-page-master>
-   </fo:layout-master-set>
-
-   <fo:page-sequence master-reference="portrait" initial-page-number="1">
-     <fo:flow flow-name="xsl-region-body">
- <fo:block text-align="center">Font samples</fo:block>
- <fo:block></fo:block>
-        <fo:block color="red">Helvetica</fo:block>
-        <fo:block font-family="Helvetica" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block font-family="Helvetica" font-style="normal" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block font-family="Helvetica" font-style="italic" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block font-family="Helvetica" font-style="italic" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block color="red">Times</fo:block>
-        <fo:block font-family="Times" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block font-family="Times" font-style="normal" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block font-family="Times" font-style="italic" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block font-family="Times" font-style="italic" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block color="red">Courier</fo:block>
-        <fo:block font-family="Courier" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block font-family="Courier" font-style="normal" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block font-family="Courier" font-style="italic" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block font-family="Courier" font-style="italic" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block color="red">Symbol</fo:block>
-        <fo:block font-family="Symbol" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-        <fo:block color="red">Zapf Dingbats</fo:block>
-        <fo:block font-family="ZapfDingbats" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
-     </fo:flow>
-  </fo:page-sequence>
-</fo:root>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+    <fo:layout-master-set>
+      <fo:simple-page-master master-name="portrait"
+                page-width="210mm"   page-height="297mm"
+                margin-top="0mm"  margin-bottom="0mm"
+                margin-left="15mm" margin-right="9mm">
+            <fo:region-body margin-top="19mm" margin-bottom="15mm"/>
+      </fo:simple-page-master>
+   </fo:layout-master-set>
+
+   <fo:page-sequence master-reference="portrait" initial-page-number="1">
+     <fo:flow flow-name="xsl-region-body">
+ <fo:block text-align="center">Font samples</fo:block>
+ <fo:block></fo:block>
+        <fo:block color="red">Helvetica</fo:block>
+        <fo:block font-family="Helvetica" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block font-family="Helvetica" font-style="normal" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block font-family="Helvetica" font-style="italic" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block font-family="Helvetica" font-style="italic" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block color="red">Times</fo:block>
+        <fo:block font-family="Times" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block font-family="Times" font-style="normal" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block font-family="Times" font-style="italic" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block font-family="Times" font-style="italic" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block color="red">Courier</fo:block>
+        <fo:block font-family="Courier" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block font-family="Courier" font-style="normal" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block font-family="Courier" font-style="italic" font-weight="bold">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block font-family="Courier" font-style="italic" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block color="red">Symbol</fo:block>
+        <fo:block font-family="Symbol" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+        <fo:block color="red">Zapf Dingbats</fo:block>
+        <fo:block font-family="ZapfDingbats" font-style="normal" font-weight="normal">the quick brown fox jumps over the lazy dog 1234657890</fo:block>
+     </fo:flow>
+  </fo:page-sequence>
+</fo:root>

Propchange: ofbiz/branches/release09.04/framework/example/webapp/example/reports/fonts.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/framework/example/webapp/example/reports/fonts.fo.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/example/webapp/example/reports/fonts.fo.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/framework/webtools/webapp/webtools/component/viewComponents.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/webtools/webapp/webtools/service/serviceResult.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/framework/widget/templates/foFormMacroLibrary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/framework/widget/templates/textScreenMacroLibrary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl Sat May  8 22:08:40 2010
@@ -1,33 +1,33 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<div id="browse-blogs" class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxhead">${uiLabelMap.ProductBrowseBlogs}</div>
-    </div>
-    <div class="screenlet-body">
-      <div class="browsecategorylist">
-        <#list blogs as blog>
-            <div class="browsecategorytext">
-                <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
-            </div>
-        </#list>
-      </div>
-    </div>
-</div>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div id="browse-blogs" class="screenlet">
+    <div class="screenlet-header">
+        <div class="boxhead">${uiLabelMap.ProductBrowseBlogs}</div>
+    </div>
+    <div class="screenlet-body">
+      <div class="browsecategorylist">
+        <#list blogs as blog>
+            <div class="browsecategorytext">
+                <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
+            </div>
+        </#list>
+      </div>
+    </div>
+</div>

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Sat May  8 22:08:40 2010
@@ -1,88 +1,88 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<html>
-<head>
-    <title>Automation Groups - Main</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <script language="javascript" src="<@ofbizContentUrl>/images/prototypejs/prototype.js</@ofbizContentUrl>" type="text/javascript"></script>
-    <script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script>
-    <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script>
-    <script language="javascript" src="<@ofbizContentUrl>/images/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script>
-    <link rel='stylesheet' href='<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>' type='text/css'>
-    <link rel='stylesheet' href='<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>' type='text/css'>
-    <link rel='stylesheet' href='<@ofbizContentUrl>/ecommerce/images/blog.css</@ofbizContentUrl>' type='text/css'>
-    <#if layoutSettings.styleSheets?has_content>
-        <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
-        <#list layoutSettings.styleSheets as styleSheet>
-            <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
-        </#list>
-    <#else>
-        <link rel="stylesheet" href="<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>" type="text/css"/>
-        <link rel="stylesheet" href="<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>" type="text/css"/>
-    </#if>
-</head>
-<body>
-<table border="0" width="100%" cellspacing="0" cellpadding="0" class="headerboxoutside">
-  <tr>
-    <td width="100%">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0" class="headerboxtop">
-        <tr>
-          <#if layoutSettings.headerImageUrl?exists>
-          <td width="1%"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.headerImageUrl}</@ofbizContentUrl>"/></td>
-          </#if>
-          <td align="right" width="1%" nowrap="nowrap" <#if layoutSettings.headerRightBackgroundUrl?has_content>background="${layoutSettings.headerRightBackgroundUrl}"</#if>>
-            <div class="insideHeaderText">
-                <#if userLogin?has_content>
-                  Logged in as&nbsp;<a href="#" class="linktext">${userLogin.userLoginId}</a>&nbsp;|&nbsp;<a href="<@ofbizUrl>/logoff</@ofbizUrl>" class="linktext">Logout</a>&nbsp;|&nbsp;<a href="#" class="linktext">Help Center</a>
-                <#else>
-                  Sign up <a href="#" class="linktext">Now!</a>&nbsp;|&nbsp;<a href="#" class="linktext">Help Center</a>
-                </#if>
-            </div>
-            <div style="padding-top: 10px;" class="insideHeaderText">
-                <form action="#">
-                    <input type="text" class="inputBox" name="search" size="20">
-                    <input type="submit" class="smallSubmit" value="Search">
-                </form>
-            </div>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-            ${sections.render("header")}
-    <div class="centerarea">
-    <!--
-        <div class="toparea">
-            ${sections.render("top")}
-        </div>
-        -->
-        <div class="contentarea">
-            <!-- by default will render left-bar only if leftbarScreen value not empty -->
-            ${sections.render("leftbar")}
-            <div class="columncenter">
-              ${sections.render("messages")}
-              ${sections.render("body")}
-            </div>
-            ${sections.render("rightbar")}
-        </div>
-    </div>
-</body>
-</html>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<html>
+<head>
+    <title>Automation Groups - Main</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <script language="javascript" src="<@ofbizContentUrl>/images/prototypejs/prototype.js</@ofbizContentUrl>" type="text/javascript"></script>
+    <script language="javascript" src="<@ofbizContentUrl>/images/fieldlookup.js</@ofbizContentUrl>" type="text/javascript"></script>
+    <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script>
+    <script language="javascript" src="<@ofbizContentUrl>/images/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script>
+    <link rel='stylesheet' href='<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>' type='text/css'>
+    <link rel='stylesheet' href='<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>' type='text/css'>
+    <link rel='stylesheet' href='<@ofbizContentUrl>/ecommerce/images/blog.css</@ofbizContentUrl>' type='text/css'>
+    <#if layoutSettings.styleSheets?has_content>
+        <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
+        <#list layoutSettings.styleSheets as styleSheet>
+            <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
+        </#list>
+    <#else>
+        <link rel="stylesheet" href="<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>" type="text/css"/>
+        <link rel="stylesheet" href="<@ofbizContentUrl>/images/tabstyles.css</@ofbizContentUrl>" type="text/css"/>
+    </#if>
+</head>
+<body>
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="headerboxoutside">
+  <tr>
+    <td width="100%">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0" class="headerboxtop">
+        <tr>
+          <#if layoutSettings.headerImageUrl?exists>
+          <td width="1%"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.headerImageUrl}</@ofbizContentUrl>"/></td>
+          </#if>
+          <td align="right" width="1%" nowrap="nowrap" <#if layoutSettings.headerRightBackgroundUrl?has_content>background="${layoutSettings.headerRightBackgroundUrl}"</#if>>
+            <div class="insideHeaderText">
+                <#if userLogin?has_content>
+                  Logged in as&nbsp;<a href="#" class="linktext">${userLogin.userLoginId}</a>&nbsp;|&nbsp;<a href="<@ofbizUrl>/logoff</@ofbizUrl>" class="linktext">Logout</a>&nbsp;|&nbsp;<a href="#" class="linktext">Help Center</a>
+                <#else>
+                  Sign up <a href="#" class="linktext">Now!</a>&nbsp;|&nbsp;<a href="#" class="linktext">Help Center</a>
+                </#if>
+            </div>
+            <div style="padding-top: 10px;" class="insideHeaderText">
+                <form action="#">
+                    <input type="text" class="inputBox" name="search" size="20">
+                    <input type="submit" class="smallSubmit" value="Search">
+                </form>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+            ${sections.render("header")}
+    <div class="centerarea">
+    <!--
+        <div class="toparea">
+            ${sections.render("top")}
+        </div>
+        -->
+        <div class="contentarea">
+            <!-- by default will render left-bar only if leftbarScreen value not empty -->
+            ${sections.render("leftbar")}
+            <div class="columncenter">
+              ${sections.render("messages")}
+              ${sections.render("body")}
+            </div>
+            ${sections.render("rightbar")}
+        </div>
+    </div>
+</body>
+</html>

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl Sat May  8 22:08:40 2010
@@ -1,27 +1,27 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<div id="menubar" style="background-color: #ccc;">
-    <a href="<@ofbizUrl>/main</@ofbizUrl>" class="headerlink">${uiLabelMap.CommonHome}</a>
-    <a href="#" class="headerlink">${uiLabelMap.CommonNew}</a>
-    <a href="#" class="headerlink">Recommended</a>
-    <a href="#" class="headerlink">Highest Rated</a>
-    <a href="#" class="headerlink">Upload Pitch</a>
-    <a href="/webtools/control/main" class="headerlink">${uiLabelMap.WebTools}</a>
-</div>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div id="menubar" style="background-color: #ccc;">
+    <a href="<@ofbizUrl>/main</@ofbizUrl>" class="headerlink">${uiLabelMap.CommonHome}</a>
+    <a href="#" class="headerlink">${uiLabelMap.CommonNew}</a>
+    <a href="#" class="headerlink">Recommended</a>
+    <a href="#" class="headerlink">Highest Rated</a>
+    <a href="#" class="headerlink">Upload Pitch</a>
+    <a href="/webtools/control/main" class="headerlink">${uiLabelMap.WebTools}</a>
+</div>

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=942474&r1=942473&r2=942474&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Sat May  8 22:08:40 2010
@@ -1,72 +1,72 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#-- A simple macro that builds the contact list -->
-<#macro contactList publicEmailContactLists>
-    <select name="contactListId" class="selectBox" style="width:134px">
-        <#list publicEmailContactLists as publicEmailContactList>
-            <#assign publicContactMechType = publicEmailContactList.getRelatedOneCache("ContactMechType")?if_exists>
-            <option value="${publicEmailContactList.contactListId}">${publicEmailContactList.contactListName?if_exists}</option>
-        </#list>
-    </select>
-</#macro>
-
-<div id="miniSignUpForContactList" class="screenlet">
-    <div class="screenlet-header">
-        <div class="boxhead">${uiLabelMap.EcommerceSignUpForContactList}</div>
-    </div>
-    <div class="screenlet-body" style="text-align: center;">
-        <#if sessionAttributes.autoName?has_content>
-            <#-- The visitor potentially has an account and party id -->
-            <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
-                <#-- They are logged in so lets present the form to sign up with their email address -->
-                <form method="post" action="<@ofbizUrl>createContactListParty</@ofbizUrl>" name="signUpForContactListForm">
-                    <input type="hidden" name="partyId" value="${partyId}"/>
-                    <input type="hidden" name="statusId" value="CLPT_PENDING"/>
-                    <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p>
-                    <@contactList publicEmailContactLists=publicEmailContactLists/>
-
-                    <select name="preferredContactMechId" class="selectBox" style="width:134px">
-                        <#list partyAndContactMechList as partyAndContactMech>
-                            <option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode?if_exists}-${partyAndContactMech.tnAreaCode?if_exists}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2?if_exists}, ${partyAndContactMech.paCity?if_exists}, ${partyAndContactMech.paStateProvinceGeoId?if_exists}, ${partyAndContactMech.paPostalCode?if_exists}, ${partyAndContactMech.paPostalCodeExt?if_exists} ${partyAndContactMech.paCountryGeoId?if_exists}</#if></option>
-                        </#list>
-                    </select>
-
-                    <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>
-                </form>
-            <#else>
-                <#-- Not logged in so ask them to log in and then sign up or clear the user association -->
-                <p>${uiLabelMap.EcommerceSignUpForContactListLogIn}</p>
-                <p><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonLogin}</a> ${sessionAttributes.autoName}</p>
-                <p>(${uiLabelMap.CommonNotYou}?&nbsp;<a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</p>
-            </#if>
-        <#else>
-            <#-- There is no party info so just offer an anonymous (non-partyId) related newsletter sign up -->
-            <form method="post" action="<@ofbizUrl>signUpForContactList</@ofbizUrl>" name="signUpForContactListForm">
-                <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p>
-                <@contactList publicEmailContactLists=publicEmailContactLists/>
-                <input size="20" maxlength="255" name="email" class="inputBox" value="" type="text">
-                <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>
-            </form>
-        </#if>
-    </div>
-</div>
-
-
-
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#-- A simple macro that builds the contact list -->
+<#macro contactList publicEmailContactLists>
+    <select name="contactListId" class="selectBox" style="width:134px">
+        <#list publicEmailContactLists as publicEmailContactList>
+            <#assign publicContactMechType = publicEmailContactList.getRelatedOneCache("ContactMechType")?if_exists>
+            <option value="${publicEmailContactList.contactListId}">${publicEmailContactList.contactListName?if_exists}</option>
+        </#list>
+    </select>
+</#macro>
+
+<div id="miniSignUpForContactList" class="screenlet">
+    <div class="screenlet-header">
+        <div class="boxhead">${uiLabelMap.EcommerceSignUpForContactList}</div>
+    </div>
+    <div class="screenlet-body" style="text-align: center;">
+        <#if sessionAttributes.autoName?has_content>
+            <#-- The visitor potentially has an account and party id -->
+            <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
+                <#-- They are logged in so lets present the form to sign up with their email address -->
+                <form method="post" action="<@ofbizUrl>createContactListParty</@ofbizUrl>" name="signUpForContactListForm">
+                    <input type="hidden" name="partyId" value="${partyId}"/>
+                    <input type="hidden" name="statusId" value="CLPT_PENDING"/>
+                    <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p>
+                    <@contactList publicEmailContactLists=publicEmailContactLists/>
+
+                    <select name="preferredContactMechId" class="selectBox" style="width:134px">
+                        <#list partyAndContactMechList as partyAndContactMech>
+                            <option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode?if_exists}-${partyAndContactMech.tnAreaCode?if_exists}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2?if_exists}, ${partyAndContactMech.paCity?if_exists}, ${partyAndContactMech.paStateProvinceGeoId?if_exists}, ${partyAndContactMech.paPostalCode?if_exists}, ${partyAndContactMech.paPostalCodeExt?if_exists} ${partyAndContactMech.paCountryGeoId?if_exists}</#if></option>
+                        </#list>
+                    </select>
+
+                    <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>
+                </form>
+            <#else>
+                <#-- Not logged in so ask them to log in and then sign up or clear the user association -->
+                <p>${uiLabelMap.EcommerceSignUpForContactListLogIn}</p>
+                <p><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonLogin}</a> ${sessionAttributes.autoName}</p>
+                <p>(${uiLabelMap.CommonNotYou}?&nbsp;<a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</p>
+            </#if>
+        <#else>
+            <#-- There is no party info so just offer an anonymous (non-partyId) related newsletter sign up -->
+            <form method="post" action="<@ofbizUrl>signUpForContactList</@ofbizUrl>" name="signUpForContactListForm">
+                <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p>
+                <@contactList publicEmailContactLists=publicEmailContactLists/>
+                <input size="20" maxlength="255" name="email" class="inputBox" value="" type="text">
+                <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>
+            </form>
+        </#if>
+    </div>
+</div>
+
+
+

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 22:08:40 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"