You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Nicolas Malin <ni...@nereide.fr> on 2015/06/20 19:25:02 UTC
Re: svn commit: r1686655 - in /ofbiz/trunk: framework/common/widget/
themes/bizznesstime/data/ themes/bizznesstime/includes/ themes/bluelight/data/
themes/bluelight/includes/ themes/droppingcrumbs/data/ themes/droppingcrumbs/includes/
themes/flatgrey/data/...
It's really nice adrian, thanks for this.
Le 20/06/2015 19:02, adrianc@apache.org a écrit :
> Author: adrianc
> Date: Sat Jun 20 17:02:22 2015
> New Revision: 1686655
>
> URL: http://svn.apache.org/r1686655
> Log:
> Move theme-specific js & css references from CommonDecorator(s) to themes - https://issues.apache.org/jira/browse/OFBIZ-6362.
>
> Modified:
> ofbiz/trunk/framework/common/widget/CommonScreens.xml
> ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
> ofbiz/trunk/themes/bizznesstime/includes/header.ftl
> ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml
> ofbiz/trunk/themes/bluelight/includes/header.ftl
> ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml
> ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
> ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
> ofbiz/trunk/themes/flatgrey/includes/header.ftl
> ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml
> ofbiz/trunk/themes/tomahawk/includes/header.ftl
>
> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sat Jun 20 17:02:22 2015
> @@ -137,41 +137,19 @@ under the License.
> <screen name="GlobalActions">
> <section>
> <actions>
> - <!-- The default (global) java scripts -->
> - <!-- jQuery part -->
> - <!-- Load available JS Language Files -->
> - <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}" />
> - <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true" />
> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true"/>
> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true" />
> - <!-- jQuery CSSs -->
> - <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true" />
> -
> - <set field="layoutSettings.javaScripts[]" value="/images/OpenLayers-2.13.1.js" global="true" />
> - <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true" />
> - <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true" />
> - <set field="layoutSettings.javaScripts[]" value="/images/date/date.format-1.2.3-min.js" global="true" />
> - <set field="layoutSettings.javaScripts[]" value="/images/date/date.timezone-min.js" global="true" />
> - <set field="layoutSettings.javaScripts[]" value="/images/miscAjaxFunctions.js" global="true" />
> - <set field="layoutSettings.javaScripts[]" value="/images/selectMultipleRelatedValues.js" global="true" />
> - <set field="layoutSettings.javaScripts[]" value="/images/util.js" global="true" />
> - <set field="layoutSettings.javaScripts[]" value="/images/date/FromThruDateCheck.js" 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" />
> </service>
> <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true" />
> +
> + <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}" />
> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true" />
> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true" />
> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true" />
> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true" />
> +
> </actions>
> <widgets />
> </section>
> @@ -392,7 +370,6 @@ under the License.
> </service>
>
> <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
> - <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
>
> <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/>
> </actions>
>
> Modified: ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml (original)
> +++ ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml Sat Jun 20 17:02:22 2015
> @@ -20,16 +20,51 @@ under the License.
>
> <entity-engine-xml>
> <VisualTheme visualThemeId="BIZZNESS_TIME" visualThemeSetId="BACKOFFICE" description="It's bizzness, it's bizzness time. I couldn't have said it better myself. This theme gets down"/>
> +
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAME" resourceValue="BIZZNESS_TIME" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/bizznesstime/screenshot.jpg" sequenceId="01"/>
> +
> + <!-- css references -->
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bizznesstime/css/style.css" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/bizznesstime/css/help.css" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/bizznesstime/webapp/bizznesstime/css/docbook.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bizznesstime/js/application.js" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
> +
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" sequenceId="02"/>
> +
> + <!-- javascript references -->
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js" sequenceId="02"/>
> +
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" sequenceId="03"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/i18n/jquery.ui.datepicker-en.js" sequenceId="04"/>
> +
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" sequenceId="05"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datejs/date-en-US.js" sequenceId="06"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" sequenceId="07"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js" sequenceId="08"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/fjTimer/jquerytimer-min.js" sequenceId="09"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js" sequenceId="10"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jeditable/jquery.jeditable.js" sequenceId="11"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/jquery.validate.min.js" sequenceId="12"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/localization/messages_en.js" sequenceId="13"/>
> +
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OpenLayers-2.13.1.js" sequenceId="13"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectall.js" sequenceId="15"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/fieldlookup.js" sequenceId="16"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.format-1.2.3-min.js" sequenceId="17"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.timezone-min.js" sequenceId="18"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/miscAjaxFunctions.js" sequenceId="19"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectMultipleRelatedValues.js" sequenceId="20"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js" sequenceId="21"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/>
> +
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bizznesstime/js/application.js" sequenceId="30"/>
> +
> + <!-- ftl references -->
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://bizznesstime/includes/header.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://bizznesstime/includes/footer.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://bizznesstime/includes/appbar.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bizznesstime/includes/messages.ftl" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/bizznesstime/screenshot.jpg" sequenceId="01"/>
> </entity-engine-xml>
>
> Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
> +++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Sat Jun 20 17:02:22 2015
> @@ -85,15 +85,6 @@ under the License.
> </#list>
> </#if>
>
> - <#if layoutSettings.javaScripts?has_content>
> - <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
> - <#list layoutSettings.javaScripts as javaScript>
> - <#if javaScriptsSet.contains(javaScript)>
> - <#assign nothing = javaScriptsSet.remove(javaScript)/>
> - <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
> - </#if>
> - </#list>
> - </#if>
> <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
> <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
> <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
>
> Modified: ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml (original)
> +++ ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml Sat Jun 20 17:02:22 2015
> @@ -21,16 +21,52 @@ under the License.
> <entity-engine-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_STYLESHEET" resourceValue="/bluelight/style.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/bluelight/help.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/bluelight/webapp/bluelight/docbook.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bluelight/dropdown.js" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/bluelight/screenshot.jpg" sequenceId="01"/>
> +
> +
> + <!-- CSS references -->
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bluelight/style.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/bluelight/help.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/bluelight/webapp/bluelight/docbook.css" sequenceId="01"/>
> +
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" sequenceId="02"/>
> +
> + <!-- Javascript references -->
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js" sequenceId="02"/>
> +
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" sequenceId="03"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/i18n/jquery.ui.datepicker-en.js" sequenceId="04"/>
> +
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" sequenceId="05"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datejs/date-en-US.js" sequenceId="06"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" sequenceId="07"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js" sequenceId="08"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/fjTimer/jquerytimer-min.js" sequenceId="09"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js" sequenceId="10"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jeditable/jquery.jeditable.js" sequenceId="11"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/jquery.validate.min.js" sequenceId="12"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/localization/messages_en.js" sequenceId="13"/>
> +
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OpenLayers-2.13.1.js" sequenceId="13"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectall.js" sequenceId="15"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/fieldlookup.js" sequenceId="16"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.format-1.2.3-min.js" sequenceId="17"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.timezone-min.js" sequenceId="18"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/miscAjaxFunctions.js" sequenceId="19"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectMultipleRelatedValues.js" sequenceId="20"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js" sequenceId="21"/>
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/>
> +
> + <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bluelight/dropdown.js" sequenceId="30"/>
> +
> + <!-- ftl references -->
> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://bluelight/includes/header.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://bluelight/includes/footer.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://bluelight/includes/appbarOpen.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://bluelight/includes/appbarClose.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bluelight/includes/messages.ftl" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/bluelight/screenshot.jpg" sequenceId="01"/>
> +
> </entity-engine-xml>
>
> Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
> +++ ofbiz/trunk/themes/bluelight/includes/header.ftl Sat Jun 20 17:02:22 2015
> @@ -37,17 +37,6 @@ under the License.
> <#if shortcutIcon?has_content>
> <link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
> </#if>
> - <#if layoutSettings.javaScripts?has_content>
> - <#--layoutSettings.javaScripts is a list of java scripts. -->
> - <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
> - <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
> - <#list layoutSettings.javaScripts as javaScript>
> - <#if javaScriptsSet.contains(javaScript)>
> - <#assign nothing = javaScriptsSet.remove(javaScript)/>
> - <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
> - </#if>
> - </#list>
> - </#if>
> <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
> <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
> <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
>
> Modified: ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml (original)
> +++ ofbiz/trunk/themes/droppingcrumbs/data/DroppingCrumbsThemeData.xml Sat Jun 20 17:02:22 2015
> @@ -20,17 +20,53 @@ under the License.
>
> <entity-engine-xml>
> <VisualTheme visualThemeId="DROPPINGCRUMBS" visualThemeSetId="BACKOFFICE" description="Dropping Crumbs: Evolution of Blue-Light, includes a drop down menu embedded in the breadcrumbs bar"/>
> +
> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAME" resourceValue="DROPPINGCRUMBS" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/droppingcrumbs/css/style.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/droppingcrumbs/css/help.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/droppingcrumbs/js/dropdown.js" sequenceId="01"/>
> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/droppingcrumbs/screenshot.jpg" sequenceId="01"/>
> +
> + <!-- css references -->
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/droppingcrumbs/css/style.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/droppingcrumbs/css/help.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css" sequenceId="01"/>
> +
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" sequenceId="02"/>
> +
> + <!-- javascript references -->
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js" sequenceId="02"/>
> +
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" sequenceId="03"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/i18n/jquery.ui.datepicker-en.js" sequenceId="04"/>
> +
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" sequenceId="05"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datejs/date-en-US.js" sequenceId="06"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" sequenceId="07"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js" sequenceId="08"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/fjTimer/jquerytimer-min.js" sequenceId="09"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js" sequenceId="10"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jeditable/jquery.jeditable.js" sequenceId="11"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/jquery.validate.min.js" sequenceId="12"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/localization/messages_en.js" sequenceId="13"/>
> +
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OpenLayers-2.13.1.js" sequenceId="13"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectall.js" sequenceId="15"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/fieldlookup.js" sequenceId="16"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.format-1.2.3-min.js" sequenceId="17"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.timezone-min.js" sequenceId="18"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/miscAjaxFunctions.js" sequenceId="19"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectMultipleRelatedValues.js" sequenceId="20"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js" sequenceId="21"/>
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/>
> +
> + <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/droppingcrumbs/js/dropdown.js" sequenceId="30"/>
> +
> + <!-- ftl references -->
> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://droppingcrumbs/includes/header.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://droppingcrumbs/includes/footer.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://droppingcrumbs/includes/appbarOpen.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://droppingcrumbs/includes/appbarClose.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="DROPPINGCRUMBS" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/droppingcrumbs/screenshot.jpg" sequenceId="01"/>
> +
> </entity-engine-xml>
>
> Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
> +++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Sat Jun 20 17:02:22 2015
> @@ -37,17 +37,6 @@ under the License.
> <#if shortcutIcon?has_content>
> <link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
> </#if>
> - <#if layoutSettings.javaScripts?has_content>
> - <#--layoutSettings.javaScripts is a list of java scripts. -->
> - <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
> - <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
> - <#list layoutSettings.javaScripts as javaScript>
> - <#if javaScriptsSet.contains(javaScript)>
> - <#assign nothing = javaScriptsSet.remove(javaScript)/>
> - <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
> - </#if>
> - </#list>
> - </#if>
> <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
> <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
> <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
>
> Modified: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
> +++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Sat Jun 20 17:02:22 2015
> @@ -20,18 +20,53 @@ under the License.
>
> <entity-engine-xml>
> <VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Floating Layout, Sight-Impaired Accessible, Bidirectional"/>
> +
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAME" resourceValue="FLAT_GREY" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/flatgrey/images/ofbiz_logo.gif" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/flatgrey/screenshot.jpg" sequenceId="01"/>
> +
> + <!-- css references -->
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss.css" sequenceId="01"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/javascript.css" sequenceId="02"/>
> - <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/flatgrey/help.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/flatgrey/webapp/flatgrey/docbook.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/flatgrey/help.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/flatgrey/webapp/flatgrey/docbook.css" sequenceId="01"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/flatgrey/js/application.js" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/flatgrey/images/ofbiz_logo.gif" sequenceId="01"/>
> +
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" sequenceId="02"/>
> +
> + <!-- javascript references -->
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js" sequenceId="02"/>
> +
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" sequenceId="03"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/i18n/jquery.ui.datepicker-en.js" sequenceId="04"/>
> +
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" sequenceId="05"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datejs/date-en-US.js" sequenceId="06"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" sequenceId="07"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js" sequenceId="08"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/fjTimer/jquerytimer-min.js" sequenceId="09"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js" sequenceId="10"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jeditable/jquery.jeditable.js" sequenceId="11"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/jquery.validate.min.js" sequenceId="12"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/localization/messages_en.js" sequenceId="13"/>
> +
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OpenLayers-2.13.1.js" sequenceId="13"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectall.js" sequenceId="15"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/fieldlookup.js" sequenceId="16"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.format-1.2.3-min.js" sequenceId="17"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.timezone-min.js" sequenceId="18"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/miscAjaxFunctions.js" sequenceId="19"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectMultipleRelatedValues.js" sequenceId="20"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js" sequenceId="21"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/>
> +
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/flatgrey/js/application.js" sequenceId="30"/>
> +
> + <!-- ftl references -->
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://flatgrey/includes/header.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/includes/footer.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/includes/appbar.ftl" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/flatgrey/screenshot.jpg" sequenceId="01"/>
> </entity-engine-xml>
>
> Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
> +++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Sat Jun 20 17:02:22 2015
> @@ -33,17 +33,6 @@ under the License.
> <#if shortcutIcon?has_content>
> <link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
> </#if>
> - <#if layoutSettings.javaScripts?has_content>
> - <#--layoutSettings.javaScripts is a list of java scripts. -->
> - <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
> - <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
> - <#list layoutSettings.javaScripts as javaScript>
> - <#if javaScriptsSet.contains(javaScript)>
> - <#assign nothing = javaScriptsSet.remove(javaScript)/>
> - <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
> - </#if>
> - </#list>
> - </#if>
> <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
> <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
> <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
>
> Modified: ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml (original)
> +++ ofbiz/trunk/themes/tomahawk/data/TomahawkThemeData.xml Sat Jun 20 17:02:22 2015
> @@ -20,17 +20,52 @@ under the License.
>
> <entity-engine-xml>
> <VisualTheme visualThemeId="TOMAHAWK" visualThemeSetId="BACKOFFICE" description="Tomahawk: the evolution of the Dropping Crumbs theme"/>
> +
> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_NAME" resourceValue="TOMAHAWK" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/tomahawk/screenshot.jpg" sequenceId="01"/>
> +
> + <!-- css references -->
> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/tomahawk/css/style.css" sequenceId="01"/>
> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/tomahawk/css/help.css" sequenceId="01"/>
> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/tomahawk/webapp/tomahawk/css/docbook.css" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/tomahawk/js/dropdown.js" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
> +
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" sequenceId="02"/>
> +
> + <!-- javascript references -->
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js" sequenceId="02"/>
> +
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" sequenceId="03"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/i18n/jquery.ui.datepicker-en.js" sequenceId="04"/>
> +
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" sequenceId="05"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datejs/date-en-US.js" sequenceId="06"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" sequenceId="07"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js" sequenceId="08"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/fjTimer/jquerytimer-min.js" sequenceId="09"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js" sequenceId="10"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jeditable/jquery.jeditable.js" sequenceId="11"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/jquery.validate.min.js" sequenceId="12"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/localization/messages_en.js" sequenceId="13"/>
> +
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OpenLayers-2.13.1.js" sequenceId="13"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectall.js" sequenceId="15"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/fieldlookup.js" sequenceId="16"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.format-1.2.3-min.js" sequenceId="17"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/date.timezone-min.js" sequenceId="18"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/miscAjaxFunctions.js" sequenceId="19"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectMultipleRelatedValues.js" sequenceId="20"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js" sequenceId="21"/>
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/>
> +
> + <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/tomahawk/js/dropdown.js" sequenceId="30"/>
> +
> + <!-- ftl references -->
> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://tomahawk/includes/header.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://tomahawk/includes/footer.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://tomahawk/includes/appbarOpen.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://tomahawk/includes/appbarClose.ftl" sequenceId="01"/>
> <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/>
> - <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/tomahawk/screenshot.jpg" sequenceId="01"/>
> </entity-engine-xml>
>
> Modified: ofbiz/trunk/themes/tomahawk/includes/header.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/header.ftl?rev=1686655&r1=1686654&r2=1686655&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/tomahawk/includes/header.ftl (original)
> +++ ofbiz/trunk/themes/tomahawk/includes/header.ftl Sat Jun 20 17:02:22 2015
> @@ -37,17 +37,6 @@ under the License.
> <#if shortcutIcon?has_content>
> <link rel="shortcut icon" href="<@o...@ofbizContentUrl>" />
> </#if>
> - <#if layoutSettings.javaScripts?has_content>
> - <#--layoutSettings.javaScripts is a list of java scripts. -->
> - <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
> - <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
> - <#list layoutSettings.javaScripts as javaScript>
> - <#if javaScriptsSet.contains(javaScript)>
> - <#assign nothing = javaScriptsSet.remove(javaScript)/>
> - <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
> - </#if>
> - </#list>
> - </#if>
> <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
> <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
> <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
>
>