Author: doogie
Date: Wed Feb 24 03:32:26 2010
New Revision: 915651
URL: http://svn.apache.org/viewvc?rev=915651&view=rev
Log:
Remove hard-coded BIZZNESS_TIME theme settings, so the default in
general.properties gets used.
Modified:
ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
ofbiz/trunk/framework/common/servicedef/services.xml
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/common/widget/HelpScreens.xml
Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=915651&r1=915650&r2=915651&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
(original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Wed Feb
24 03:32:26 2010
@@ -170,7 +170,7 @@
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="CommonExtUiLabels"
map-name="uiLabelMap" global="true"/>
<set field="contentId" from-field="parameters.contentId"
default-value="${contentId}"/>
- <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" default-value="BIZZNESS_TIME"
global="true"/>
+ <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
<field-map field-name="themeResources"
from-field="layoutSettings"/>
Modified: ofbiz/trunk/framework/common/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services.xml?rev=915651&r1=915650&r2=915651&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/servicedef/services.xml (original)
+++ ofbiz/trunk/framework/common/servicedef/services.xml Wed Feb 24 03:32:26
2010
@@ -470,7 +470,7 @@
Map of Lists, where the resourceTypeEnumId is the key and the value
is a List of resourceValue Strings for that resourceTypeEnumId.
</description>
- <attribute name="visualThemeId" type="String" mode="IN"
optional="true" default-value="BIZZNESS_TIME"/>
+ <attribute name="visualThemeId" type="String" mode="IN"
optional="true"/>
<attribute name="themeResources" type="Map" mode="IN" optional="true"/>
<attribute name="themeResources" type="Map" mode="OUT"
optional="false"/>
</service>
@@ -690,4 +690,4 @@
<permission-service service-name="commonGenericPermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
-</services>
\ No newline at end of file
+</services>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=915651&r1=915650&r2=915651&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Wed Feb 24 03:32:26
2010
@@ -124,7 +124,7 @@
<set field="layoutSettings.javaScripts[]"
value="/images/calendarDateSelect/locale/${initialLocale}.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/images/GooglemapMarkers.js" global="true"/>
<set field="layoutSettings.commonHeaderImageLinkUrl"
from-field="layoutSettings.commonHeaderImageLinkUrl" default-value="main"
global="true"/>
- <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" default-value="TOMAHAWK"
global="true"/>
+ <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
<field-map field-name="themeResources"
from-field="layoutSettings"/>
@@ -233,7 +233,7 @@
<set field="userPreferences"
from-field="prefResult.userPrefMap" global="true"/>
<property-map resource="general"
map-name="generalProperties" global="true"/>
- <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" default-value="BIZZNESS_TIME"
global="true"/>
+ <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
<field-map field-name="themeResources"
from-field="layoutSettings"/>
@@ -304,7 +304,7 @@
<set field="userPreferences"
from-field="prefResult.userPrefMap" global="true"/>
<property-map resource="general"
map-name="generalProperties" global="true"/>
- <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" default-value="BIZZNESS_TIME"
global="true"/>
+ <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
<field-map field-name="themeResources"
from-field="layoutSettings"/>
Modified: ofbiz/trunk/framework/common/widget/HelpScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/HelpScreens.xml?rev=915651&r1=915650&r2=915651&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/HelpScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/HelpScreens.xml Wed Feb 24 03:32:26 2010
@@ -127,7 +127,7 @@
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="CommonExtUiLabels"
map-name="uiLabelMap" global="true"/>
<set field="contentId" from-field="parameters.contentId"
default-value="${contentId}"/>
- <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" default-value="BIZZNESS_TIME"
global="true"/>
+ <set field="visualThemeId"
from-field="userPreferences.VISUAL_THEME" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
<field-map field-name="themeResources"
from-field="layoutSettings"/>
@@ -175,4 +175,4 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
