Author: deepak
Date: Mon Dec 18 18:16:09 2017
New Revision: 1818600
URL: http://svn.apache.org/viewvc?rev=1818600&view=rev
Log:
Improved: Moved plugins js from images to common/js (OFBIZ-5776)
Added:
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/OpenLayers-2.13.1-modified-for-CSP-.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/OpenLayers-2.13.1-modified-for-CSP-.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/jsgantt/
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/jsgantt/jsgantt.css
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jsgantt.css
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/jsgantt/jsgantt.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jsgantt.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/moment-timezone/
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/moment-timezone/moment-timezone-with-data.min.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/moment-timezone-with-data.min.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/moment-timezone/moment-with-locales.min.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/moment-with-locales.min.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/myportal.css
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/myportal.css
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/myportal.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/myportal.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/combobox.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/combobox.js
Removed:
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/OpenLayers-2.13.1-modified-for-CSP-.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/combobox.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jsgantt.css
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jsgantt.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/moment-timezone-with-data.min.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/moment-with-locales.min.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/myportal.css
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/myportal.js
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-form.xsd
ofbiz/ofbiz-framework/trunk/themes/README.md
ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml?rev=1818600&r1=1818599&r2=1818600&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml
Mon Dec 18 18:16:09 2017
@@ -70,8 +70,8 @@ under the License.
<screen name="showPortalPage">
<section>
<actions>
- <set field="layoutSettings.javaScripts[]"
value="/images/myportal.js" global="true"/>
- <set field="layoutSettings.styleSheets[+0]"
value="/images/myportal.css" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/common/js/plugins/myportal.js" global="true"/>
+ <set field="layoutSettings.styleSheets[+0]"
value="/common/js/plugins/myportal.css" global="true"/>
<entity-one entity-name="PortalPage" value-field="portalPage"/>
<set field="title" from-field="portalPage.portalPageName"/>
</actions>
@@ -91,8 +91,8 @@ under the License.
<section>
<actions>
<set field="headerItem" value="Dashboard"/>
- <set field="layoutSettings.javaScripts[]"
value="/images/myportal.js" global="true"/>
- <set field="layoutSettings.styleSheets[+0]"
value="/images/myportal.css" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/common/js/plugins/myportal.js" global="true"/>
+ <set field="layoutSettings.styleSheets[+0]"
value="/common/js/plugins/myportal.css" global="true"/>
<entity-one entity-name="PortalPage" value-field="portalPage"/>
<set field="portalPages"
value="${groovy:org.apache.ofbiz.widget.portal.PortalPageWorker.getPortalPages(parameters.parentPortalPageId,context)}"/>
</actions>
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java?rev=1818600&r1=1818599&r2=1818600&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Mon Dec 18 18:16:09 2017
@@ -987,7 +987,7 @@ public class RequestHandler {
//resp.setHeader("Content-Security-Policy", "default-src 'self'");
//resp.setHeader("Content-Security-Policy-Report-Only", "default-src
'self'; report-uri webtools/control/ContentSecurityPolicyReporter");
- resp.setHeader("Content-Security-Policy-Report-Only", "default-src
'self'");
+ //resp.setHeader("Content-Security-Policy-Report-Only", "default-src
'self'");
// TODO in custom project. Public-Key-Pins-Report-Only is interesting
but can't be used OOTB because of demos (the letsencrypt certificate is renewed
every 3 months)
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-form.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-form.xsd?rev=1818600&r1=1818599&r2=1818600&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-form.xsd Mon Dec 18
18:16:09 2017
@@ -1210,7 +1210,7 @@ under the License.
<option key="_OTHER_"
description="Specify other"/>
- with '_OTHER_' being required and any 'description'
allowed.
In order to use this feature, the javascript code
contained in the file:
- images/webapp/images/combobox.js must be included in
the page.
+ common/js/util/combobox.js must be included in the
page.
</xs:documentation>
</xs:annotation>
</xs:attribute>
Modified: ofbiz/ofbiz-framework/trunk/themes/README.md
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/README.md?rev=1818600&r1=1818599&r2=1818600&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/README.md (original)
+++ ofbiz/ofbiz-framework/trunk/themes/README.md Mon Dec 18 18:16:09 2017
@@ -262,7 +262,7 @@ The blue light theme has been these prop
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/jquery/plugins/jquery.maskedinput-1.3.1.min.js"
sequenceId="10"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/jquery/plugins/jeditable/jquery.jeditable-1.7.3.js"
sequenceId="11"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/jquery/plugins/validate/jquery.validate.min.js"
sequenceId="12"/>
- <VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/images/OpenLayers-2.13.1.js" sequenceId="13"/>
+ <VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/plugins/OpenLayers-2.13.1.js" sequenceId="13"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/util/OfbizUtil.js" sequenceId="15"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/util/fieldlookup.js" sequenceId="16"/>
<VisualThemeResource visualThemeId="BLUELIGHT"
resourceTypeEnumId="VT_HDR_JAVASCRIPT"
resourceValue="/common/js/plugins/date/date.format-1.2.3-min.js"
sequenceId="17"/>
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=1818600&r1=1818599&r2=1818600&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml Mon Dec
18 18:16:09 2017
@@ -132,8 +132,8 @@ under the License.
<set field="layoutSettings.styleSheets[+0]"
value="/common/js/jquery/plugins/jquery-jgrowl/jquery.jgrowl-1.4.6.min.css"
global="true" />
<!-- Set default user locale from browser -->
<set field="layoutSettings.javaScripts[+0]"
value="/common/js/util/setUserLocale.js"/>
- <set field="layoutSettings.javaScripts[+0]"
value="/images/moment-timezone-with-data.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]"
value="/images/moment-with-locales.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]"
value="/common/js/plugins/moment-timezone/moment-timezone-with-data.min.js"
global="true"/>
+ <set field="layoutSettings.javaScripts[+0]"
value="/common/js/plugins/moment-timezone/moment-with-locales.min.js"
global="true"/>
</actions>
<widgets />
</section>
@@ -444,7 +444,7 @@ under the License.
<set field="layoutSettings.styleSheets[+0]"
value="/common/js/jquery/ui/jquery-ui-1.12.1.min.css" global="true" />
<set field="layoutSettings.styleSheets[+0]"
value="/common/js/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.6.3.min.css"
global="true" />
- <set field="layoutSettings.javaScripts[]"
value="/images/OpenLayers-2.13.1-modified-for-CSP-.js" global="true" />
+ <set field="layoutSettings.javaScripts[]"
value="/common/js/plugins/OpenLayers-2.13.1-modified-for-CSP-.js" global="true"
/>
<set field="layoutSettings.javaScripts[]"
value="/common/js/util/OfbizUtil.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/common/js/util/fieldlookup.js" global="true"/>
<!-- The default (global) shortcut icon -->
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=1818600&r1=1818599&r2=1818600&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml Mon Dec 18
18:16:09 2017
@@ -67,7 +67,7 @@ under the License.
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/jquery/plugins/jquery.maskedinput-1.3.1.min.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/jquery/plugins/jeditable/jquery.jeditable-1.7.3.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/jquery/plugins/validate/jquery.validate.min.js"/>
- <property name="VT_HDR_JAVASCRIPT['add']"
value="/images/OpenLayers-2.13.1-modified-for-CSP-.js"/>
+ <property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/plugins/OpenLayers-2.13.1-modified-for-CSP-.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/jquery/plugins/elrte-1.3/js/elrte.min.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/util/OfbizUtil.js"/>
<property name="VT_HDR_JAVASCRIPT['add']"
value="/common/js/util/fieldlookup.js"/>
