Author: nmalin
Date: Fri Aug 25 13:13:33 2017 New Revision: 1806170 URL: http://svn.apache.org/viewvc?rev=1806170&view=rev Log: Fixed: Continue the common-theme upload (OFBIZ-9138 Create a common theme) Correct all Theme.xml file fo the theme definition with the good xmlns Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml 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=1806170&r1=1806169&r2=1806170&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml Fri Aug 25 13:13:33 2017 @@ -19,8 +19,8 @@ under the License. --> <theme name="bluelight" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-theme.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://ofbiz.apache.org/Widget-Theme" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme http://ofbiz.apache.org/dtds/widget-theme.xsd"> <visual-themes> <visual-theme id="BLUELIGHT" display-name="BlueLight Theme"> <description>${str:label('CommonEntityLabels', 'VisualTheme.description.BLUELIGHT', locale)}</description> Modified: ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml?rev=1806170&r1=1806169&r2=1806170&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml Fri Aug 25 13:13:33 2017 @@ -19,8 +19,8 @@ under the License. --> <theme name="common" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-theme.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://ofbiz.apache.org/Widget-Theme" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme http://ofbiz.apache.org/dtds/widget-theme.xsd"> <visual-themes><!--List of visual theme contains to this theme components--> <visual-theme id="COMMON" display-name="Common Theme"> <description>${util:label('CommonThemeUiLabels', 'CommonThemeVisualThemeDescription', locale)}</description> @@ -117,7 +117,7 @@ under the License. </templates> <common-screens><!--list all common screen and decorator global to each application that each theme can be surcharge or not and use the screen present on common theme--> - <structural-decorator default-location="component://common-theme/widget/CommonScreens.xml"> + <root-decorator default-location="component://common-theme/widget/CommonScreens.xml"> <screen name="AjaxGlobalDecorator"/> <screen name="ajaxAutocompleteOptions"/> <screen name="GlobalActions"/> @@ -127,11 +127,11 @@ under the License. <screen name="FoReportDecorator"/> <screen name="GlobalFoDecorator"/> <screen name="LookupHelpDecorator" location="component://common-theme/widget/HelpScreens.xml"/> - </structural-decorator> - <embed-decorator default-location="component://common-theme/widget/CommonScreens.xml"> + </root-decorator> + <subtype-decorator default-location="component://common-theme/widget/CommonScreens.xml"> <screen name="FindScreenDecorator"/> - </embed-decorator> - <general-screen default-location="component://common-theme/widget/CommonScreens.xml"> + </subtype-decorator> + <generic-screen default-location="component://common-theme/widget/CommonScreens.xml"> <screen name="geoChart"/> <screen name="EventMessages"/> <screen name="countries"/> @@ -158,6 +158,6 @@ under the License. <screen name="showDocumentHelp" location="component://common-theme/widget/HelpScreens.xml"/> <screen name="navigateHelp" location="component://common-theme/widget/HelpScreens.xml"/> <screen name="ShowHelp" location="component://common-theme/widget/HelpScreens.xml"/> - </general-screen> + </generic-screen> </common-screens> </theme> 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=1806170&r1=1806169&r2=1806170&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml Fri Aug 25 13:13:33 2017 @@ -20,7 +20,7 @@ under the License. <theme name="flatgrey" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-theme.xsd"> + xmlns="http://ofbiz.apache.org/Widget-Theme" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme http://ofbiz.apache.org/dtds/widget-theme.xsd"> <visual-themes> <visual-theme id="FLAT_GREY" display-name="Flat Grey"> <description>${str:label('CommonEntityLabels', 'VisualTheme.description.FLAT_GREY', locale)}</description> Modified: ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml?rev=1806170&r1=1806169&r2=1806170&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml Fri Aug 25 13:13:33 2017 @@ -18,9 +18,9 @@ specific language governing permissions under the License. --> -<theme name="multiflex" visual-theme-id="MULTIFLEX" +<theme name="multiflex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-theme.xsd"> + xmlns="http://ofbiz.apache.org/Widget-Theme" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme http://ofbiz.apache.org/dtds/widget-theme.xsd"> <visual-themes> <visual-theme id="MULTIFLEX" display-name="Multiflex"> <description>${str:label('CommonEntityLabels', 'VisualTheme.description.MULTIFLEX', locale)}</description> 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=1806170&r1=1806169&r2=1806170&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml Fri Aug 25 13:13:33 2017 @@ -19,8 +19,8 @@ under the License. --> <theme name="rainbowstone" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-theme.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://ofbiz.apache.org/Widget-Theme" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme http://ofbiz.apache.org/dtds/widget-theme.xsd"> <visual-themes> <visual-theme id="RAINBOWSTONE_SAPHIR" display-name="Rainbow Stone - Saphir"> <screenshot location="/rainbowstone/images/themeSaphir.png"/> 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=1806170&r1=1806169&r2=1806170&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml Fri Aug 25 13:13:33 2017 @@ -20,7 +20,7 @@ under the License. <theme name="tomahawk" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-theme.xsd"> + xmlns="http://ofbiz.apache.org/Widget-Theme" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme http://ofbiz.apache.org/dtds/widget-theme.xsd"> <visual-themes> <visual-theme id="TOMAHAWK" display-name="Tomahawk"> <description>${str:label('CommonEntityLabels', 'VisualTheme.description.TOMAHAWK', locale)}</description> |
Free forum by Nabble | Edit this page |