You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/05/03 22:50:10 UTC
svn commit: r1742196 [3/6] - in /ofbiz/trunk: ./
applications/accounting/config/
applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/
applications/accounting/webapp/accounting/WEB-INF/
applications/content/config/ applications/product/con...
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Tue May 3 20:50:10 2016
@@ -195,7 +195,7 @@ under the License.
</container>
<container style="righthalf">
<screenlet title="${uiLabelMap.WorkEffortParticipants}">
- <include-form name="showCalEventRolesDel" location="component://workeffort/widget/CalendarForms.xml" />
+ <include-grid name="showCalEventRolesDel" location="component://workeffort/widget/CalendarForms.xml" />
<section>
<condition>
<and>
@@ -221,7 +221,7 @@ under the License.
</container>
<container style="righthalf">
<screenlet title="${uiLabelMap.WorkEffortParticipants}">
- <include-form name="showCalEventRoles" location="component://workeffort/widget/CalendarForms.xml" />
+ <include-grid name="showCalEventRoles" location="component://workeffort/widget/CalendarForms.xml" />
</screenlet>
</container>
</fail-widgets>
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Tue May 3 20:50:10 2016
@@ -324,8 +324,8 @@ public class CommonServices {
v.set("serverHostName", "localhost");
v.set("webappName", "webtools");
v.set("initialLocale", "en_US");
- v.set("initialRequest", "http://localhost:8080/webtools/control/main");
- v.set("initialReferrer", "http://localhost:8080/webtools/control/main");
+ v.set("initialRequest", "https://localhost:8443/webtools/control/main");
+ v.set("initialReferrer", "https://localhost:8443/webtools/control/main");
v.set("initialUserAgent", "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/124 (KHTML, like Gecko) Safari/125.1");
v.set("clientIpAddress", "127.0.0.1");
v.set("clientHostName", "localhost");
Added: ofbiz/trunk/framework/images/webapp/images/commons-safe-head.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/commons-safe-head.ftl?rev=1742196&view=auto
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/commons-safe-head.ftl (added)
+++ ofbiz/trunk/framework/images/webapp/images/commons-safe-head.ftl Tue May 3 20:50:10 2016
@@ -0,0 +1,15 @@
+<#-- Refer to https://cyh.herokuapp.com/cyh for details, you might also have a look at https://cwiki.apache.org/confluence/display/OFBIZ/How+to+Secure+HTTP+Headers -->
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta http-equiv="pragma" content="no-cache" />
+ <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate" />
+ <meta http-equiv="expires" content="-1" />
+
+ <title>${layoutSettings.companyName}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)!}</#if></title>
+
+ <meta name="robots" content="index, follow" />
+ <meta name="googlebot" content="index,follow" />
+ <meta name="description" content="" />
+ <meta name="keywords" content="" />
+ <meta name="copyright" content="" />
+ <meta name="author" content="" />
Propchange: ofbiz/trunk/framework/images/webapp/images/commons-safe-head.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/images/webapp/images/commons-safe-head.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/framework/images/webapp/images/commons-safe-head.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/framework/service/config/serviceengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/config/serviceengine.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/config/serviceengine.xml (original)
+++ ofbiz/trunk/framework/service/config/serviceengine.xml Tue May 3 20:50:10 2016
@@ -57,11 +57,11 @@ under the License.
<engine name="jms" class="org.ofbiz.service.jms.JmsServiceEngine"/>
<engine name="rmi" class="org.ofbiz.service.rmi.RmiServiceEngine"/>
<engine name="soap" class="org.ofbiz.service.engine.SOAPClientEngine"/>
- <!-- The engine xml-rpc-local is only used by a test service and for this reason it is configured to run on port 8080.
- In order to use this in OFBiz change the port accordingly (for demo the default value is 8080)
+ <!-- The engine xml-rpc-local is only used by a test service and for this reason it is configured to run on port 8443.
+ In order to use this in OFBiz change the port accordingly (for demo the default value is 8443)
-->
<engine name="xml-rpc-local" class="org.ofbiz.service.engine.XMLRPCClientEngine">
- <parameter name="url" value="http://localhost:8080/webtools/control/xmlrpc"/>
+ <parameter name="url" value="https://localhost:8443/webtools/control/xmlrpc"/>
<parameter name="login" value="admin"/>
<parameter name="password" value="ofbiz"/>
</engine>
@@ -71,10 +71,10 @@ under the License.
<service-location name="main-soap" location="http://localhost:8080/webtools/control/SOAPService"/>
<service-location name="entity-sync-rmi" location="rmi://localhost:1099/RMIDispatcher"/>
- <service-location name="entity-sync-http" location="http://localhost:8080/webtools/control/httpService"/>
+ <service-location name="entity-sync-http" location="https://localhost:8443/webtools/control/httpService"/>
<service-location name="rita-rmi" location="rmi://localhost:1099/RMIDispatcher"/>
- <service-location name="eedcc-test" location="http://localhost:8080/webtools/control/httpService"/>
+ <service-location name="eedcc-test" location="https://localhost:8443/webtools/control/httpService"/>
<!-- default notification group for all services loaded with 'main' loader
- uncomment this to enable error notification for all services
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java Tue May 3 20:50:10 2016
@@ -38,7 +38,7 @@ public class XmlRpcTests extends Abstrac
public static final String module = XmlRpcTests.class.getName();
public static final String resource = "ServiceErrorUiLabels";
- public static String url = "http://localhost:8080/webtools/control/xmlrpc";
+ public static String url = "https://localhost:8443/webtools/control/xmlrpc";
public XmlRpcTests(String name) {
super(name);
Modified: ofbiz/trunk/framework/webapp/config/fop.xconf
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/fop.xconf?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/fop.xconf (original)
+++ ofbiz/trunk/framework/webapp/config/fop.xconf Tue May 3 20:50:10 2016
@@ -31,7 +31,7 @@ the location of this file.
<fop version="1.0">
<!-- Base URL for resolving relative URLs -->
- <base>http://localhost:8080</base>
+ <base>https://localhost:8443</base>
<!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
<source-resolution>72</source-resolution>
Modified: ofbiz/trunk/framework/webapp/config/url.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/url.properties?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/url.properties (original)
+++ ofbiz/trunk/framework/webapp/config/url.properties Tue May 3 20:50:10 2016
@@ -29,6 +29,10 @@ force.https.host=
port.http=8080
force.http.host=
+# If you want to use HTTP then set no.http=N. Else all requests will use HTTPS except if put in the http.request-map.list
+no.http=Y
+http.request-map.list=SOAPService
+
# Static Content URLs to make it easy to move the serving load for static content to other machines
# -- thse are for general content such as images, js & css files, or non-dynamic HTML files
content.url.prefix.secure=
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Tue May 3 20:50:10 2016
@@ -49,6 +49,7 @@ under the License.
<response name="error" type="none"/>
</request-map>
<request-map uri="SOAPService">
+ <security https="false"/>
<event type="soap"/>
<response name="error" type="none"/>
<response name="success" type="none"/>
@@ -603,6 +604,7 @@ under the License.
<request-map uri="WebtoolsLayoutDemoFop"><security https="true" auth="true"/><response name="success" type="view" value="WebtoolsLayoutDemoFop"/></request-map>
<request-map uri="WebtoolsLayoutDemoText"><security https="true" auth="true"/><response name="success" type="view" value="WebtoolsLayoutDemoText"/></request-map>
<request-map uri="WebtoolsLayoutDemoXml"><security https="true" auth="true"/><response name="success" type="view" value="WebtoolsLayoutDemoXml"/></request-map>
+ <request-map uri="WebtoolsLayoutDemoXls"><security https="true" auth="true"/><response name="success" type="view" value="WebtoolsLayoutDemoXls"/></request-map>
<request-map uri="WebtoolsLayoutDemoCsv"><security https="true" auth="true"/><response name="success" type="view" value="WebtoolsLayoutDemoCsv"/></request-map>
<!-- end of request mappings -->
@@ -629,7 +631,7 @@ under the License.
<view-map name="dataMySql" page="/entity/dataMySql.jsp"/>
<view-map name="ModelWriter" page="/entity/ModelWriter.jsp"/>
<view-map name="ModelGroupWriter" page="/entity/ModelGroupWriter.jsp"/>
- <view-map name="ModelInduceFromDb" page="/entity/ModelInduceFromDb.jsp"/>
+ <view-map name="ModelInduceFromDb" type="screen" page="component://webtools/widget/EntityScreens.xml#ModelInduceFromDb"/>
<view-map name="EntityEoModelBundle" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityEoModelBundle"/>
<view-map name="checkdb" type="screen" page="component://webtools/widget/EntityScreens.xml#CheckDb"/>
@@ -709,6 +711,8 @@ under the License.
<view-map name="WebtoolsLayoutDemoText" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" type="screentext"/>
<view-map name="WebtoolsLayoutDemoXml" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" content-type="text/xml" type="screenxml"/>
<view-map name="WebtoolsLayoutDemoCsv" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" content-type="text/csv" type="screencsv"/>
+ <view-map name="WebtoolsLayoutDemoXls" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" content-type="application/vnd.ms-excel" type="screenxls"/><!--#Eam# xls-renderer -->
+
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CacheScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CacheScreens.xml Tue May 3 20:50:10 2016
@@ -41,7 +41,7 @@ under the License.
</screenlet>
<screenlet>
<include-menu name="FindCache" location="component://webtools/widget/Menus.xml"/>
- <include-form name="ListCache" location="component://webtools/widget/CacheForms.xml"/>
+ <include-grid name="ListCache" location="component://webtools/widget/CacheForms.xml"/>
<include-menu name="FindCache" location="component://webtools/widget/Menus.xml"/>
</screenlet>
</widgets>
@@ -74,7 +74,7 @@ under the License.
<screenlet title="${uiLabelMap.PageTitleFindUtilCacheElements}">
<label>${uiLabelMap.WebtoolsCacheName} ${cacheName} (${now}) ${uiLabelMap.WebtoolsSizeTotal} ${totalSize} ${uiLabelMap.WebtoolsBytes}</label>
<include-menu name="CacheElements" location="component://webtools/widget/Menus.xml"/>
- <include-form name="ListCacheElements" location="component://webtools/widget/CacheForms.xml"/>
+ <include-grid name="ListCacheElements" location="component://webtools/widget/CacheForms.xml"/>
<include-menu name="CacheElements" location="component://webtools/widget/Menus.xml"/>
</screenlet>
</widgets>
Modified: ofbiz/trunk/framework/webtools/widget/StatsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/StatsForms.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/StatsForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/StatsForms.xml Tue May 3 20:50:10 2016
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
- <grid name="ListStats" paginate-target="StatsSinceStart" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <field name="requestId" title="${uiLabelMap.WebtoolsStatsRequestId}"><display/></field>
- <field name="startTime" title="${uiLabelMap.WebtoolsStatsStart}"><display/></field>
- <field name="endTime" title="${uiLabelMap.WebtoolsStatsStop}"><display/></field>
- <field name="lengthMins" title="${uiLabelMap.WebtoolsStatsMinutes}"><display/></field>
- <field name="numberHits" title="${uiLabelMap.WebtoolsStatsHits}"><display/></field>
- <field name="minTime" title="${uiLabelMap.WebtoolsStatsMin}"><display/></field>
- <field name="avgTime" title="${uiLabelMap.WebtoolsStatsAvg}"><display/></field>
- <field name="maxTime" title="${uiLabelMap.WebtoolsStatsMax}"><display/></field>
- <field name="hitsPerMin" title="${uiLabelMap.WebtoolsStatsHitsPerMin}"><display/></field>
- <field name="viewBins" title=" " widget-area-style="button-col">
- <hyperlink description="${uiLabelMap.WebtoolsStatsViewBins}" target="StatBinsHistory">
- <parameter param-name="statsId" from-field="requestId"/>
- <parameter param-name="type" from-field="requestType"/>
- </hyperlink>
- </field>
- </grid>
-
- <form name="ListRequestStats" extends="ListStats" list-name="requestList"/>
- <form name="ListEventStats" extends="ListStats" list-name="eventList"/>
- <form name="ListViewStats" extends="ListStats" list-name="viewList"/>
- <form name="ListRequestBins" extends="ListStats" list-name="requestList">
- <field name="viewBins"><hidden/></field>
- </form>
-
- <grid name="ListMetrics" list-name="metricsList" paginate-target="ViewMetrics"
- header-row-style="header-row-2" default-table-style="basic-table light-grid">
- <actions>
- <service service-name="getAllMetrics" />
- </actions>
- <field name="name" title="${uiLabelMap.CommonName}"><display/></field>
- <field name="serviceRate" title="${uiLabelMap.WebtoolsMetricsRate}"><display/></field>
- <field name="threshold" title="${uiLabelMap.WebtoolsMetricsThreshold}"><display/></field>
- <field name="totalEvents" title="${uiLabelMap.WebtoolsMetricsTotalEvents}"><display/></field>
- <field name="resetMetric" title=" " widget-area-style="button-col">
- <hyperlink description="${uiLabelMap.CommonReset}" target="ResetMetric">
- <parameter param-name="name"/>
- </hyperlink>
- </field>
- </grid>
-</forms>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ <grid name="ListStats" paginate-target="StatsSinceStart" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <field name="requestId" title="${uiLabelMap.WebtoolsStatsRequestId}"><display/></field>
+ <field name="startTime" title="${uiLabelMap.WebtoolsStatsStart}"><display/></field>
+ <field name="endTime" title="${uiLabelMap.WebtoolsStatsStop}"><display/></field>
+ <field name="lengthMins" title="${uiLabelMap.WebtoolsStatsMinutes}"><display/></field>
+ <field name="numberHits" title="${uiLabelMap.WebtoolsStatsHits}"><display/></field>
+ <field name="minTime" title="${uiLabelMap.WebtoolsStatsMin}"><display/></field>
+ <field name="avgTime" title="${uiLabelMap.WebtoolsStatsAvg}"><display/></field>
+ <field name="maxTime" title="${uiLabelMap.WebtoolsStatsMax}"><display/></field>
+ <field name="hitsPerMin" title="${uiLabelMap.WebtoolsStatsHitsPerMin}"><display/></field>
+ <field name="viewBins" title=" " widget-area-style="button-col">
+ <hyperlink description="${uiLabelMap.WebtoolsStatsViewBins}" target="StatBinsHistory">
+ <parameter param-name="statsId" from-field="requestId"/>
+ <parameter param-name="type" from-field="requestType"/>
+ </hyperlink>
+ </field>
+ </grid>
+
+ <grid name="ListRequestStats" extends="ListStats" list-name="requestList"/>
+ <grid name="ListEventStats" extends="ListStats" list-name="eventList"/>
+ <grid name="ListViewStats" extends="ListStats" list-name="viewList"/>
+ <grid name="ListRequestBins" extends="ListStats" list-name="requestList">
+ <field name="viewBins"><hidden/></field>
+ </grid>
+
+ <grid name="ListMetrics" list-name="metricsList" paginate-target="ViewMetrics"
+ header-row-style="header-row-2" default-table-style="basic-table light-grid">
+ <actions>
+ <service service-name="getAllMetrics" />
+ </actions>
+ <field name="name" title="${uiLabelMap.CommonName}"><display/></field>
+ <field name="serviceRate" title="${uiLabelMap.WebtoolsMetricsRate}"><display/></field>
+ <field name="threshold" title="${uiLabelMap.WebtoolsMetricsThreshold}"><display/></field>
+ <field name="totalEvents" title="${uiLabelMap.WebtoolsMetricsTotalEvents}"><display/></field>
+ <field name="resetMetric" title=" " widget-area-style="button-col">
+ <hyperlink description="${uiLabelMap.CommonReset}" target="ResetMetric">
+ <parameter param-name="name"/>
+ </hyperlink>
+ </field>
+ </grid>
+</forms>
Modified: ofbiz/trunk/framework/webtools/widget/StatsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/StatsScreens.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/StatsScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/StatsScreens.xml Tue May 3 20:50:10 2016
@@ -65,13 +65,13 @@ under the License.
<include-menu name="StatsSinceStart" location="component://webtools/widget/Menus.xml"/>
<label>${uiLabelMap.WebtoolsStatsCurrentTime} ${nowTimestamp}</label>
<screenlet title="${uiLabelMap.WebtoolsStatsRequestStats}" padded="false">
- <include-form name="ListRequestStats" location="component://webtools/widget/StatsForms.xml"/>
+ <include-grid name="ListRequestStats" location="component://webtools/widget/StatsForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.WebtoolsStatsEventStats}" padded="false">
- <include-form name="ListEventStats" location="component://webtools/widget/StatsForms.xml"/>
+ <include-grid name="ListEventStats" location="component://webtools/widget/StatsForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.WebtoolsStatsViewStats}" padded="false">
- <include-form name="ListViewStats" location="component://webtools/widget/StatsForms.xml"/>
+ <include-grid name="ListViewStats" location="component://webtools/widget/StatsForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -98,7 +98,7 @@ under the License.
</container>
<include-menu name="StatsBinHistory" location="component://webtools/widget/Menus.xml"/>
<label>${uiLabelMap.WebtoolsStatsCurrentTime} ${nowTimestamp}</label>
- <include-form name="ListRequestBins" location="component://webtools/widget/StatsForms.xml"/>
+ <include-grid name="ListRequestBins" location="component://webtools/widget/StatsForms.xml"/>
</widgets>
</section>
</decorator-section>
@@ -121,7 +121,7 @@ under the License.
<container style="page-title">
<label text="${uiLabelMap[titleProperty]}"/>
</container>
- <include-form name="ListMetrics" location="component://webtools/widget/StatsForms.xml" />
+ <include-grid name="ListMetrics" location="component://webtools/widget/StatsForms.xml" />
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/framework/widget/config/widget.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/config/widget.properties?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/config/widget.properties (original)
+++ ofbiz/trunk/framework/widget/config/widget.properties Tue May 3 20:50:10 2016
@@ -28,7 +28,7 @@
widget.verbose=true
# Default number of items to be displayed per page in a list form
-widget.form.defaultViewSize=20
+widget.form.defaultViewSize=2
# Default number of items to be displayed in lookup ajax autocompleter
widget.autocompleter.defaultViewSize=10
Modified: ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/birt/ajax/utility/BirtUtility.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/birt/ajax/utility/BirtUtility.js?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/birt/ajax/utility/BirtUtility.js (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/birt/ajax/utility/BirtUtility.js Tue May 3 20:50:10 2016
@@ -181,7 +181,7 @@ BirtUtility.prototype =
/**
* Get a parameter specified in the URL. For example, if a URL is
- * http://localhost:8080/iportal/wr?__report=/16.webrptdesign&iPortalID=YPTDAGCNPOYSOS
+ * https://localhost:8443/iportal/wr?__report=/16.webrptdesign&iPortalID=YPTDAGCNPOYSOS
* getURLParameter(iPortalID) will return &iPortalID=YPTDAGCNPOYSOS
*/
getURLParameter: function ( url, parameterName )
Modified: ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl Tue May 3 20:50:10 2016
@@ -21,7 +21,7 @@ under the License.
<br />
<div align="center">
<a href="http://jigsaw.w3.org/css-validator/validator?uri=http://ofbiz.apache.org/"><img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"/></a>
- <a href="http://validator.w3.org/check?uri=referer"><img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!"/></a>
+ <a href="http://validator.w3.org/check?uri=referer" onclick="this.href='http://validator.w3.org/check?uri=' + escape(document.URL)"><img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!"/></a>
</div>
<br />
<div id="footer" align="center">
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml Tue May 3 20:50:10 2016
@@ -1,218 +1,218 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
- <!-- Personal Information -->
- <screen name="EbayPersonalInformation">
- <section>
- <actions>
- <set field="accountItem" value="personalInformation"/>
- <service service-name="getEbayUser" result-map="results">
- <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
- </service>
- </actions>
- <widgets>
- <decorator-screen name="AccountDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet name="" title="${uiLabelMap.EbayPersonalInformation}">
- <include-form location="component://ebaystore/widget/EbayAccountForms.xml" name="EbayPersonalInformationForm"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <!-- feedback -->
- <screen name="EbayFeedback">
- <section>
- <actions>
- <set field="titleProperty" value="eBay Feedback"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="accountItem" value="feedback"/>
- </actions>
- <widgets>
- <decorator-screen name="AccountDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="EBAY" action="_VIEW"/>
- </condition>
- <widgets>
- <screenlet title="${uiLabelMap.EbayFeedback}">
- <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackTabBar"/>
- <decorator-section-include name="body"/>
- </screenlet>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.EbayViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="Feedback">
- <section>
- <actions>
- <set field="titleProperty" value="eBay Feedback"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="feedbackItem" value="Feedback"/>
- <service service-name="loadFeedback">
- <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
- </service>
- <service service-name="getItemsAwaitingFeedback" result-map="results">
- <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
- </service>
- <set field="itemsAwaitingFeedbackList" from-field="results.itemsAwaitingFeedback"/>
- <script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="EbayFeedback" >
- <decorator-section name="body">
- <screenlet>
- <screenlet navigation-form-name="ItemsAwaitingFeedback" title="Items Awaiting Feedback">
- <include-form name="ItemsAwaitingFeedback" location="component://ebaystore/widget/EbayAccountForms.xml"/>
- </screenlet>
- </screenlet>
- <screenlet>
- <screenlet navigation-form-name="RecentFeedback" title="Recent Feedback">
- <include-form name="RecentFeedback" location="component://ebaystore/widget/EbayAccountForms.xml"/>
- </screenlet>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="LeaveFeedback">
- <section>
- <actions>
- <set field="titleProperty" value="eBay Feedback"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="feedbackItem" value="LeaveFeedback"/>
- <set field="role" from-field="parameters.role" default-value="all"/>
- <service service-name="getItemsAwaitingFeedback" result-map="results"/>
- </actions>
- <widgets>
- <decorator-screen name="EbayFeedback" >
- <decorator-section name="body">
- <screenlet>
- <screenlet title="${uiLabelMap.EbayLeaveFeedback}">
- <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackSubTabBar"/>
- <platform-specific>
- <html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
- </platform-specific>
- </screenlet>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <!-- ebay feedback -->
- <screen name="EbayFeedback">
- <section>
- <actions>
- <set field="titleProperty" value="eBay Feedback"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="accountItem" value="feedback"/>
- </actions>
- <widgets>
- <decorator-screen name="AccountDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="EBAY" action="_VIEW"/>
- </condition>
- <widgets>
- <screenlet title="${uiLabelMap.EbayFeedback}">
- <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackTabBar"/>
- <decorator-section-include name="body"/>
- </screenlet>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.EbayViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="Feedback">
- <section>
- <actions>
- <set field="titleProperty" value="eBay Feedback"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="feedbackItem" value="Feedback"/>
- <service service-name="loadFeedback">
- <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
- </service>
- <service service-name="getItemsAwaitingFeedback" result-map="results">
- <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
- </service>
- <set field="itemsAwaitingFeedbackList" from-field="results.itemsAwaitingFeedback"/>
- <script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="EbayFeedback" >
- <decorator-section name="body">
- <screenlet>
- <screenlet navigation-form-name="ItemsAwaitingFeedback" title="Items Awaiting Feedback">
- <include-form name="ItemsAwaitingFeedback" location="component://ebaystore/widget/EbayAccountForms.xml"/>
- </screenlet>
- </screenlet>
- <screenlet>
- <screenlet navigation-form-name="RecentFeedback" title="Recent Feedback">
- <include-form name="RecentFeedback" location="component://ebaystore/widget/EbayAccountForms.xml"/>
- </screenlet>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="LeaveFeedback">
- <section>
- <actions>
- <set field="titleProperty" value="eBay Feedback"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="feedbackItem" value="LeaveFeedback"/>
- <set field="role" from-field="parameters.role" default-value="all"/>
- <service service-name="getItemsAwaitingFeedback" result-map="results"/>
- </actions>
- <widgets>
- <decorator-screen name="EbayFeedback" >
- <decorator-section name="body">
- <screenlet>
- <screenlet title="${uiLabelMap.EbayLeaveFeedback}">
- <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackSubTabBar"/>
- <platform-specific>
- <html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
- </platform-specific>
- </screenlet>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-</screens>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+ <!-- Personal Information -->
+ <screen name="EbayPersonalInformation">
+ <section>
+ <actions>
+ <set field="accountItem" value="personalInformation"/>
+ <service service-name="getEbayUser" result-map="results">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ </service>
+ </actions>
+ <widgets>
+ <decorator-screen name="AccountDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet name="" title="${uiLabelMap.EbayPersonalInformation}">
+ <include-form location="component://ebaystore/widget/EbayAccountForms.xml" name="EbayPersonalInformationForm"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <!-- feedback -->
+ <screen name="EbayFeedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="accountItem" value="feedback"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="AccountDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="EBAY" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <screenlet title="${uiLabelMap.EbayFeedback}">
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackTabBar"/>
+ <decorator-section-include name="body"/>
+ </screenlet>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.EbayViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="Feedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="feedbackItem" value="Feedback"/>
+ <service service-name="loadFeedback">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ </service>
+ <service service-name="getItemsAwaitingFeedback" result-map="results">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ </service>
+ <set field="itemsAwaitingFeedbackList" from-field="results.itemsAwaitingFeedback"/>
+ <script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="EbayFeedback" >
+ <decorator-section name="body">
+ <screenlet>
+ <screenlet navigation-form-name="ItemsAwaitingFeedback" title="Items Awaiting Feedback">
+ <include-form name="ItemsAwaitingFeedback" location="component://ebaystore/widget/EbayAccountForms.xml"/>
+ </screenlet>
+ </screenlet>
+ <screenlet>
+ <screenlet navigation-form-name="RecentFeedback" title="Recent Feedback">
+ <include-form name="RecentFeedback" location="component://ebaystore/widget/EbayAccountForms.xml"/>
+ </screenlet>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="LeaveFeedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="feedbackItem" value="LeaveFeedback"/>
+ <set field="role" from-field="parameters.role" default-value="all"/>
+ <service service-name="getItemsAwaitingFeedback" result-map="results"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="EbayFeedback" >
+ <decorator-section name="body">
+ <screenlet>
+ <screenlet title="${uiLabelMap.EbayLeaveFeedback}">
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackSubTabBar"/>
+ <platform-specific>
+ <html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
+ </platform-specific>
+ </screenlet>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <!-- ebay feedback -->
+ <screen name="EbayFeedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="accountItem" value="feedback"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="AccountDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="EBAY" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <screenlet title="${uiLabelMap.EbayFeedback}">
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackTabBar"/>
+ <decorator-section-include name="body"/>
+ </screenlet>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.EbayViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="Feedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="feedbackItem" value="Feedback"/>
+ <service service-name="loadFeedback">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ </service>
+ <service service-name="getItemsAwaitingFeedback" result-map="results">
+ <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
+ </service>
+ <set field="itemsAwaitingFeedbackList" from-field="results.itemsAwaitingFeedback"/>
+ <script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="EbayFeedback" >
+ <decorator-section name="body">
+ <screenlet>
+ <screenlet navigation-form-name="ItemsAwaitingFeedback" title="Items Awaiting Feedback">
+ <include-grid name="ItemsAwaitingFeedback" location="component://ebaystore/widget/EbayAccountForms.xml"/>
+ </screenlet>
+ </screenlet>
+ <screenlet>
+ <screenlet navigation-form-name="RecentFeedback" title="Recent Feedback">
+ <include-grid name="RecentFeedback" location="component://ebaystore/widget/EbayAccountForms.xml"/>
+ </screenlet>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="LeaveFeedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="feedbackItem" value="LeaveFeedback"/>
+ <set field="role" from-field="parameters.role" default-value="all"/>
+ <service service-name="getItemsAwaitingFeedback" result-map="results"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="EbayFeedback" >
+ <decorator-section name="body">
+ <screenlet>
+ <screenlet title="${uiLabelMap.EbayLeaveFeedback}">
+ <include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayFeedbackSubTabBar"/>
+ <platform-specific>
+ <html><html-template location="component://ebaystore/template/feedback/LeaveFeedback.ftl"/></html>
+ </platform-specific>
+ </screenlet>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>