OFBiz › OFBiz - Commits

svn commit: r1806091 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget/ap/ applications/commonext/widget/ofbizsetup/ applications/manufacturing/widget/manufacturing/ applications/marketing/widget/sfa/ applications/order/widget/ord...

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

svn commit: r1806091 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget/ap/ applications/commonext/widget/ofbizsetup/ applications/manufacturing/widget/manufacturing/ applications/marketing/widget/sfa/ applications/order/widget/ord...

nmalin
Added: ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml?rev=1806091&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml (added)
+++ ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml Thu Aug 24 21:55:06 2017
@@ -0,0 +1,138 @@
+<?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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+    <!-- Locales Lookup Screen -->
+    <screen name="ListLocales">
+        <section>
+            <actions>
+                <set field="title" value="${uiLabelMap.CommonChooseLanguage}"/>
+                <set field="parameters.presentation" value="window"/>
+            </actions>
+            <widgets>
+               <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                <decorator-section name="body">
+                    <platform-specific>
+                        <html>
+                            <html-template location="component://common-theme/template/includes/ListLocales.ftl"/>
+                        </html>
+                    </platform-specific>
+                </decorator-section>
+              </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <!-- Companies Lookup Screen -->
+    <screen name="ListSetCompanies">
+        <section>
+            <actions>
+                <set field="titleProperty" value="CommonCompany"/>
+                <entity-condition entity-name="PartyAcctgPrefAndGroup" list="companyList" distinct="true">
+                    <condition-list>
+                        <condition-expr field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
+                    </condition-list>
+                    <select-field field-name="partyId"/>
+                    <select-field field-name="groupName"/>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                    <decorator-section name="body">
+                        <platform-specific>
+                            <html><html-template location="component://common-theme/template/includes/listCompanies.ftl"/></html>
+                        </platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <!-- Timezones Lookup Screen -->
+    <screen name="ListTimezones">
+        <section>
+            <actions>
+                <set field="title" value="${uiLabelMap.CommonTime}"/>
+                <set field="parameters.presentation" value="window"/>
+            </actions>
+            <widgets>
+               <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                <decorator-section name="body">
+                    <platform-specific>
+                        <html>
+                            <html-template location="component://common-theme/template/includes/ListTimezones.ftl"/>
+                        </html>
+                    </platform-specific>
+                </decorator-section>
+              </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <!-- Visual Themes Lookup Screen -->
+    <screen name="ListVisualThemes">
+        <section>
+            <actions>
+                <set field="title" value="${uiLabelMap.CommonVisualThemes}"/>
+                <set field="parameters.presentation" value="window"/>
+                <entity-one entity-name="WebSite" value-field="webSite"/>
+                <set field="visualThemeSetId" from-field="webSite.visualThemeSetId" default-value="BACKOFFICE" />
+                <entity-condition entity-name="VisualTheme" list="visualThemes">
+                    <condition-expr field-name="visualThemeSetId" from-field="visualThemeSetId" />
+                </entity-condition>
+            </actions>
+            <widgets>
+               <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                <decorator-section name="body">
+                    <platform-specific>
+                        <html>
+                            <html-template location="component://common-theme/template/includes/ListVisualThemes.ftl"/>
+                        </html>
+                    </platform-specific>
+                </decorator-section>
+              </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <!-- Time Duration Screen -->
+    <screen name="TimeDuration">
+        <section>
+            <actions>
+                <set field="title" value="${uiLabelMap.CommonTime}"/>
+                <set field="parameters.presentation" value="window"/>
+            </actions>
+            <widgets>
+               <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+                <decorator-section name="body">
+                    <platform-specific>
+                        <html>
+                            <html-template location="component://common-theme/template/includes/TimeDuration.ftl"/>
+                        </html>
+                    </platform-specific>
+                </decorator-section>
+              </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+</screens>

Propchange: ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=1806091&r1=1806090&r2=1806091&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Thu Aug 24 21:55:06 2017
@@ -61,7 +61,7 @@ under the License.
     
     <!-- ftl references -->
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://flatgrey/template/Header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common-theme/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/template/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/template/AppBar.ftl" sequenceId="01"/>
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl Thu Aug 24 21:55:06 2017
@@ -136,7 +136,7 @@ under the License.
                 <#if topLine.text??>
                   <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url!)}${StringUtil.wrapString(externalKeyParam)}">${topLine.urlText!}</a></li>
                 <#elseif topLine.dropDownList??>
-                  <li><#include "component://common/template/includes/InsertDropDown.ftl"/></li>
+                  <li><#include "component://common-theme/template/includes/InsertDropDown.ftl"/></li>
                 <#else>
                   <li>${topLine!}</li>
                 </#if>
@@ -150,7 +150,7 @@ under the License.
           </#if>
           <#---if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??-->
           <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??>
-            <#include "component://common/template/includes/HelpLink.ftl" />
+            <#include "component://common-theme/template/includes/HelpLink.ftl" />
             <li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId!}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
           </#if>
           </ul>

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml?rev=1806091&r1=1806090&r2=1806091&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml Thu Aug 24 21:55:06 2017
@@ -32,7 +32,7 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common-theme/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/TopAppBar.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeSaphir.png" sequenceId="01"/>
@@ -80,7 +80,7 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common-theme/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/TopAppBar.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeRuby.png" sequenceId="01"/>
@@ -124,7 +124,7 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common-theme/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/TopAppBar.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeEmerald.png" sequenceId="01"/>
@@ -167,7 +167,7 @@ under the License.
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/rainbowstone/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Header.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common-theme/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://rainbowstone/template/includes/TopAppBar.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/rainbowstone/images/themeAmber.png" sequenceId="01"/>

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml?rev=1806091&r1=1806090&r2=1806091&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml Thu Aug 24 21:55:06 2017
@@ -63,5 +63,5 @@ under the License.
     <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://tomahawk/template/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://tomahawk/template/AppBarOpen.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://tomahawk/template/AppBarClose.ftl" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/template/includes/Messages.ftl" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common-theme/template/includes/Messages.ftl" sequenceId="01"/>
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl?rev=1806091&r1=1806090&r2=1806091&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/AppBarClose.ftl Thu Aug 24 21:55:06 2017
@@ -74,7 +74,7 @@ under the License.
     <#if userLogin??>
       <#--if webSiteId?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??-->
       <#if parameters.componentName?? && requestAttributes._CURRENT_VIEW_?? && helpTopic??>
-        <#include "component://common/template/includes/HelpLink.ftl" />
+        <#include "component://common-theme/template/includes/HelpLink.ftl" />
         <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId!}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
       </#if>
       <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>


Free forum by Nabble Edit this page