You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2010/05/08 15:51:22 UTC

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

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Sat May  8 13:51:19 2010
@@ -1,166 +1,166 @@
-<?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/161B_PROCESS_SHIPMENT_001 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/REL%201%20-%20VER%202/161B_process_shipment_005.xsd" -->
-<#-- NOTE: not all of these are used -->
-<#assign partnerNameSize = 35/>
-<#assign partnerAddressLineSize = 35/>
-<#assign partnerAddressCitySize = 15/>
-<#assign partnerAddressStateSize = 2/>
-<#assign partnerAddressPostalSize = 9/>
-<#assign partnerAddressCountrySize = 2/>
-<#assign partnerContactNameSize = 35/>
-<#assign partnerContactPhoneSize = 21/>
-<#assign partnerContactFaxSize = 10/>
-<#assign partnerContactEmailSize = 65/>
-<#assign shipmentNotesSize = 65/>
-<n:PROCESS_SHIPMENT_001
-    xmlns:n="http://www.openapplications.org/161B_PROCESS_SHIPMENT_001"
-    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>PROCESS</of:VERB>
-      <of:NOUN>SHIPMENT</of:NOUN>
-      <of:REVISION>001</of:REVISION>
-    </os:BSR>
-    <os:SENDER>
-      <of:LOGICALID>${logicalId}</of:LOGICALID>
-      <of:COMPONENT>INVENTORY</of:COMPONENT>
-      <of:TASK>SHIPREQUEST</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:PROCESS_SHIPMENT>
-      <n:SHIPMENT>
-        <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
-        <#if shipperId?has_content>
-          <of:SHIPPERID>${shipperId}</of:SHIPPERID><#-- fill in from PartyCarrierAccount.accountNumber; make sure filter by from/thru date and PartyCarrierAccount.carrierPartyId==orderItemShipGroup.carrierPartyId; get most recent fromDate -->
-          <#-- this we will also only send if there is a SHIPPERID, normally fulfillment partner will select based on TRANSMETHD, address, weight, etc -->
-          <of:CARRIER>${orderItemShipGroup.carrierPartyId?if_exists}</of:CARRIER>
-        </#if>
-        <#if shipperId?has_content>
-          <of:FRGHTTERMS>COLLECT</of:FRGHTTERMS>
-        <#else>
-          <of:FRGHTTERMS>PREPAID</of:FRGHTTERMS>
-        </#if>
-        <of:NOTES>${orderItemShipGroup.shippingInstructions?if_exists?xml}</of:NOTES>
-        <of:SHIPNOTES>${shipnotes?if_exists?xml}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank -->
-        <of:TRANSMETHD>${orderItemShipGroup.shipmentMethodTypeId?if_exists}</of:TRANSMETHD>
-        <os:PARTNER>
-          <#if address?has_content>
-            <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if>
-            <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if>
-            <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if>
-
-            <#-- NOTE: this is the to name -->
-            <#assign toName = (address.toName)?default(partyName)?if_exists/>
-            <#if (toName?length > partnerNameSize)><#assign toName = (toName?substring(0,partnerNameSize))?if_exists/></#if>
-            <of:NAME>${toName?if_exists?xml}</of:NAME>
-            <of:PARTNRTYPE>SHIPTO</of:PARTNRTYPE>
-            <of:CURRENCY>USD</of:CURRENCY>
-            <os:ADDRESS>
-              <#assign address1 = address.address1?if_exists/>
-              <#if (address1?length > partnerAddressLineSize)><#assign address1 = (address1?substring(0,partnerAddressLineSize))?if_exists/></#if>
-              <of:ADDRLINE>${address1?if_exists?xml}</of:ADDRLINE>
-              <#if address.address2?exists>
-                <#assign address2 = address.address2?if_exists/>
-                <#if (address2?length > partnerAddressLineSize)><#assign address2 = (address2?substring(0,partnerAddressLineSize))?if_exists/></#if>
-                <of:ADDRLINE>${address2?xml}</of:ADDRLINE>
-              </#if>
-              <#assign city = address.city?if_exists/>
-              <#if (city?length > partnerAddressCitySize)><#assign city = (city?substring(0,partnerAddressCitySize))?if_exists/></#if>
-              <of:CITY>${city?if_exists?xml}</of:CITY>
-              <#assign countryGeoId = address.countryGeoId?if_exists/>
-              <#if (countryGeoId?length > partnerAddressCountrySize)><#assign countryGeoId = (countryGeoId?substring(0,partnerAddressCountrySize))?if_exists/></#if>
-              <of:COUNTRY>${countryGeoId?if_exists}</of:COUNTRY>
-              <#--<of:DESCRIPTN></of:DESCRIPTN>
-              <of:FAX></of:FAX>-->
-              <of:POSTALCODE>${address.postalCode?if_exists?xml}</of:POSTALCODE>
-              <of:STATEPROVN>${address.stateProvinceGeoId?if_exists}</of:STATEPROVN>
-              <#if telecomNumber?has_content>
-              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
-              </#if>
-            </os:ADDRESS>
-            <os:CONTACT>
-              <#-- NOTE: this is the attention name -->
-              <#assign attnName = (address.attnName)?default(partyName)?if_exists/>
-              <#if (attnName?length > partnerContactNameSize)><#assign attnName = (attnName?substring(0,partnerContactNameSize))?if_exists/></#if>
-              <of:NAME>${attnName?if_exists?xml}</of:NAME>
-              <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
-              <#--<of:FAX></of:FAX>-->
-              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
-            </os:CONTACT>
-          </#if>
-        </os:PARTNER>
-        <#list shipmentItems as shipmentItem>
-        <#assign product = shipmentItem.getRelatedOne("Product")>
-        <#assign productType = product.getRelatedOne("ProductType")>
-        <#if productType.isPhysical == "Y" || productType.isPhysical == "y">
-        <n:SHIPITEM>
-            <os:QUANTITY>
-              <of:VALUE>${shipmentItem.quantity?if_exists}</of:VALUE>
-              <of:NUMOFDEC>0</of:NUMOFDEC>
-              <of:SIGN>+</of:SIGN>
-              <of:UOM>EACH</of:UOM>
-            </os:QUANTITY>
-            <of:ITEM>${shipmentItem.productId?if_exists}</of:ITEM>
-            <of:DISPOSITN>FIFO</of:DISPOSITN><#-- TODO: figure out if this is a reviewer order, if so set this to LIFO -->
-            <n:DOCUMNTREF>
-              <of:DOCTYPE>SHIPMENT</of:DOCTYPE>
-              <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
-              <of:LINENUM>${shipmentItem.shipmentItemSeqId?if_exists}</of:LINENUM>
-            </n:DOCUMNTREF>
-        </n:SHIPITEM>
-        </#if>
-        </#list>
-        <#list externalIdSet?if_exists as externalId>
-        <n:DOCUMNTREF>
-          <of:DOCTYPE>PARTNER_SO</of:DOCTYPE>
-          <of:DOCUMENTID>${externalId?if_exists?xml}</of:DOCUMENTID>
-        </n:DOCUMNTREF>
-        </#list>
-        <#list correspondingPoIdSet?if_exists as correspondingPoId>
-        <n:DOCUMNTREF>
-          <of:DOCTYPE>CUST_PO</of:DOCTYPE>
-          <of:DOCUMENTID>${correspondingPoId?if_exists?xml}</of:DOCUMENTID>
-        </n:DOCUMNTREF>
-        </#list>
-        <#-- data preparation code to create the replacementReturnId; this is the returnId if the order is a return replacement order -->
-        <#if replacementReturnId?exists>
-        <n:DOCUMNTREF>
-          <of:DOCTYPE>RMA</of:DOCTYPE>
-          <of:DOCUMENTID>${replacementReturnId}</of:DOCUMENTID>
-        </n:DOCUMNTREF>
-        </#if>
-        <n:DOCUMNTREF>
-          <of:DOCTYPE>SO</of:DOCTYPE>
-          <of:DOCUMENTID>${orderId}</of:DOCUMENTID>
-        </n:DOCUMNTREF>
-      </n:SHIPMENT>
-    </n:PROCESS_SHIPMENT>
-  </n:DATAAREA>
-</n:PROCESS_SHIPMENT_001>
+<?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/161B_PROCESS_SHIPMENT_001 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/REL%201%20-%20VER%202/161B_process_shipment_005.xsd" -->
+<#-- NOTE: not all of these are used -->
+<#assign partnerNameSize = 35/>
+<#assign partnerAddressLineSize = 35/>
+<#assign partnerAddressCitySize = 15/>
+<#assign partnerAddressStateSize = 2/>
+<#assign partnerAddressPostalSize = 9/>
+<#assign partnerAddressCountrySize = 2/>
+<#assign partnerContactNameSize = 35/>
+<#assign partnerContactPhoneSize = 21/>
+<#assign partnerContactFaxSize = 10/>
+<#assign partnerContactEmailSize = 65/>
+<#assign shipmentNotesSize = 65/>
+<n:PROCESS_SHIPMENT_001
+    xmlns:n="http://www.openapplications.org/161B_PROCESS_SHIPMENT_001"
+    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>PROCESS</of:VERB>
+      <of:NOUN>SHIPMENT</of:NOUN>
+      <of:REVISION>001</of:REVISION>
+    </os:BSR>
+    <os:SENDER>
+      <of:LOGICALID>${logicalId}</of:LOGICALID>
+      <of:COMPONENT>INVENTORY</of:COMPONENT>
+      <of:TASK>SHIPREQUEST</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:PROCESS_SHIPMENT>
+      <n:SHIPMENT>
+        <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
+        <#if shipperId?has_content>
+          <of:SHIPPERID>${shipperId}</of:SHIPPERID><#-- fill in from PartyCarrierAccount.accountNumber; make sure filter by from/thru date and PartyCarrierAccount.carrierPartyId==orderItemShipGroup.carrierPartyId; get most recent fromDate -->
+          <#-- this we will also only send if there is a SHIPPERID, normally fulfillment partner will select based on TRANSMETHD, address, weight, etc -->
+          <of:CARRIER>${orderItemShipGroup.carrierPartyId?if_exists}</of:CARRIER>
+        </#if>
+        <#if shipperId?has_content>
+          <of:FRGHTTERMS>COLLECT</of:FRGHTTERMS>
+        <#else>
+          <of:FRGHTTERMS>PREPAID</of:FRGHTTERMS>
+        </#if>
+        <of:NOTES>${orderItemShipGroup.shippingInstructions?if_exists?xml}</of:NOTES>
+        <of:SHIPNOTES>${shipnotes?if_exists?xml}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank -->
+        <of:TRANSMETHD>${orderItemShipGroup.shipmentMethodTypeId?if_exists}</of:TRANSMETHD>
+        <os:PARTNER>
+          <#if address?has_content>
+            <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if>
+            <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if>
+            <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if>
+
+            <#-- NOTE: this is the to name -->
+            <#assign toName = (address.toName)?default(partyName)?if_exists/>
+            <#if (toName?length > partnerNameSize)><#assign toName = (toName?substring(0,partnerNameSize))?if_exists/></#if>
+            <of:NAME>${toName?if_exists?xml}</of:NAME>
+            <of:PARTNRTYPE>SHIPTO</of:PARTNRTYPE>
+            <of:CURRENCY>USD</of:CURRENCY>
+            <os:ADDRESS>
+              <#assign address1 = address.address1?if_exists/>
+              <#if (address1?length > partnerAddressLineSize)><#assign address1 = (address1?substring(0,partnerAddressLineSize))?if_exists/></#if>
+              <of:ADDRLINE>${address1?if_exists?xml}</of:ADDRLINE>
+              <#if address.address2?exists>
+                <#assign address2 = address.address2?if_exists/>
+                <#if (address2?length > partnerAddressLineSize)><#assign address2 = (address2?substring(0,partnerAddressLineSize))?if_exists/></#if>
+                <of:ADDRLINE>${address2?xml}</of:ADDRLINE>
+              </#if>
+              <#assign city = address.city?if_exists/>
+              <#if (city?length > partnerAddressCitySize)><#assign city = (city?substring(0,partnerAddressCitySize))?if_exists/></#if>
+              <of:CITY>${city?if_exists?xml}</of:CITY>
+              <#assign countryGeoId = address.countryGeoId?if_exists/>
+              <#if (countryGeoId?length > partnerAddressCountrySize)><#assign countryGeoId = (countryGeoId?substring(0,partnerAddressCountrySize))?if_exists/></#if>
+              <of:COUNTRY>${countryGeoId?if_exists}</of:COUNTRY>
+              <#--<of:DESCRIPTN></of:DESCRIPTN>
+              <of:FAX></of:FAX>-->
+              <of:POSTALCODE>${address.postalCode?if_exists?xml}</of:POSTALCODE>
+              <of:STATEPROVN>${address.stateProvinceGeoId?if_exists}</of:STATEPROVN>
+              <#if telecomNumber?has_content>
+              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
+              </#if>
+            </os:ADDRESS>
+            <os:CONTACT>
+              <#-- NOTE: this is the attention name -->
+              <#assign attnName = (address.attnName)?default(partyName)?if_exists/>
+              <#if (attnName?length > partnerContactNameSize)><#assign attnName = (attnName?substring(0,partnerContactNameSize))?if_exists/></#if>
+              <of:NAME>${attnName?if_exists?xml}</of:NAME>
+              <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
+              <#--<of:FAX></of:FAX>-->
+              <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
+            </os:CONTACT>
+          </#if>
+        </os:PARTNER>
+        <#list shipmentItems as shipmentItem>
+        <#assign product = shipmentItem.getRelatedOne("Product")>
+        <#assign productType = product.getRelatedOne("ProductType")>
+        <#if productType.isPhysical == "Y" || productType.isPhysical == "y">
+        <n:SHIPITEM>
+            <os:QUANTITY>
+              <of:VALUE>${shipmentItem.quantity?if_exists}</of:VALUE>
+              <of:NUMOFDEC>0</of:NUMOFDEC>
+              <of:SIGN>+</of:SIGN>
+              <of:UOM>EACH</of:UOM>
+            </os:QUANTITY>
+            <of:ITEM>${shipmentItem.productId?if_exists}</of:ITEM>
+            <of:DISPOSITN>FIFO</of:DISPOSITN><#-- TODO: figure out if this is a reviewer order, if so set this to LIFO -->
+            <n:DOCUMNTREF>
+              <of:DOCTYPE>SHIPMENT</of:DOCTYPE>
+              <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID>
+              <of:LINENUM>${shipmentItem.shipmentItemSeqId?if_exists}</of:LINENUM>
+            </n:DOCUMNTREF>
+        </n:SHIPITEM>
+        </#if>
+        </#list>
+        <#list externalIdSet?if_exists as externalId>
+        <n:DOCUMNTREF>
+          <of:DOCTYPE>PARTNER_SO</of:DOCTYPE>
+          <of:DOCUMENTID>${externalId?if_exists?xml}</of:DOCUMENTID>
+        </n:DOCUMNTREF>
+        </#list>
+        <#list correspondingPoIdSet?if_exists as correspondingPoId>
+        <n:DOCUMNTREF>
+          <of:DOCTYPE>CUST_PO</of:DOCTYPE>
+          <of:DOCUMENTID>${correspondingPoId?if_exists?xml}</of:DOCUMENTID>
+        </n:DOCUMNTREF>
+        </#list>
+        <#-- data preparation code to create the replacementReturnId; this is the returnId if the order is a return replacement order -->
+        <#if replacementReturnId?exists>
+        <n:DOCUMNTREF>
+          <of:DOCTYPE>RMA</of:DOCTYPE>
+          <of:DOCUMENTID>${replacementReturnId}</of:DOCUMENTID>
+        </n:DOCUMNTREF>
+        </#if>
+        <n:DOCUMNTREF>
+          <of:DOCTYPE>SO</of:DOCTYPE>
+          <of:DOCUMENTID>${orderId}</of:DOCUMENTID>
+        </n:DOCUMNTREF>
+      </n:SHIPMENT>
+    </n:PROCESS_SHIPMENT>
+  </n:DATAAREA>
+</n:PROCESS_SHIPMENT_001>

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

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

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

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Sat May  8 13:51:19 2010
@@ -1,115 +1,115 @@
-<?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/197_receive_delivery_001 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/OAG%20721/197_receive_delivery_001.xsd" -->
-<n:RECEIVE_DELIVERY_001
-    xmlns:n="http://www.openapplications.org/197_receive_delivery_001"
-    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>RECEIVE</of:VERB>
-            <of:NOUN>DELIVERY</of:NOUN>
-            <of:REVISION>001</of:REVISION>
-        </os:BSR>
-        <os:SENDER>
-            <of:LOGICALID>${logicalId}</of:LOGICALID>
-            <of:COMPONENT>INVENTORY</of:COMPONENT>
-            <of:TASK>RMA</of:TASK>
-            <of:REFERENCEID>${referenceId?if_exists}</of:REFERENCEID>
-            <of:CONFIRMATION>1</of:CONFIRMATION>
-            <of:LANGUAGE>ENG</of:LANGUAGE>
-            <of:CODEPAGE>NONE</of:CODEPAGE>
-            <of:AUTHID>${authId}</of:AUTHID>
-        </os:SENDER>
-        <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO>
-    </os:CNTROLAREA>
-    <n:DATAAREA>
-        <n:RECEIVE_DELIVERY>
-            <n:RECEIPTHDR>
-                <os:DATETIMEISO>${entryDate?if_exists}</os:DATETIMEISO>
-                <of:RECEIPTID>${returnId?if_exists}</of:RECEIPTID>
-                <of:CARRIER></of:CARRIER>
-                <of:NOTES></of:NOTES>
-                <of:RECEIPTYPE>RMA</of:RECEIPTYPE>
-                <os:PARTNER>
-                <#if postalAddress?has_content>
-                    <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if>
-                    <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if>
-                    <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if>
-                    <of:NAME>${postalAddress.toName?default(partyName)?if_exists?xml}</of:NAME>
-                    <of:PARTNRTYPE>SHIPFROM</of:PARTNRTYPE>
-                    <of:CURRENCY>USD</of:CURRENCY>
-                    <os:ADDRESS>
-                        <of:ADDRLINE>${postalAddress.address1?if_exists?xml}</of:ADDRLINE>
-                        <#if postalAddress.address2?has_content>
-                        <of:ADDRLINE>${postalAddress.address2?if_exists?xml}</of:ADDRLINE>
-                        </#if>
-                        <of:CITY>${postalAddress.city?if_exists?xml}</of:CITY>
-                        <of:COUNTRY>${postalAddress.countryGeoId?if_exists}</of:COUNTRY>
-                        <#-- <of:FAX></of:FAX> -->
-                        <of:POSTALCODE>${postalAddress.postalCode?if_exists?xml}</of:POSTALCODE>
-                        <of:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</of:STATEPROVN>
-                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
-                    </os:ADDRESS>
-                    <os:CONTACT>
-                        <of:NAME>${postalAddress.attnName?default(partyName)?if_exists?xml}</of:NAME>
-                        <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
-                        <#-- <of:FAX></of:FAX> -->
-                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
-                    </os:CONTACT>
-                </#if>
-                </os:PARTNER>
-            </n:RECEIPTHDR>
-            <n:RECEIPTUNT>
-                <os:QUANTITY>
-                    <of:VALUE>${totalQty?if_exists}</of:VALUE>
-                    <of:NUMOFDEC>0</of:NUMOFDEC>
-                    <of:SIGN>+</of:SIGN>
-                    <of:UOM>EACH</of:UOM>
-                </os:QUANTITY>
-                <#list returnItems as returnItem>
-                    <#assign returnReason = returnItem.getRelatedOne("ReturnReason")/>
-                    <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)?if_exists/>
-                <n:RECEIPTITM>
-                    <os:QUANTITY>
-                        <of:VALUE>${returnItem.returnQuantity?if_exists}</of:VALUE>
-                        <of:NUMOFDEC>0</of:NUMOFDEC>
-                        <of:SIGN>+</of:SIGN>
-                        <of:UOM>EACH</of:UOM>
-                    </os:QUANTITY>
-                    <of:ITEM>${returnItem.productId?if_exists}</of:ITEM>
-                    <of:NOTES>${returnReason.description?if_exists?xml}</of:NOTES>
-                    <os:DOCUMNTREF>
-                        <of:DOCTYPE>RMA</of:DOCTYPE>
-                        <of:DOCUMENTID>${returnItem.returnId}</of:DOCUMENTID>
-                        <of:LINENUM>${returnItem.returnItemSeqId}</of:LINENUM>
-                    </os:DOCUMNTREF>
-                    <#list serialNumberList?if_exists as serialNumber>
-                    <n:INVDETAIL>
-                        <of:SERIALNUM>${serialNumber?xml}</of:SERIALNUM>
-                    </n:INVDETAIL>
-                    </#list>
-                </n:RECEIPTITM>
-                </#list>
-            </n:RECEIPTUNT>
-        </n:RECEIVE_DELIVERY>
-    </n:DATAAREA>
-</n:RECEIVE_DELIVERY_001>
+<?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/197_receive_delivery_001 file:///C:/Documents%20and%20Settings/022523/My%20Documents/Vudu/XML%20Specs/OAG%20721/197_receive_delivery_001.xsd" -->
+<n:RECEIVE_DELIVERY_001
+    xmlns:n="http://www.openapplications.org/197_receive_delivery_001"
+    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>RECEIVE</of:VERB>
+            <of:NOUN>DELIVERY</of:NOUN>
+            <of:REVISION>001</of:REVISION>
+        </os:BSR>
+        <os:SENDER>
+            <of:LOGICALID>${logicalId}</of:LOGICALID>
+            <of:COMPONENT>INVENTORY</of:COMPONENT>
+            <of:TASK>RMA</of:TASK>
+            <of:REFERENCEID>${referenceId?if_exists}</of:REFERENCEID>
+            <of:CONFIRMATION>1</of:CONFIRMATION>
+            <of:LANGUAGE>ENG</of:LANGUAGE>
+            <of:CODEPAGE>NONE</of:CODEPAGE>
+            <of:AUTHID>${authId}</of:AUTHID>
+        </os:SENDER>
+        <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO>
+    </os:CNTROLAREA>
+    <n:DATAAREA>
+        <n:RECEIVE_DELIVERY>
+            <n:RECEIPTHDR>
+                <os:DATETIMEISO>${entryDate?if_exists}</os:DATETIMEISO>
+                <of:RECEIPTID>${returnId?if_exists}</of:RECEIPTID>
+                <of:CARRIER></of:CARRIER>
+                <of:NOTES></of:NOTES>
+                <of:RECEIPTYPE>RMA</of:RECEIPTYPE>
+                <os:PARTNER>
+                <#if postalAddress?has_content>
+                    <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if>
+                    <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if>
+                    <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if>
+                    <of:NAME>${postalAddress.toName?default(partyName)?if_exists?xml}</of:NAME>
+                    <of:PARTNRTYPE>SHIPFROM</of:PARTNRTYPE>
+                    <of:CURRENCY>USD</of:CURRENCY>
+                    <os:ADDRESS>
+                        <of:ADDRLINE>${postalAddress.address1?if_exists?xml}</of:ADDRLINE>
+                        <#if postalAddress.address2?has_content>
+                        <of:ADDRLINE>${postalAddress.address2?if_exists?xml}</of:ADDRLINE>
+                        </#if>
+                        <of:CITY>${postalAddress.city?if_exists?xml}</of:CITY>
+                        <of:COUNTRY>${postalAddress.countryGeoId?if_exists}</of:COUNTRY>
+                        <#-- <of:FAX></of:FAX> -->
+                        <of:POSTALCODE>${postalAddress.postalCode?if_exists?xml}</of:POSTALCODE>
+                        <of:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</of:STATEPROVN>
+                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
+                    </os:ADDRESS>
+                    <os:CONTACT>
+                        <of:NAME>${postalAddress.attnName?default(partyName)?if_exists?xml}</of:NAME>
+                        <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL>
+                        <#-- <of:FAX></of:FAX> -->
+                        <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE>
+                    </os:CONTACT>
+                </#if>
+                </os:PARTNER>
+            </n:RECEIPTHDR>
+            <n:RECEIPTUNT>
+                <os:QUANTITY>
+                    <of:VALUE>${totalQty?if_exists}</of:VALUE>
+                    <of:NUMOFDEC>0</of:NUMOFDEC>
+                    <of:SIGN>+</of:SIGN>
+                    <of:UOM>EACH</of:UOM>
+                </os:QUANTITY>
+                <#list returnItems as returnItem>
+                    <#assign returnReason = returnItem.getRelatedOne("ReturnReason")/>
+                    <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)?if_exists/>
+                <n:RECEIPTITM>
+                    <os:QUANTITY>
+                        <of:VALUE>${returnItem.returnQuantity?if_exists}</of:VALUE>
+                        <of:NUMOFDEC>0</of:NUMOFDEC>
+                        <of:SIGN>+</of:SIGN>
+                        <of:UOM>EACH</of:UOM>
+                    </os:QUANTITY>
+                    <of:ITEM>${returnItem.productId?if_exists}</of:ITEM>
+                    <of:NOTES>${returnReason.description?if_exists?xml}</of:NOTES>
+                    <os:DOCUMNTREF>
+                        <of:DOCTYPE>RMA</of:DOCTYPE>
+                        <of:DOCUMENTID>${returnItem.returnId}</of:DOCUMENTID>
+                        <of:LINENUM>${returnItem.returnItemSeqId}</of:LINENUM>
+                    </os:DOCUMNTREF>
+                    <#list serialNumberList?if_exists as serialNumber>
+                    <n:INVDETAIL>
+                        <of:SERIALNUM>${serialNumber?xml}</of:SERIALNUM>
+                    </n:INVDETAIL>
+                    </#list>
+                </n:RECEIPTITM>
+                </#list>
+            </n:RECEIPTUNT>
+        </n:RECEIVE_DELIVERY>
+    </n:DATAAREA>
+</n:RECEIVE_DELIVERY_001>

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

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

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

Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.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/projectmgr/webapp/projectmgr/survey/TestWorkEffortSurvey.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/themes/bizznesstime/includes/appbar.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/themes/bizznesstime/includes/messages.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/bizznesstime/includes/messages.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/bizznesstime/includes/messages.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/appbarClose.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.
--->
-    </div>
-  </div>
-  <div class="breadcrumbs-sep">
-    <#if titleProperty?exists>
-        ${uiLabelMap[titleProperty]}
-    </#if>
-  </div>
-  <div class="breadcrumbs-end">
-  </div>
-</div>
-<div class="clear">
-</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>
+  </div>
+  <div class="breadcrumbs-sep">
+    <#if titleProperty?exists>
+        ${uiLabelMap[titleProperty]}
+    </#if>
+  </div>
+  <div class="breadcrumbs-end">
+  </div>
+</div>
+<div class="clear">
+</div>

Propchange: ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/appbarOpen.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.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
-<#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
-<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
-<#assign contextPath = request.getContextPath()>
-<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "main")>
-
-<#assign showBreadcrumbs = true>
-
-<div class="tabbar">
-  <div class="breadcrumbs">
-    <div class="breadcrumbs-start">
-      <div id="main-navigation">
-        <h2>${uiLabelMap.CommonApplications}</h2>
-        <ul>
-          <li>
-            <ul>
-            <#list displayApps as display>
-              <#assign thisApp = display.getContextRoot()>
-              <#assign permission = true>
-              <#assign selected = false>
-              <#assign permissions = display.getBasePermission()>
-              <#list permissions as perm>
-                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
-                  <#-- User must have ALL permissions in the base-permission list -->
-                  <#assign permission = false>
-                </#if>
-              </#list>
-              <#if permission == true>
-                <#if thisApp == contextPath || contextPath + "/" == thisApp>
-                  <#assign selected = true>
-                </#if>
-                <#assign thisURL = thisApp>
-                <#if thisApp != "/">
-                  <#assign thisURL = thisURL + "/control/main">
-                </#if>
-                <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
-                  <!-- do not display this component-->
-                <#else>
-                  <#if !selected>
-                    <li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
-                  <#else>
-                    <li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
-                  </#if>
-                </#if>
-              </#if>
-            </#list>
-            </ul>
-          </li>
-        </ul>
-      </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.
+-->
+<#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
+<#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
+<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
+<#assign contextPath = request.getContextPath()>
+<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "main")>
+
+<#assign showBreadcrumbs = true>
+
+<div class="tabbar">
+  <div class="breadcrumbs">
+    <div class="breadcrumbs-start">
+      <div id="main-navigation">
+        <h2>${uiLabelMap.CommonApplications}</h2>
+        <ul>
+          <li>
+            <ul>
+            <#list displayApps as display>
+              <#assign thisApp = display.getContextRoot()>
+              <#assign permission = true>
+              <#assign selected = false>
+              <#assign permissions = display.getBasePermission()>
+              <#list permissions as perm>
+                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
+                  <#-- User must have ALL permissions in the base-permission list -->
+                  <#assign permission = false>
+                </#if>
+              </#list>
+              <#if permission == true>
+                <#if thisApp == contextPath || contextPath + "/" == thisApp>
+                  <#assign selected = true>
+                </#if>
+                <#assign thisURL = thisApp>
+                <#if thisApp != "/">
+                  <#assign thisURL = thisURL + "/control/main">
+                </#if>
+                <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
+                  <!-- do not display this component-->
+                <#else>
+                  <#if !selected>
+                    <li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
+                  <#else>
+                    <li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
+                  </#if>
+                </#if>
+              </#if>
+            </#list>
+            </ul>
+          </li>
+        </ul>
+      </div>

Propchange: ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.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 appModelMenu = Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,applicationMenuName,delegator,dispatcher)>
-<#if appModelMenu.getModelMenuItemByName(headerItem)?exists>
-  <#if headerItem!="main">
-    <div class="breadcrumbs-sep">
-      ${appModelMenu.getModelMenuItemByName(headerItem).getTitle(context)}
-    </div>
-  </#if>
-</#if>
-  </div>
-</div>
-<div class="clear">
-</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.
+-->
+<#assign appModelMenu = Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,applicationMenuName,delegator,dispatcher)>
+<#if appModelMenu.getModelMenuItemByName(headerItem)?exists>
+  <#if headerItem!="main">
+    <div class="breadcrumbs-sep">
+      ${appModelMenu.getModelMenuItemByName(headerItem).getTitle(context)}
+    </div>
+  </#if>
+</#if>
+  </div>
+</div>
+<div class="clear">
+</div>

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl Sat May  8 13:51:19 2010
@@ -1,102 +1,102 @@
-<#--
-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.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
-<#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
-<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
-<#assign contextPath = request.getContextPath()>
-<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "main")>
-<#assign displaySecondaryApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "secondary")>
-
-<#assign appModelMenu = Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,applicationMenuName,delegator,dispatcher)>
-<#if appModelMenu.getModelMenuItemByName(headerItem)?exists>
-  <#if headerItem!="main">
-    <#assign show_last_menu = true>
-  </#if>
-</#if>
-
-<div class="tabbar">
-  <div class="breadcrumbs<#if show_last_menu?exists> menu_selected</#if>">
-      <div id="main-navigation">
-        <h2>${uiLabelMap.CommonApplications}</h2>
-        <ul>
-          <li>
-            <ul><li><ul class="primary">
-            <#-- Primary Applications -->
-            <#list displayApps as display>
-              <#assign thisApp = display.getContextRoot()>
-              <#assign permission = true>
-              <#assign selected = false>
-              <#assign permissions = display.getBasePermission()>
-              <#list permissions as perm>
-                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
-                  <#-- User must have ALL permissions in the base-permission list -->
-                  <#assign permission = false>
-                </#if>
-              </#list>
-              <#if permission == true>
-                <#if thisApp == contextPath || contextPath + "/" == thisApp>
-                  <#assign selected = true>
-                </#if>
-                <#assign thisURL = thisApp>
-                <#if thisApp != "/">
-                  <#assign thisURL = thisURL + "/control/main">
-                </#if>
-                <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
-                  <!-- do not display this component-->
-                <#else>
-                    <li <#if selected>class="selected"</#if>><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
-                </#if>
-              </#if>
-            </#list>
-           </ul></li>
-           <li><ul class="secondary">
-            <#-- Secondary Applications -->
-            <#list displaySecondaryApps as display>
-              <#assign thisApp = display.getContextRoot()>
-              <#assign permission = true>
-              <#assign selected = false>
-              <#assign permissions = display.getBasePermission()>
-              <#list permissions as perm>
-                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
-                  <#-- User must have ALL permissions in the base-permission list -->
-                  <#assign permission = false>
-                </#if>
-              </#list>
-              <#if permission == true>
-                <#if thisApp == contextPath || contextPath + "/" == thisApp>
-                  <#assign selected = true>
-                </#if>
-                <#assign thisURL = thisApp>
-                <#if thisApp != "/">
-                  <#assign thisURL = thisURL + "/control/main">
-                </#if>
-                <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
-                  <!-- do not display this component-->
-                <#else>
-                  <li <#if selected>class="selected"</#if>><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
-                </#if>
-              </#if>
-            </#list>
-            </ul>
-          </li>
-        </ul>
-        </li>
-        </ul>
-      </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.
+-->
+
+<#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
+<#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
+<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
+<#assign contextPath = request.getContextPath()>
+<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "main")>
+<#assign displaySecondaryApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "secondary")>
+
+<#assign appModelMenu = Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,applicationMenuName,delegator,dispatcher)>
+<#if appModelMenu.getModelMenuItemByName(headerItem)?exists>
+  <#if headerItem!="main">
+    <#assign show_last_menu = true>
+  </#if>
+</#if>
+
+<div class="tabbar">
+  <div class="breadcrumbs<#if show_last_menu?exists> menu_selected</#if>">
+      <div id="main-navigation">
+        <h2>${uiLabelMap.CommonApplications}</h2>
+        <ul>
+          <li>
+            <ul><li><ul class="primary">
+            <#-- Primary Applications -->
+            <#list displayApps as display>
+              <#assign thisApp = display.getContextRoot()>
+              <#assign permission = true>
+              <#assign selected = false>
+              <#assign permissions = display.getBasePermission()>
+              <#list permissions as perm>
+                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
+                  <#-- User must have ALL permissions in the base-permission list -->
+                  <#assign permission = false>
+                </#if>
+              </#list>
+              <#if permission == true>
+                <#if thisApp == contextPath || contextPath + "/" == thisApp>
+                  <#assign selected = true>
+                </#if>
+                <#assign thisURL = thisApp>
+                <#if thisApp != "/">
+                  <#assign thisURL = thisURL + "/control/main">
+                </#if>
+                <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
+                  <!-- do not display this component-->
+                <#else>
+                    <li <#if selected>class="selected"</#if>><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
+                </#if>
+              </#if>
+            </#list>
+           </ul></li>
+           <li><ul class="secondary">
+            <#-- Secondary Applications -->
+            <#list displaySecondaryApps as display>
+              <#assign thisApp = display.getContextRoot()>
+              <#assign permission = true>
+              <#assign selected = false>
+              <#assign permissions = display.getBasePermission()>
+              <#list permissions as perm>
+                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters))>
+                  <#-- User must have ALL permissions in the base-permission list -->
+                  <#assign permission = false>
+                </#if>
+              </#list>
+              <#if permission == true>
+                <#if thisApp == contextPath || contextPath + "/" == thisApp>
+                  <#assign selected = true>
+                </#if>
+                <#assign thisURL = thisApp>
+                <#if thisApp != "/">
+                  <#assign thisURL = thisURL + "/control/main">
+                </#if>
+                <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
+                  <!-- do not display this component-->
+                <#else>
+                  <li <#if selected>class="selected"</#if>><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
+                </#if>
+              </#if>
+            </#list>
+            </ul>
+          </li>
+        </ul>
+        </li>
+        </ul>
+      </div>

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl Sat May  8 13:51:19 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.
--->
-
-<#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
-
-<div id="footer">
-  <p>${nowTimestamp?datetime?string.short} -
-  <a href="<@o...@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>
-  </p>
-  <p><a href="http://jigsaw.w3.org/css-validator/"><img src="<@o...@ofbizContentUrl>" alt="Valid CSS!"/></a>
-  <a href="http://validator.w3.org/check?uri=referer"><img src="<@o...@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p>
-  <p>
-  ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br />
-  ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "../../../runtime/svninfo.ftl" /></p>
-</div>
-<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
-  <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
-    <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
-  </#list>
-</#if>
-
-</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 nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
+
+<div id="footer">
+  <p>${nowTimestamp?datetime?string.short} -
+  <a href="<@o...@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>
+  </p>
+  <p><a href="http://jigsaw.w3.org/css-validator/"><img src="<@o...@ofbizContentUrl>" alt="Valid CSS!"/></a>
+  <a href="http://validator.w3.org/check?uri=referer"><img src="<@o...@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p>
+  <p>
+  ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br />
+  ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "../../../runtime/svninfo.ftl" /></p>
+</div>
+<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
+  <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
+    <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+  </#list>
+</#if>
+
+</div>
+</body>
+</html>

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Sat May  8 13:51:19 2010
@@ -1,189 +1,189 @@
-<#--
-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 externalKeyParam = "&amp;externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
-
-<#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if>
-<#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if>
-<#assign docLangAttr = locale.toString()?replace("_", "-")>
-<#assign langDir = "ltr">
-<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
-    <#assign langDir = "rtl">
-</#if>
-<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>${layoutSettings.companyName}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)?if_exists}</#if></title>
-    <#if layoutSettings.shortcutIcon?has_content>
-      <#assign shortcutIcon = layoutSettings.shortcutIcon/>
-    <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
-      <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/>
-    </#if>
-    <#if shortcutIcon?has_content>
-      <link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
-    </#if>
-    <#if layoutSettings.javaScripts?has_content>
-        <#--layoutSettings.javaScripts is a list of java scripts. -->
-        <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
-        <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
-        <#list layoutSettings.javaScripts as javaScript>
-            <#if javaScriptsSet.contains(javaScript)>
-                <#assign nothing = javaScriptsSet.remove(javaScript)/>
-                <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
-            </#if>
-        </#list>
-    </#if>
-    <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
-        <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
-            <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
-        </#list>
-    </#if>
-    <#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="<@o...@ofbizContentUrl>" type="text/css"/>
-        </#list>
-    </#if>
-    <#if layoutSettings.VT_STYLESHEET?has_content>
-        <#list layoutSettings.VT_STYLESHEET as styleSheet>
-            <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
-        </#list>
-    </#if>
-    <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
-        <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
-        <#list layoutSettings.rtlStyleSheets as styleSheet>
-            <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
-        </#list>
-    </#if>
-    <#if layoutSettings.VT_RTL_STYLESHEET?has_content && langDir == "rtl">
-        <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
-            <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
-        </#list>
-    </#if>
-    <#if layoutSettings.VT_EXTRA_HEAD?has_content>
-        <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
-            ${extraHead}
-        </#list>
-    </#if>
-</head>
-<#if layoutSettings.headerImageLinkUrl?exists>
-  <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
-<#else>
-  <#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
-</#if>
-
-<#if person?has_content>
-  <#assign userName = person.firstName?if_exists + " " + person.middleName?if_exists + " " + person.lastName?if_exists>
-<#elseif partyGroup?has_content>
-  <#assign userName = partyGroup.groupName?if_exists>
-<#elseif userLogin?exists>
-  <#assign userName = userLogin.userLoginId>
-<#else>
-  <#assign userName = "">
-</#if>
-
-<#if defaultOrganizationPartyGroupName?has_content>
-  <#assign orgName = " - " + defaultOrganizationPartyGroupName?if_exists>
-<#else>
-  <#assign orgName = "">
-</#if>
-
-<body>
-  <div class="page-container">
-    <div class="hidden">
-      <a href="#column-container" title="${uiLabelMap.CommonSkipNavigation}" accesskey="2">
-        ${uiLabelMap.CommonSkipNavigation}
-      </a>
-    </div>
-    <div id="masthead">
-      <ul>
-        <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
-          <li>
-            <#if shortcutIcon?has_content>
-              <a href="<@o...@ofbizUrl>"><img src="<@o...@ofbizContentUrl>" height="16px" width="16px"/></a>
-            </#if>
-          </li>
-        <#else>
-          <#if layoutSettings.headerImageUrl?exists>
-            <#assign headerImageUrl = layoutSettings.headerImageUrl>
-          <#elseif layoutSettings.commonHeaderImageUrl?exists>
-            <#assign headerImageUrl = layoutSettings.commonHeaderImageUrl>
-          <#elseif layoutSettings.VT_HDR_IMAGE_URL?exists>
-            <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
-          </#if>
-          <#if headerImageUrl?exists>
-            <li id="logo-area"><a href="<@o...@ofbizUrl>" title="${layoutSettings.companyName}"><span>&nbsp;</span></a></li>
-          </#if>
-          <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
-            <li>
-            <div class="last-system-msg">
-            <center>${layoutSettings.middleTopHeader?if_exists}</center>
-            <a href="${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
-            <a href="${layoutSettings.middleTopLink2?if_exists}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
-            <a href="${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
-            </div>
-            </li>
-          </#if>
-        </#if>
-        <li class="control-area">
-          <ul id="preferences-menu">
-            <li class="first"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)}</a></li>
-            <#if userLogin?exists>
-              <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
-              <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
-            <#else>
-              <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
-            </#if>
-            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
-              <#include "component://common/webcommon/includes/helplink.ftl" />
-              <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
-            </#if>
-            <#if userLogin?exists>
-              <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
-                <li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()">&nbsp;</a>
-                <form name="setUserPreferenceCompactHeaderN" method="post" action="<@o...@ofbizUrl>">
-                    <input type="hidden" name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
-                    <input type="hidden" name="userPrefTypeId" value="COMPACT_HEADER"/>
-                    <input type="hidden" name="userPrefValue" value="N"/>
-                </form>
-                </li>
-              <#else>
-                <li class="expanded"><a href="javascript:document.setUserPreferenceCompactHeaderY.submit()">&nbsp;</a>
-                <form name="setUserPreferenceCompactHeaderY" method="post" action="<@o...@ofbizUrl>">
-                    <input type="hidden" name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
-                    <input type="hidden" name="userPrefTypeId" value="COMPACT_HEADER"/>
-                    <input type="hidden" name="userPrefValue" value="Y"/>
-                </form>
-                </li>
-              </#if>
-            </#if>
-            <#if userLogin?exists>
-              <#if userLogin.partyId?exists>
-                <li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${externalKeyParam?if_exists}">${userName}</a></li>
-              <#else>
-                <li class="user">${userName}</li>
-              </#if>
-              <#if orgName?has_content>              
-                <li class="org">${orgName}</li>
-              </#if>
-            </#if>
-          </ul>
-        </li>
-      </ul>
-      <br class="clear" />
-    </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.
+-->
+<#assign externalKeyParam = "&amp;externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
+
+<#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if>
+<#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if>
+<#assign docLangAttr = locale.toString()?replace("_", "-")>
+<#assign langDir = "ltr">
+<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
+    <#assign langDir = "rtl">
+</#if>
+<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>${layoutSettings.companyName}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)?if_exists}</#if></title>
+    <#if layoutSettings.shortcutIcon?has_content>
+      <#assign shortcutIcon = layoutSettings.shortcutIcon/>
+    <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
+      <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/>
+    </#if>
+    <#if shortcutIcon?has_content>
+      <link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
+    </#if>
+    <#if layoutSettings.javaScripts?has_content>
+        <#--layoutSettings.javaScripts is a list of java scripts. -->
+        <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+        <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+        <#list layoutSettings.javaScripts as javaScript>
+            <#if javaScriptsSet.contains(javaScript)>
+                <#assign nothing = javaScriptsSet.remove(javaScript)/>
+                <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+            </#if>
+        </#list>
+    </#if>
+    <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+        <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+            <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+        </#list>
+    </#if>
+    <#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="<@o...@ofbizContentUrl>" type="text/css"/>
+        </#list>
+    </#if>
+    <#if layoutSettings.VT_STYLESHEET?has_content>
+        <#list layoutSettings.VT_STYLESHEET as styleSheet>
+            <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
+        </#list>
+    </#if>
+    <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
+        <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
+        <#list layoutSettings.rtlStyleSheets as styleSheet>
+            <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
+        </#list>
+    </#if>
+    <#if layoutSettings.VT_RTL_STYLESHEET?has_content && langDir == "rtl">
+        <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
+            <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
+        </#list>
+    </#if>
+    <#if layoutSettings.VT_EXTRA_HEAD?has_content>
+        <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
+            ${extraHead}
+        </#list>
+    </#if>
+</head>
+<#if layoutSettings.headerImageLinkUrl?exists>
+  <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
+<#else>
+  <#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
+</#if>
+
+<#if person?has_content>
+  <#assign userName = person.firstName?if_exists + " " + person.middleName?if_exists + " " + person.lastName?if_exists>
+<#elseif partyGroup?has_content>
+  <#assign userName = partyGroup.groupName?if_exists>
+<#elseif userLogin?exists>
+  <#assign userName = userLogin.userLoginId>
+<#else>
+  <#assign userName = "">
+</#if>
+
+<#if defaultOrganizationPartyGroupName?has_content>
+  <#assign orgName = " - " + defaultOrganizationPartyGroupName?if_exists>
+<#else>
+  <#assign orgName = "">
+</#if>
+
+<body>
+  <div class="page-container">
+    <div class="hidden">
+      <a href="#column-container" title="${uiLabelMap.CommonSkipNavigation}" accesskey="2">
+        ${uiLabelMap.CommonSkipNavigation}
+      </a>
+    </div>
+    <div id="masthead">
+      <ul>
+        <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
+          <li>
+            <#if shortcutIcon?has_content>
+              <a href="<@o...@ofbizUrl>"><img src="<@o...@ofbizContentUrl>" height="16px" width="16px"/></a>
+            </#if>
+          </li>
+        <#else>
+          <#if layoutSettings.headerImageUrl?exists>
+            <#assign headerImageUrl = layoutSettings.headerImageUrl>
+          <#elseif layoutSettings.commonHeaderImageUrl?exists>
+            <#assign headerImageUrl = layoutSettings.commonHeaderImageUrl>
+          <#elseif layoutSettings.VT_HDR_IMAGE_URL?exists>
+            <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
+          </#if>
+          <#if headerImageUrl?exists>
+            <li id="logo-area"><a href="<@o...@ofbizUrl>" title="${layoutSettings.companyName}"><span>&nbsp;</span></a></li>
+          </#if>
+          <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
+            <li>
+            <div class="last-system-msg">
+            <center>${layoutSettings.middleTopHeader?if_exists}</center>
+            <a href="${layoutSettings.middleTopLink1?if_exists}">${layoutSettings.middleTopMessage1?if_exists}</a><br/>
+            <a href="${layoutSettings.middleTopLink2?if_exists}">${layoutSettings.middleTopMessage2?if_exists}</a><br/>
+            <a href="${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
+            </div>
+            </li>
+          </#if>
+        </#if>
+        <li class="control-area">
+          <ul id="preferences-menu">
+            <li class="first"><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)}</a></li>
+            <#if userLogin?exists>
+              <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
+              <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+            <#else>
+              <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
+            </#if>
+            <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
+              <#include "component://common/webcommon/includes/helplink.ftl" />
+              <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
+            </#if>
+            <#if userLogin?exists>
+              <#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
+                <li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()">&nbsp;</a>
+                <form name="setUserPreferenceCompactHeaderN" method="post" action="<@o...@ofbizUrl>">
+                    <input type="hidden" name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
+                    <input type="hidden" name="userPrefTypeId" value="COMPACT_HEADER"/>
+                    <input type="hidden" name="userPrefValue" value="N"/>
+                </form>
+                </li>
+              <#else>
+                <li class="expanded"><a href="javascript:document.setUserPreferenceCompactHeaderY.submit()">&nbsp;</a>
+                <form name="setUserPreferenceCompactHeaderY" method="post" action="<@o...@ofbizUrl>">
+                    <input type="hidden" name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
+                    <input type="hidden" name="userPrefTypeId" value="COMPACT_HEADER"/>
+                    <input type="hidden" name="userPrefValue" value="Y"/>
+                </form>
+                </li>
+              </#if>
+            </#if>
+            <#if userLogin?exists>
+              <#if userLogin.partyId?exists>
+                <li class="user"><a href="/partymgr/control/viewprofile?partyId=${userLogin.partyId}${externalKeyParam?if_exists}">${userName}</a></li>
+              <#else>
+                <li class="user">${userName}</li>
+              </#if>
+              <#if orgName?has_content>              
+                <li class="org">${orgName}</li>
+              </#if>
+            </#if>
+          </ul>
+        </li>
+      </ul>
+      <br class="clear" />
+    </div>

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain