svn commit: r1820961 - in /ofbiz/ofbiz-framework/trunk/themes: ./ bluelight/webapp/bluelight/ bluelight/widget/ common/widget/ flatgrey/webapp/flatgrey/ flatgrey/widget/ rainbowstone/webapp/rainbowstone/ rainbowstone/widget/ tomahawk/webapp/tomahawk/cs...

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

svn commit: r1820961 - in /ofbiz/ofbiz-framework/trunk/themes: ./ bluelight/webapp/bluelight/ bluelight/widget/ common/widget/ flatgrey/webapp/flatgrey/ flatgrey/widget/ rainbowstone/webapp/rainbowstone/ rainbowstone/widget/ tomahawk/webapp/tomahawk/cs...

jleroux@apache.org
Author: jleroux
Date: Fri Jan 12 10:37:28 2018
New Revision: 1820961

URL: http://svn.apache.org/viewvc?rev=1820961&view=rev
Log:
Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

The ofbiz_logo.png and ofbiz_logo.ico are now in theme but for Tomahawk which
has still it's own version but not really used I'd say.

So apart for tomahawk/css/style.css which uses a relative path (not sure why)
this replaces the locations for these files in theme files

Modified:
    ofbiz/ofbiz-framework/trunk/themes/README.md
    ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/docbook.css
    ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml
    ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
    ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
    ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/docbook.css
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml
    ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css
    ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml

Modified: ofbiz/ofbiz-framework/trunk/themes/README.md
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/README.md?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/README.md (original)
+++ ofbiz/ofbiz-framework/trunk/themes/README.md Fri Jan 12 10:37:28 2018
@@ -242,8 +242,8 @@ The blue light theme has been these prop
 ```xml
     <VisualTheme visualThemeId="BLUELIGHT" visualThemeSetId="BACKOFFICE" description="BlueLight Theme: breadcrumbs, drop-down menus and rounded corners"/>
     <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAME" resourceValue="BLUELIGHT" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.png" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/themes/common/webapp/images/ofbiz_logo.png" sequenceId="01"/>
+    <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/themes/common/webapp/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/bluelight/screenshot.jpg" sequenceId="01"/>
 
     <!-- CSS references -->

Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/docbook.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/docbook.css?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/docbook.css (original)
+++ ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/docbook.css Fri Jan 12 10:37:28 2018
@@ -18,7 +18,7 @@ specific language governing permissions
 under the License.
 ***********************************************/
 body {
-    background: transparent url(/images/ofbiz_logo.png) no-repeat scroll left top;
+    background: transparent url(/themes/common/webapp/images/ofbiz_logo.png) no-repeat scroll left top;
     color: #000;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: .75em;

Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml Fri Jan 12 10:37:28 2018
@@ -37,7 +37,7 @@ under the License.
         <property name="VT_HELPSTYLESHEET['add']" value="/bluelight/help.css"/>
         <property name="VT_DOCBOOKSTYLESHEET['add']" value="/bluelight/webapp/bluelight/docbook.css"/>
         <!--header image -->
-        <property name="VT_HDR_IMAGE_URL" value="/images/ofbiz_logo.png"/>
+        <property name="VT_HDR_IMAGE_URL" value="/themes/common/webapp/images/ofbiz_logo.png"/>
         <!--template location-->
         <property name="VT_HDR_TMPLT_LOC" value="component://bluelight/template/Header.ftl"/>
         <property name="VT_FTR_TMPLT_LOC" value="component://bluelight/template/Footer.ftl"/>

Modified: ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml Fri Jan 12 10:37:28 2018
@@ -455,7 +455,7 @@ under the License.
                 <entity-one entity-name="PartyNameView" value-field="currentOrganization">
                     <field-map field-name="partyId" from-field="organizationPartyId"/>
                 </entity-one>
-                <set field="logoImageUrl" value="/images/ofbiz_logo.png"/>
+                <set field="logoImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png"/>
                 <!--<set field="defaultFontFamily" value="Arial"/>-->
             </actions>
             <widgets>
@@ -477,7 +477,7 @@ under the License.
         <section>
             <actions>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="logoImageUrl" value="/images/ofbiz_logo.png" global="true"/>
+                <set field="logoImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png" global="true"/>
                 <property-to-field resource="fop.properties" field="defaultFontFamily" property="fop.font.family" default="NotoSans"/>
             </actions>
             <widgets>
@@ -490,7 +490,7 @@ under the License.
     <screen name="GlobalFoDecorator">
         <section>
             <actions>
-                <set field="layoutSettings.commonHeaderImageUrl" value="/images/ofbiz_logo.png"/>
+                <set field="layoutSettings.commonHeaderImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png"/>
             </actions>
             <widgets>
                 <platform-specific>
@@ -510,7 +510,7 @@ under the License.
     <screen name="FoError">
         <section>
             <actions>
-                <set field="logoImageUrl" value="/images/ofbiz_logo.png"/>
+                <set field="logoImageUrl" value="/themes/common/webapp/images/ofbiz_logo.png"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/docbook.css?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/docbook.css (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/docbook.css Fri Jan 12 10:37:28 2018
@@ -18,7 +18,7 @@ specific language governing permissions
 under the License.
 ***********************************************/
 body {
-    background: transparent url(/images/ofbiz_logo.png) no-repeat scroll left top;
+    background: transparent url(/themes/common/webapp/images/ofbiz_logo.png) no-repeat scroll left top;
     color: #000;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: .75em;

Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml Fri Jan 12 10:37:28 2018
@@ -31,7 +31,7 @@ under the License.
 
     <theme-properties>
         <!--header image -->
-        <property name="VT_HDR_IMAGE_URL" value="/flatgrey/images/ofbiz_logo.png"/>
+        <property name="VT_HDR_IMAGE_URL" value="/themes/common/webapp/images/ofbiz_logo.png"/>
         <!--template location-->
         <property name="VT_HDR_TMPLT_LOC" value="component://flatgrey/template/Header.ftl"/>
         <property name="VT_FTR_TMPLT_LOC" value="component://flatgrey/template/Footer.ftl"/>

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/docbook.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/docbook.css?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/docbook.css (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/docbook.css Fri Jan 12 10:37:28 2018
@@ -18,7 +18,7 @@ specific language governing permissions
 under the License.
 ***********************************************/
 body {
-    background: transparent url(/images/ofbiz_logo.png) no-repeat scroll left top;
+    background: transparent url(/themes/common/webapp/images/ofbiz_logo.png) no-repeat scroll left top;
     color: #000;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: .75em;

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml Fri Jan 12 10:37:28 2018
@@ -38,7 +38,7 @@ under the License.
     <extends location="component://common-theme/widget/Theme.xml"/>
     <theme-properties>
         <!--header image -->
-        <property name="VT_HDR_IMAGE_URL" value="/rainbowstone/images/ofbiz_logo.png"/>
+        <property name="VT_HDR_IMAGE_URL" value="/themes/common/webapp/images/ofbiz_logo.png"/>
         <!--template location-->
         <property name="VT_HDR_TMPLT_LOC" value="component://rainbowstone/template/includes/Header.ftl"/>
         <property name="VT_FTR_TMPLT_LOC" value="component://rainbowstone/template/includes/Footer.ftl"/>

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/css/docbook.css Fri Jan 12 10:37:28 2018
@@ -18,7 +18,7 @@ specific language governing permissions
 under the License.
 ***********************************************/
 body {
-    background: transparent url(/images/ofbiz_logo.png) no-repeat scroll left top;
+    background: transparent url(/themes/common/webapp/images/ofbiz_logo.png) no-repeat scroll left top;
     color: #000;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     font-size: .75em;

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml?rev=1820961&r1=1820960&r2=1820961&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml Fri Jan 12 10:37:28 2018
@@ -36,7 +36,7 @@ under the License.
         <property name="VT_NAV_CLOSE_TMPLT" value="component://tomahawk/template/AppBarClose.ftl"/>
         <property name="VT_MSG_TMPLT_LOC" value="component://common-theme/template/includes/Messages.ftl"/>
         <!--header image -->
-        <property name="VT_HDR_IMAGE_URL" value="/images/ofbiz_logo.png"/>
+        <property name="VT_HDR_IMAGE_URL" value="/themes/common/webapp/images/ofbiz_logo.png"/>
         <!--javascript lib-->
         <property name="VT_HDR_JAVASCRIPT['add']" value="/tomahawk/js/dropdown.js"/>
         <!--Css style-->