svn commit: r942389 [4/4] - in /ofbiz/branches/release10.04: applications/accounting/webapp/accounting/common/ applications/accounting/webapp/accounting/finaccounttrans/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/...

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

svn commit: r942389 [4/4] - in /ofbiz/branches/release10.04: applications/accounting/webapp/accounting/common/ applications/accounting/webapp/accounting/finaccounttrans/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/...

lektran
Modified: ofbiz/branches/release10.04/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/themes/droppingcrumbs/includes/header.ftl?rev=942389&r1=942388&r2=942389&view=diff
==============================================================================
--- ofbiz/branches/release10.04/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/branches/release10.04/themes/droppingcrumbs/includes/header.ftl Sat May  8 14:01:38 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="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@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="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
-            </#if>
-        </#list>
-    </#if>
-    <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
-        <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
-            <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@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="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
-        </#list>
-    </#if>
-    <#if layoutSettings.VT_STYLESHEET?has_content>
-        <#list layoutSettings.VT_STYLESHEET as styleSheet>
-            <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@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="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@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="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@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="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img src="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@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="<@ofbizUrl>${logoLinkURL}</@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="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)}</a></li>
-            <#if userLogin?exists>
-              <li><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
-              <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
-            <#else>
-              <li><a href="<@ofbizUrl>${checkLoginUrl}</@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="<@ofbizUrl>setUserPreference</@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="<@ofbizUrl>setUserPreference</@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="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@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="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+            </#if>
+        </#list>
+    </#if>
+    <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+        <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+            <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@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="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/>
+        </#list>
+    </#if>
+    <#if layoutSettings.VT_STYLESHEET?has_content>
+        <#list layoutSettings.VT_STYLESHEET as styleSheet>
+            <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@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="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@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="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@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="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img src="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@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="<@ofbizUrl>${logoLinkURL}</@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="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)}</a></li>
+            <#if userLogin?exists>
+              <li><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
+              <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+            <#else>
+              <li><a href="<@ofbizUrl>${checkLoginUrl}</@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="<@ofbizUrl>setUserPreference</@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="<@ofbizUrl>setUserPreference</@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/branches/release10.04/themes/droppingcrumbs/includes/header.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Modified: ofbiz/branches/release10.04/themes/multiflex/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/themes/multiflex/includes/footer.ftl?rev=942389&r1=942388&r2=942389&view=diff
==============================================================================
--- ofbiz/branches/release10.04/themes/multiflex/includes/footer.ftl (original)
+++ ofbiz/branches/release10.04/themes/multiflex/includes/footer.ftl Sat May  8 14:01:38 2010
@@ -1,33 +1,33 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
-
-<div class="footer">
-  <p align="center">
-    <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" class="tabletext" target="_blank">www.apache.org</a></p>
-    <p>Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p>
-  </p>
-  <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
-    <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
-      <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
-    </#list>
-  </#if>
-</div>
-</div>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
+
+<div class="footer">
+  <p align="center">
+    <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" class="tabletext" target="_blank">www.apache.org</a></p>
+    <p>Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p>
+  </p>
+  <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
+    <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
+      <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
+    </#list>
+  </#if>
+</div>
+</div>

Propchange: ofbiz/branches/release10.04/themes/multiflex/includes/footer.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release10.04/themes/multiflex/includes/footer.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release10.04/themes/multiflex/includes/footer.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/branches/release10.04/themes/multiflex/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/themes/multiflex/includes/header.ftl?rev=942389&r1=942388&r2=942389&view=diff
==============================================================================
--- ofbiz/branches/release10.04/themes/multiflex/includes/header.ftl (original)
+++ ofbiz/branches/release10.04/themes/multiflex/includes/header.ftl Sat May  8 14:01:38 2010
@@ -1,126 +1,126 @@
-<#--
-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.
--->
-
-<!-- Global IE fix to avoid layout crash when single word size wider than column width -->
-<!--[if IE]><style type="text/css"> body {word-wrap: break-word;}</style><![endif]-->
-
-  <div class="page-container">
-    <div class="header">
-      <div class="header-top">
-
-        <!-- Sitelogo and sitename -->
-        <a class="sitelogo" href="<@ofbizUrl>main</@ofbizUrl>" title="${uiLabelMap.CommonMain}"></a>
-        <div class="sitename">
-          <#if !productStore?exists>
-            <h1><a href="index.html" title="Go to Start page">${uiLabelMap.EcommerceNoProductStore}</a></h1>
-          </#if>
-          <#if (productStore.title)?exists><h1><a href="index.html" title="Go to Start page">${productStore.title}</a></h1></#if>
-          <#if (productStore.subtitle)?exists><h2>${productStore.subtitle}</h2></#if>
-        </div>
-
-        <!-- Navigation Level 0 -->
-        <div class="nav0">
-          <ul>
-            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=it</@ofbizUrl>"><img src="/multiflex/flag_it.gif" alt="" /></a></li>
-            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=en</@ofbizUrl>"><img src="/multiflex/flag_en.gif" alt="" /></a></li>
-            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=de</@ofbizUrl>"><img src="/multiflex/flag_de.gif" alt="" /></a></li>
-            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=fr</@ofbizUrl>"><img src="/multiflex/flag_fr.gif" alt="" /></a></li>
-          </ul>
-        </div>
-
-        <!-- Navigation Level 1 -->
-        <div class="nav1">
-          <ul>
-            <li><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li>
-            <li><a href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li>
-            <li><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></li>
-          </ul>
-        </div>
-      </div>
-
-      <!-- A.2 HEADER MIDDLE -->
-      <div class="header-middle">
-        <!-- Site message -->
-        <div class="sitemessage">
-          <h1>EASY &bull; FLEXIBLE &bull; ROBUST</h1>
-          <h2>
-          <#if sessionAttributes.autoName?has_content>
-            ${uiLabelMap.CommonWelcome}&nbsp;${sessionAttributes.autoName}!
-            (${uiLabelMap.CommonNotYou}?&nbsp;<a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)
-          <#else/>
-            ${uiLabelMap.CommonWelcome}!
-          </#if>
-          </h2>
-          <h3><a href="#">&rsaquo;&rsaquo;&nbsp;More details</a></h3>
-        </div>
-      </div>
-
-      <!-- A.3 HEADER BOTTOM -->
-      <div class="header-bottom">
-
-        <!-- Navigation Level 2 (Drop-down menus) -->
-        <div class="nav2">
-
-          <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
-            <!-- Navigation item -->
-            <ul>
-              <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
-            </ul>
-          <#else/>
-            <!-- Navigation item -->
-            <ul>
-              <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
-            </ul>
-
-            <!-- Navigation item -->
-            <ul>
-              <li><a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.EcommerceRegister}</a></li>
-            </ul>
-          </#if>
-
-          <#if catalogQuickaddUse?has_content && catalogQuickaddUse>
-            <!-- Navigation item -->
-            <ul>
-              <li id="header-bar-quickadd"><a href="<@ofbizUrl>quickadd</@ofbizUrl>">${uiLabelMap.CommonQuickAdd}</a></li>
-            </ul>
-          </#if>
-
-          <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
-            <!-- Navigation item -->
-            <ul>
-              <li><a href="#">Utente<!--[if IE 7]><!--></a><!--<![endif]-->
-                <!--[if lte IE 6]><table><tr><td><![endif]-->
-                  <ul>
-                    <li id="header-bar-viewprofile"><a href="<@ofbizUrl>viewprofile</@ofbizUrl>">${uiLabelMap.CommonProfile}</a></li>
-                    <li id="header-bar-ListQuotes"><a href="<@ofbizUrl>ListQuotes</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a></li>
-                    <li id="header-bar-ListRequests"><a href="<@ofbizUrl>ListRequests</@ofbizUrl>">${uiLabelMap.OrderRequests}</a></li>
-                    <li id="header-bar-editShoppingList"><a href="<@ofbizUrl>editShoppingList</@ofbizUrl>">${uiLabelMap.EcommerceShoppingLists}</a></li>
-                    <li id="header-bar-orderhistory"><a href="<@ofbizUrl>orderhistory</@ofbizUrl>">${uiLabelMap.EcommerceOrderHistory}</a></li>
-                  </ul>
-                <!--[if lte IE 6]></td></tr></table></a><![endif]-->
-              </li>
-            </ul>
-          </#if>
-
-        </div>
-      </div>
-
-      <!-- Breadcrumbs -->
-      <div class="header-breadcrumbs">
-    </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.
+-->
+
+<!-- Global IE fix to avoid layout crash when single word size wider than column width -->
+<!--[if IE]><style type="text/css"> body {word-wrap: break-word;}</style><![endif]-->
+
+  <div class="page-container">
+    <div class="header">
+      <div class="header-top">
+
+        <!-- Sitelogo and sitename -->
+        <a class="sitelogo" href="<@ofbizUrl>main</@ofbizUrl>" title="${uiLabelMap.CommonMain}"></a>
+        <div class="sitename">
+          <#if !productStore?exists>
+            <h1><a href="index.html" title="Go to Start page">${uiLabelMap.EcommerceNoProductStore}</a></h1>
+          </#if>
+          <#if (productStore.title)?exists><h1><a href="index.html" title="Go to Start page">${productStore.title}</a></h1></#if>
+          <#if (productStore.subtitle)?exists><h2>${productStore.subtitle}</h2></#if>
+        </div>
+
+        <!-- Navigation Level 0 -->
+        <div class="nav0">
+          <ul>
+            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=it</@ofbizUrl>"><img src="/multiflex/flag_it.gif" alt="" /></a></li>
+            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=en</@ofbizUrl>"><img src="/multiflex/flag_en.gif" alt="" /></a></li>
+            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=de</@ofbizUrl>"><img src="/multiflex/flag_de.gif" alt="" /></a></li>
+            <li><a href="<@ofbizUrl>setSessionLocale?newLocale=fr</@ofbizUrl>"><img src="/multiflex/flag_fr.gif" alt="" /></a></li>
+          </ul>
+        </div>
+
+        <!-- Navigation Level 1 -->
+        <div class="nav1">
+          <ul>
+            <li><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li>
+            <li><a href="<@ofbizUrl>contactus</@ofbizUrl>">${uiLabelMap.CommonContactUs}</a></li>
+            <li><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></li>
+          </ul>
+        </div>
+      </div>
+
+      <!-- A.2 HEADER MIDDLE -->
+      <div class="header-middle">
+        <!-- Site message -->
+        <div class="sitemessage">
+          <h1>EASY &bull; FLEXIBLE &bull; ROBUST</h1>
+          <h2>
+          <#if sessionAttributes.autoName?has_content>
+            ${uiLabelMap.CommonWelcome}&nbsp;${sessionAttributes.autoName}!
+            (${uiLabelMap.CommonNotYou}?&nbsp;<a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)
+          <#else/>
+            ${uiLabelMap.CommonWelcome}!
+          </#if>
+          </h2>
+          <h3><a href="#">&rsaquo;&rsaquo;&nbsp;More details</a></h3>
+        </div>
+      </div>
+
+      <!-- A.3 HEADER BOTTOM -->
+      <div class="header-bottom">
+
+        <!-- Navigation Level 2 (Drop-down menus) -->
+        <div class="nav2">
+
+          <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
+            <!-- Navigation item -->
+            <ul>
+              <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+            </ul>
+          <#else/>
+            <!-- Navigation item -->
+            <ul>
+              <li><a href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
+            </ul>
+
+            <!-- Navigation item -->
+            <ul>
+              <li><a href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.EcommerceRegister}</a></li>
+            </ul>
+          </#if>
+
+          <#if catalogQuickaddUse?has_content && catalogQuickaddUse>
+            <!-- Navigation item -->
+            <ul>
+              <li id="header-bar-quickadd"><a href="<@ofbizUrl>quickadd</@ofbizUrl>">${uiLabelMap.CommonQuickAdd}</a></li>
+            </ul>
+          </#if>
+
+          <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
+            <!-- Navigation item -->
+            <ul>
+              <li><a href="#">Utente<!--[if IE 7]><!--></a><!--<![endif]-->
+                <!--[if lte IE 6]><table><tr><td><![endif]-->
+                  <ul>
+                    <li id="header-bar-viewprofile"><a href="<@ofbizUrl>viewprofile</@ofbizUrl>">${uiLabelMap.CommonProfile}</a></li>
+                    <li id="header-bar-ListQuotes"><a href="<@ofbizUrl>ListQuotes</@ofbizUrl>">${uiLabelMap.OrderOrderQuotes}</a></li>
+                    <li id="header-bar-ListRequests"><a href="<@ofbizUrl>ListRequests</@ofbizUrl>">${uiLabelMap.OrderRequests}</a></li>
+                    <li id="header-bar-editShoppingList"><a href="<@ofbizUrl>editShoppingList</@ofbizUrl>">${uiLabelMap.EcommerceShoppingLists}</a></li>
+                    <li id="header-bar-orderhistory"><a href="<@ofbizUrl>orderhistory</@ofbizUrl>">${uiLabelMap.EcommerceOrderHistory}</a></li>
+                  </ul>
+                <!--[if lte IE 6]></td></tr></table></a><![endif]-->
+              </li>
+            </ul>
+          </#if>
+
+        </div>
+      </div>
+
+      <!-- Breadcrumbs -->
+      <div class="header-breadcrumbs">
+    </div>

Propchange: ofbiz/branches/release10.04/themes/multiflex/includes/header.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release10.04/themes/multiflex/includes/header.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release10.04/themes/multiflex/includes/header.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/appbarClose.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/appbarOpen.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/appbarOpen.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/appbarOpen.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/footer.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/footer.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/footer.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/header.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/header.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/release10.04/themes/tomahawk/includes/header.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain