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

[lektran]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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