svn commit: r942386 [2/4] - in /ofbiz/trunk: applications/accounting/webapp/accounting/common/ applications/accounting/webapp/accounting/finaccounttrans/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/accounting/ledge...

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

svn commit: r942386 [2/4] - in /ofbiz/trunk: applications/accounting/webapp/accounting/common/ applications/accounting/webapp/accounting/finaccounttrans/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/accounting/ledge...

lektran
Modified: ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl Sat May  8 13:51:19 2010
@@ -1,95 +1,95 @@
-<#--
-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 geoChart?has_content>
-    <#if geoChart.dataSourceId?has_content>
-      <#if geoChart.dataSourceId == "GEOPT_GOOGLE">
-        <div id="<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>" style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}; height:${geoChart.height}; 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"><!--
-          if (GBrowserIsCompatible()) {
-            var map = new GMap2(document.getElementById("<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>"));
-            <#if geoChart.center?has_content>
-              map.setCenter(new GLatLng(${geoChart.center.lat?c}, ${geoChart.center.lon?c}), ${geoChart.center.zoom});
-            <#else>
-              <#if geoChart.points?has_content>
-                var latlng = [
-                <#list geoChart.points as point>
-                  new GLatLng(${point.lat?c}, ${point.lon?c})<#if point_has_next>,</#if>
-                </#list>
-                ];
-                var latlngbounds = new GLatLngBounds();
-                for (var i = 0; i < latlng.length; i++) {
-                  latlngbounds.extend(latlng[i]);
-                }
-                map.setCenter(latlngbounds.getCenter(), map.getBoundsZoomLevel(latlngbounds) - 1);//reduce bounds zoom level to see all markers
-              <#else>
-                //map.setCenter(new GLatLng(37.4419, -122.1419), 12);
-                map.setCenter(new GLatLng(0, 0), 1);
-              </#if>
-            </#if>
-            <#if geoChart.controlUI?has_content && geoChart.controlUI == "small">
-              map.addControl(new GSmallMapControl());
-            <#else>
-              map.setUIToDefault();
-            </#if>
-            <#if geoChart.points?has_content>
-                <#list geoChart.points as point>
-                  var marker_${point_index} = new GMarker(new GLatLng(${point.lat?c}, ${point.lon?c}));
-                  map.addOverlay(marker_${point_index});
-                  //map.addOverlay(new GMarker(new GLatLng(${point.lat?c}, ${point.lon?c})));
-                  <#if point.link?has_content>
-                      GEvent.addListener(marker_${point_index}, "click", function() {
-                          marker_${point_index}.openInfoWindowHtml("<div style=\"width:210px; padding-right:10px;\"><a href=${point.link.url}>${point.link.label}</a></div>");
-                      });
-                  </#if>
-                </#list>
-            </#if>
-          }
-       --></script>
-      <#elseif  geoChart.dataSourceId == "GEOPT_YAHOO">
-      <#elseif  geoChart.dataSourceId == "GEOPT_MICROSOFT">
-      <#elseif  geoChart.dataSourceId == "GEOPT_MAPTP">
-      <#elseif  geoChart.dataSourceId == "GEOPT_ADDRESS_GOOGLE">
-        <div id="<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>" style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}px; height:${geoChart.height}px; 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"><!--
-          if (GBrowserIsCompatible()) {
-            var geocoder = new GClientGeocoder();
-            var map = new GMap2(document.getElementById("<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>"));
-            geocoder.getLatLng("${pointAddress}", function(point) {
-              if (!point) { alert("Address not found");}
-              map.setUIToDefault();
-              map.setCenter(point, 13);
-              map.addOverlay(new GMarker(point));
-            });
-          }
-        --></script>
-      </#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 geoChart?has_content>
+    <#if geoChart.dataSourceId?has_content>
+      <#if geoChart.dataSourceId == "GEOPT_GOOGLE">
+        <div id="<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>" style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}; height:${geoChart.height}; 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"><!--
+          if (GBrowserIsCompatible()) {
+            var map = new GMap2(document.getElementById("<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>"));
+            <#if geoChart.center?has_content>
+              map.setCenter(new GLatLng(${geoChart.center.lat?c}, ${geoChart.center.lon?c}), ${geoChart.center.zoom});
+            <#else>
+              <#if geoChart.points?has_content>
+                var latlng = [
+                <#list geoChart.points as point>
+                  new GLatLng(${point.lat?c}, ${point.lon?c})<#if point_has_next>,</#if>
+                </#list>
+                ];
+                var latlngbounds = new GLatLngBounds();
+                for (var i = 0; i < latlng.length; i++) {
+                  latlngbounds.extend(latlng[i]);
+                }
+                map.setCenter(latlngbounds.getCenter(), map.getBoundsZoomLevel(latlngbounds) - 1);//reduce bounds zoom level to see all markers
+              <#else>
+                //map.setCenter(new GLatLng(37.4419, -122.1419), 12);
+                map.setCenter(new GLatLng(0, 0), 1);
+              </#if>
+            </#if>
+            <#if geoChart.controlUI?has_content && geoChart.controlUI == "small">
+              map.addControl(new GSmallMapControl());
+            <#else>
+              map.setUIToDefault();
+            </#if>
+            <#if geoChart.points?has_content>
+                <#list geoChart.points as point>
+                  var marker_${point_index} = new GMarker(new GLatLng(${point.lat?c}, ${point.lon?c}));
+                  map.addOverlay(marker_${point_index});
+                  //map.addOverlay(new GMarker(new GLatLng(${point.lat?c}, ${point.lon?c})));
+                  <#if point.link?has_content>
+                      GEvent.addListener(marker_${point_index}, "click", function() {
+                          marker_${point_index}.openInfoWindowHtml("<div style=\"width:210px; padding-right:10px;\"><a href=${point.link.url}>${point.link.label}</a></div>");
+                      });
+                  </#if>
+                </#list>
+            </#if>
+          }
+       --></script>
+      <#elseif  geoChart.dataSourceId == "GEOPT_YAHOO">
+      <#elseif  geoChart.dataSourceId == "GEOPT_MICROSOFT">
+      <#elseif  geoChart.dataSourceId == "GEOPT_MAPTP">
+      <#elseif  geoChart.dataSourceId == "GEOPT_ADDRESS_GOOGLE">
+        <div id="<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>" style="border:1px solid #979797; background-color:#e5e3df; width:${geoChart.width}px; height:${geoChart.height}px; 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"><!--
+          if (GBrowserIsCompatible()) {
+            var geocoder = new GClientGeocoder();
+            var map = new GMap2(document.getElementById("<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas</#if>"));
+            geocoder.getLatLng("${pointAddress}", function(point) {
+              if (!point) { alert("Address not found");}
+              map.setUIToDefault();
+              map.setCenter(point, 13);
+              map.addOverlay(new GMarker(point));
+            });
+          }
+        --></script>
+      </#if>
+    </#if>
+<#else>
+  <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2>
+</#if>

Propchange: ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Sat May  8 13:51:19 2010
@@ -1,26 +1,26 @@
-<#--
-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.
--->
-
-  <#assign helpTopic = webSiteId + "_" + requestAttributes._CURRENT_VIEW_ />
-
-<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files
-${helpTopic}
--->
-  <#assign pageAvail = delegator.findByAnd("ContentAssoc", {"mapKey" : helpTopic})/>
-
+<#--
+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.
+-->
+
+  <#assign helpTopic = webSiteId + "_" + requestAttributes._CURRENT_VIEW_ />
+
+<#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files
+${helpTopic}
+-->
+  <#assign pageAvail = delegator.findByAnd("ContentAssoc", {"mapKey" : helpTopic})/>
+

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

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

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

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

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

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

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

Modified: ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl Sat May  8 13:51:19 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/trunk/framework/common/webcommon/viewBlocked.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Modified: ofbiz/trunk/framework/example/webapp/birt/birt/report.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/birt/birt/report.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/birt/birt/report.ftl (original)
+++ ofbiz/trunk/framework/example/webapp/birt/birt/report.ftl Sat May  8 13:51:19 2010
@@ -1,30 +1,30 @@
-<#--
-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.
--->
-
-<#assign birt = JspTaglibs["/WEB-INF/birt.tld"]/>
-
-<@birt.report id="birtReport"
-    reportDesign="component://example/webapp/birt/report/product.rptdesign"
-    baseURL="/birt"
-    height="700"
-    width="900"
-    format="html"
-    isHostPage="false"
-    pageNum="2">
+<#--
+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.
+-->
+
+<#assign birt = JspTaglibs["/WEB-INF/birt.tld"]/>
+
+<@birt.report id="birtReport"
+    reportDesign="component://example/webapp/birt/report/product.rptdesign"
+    baseURL="/birt"
+    height="700"
+    width="900"
+    format="html"
+    isHostPage="false"
+    pageNum="2">
 </@birt.report>
\ No newline at end of file

Propchange: ofbiz/trunk/framework/example/webapp/birt/birt/report.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/example/webapp/birt/birt/report.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/framework/example/webapp/birt/birt/report.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/framework/example/webapp/example/reports/fonts.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/reports/fonts.fo.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/reports/fonts.fo.ftl (original)
+++ ofbiz/trunk/framework/example/webapp/example/reports/fonts.fo.ftl Sat May  8 13:51:19 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/trunk/framework/example/webapp/example/reports/fonts.fo.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

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

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

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

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

Propchange: ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/framework/widget/templates/csvScreenMacroLibrary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Modified: ofbiz/trunk/framework/widget/templates/htmlTreeMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlTreeMacroLibrary.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlTreeMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlTreeMacroLibrary.ftl Sat May  8 13:51:19 2010
@@ -1,64 +1,64 @@
-<#--
-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.
--->
-
-<#macro renderNodeBegin style>
-<#if style?has_content><ul class="${style}"></#if>
-<li><#rt/>
-</#macro>
-
-<#macro renderLastElement style>
-<ul<#if style?has_content> class="${style}"</#if>>
-<#rt/>
-</#macro>
-  
-<#macro renderNodeEnd processChildren isRootNode>
-<#if processChildren?has_content && processChildren>
-</ul><#lt/>
-</#if>
-</li><#rt/>
-<#if isRootNode?has_content && isRootNode>
-</ul><#lt/>
-</#if>
-</#macro>
-
-<#macro renderLabel id style labelText>
-<span<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>><#rt/>
-<#if id?has_content>{labelText}</#if><#rt/>
-</span>    
-</#macro>
-
-<#macro formatBoundaryComment boundaryType widgetType widgetName>
-<!-- ${boundaryType}  ${widgetType}  ${widgetName} -->
-</#macro>
-
-<#macro renderLink id style name title targetWindow linkUrl linkText imgStr>
-<a<#if id?has_content> id="${id}"</#if><#rt/>
-<#if style?has_content> class="${style}"</#if><#rt/>
-<#if name?has_content> name="${name}"</#if><#rt/>
-<#if title?has_content> title="${title}"</#if><#rt/>
-<#if targetWindow?has_content> target="${targetWindow}</#if> href="${linkUrl}"><#rt/>
-<#if imgStr?has_content>${imgStr}<#elseif linkText?has_content/>${linkText}<#else/>&nbsp;</#if></a><#rt/>
-</#macro>
-
-<#macro renderImage src id style wid hgt border alt urlString>
-<#if src?has_content>
-<img <#if id?has_content>id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if wid?has_content> width="${wid}"</#if><#if hgt?has_content> height="${hgt}"</#if><#if border?has_content> border="${border}"</#if><#if alt?has_content> alt="${alt}"</#if> src="${urlString}" /><#rt/>
-</#if>
-</#macro>
+<#--
+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.
+-->
+
+<#macro renderNodeBegin style>
+<#if style?has_content><ul class="${style}"></#if>
+<li><#rt/>
+</#macro>
+
+<#macro renderLastElement style>
+<ul<#if style?has_content> class="${style}"</#if>>
+<#rt/>
+</#macro>
+  
+<#macro renderNodeEnd processChildren isRootNode>
+<#if processChildren?has_content && processChildren>
+</ul><#lt/>
+</#if>
+</li><#rt/>
+<#if isRootNode?has_content && isRootNode>
+</ul><#lt/>
+</#if>
+</#macro>
+
+<#macro renderLabel id style labelText>
+<span<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>><#rt/>
+<#if id?has_content>{labelText}</#if><#rt/>
+</span>    
+</#macro>
+
+<#macro formatBoundaryComment boundaryType widgetType widgetName>
+<!-- ${boundaryType}  ${widgetType}  ${widgetName} -->
+</#macro>
+
+<#macro renderLink id style name title targetWindow linkUrl linkText imgStr>
+<a<#if id?has_content> id="${id}"</#if><#rt/>
+<#if style?has_content> class="${style}"</#if><#rt/>
+<#if name?has_content> name="${name}"</#if><#rt/>
+<#if title?has_content> title="${title}"</#if><#rt/>
+<#if targetWindow?has_content> target="${targetWindow}</#if> href="${linkUrl}"><#rt/>
+<#if imgStr?has_content>${imgStr}<#elseif linkText?has_content/>${linkText}<#else/>&nbsp;</#if></a><#rt/>
+</#macro>
+
+<#macro renderImage src id style wid hgt border alt urlString>
+<#if src?has_content>
+<img <#if id?has_content>id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if wid?has_content> width="${wid}"</#if><#if hgt?has_content> height="${hgt}"</#if><#if border?has_content> border="${border}"</#if><#if alt?has_content> alt="${alt}"</#if> src="${urlString}" /><#rt/>
+</#if>
+</#macro>
 
\ No newline at end of file

Propchange: ofbiz/trunk/framework/widget/templates/htmlTreeMacroLibrary.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/widget/templates/htmlTreeMacroLibrary.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/framework/widget/templates/htmlTreeMacroLibrary.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/feedback/LeaveFeedback.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/feedback/LeaveFeedback.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/feedback/LeaveFeedback.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactUsEmail.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

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

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

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

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Sat May  8 13:51:19 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.
--->
-
-<#assign initialLocale = locale.toString()>
-<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/calendarDateSelect/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script>
-    <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!initialLocale}.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.
+-->
+
+<#assign initialLocale = locale.toString()>
+<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/calendarDateSelect/calendar_date_select.js</@ofbizContentUrl>" type="text/javascript"></script>
+    <script language="javascript" src="<@ofbizContentUrl>/images/calendarDateSelect/locale/${parameters.userLogin.lastLocale!initialLocale}.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/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

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

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

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

Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/AnonContactus.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

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

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

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

Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May  8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"

Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl Sat May  8 13:51:19 2010
@@ -1,68 +1,68 @@
-<#--
-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 requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
-<#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
-<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
-<#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-
-<#if !errorMessage?has_content>
-  <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
-</#if>
-<#if !errorMessageList?has_content>
-  <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
-</#if>
-<#if !eventMessage?has_content>
-  <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
-</#if>
-<#if !eventMessageList?has_content>
-  <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
-</#if>
-
-<#-- display the error messages -->
-<#if (errorMessage?has_content || errorMessageList?has_content)>
-  <div class="errorMessage">Errors Occurred:</div><br />
-  <ul>
-    <#if errorMessage?has_content>
-      <li class="errorMessage">${errorMessage}</li>
-    </#if>
-    <#if errorMessageList?has_content>
-      <#list errorMessageList as errorMsg>
-        <li class="errorMessage">${errorMsg}</li>
-      </#list>
-    </#if>
-  </ul>
-  <br />
-</#if>
-
-<#-- display the event messages -->
-<#if (eventMessage?has_content || eventMessageList?has_content)>
-  <div class="eventMessage">Events:</div><br />
-  <ul>
-    <#if eventMessage?has_content>
-      <li class="eventMessage">${eventMessage}</li>
-    </#if>
-    <#if eventMessageList?has_content>
-      <#list eventMessageList as eventMsg>
-        <li class="eventMessage">${eventMsg}</li>
-      </#list>
-    </#if>
-  </ul>
-  <br />
-</#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 requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if>
+<#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if>
+<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if>
+<#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+
+<#if !errorMessage?has_content>
+  <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists>
+</#if>
+<#if !errorMessageList?has_content>
+  <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists>
+</#if>
+<#if !eventMessage?has_content>
+  <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists>
+</#if>
+<#if !eventMessageList?has_content>
+  <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists>
+</#if>
+
+<#-- display the error messages -->
+<#if (errorMessage?has_content || errorMessageList?has_content)>
+  <div class="errorMessage">Errors Occurred:</div><br />
+  <ul>
+    <#if errorMessage?has_content>
+      <li class="errorMessage">${errorMessage}</li>
+    </#if>
+    <#if errorMessageList?has_content>
+      <#list errorMessageList as errorMsg>
+        <li class="errorMessage">${errorMsg}</li>
+      </#list>
+    </#if>
+  </ul>
+  <br />
+</#if>
+
+<#-- display the event messages -->
+<#if (eventMessage?has_content || eventMessageList?has_content)>
+  <div class="eventMessage">Events:</div><br />
+  <ul>
+    <#if eventMessage?has_content>
+      <li class="eventMessage">${eventMessage}</li>
+    </#if>
+    <#if eventMessageList?has_content>
+      <#list eventMessageList as eventMsg>
+        <li class="eventMessage">${eventMsg}</li>
+      </#list>
+    </#if>
+  </ul>
+  <br />
+</#if>

Propchange: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl Sat May  8 13:51:19 2010
@@ -1,64 +1,64 @@
-<#--
-    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.
--->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>${title}</title>
-    <#-- this needs to be fully qualified to appear in email; the server must also be available -->
-    <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
-  </head>
-
-  <body>
-    <h1>${title}</h1>
-    <#-- custom logo or text can be inserted here -->
-    <br />
-    <div class="screenlet-title-bar">
-      <div class="h3">${uiLabelMap.OagisInventoryDescription}<b></b></div>
-    </div>
-    <div class="screenlet-body">
-      <table class="basic-table" cellspacing="0">
-        <tr valign="bottom" class="header-row">
-          <td width="10%"><b>${uiLabelMap.ProductProduct}</b></td>
-          <td width="10%" align="center"><b>${uiLabelMap.OagisInventoryLevelDateTime}</b></td>
-          <td width="10%" align="right"><b>${uiLabelMap.OrderReturnItemInventoryStatus}</b></td>
-          <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Inventory)</b></td>
-          <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Message)</b></td>
-          <td width="10%" align="right"><b>${uiLabelMap.OagisQuantityDiff}.</b></td>
-        </tr>
-        <tr><td colspan="10"><hr /></td></tr>
-        <#assign alt_row = false>
-        <#list inventoryMapList as inventoryMap>
-          <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-            <td valign="top"> ${inventoryMap.productId?if_exists}</td>
-            <td align="right" valign="top"> ${inventoryMap.timestamp?if_exists?if_exists}</td>
-            <td align="right" valign="top"> ${inventoryMap.statusId?if_exists?if_exists}</td>
-            <td align="center" valign="top"> ${inventoryMap.quantityOnHandTotal?if_exists?if_exists}</td>
-            <td align="center" valign="top"> ${inventoryMap.quantityFromMessage?if_exists?if_exists}</td>
-            <td align="right" valign="top"> ${inventoryMap.quantityDiff?if_exists?if_exists}</td>
-          </tr>
-          <#-- toggle the row color -->
-          <#assign alt_row = !alt_row>
-        </#list>
-        <tr><td colspan="10"><hr /></td></tr>
-      </table>
-    </div>
-  </body>
+<#--
+    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.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>${title}</title>
+    <#-- this needs to be fully qualified to appear in email; the server must also be available -->
+    <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
+  </head>
+
+  <body>
+    <h1>${title}</h1>
+    <#-- custom logo or text can be inserted here -->
+    <br />
+    <div class="screenlet-title-bar">
+      <div class="h3">${uiLabelMap.OagisInventoryDescription}<b></b></div>
+    </div>
+    <div class="screenlet-body">
+      <table class="basic-table" cellspacing="0">
+        <tr valign="bottom" class="header-row">
+          <td width="10%"><b>${uiLabelMap.ProductProduct}</b></td>
+          <td width="10%" align="center"><b>${uiLabelMap.OagisInventoryLevelDateTime}</b></td>
+          <td width="10%" align="right"><b>${uiLabelMap.OrderReturnItemInventoryStatus}</b></td>
+          <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Inventory)</b></td>
+          <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Message)</b></td>
+          <td width="10%" align="right"><b>${uiLabelMap.OagisQuantityDiff}.</b></td>
+        </tr>
+        <tr><td colspan="10"><hr /></td></tr>
+        <#assign alt_row = false>
+        <#list inventoryMapList as inventoryMap>
+          <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+            <td valign="top"> ${inventoryMap.productId?if_exists}</td>
+            <td align="right" valign="top"> ${inventoryMap.timestamp?if_exists?if_exists}</td>
+            <td align="right" valign="top"> ${inventoryMap.statusId?if_exists?if_exists}</td>
+            <td align="center" valign="top"> ${inventoryMap.quantityOnHandTotal?if_exists?if_exists}</td>
+            <td align="center" valign="top"> ${inventoryMap.quantityFromMessage?if_exists?if_exists}</td>
+            <td align="right" valign="top"> ${inventoryMap.quantityDiff?if_exists?if_exists}</td>
+          </tr>
+          <#-- toggle the row color -->
+          <#assign alt_row = !alt_row>
+        </#list>
+        <tr><td colspan="10"><hr /></td></tr>
+      </table>
+    </div>
+  </body>
 </html>
\ No newline at end of file

Propchange: ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl Sat May  8 13:51:19 2010
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<#--
-    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.
--->
-<#--  xsi:schemaLocation="http://www.openapplications.org/002_confirm_bod_004 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/OAG%20721/002_confirm_bod_004.xsd" -->
-<n:CONFIRM_BOD_004 xmlns:n="http://www.openapplications.org/002_confirm_bod_004"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:os="http://www.openapplications.org/oagis_segments"
-        xmlns:of="http://www.openapplications.org/oagis_fields">
-  <os:CNTROLAREA>
-    <os:BSR>
-      <of:VERB>CONFIRM</of:VERB>
-      <of:NOUN>BOD</of:NOUN>
-      <of:REVISION>004</of:REVISION>
-    </os:BSR>
-    <os:SENDER>
-      <of:LOGICALID>${logicalId}</of:LOGICALID>
-      <of:COMPONENT>EXCEPTION</of:COMPONENT>
-      <of:TASK>RECEIPT</of:TASK>
-      <of:REFERENCEID>${referenceId}</of:REFERENCEID>
-      <of:CONFIRMATION>1</of:CONFIRMATION>
-      <of:LANGUAGE>ENG</of:LANGUAGE>
-      <of:CODEPAGE>NONE</of:CODEPAGE>
-      <of:AUTHID>${authId?if_exists}</of:AUTHID>
-    </os:SENDER>
-    <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO>
-  </os:CNTROLAREA>
-  <n:DATAAREA>
-    <n:CONFIRM_BOD>
-      <n:CONFIRM>
-        <os:CNTROLAREA>
-          <os:SENDER>
-            <of:LOGICALID>${errorLogicalId?if_exists}</of:LOGICALID>
-            <of:COMPONENT>${errorComponent?if_exists}</of:COMPONENT>
-            <of:TASK>${errorTask?if_exists}</of:TASK>
-            <of:REFERENCEID>${errorReferenceId?if_exists}</of:REFERENCEID>
-          </os:SENDER>
-          <os:DATETIMEISO></os:DATETIMEISO>
-        </os:CNTROLAREA>
-        <of:ORIGREF>${origRef?if_exists}</of:ORIGREF>
-        <#if errorMapList?exists>
-          <#list errorMapList as errorMap>
-            <n:CONFIRMMSG>
-              <of:DESCRIPTN>${errorMap.description?if_exists?xml}</of:DESCRIPTN>
-              <of:REASONCODE>${errorMap.reasonCode?if_exists?xml}</of:REASONCODE>
-            </n:CONFIRMMSG>
-          </#list>
-        </#if>
-      </n:CONFIRM>
-    </n:CONFIRM_BOD>
-  </n:DATAAREA>
-</n:CONFIRM_BOD_004>
+<?xml version="1.0" encoding="UTF-8"?>
+<#--
+    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.
+-->
+<#--  xsi:schemaLocation="http://www.openapplications.org/002_confirm_bod_004 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/OAG%20721/002_confirm_bod_004.xsd" -->
+<n:CONFIRM_BOD_004 xmlns:n="http://www.openapplications.org/002_confirm_bod_004"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:os="http://www.openapplications.org/oagis_segments"
+        xmlns:of="http://www.openapplications.org/oagis_fields">
+  <os:CNTROLAREA>
+    <os:BSR>
+      <of:VERB>CONFIRM</of:VERB>
+      <of:NOUN>BOD</of:NOUN>
+      <of:REVISION>004</of:REVISION>
+    </os:BSR>
+    <os:SENDER>
+      <of:LOGICALID>${logicalId}</of:LOGICALID>
+      <of:COMPONENT>EXCEPTION</of:COMPONENT>
+      <of:TASK>RECEIPT</of:TASK>
+      <of:REFERENCEID>${referenceId}</of:REFERENCEID>
+      <of:CONFIRMATION>1</of:CONFIRMATION>
+      <of:LANGUAGE>ENG</of:LANGUAGE>
+      <of:CODEPAGE>NONE</of:CODEPAGE>
+      <of:AUTHID>${authId?if_exists}</of:AUTHID>
+    </os:SENDER>
+    <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO>
+  </os:CNTROLAREA>
+  <n:DATAAREA>
+    <n:CONFIRM_BOD>
+      <n:CONFIRM>
+        <os:CNTROLAREA>
+          <os:SENDER>
+            <of:LOGICALID>${errorLogicalId?if_exists}</of:LOGICALID>
+            <of:COMPONENT>${errorComponent?if_exists}</of:COMPONENT>
+            <of:TASK>${errorTask?if_exists}</of:TASK>
+            <of:REFERENCEID>${errorReferenceId?if_exists}</of:REFERENCEID>
+          </os:SENDER>
+          <os:DATETIMEISO></os:DATETIMEISO>
+        </os:CNTROLAREA>
+        <of:ORIGREF>${origRef?if_exists}</of:ORIGREF>
+        <#if errorMapList?exists>
+          <#list errorMapList as errorMap>
+            <n:CONFIRMMSG>
+              <of:DESCRIPTN>${errorMap.description?if_exists?xml}</of:DESCRIPTN>
+              <of:REASONCODE>${errorMap.reasonCode?if_exists?xml}</of:REASONCODE>
+            </n:CONFIRMMSG>
+          </#list>
+        </#if>
+      </n:CONFIRM>
+    </n:CONFIRM_BOD>
+  </n:DATAAREA>
+</n:CONFIRM_BOD_004>

Propchange: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain