You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pr...@apache.org on 2016/08/30 13:37:27 UTC
svn commit: r1758389 - in /ofbiz/trunk:
applications/accounting/webapp/accounting/WEB-INF/
applications/accounting/webapp/ap/WEB-INF/
applications/accounting/webapp/ar/WEB-INF/
applications/content/webapp/content/WEB-INF/
applications/humanres/webapp/h...
Author: pranayp
Date: Tue Aug 30 13:37:27 2016
New Revision: 1758389
URL: http://svn.apache.org/viewvc?rev=1758389&view=rev
Log:
[OFBIZ-7311] - Applied the patch from the ticket. Removing the unused references of the maincss.css from source code, following is done-
1) Removed 'maincss.css' entry from 'allowedPaths' param of from web.xml
Reason: Since, there is no file like 'maincss.css' exist under any includes directory.
2) Removed the unused references of maincss.css from FTLs, code
<link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/>
has been removed.
Reason: This is an interesting thing, these FTLs were using the maincss.css located under the images directory.
When I look the history of these files, following were my findings,
The 'maincss.css' file under the 'images' directory exist in release4.0
http://svn.apache.org/repos/asf/ofbiz/branches/release4.0/framework/images/webapp/images/
after this release, this files no longer exist there.
3) Also, I have updated one file 'InventoryNoticeEmail.ftl' and used the basic HTML code to style, instead of using style defined in 'maincss.css' which were exist in release-4.0
4) Updated some references from 'maincss.css' to style.css in comments.
5) Also removed the entry of including '/images/maincss.css' and '/images/mainrtl.css' in SimpleDecorator
Since, these files no longer exist after release-4.0.
Thanks Wai for reviewing the work and thanks Swapnil M Mane for the contribution.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml
ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml
ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml
ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml
ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml
ofbiz/trunk/applications/party/template/email/AccountActivatedNotification.ftl
ofbiz/trunk/applications/party/template/email/ChangePersonalInfoNotification.ftl
ofbiz/trunk/applications/party/template/email/CreatePartyNotification.ftl
ofbiz/trunk/applications/party/template/email/VerifyEmailAddressNotification.ftl
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web.xml
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml
ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml
ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
ofbiz/trunk/framework/common/template/includes/Simple.ftl
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/resources/templates/web.xml
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl
ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl
ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/stylertl.css
ofbiz/trunk/themes/rainbowstone/webapp/rainbowstone/stylertl.css
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/stylertl.css
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -54,7 +54,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -50,7 +50,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -54,7 +54,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -54,7 +54,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -49,7 +49,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -53,7 +53,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -49,7 +49,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -49,7 +49,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl (original)
+++ ofbiz/trunk/applications/order/template/request/AddedNoteCustRequestNotification.ftl Tue Aug 30 13:37:27 2016
@@ -20,7 +20,6 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title}</title>
- <link rel="stylesheet" href="${baseSecureUrl!}/images/maincss.css" type="text/css"/>
</head>
<body>
<h2>${title}</h2>
Modified: ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl (original)
+++ ofbiz/trunk/applications/order/template/request/CompletedCustRequestNotification.ftl Tue Aug 30 13:37:27 2016
@@ -20,7 +20,6 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title}</title>
- <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/>
</head>
<body>
<h1>${title}</h1>
Modified: ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl (original)
+++ ofbiz/trunk/applications/order/template/request/CreateCustRequestNotification.ftl Tue Aug 30 13:37:27 2016
@@ -20,7 +20,6 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title}</title>
- <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/>
</head>
<body>
<h1>${title}</h1>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -50,7 +50,7 @@ under the License.
<init-param>
<param-name>allowedPaths</param-name>
<!-- Beware, if you use the Birt component, allowedPaths are not defined here anymore but in Birt web.xml-->
- <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/js:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/js</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/party/template/email/AccountActivatedNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/email/AccountActivatedNotification.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/email/AccountActivatedNotification.ftl (original)
+++ ofbiz/trunk/applications/party/template/email/AccountActivatedNotification.ftl Tue Aug 30 13:37:27 2016
@@ -20,7 +20,6 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title!}</title>
- <link rel="stylesheet" href="${baseUrl!}/images/maincss.css" type="text/css"/>
</head>
<body>
<h1>${title!}</h1>
Modified: ofbiz/trunk/applications/party/template/email/ChangePersonalInfoNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/email/ChangePersonalInfoNotification.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/email/ChangePersonalInfoNotification.ftl (original)
+++ ofbiz/trunk/applications/party/template/email/ChangePersonalInfoNotification.ftl Tue Aug 30 13:37:27 2016
@@ -20,7 +20,6 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title!}</title>
- <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
</head>
<body>
<h1>${title!}</h1>
Modified: ofbiz/trunk/applications/party/template/email/CreatePartyNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/email/CreatePartyNotification.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/email/CreatePartyNotification.ftl (original)
+++ ofbiz/trunk/applications/party/template/email/CreatePartyNotification.ftl Tue Aug 30 13:37:27 2016
@@ -20,7 +20,6 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title!}</title>
- <link rel="stylesheet" href="${baseUrl!}/images/maincss.css" type="text/css"/>
</head>
<body>
<h1>${title!}</h1>
Modified: ofbiz/trunk/applications/party/template/email/VerifyEmailAddressNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/template/email/VerifyEmailAddressNotification.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/template/email/VerifyEmailAddressNotification.ftl (original)
+++ ofbiz/trunk/applications/party/template/email/VerifyEmailAddressNotification.ftl Tue Aug 30 13:37:27 2016
@@ -20,7 +20,6 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title!}</title>
- <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
</head>
<body>
<h1>${title!}</h1>
@@ -28,4 +27,4 @@ under the License.
<br/><br/>
<a href="${baseUrl}/cmssite/cms/verifyEmailAddress?verifyHash=${parameters.verifyHash}">www.cmssite.com/cms/registration.html</a>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -49,7 +49,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/imagemanagement:/products</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/imagemanagement:/products</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -54,7 +54,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/ShippingAPI.dll</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/ShippingAPI.dll</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -49,7 +49,7 @@ under the License.
<init-param>
<param-name>allowedPaths</param-name>
<param-value>
- /error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css
+ /error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images
</param-value>
</init-param>
<init-param>
Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -52,7 +52,7 @@ under the License.
<init-param>
<param-name>allowedPaths</param-name>
<param-value>
- /error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css
+ /error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images
</param-value>
</init-param>
<init-param>
Modified: ofbiz/trunk/framework/common/template/includes/Simple.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/Simple.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/Simple.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/Simple.ftl Tue Aug 30 13:37:27 2016
@@ -42,8 +42,6 @@ under the License.
<#list layoutSettings.styleSheets as styleSheet>
<link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
</#list>
- <#else>
- <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
</#if>
<#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
<#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Aug 30 13:37:27 2016
@@ -448,9 +448,6 @@ under the License.
<screen name="SimpleDecorator">
<section>
<actions>
- <!-- The default (global) stylesheet -->
- <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/>
- <set field="layoutSettings.rtlStyleSheets[+0]" value="/images/mainrtl.css" global="true"/>
<!-- The default (global) java scripts -->
<!-- jQuery part -->
<!-- Load available JS Language Files -->
Modified: ofbiz/trunk/framework/resources/templates/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/templates/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/framework/resources/templates/web.xml (original)
+++ ofbiz/trunk/framework/resources/templates/web.xml Tue Aug 30 13:37:27 2016
@@ -41,7 +41,7 @@
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
@@ -76,4 +76,4 @@
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
</welcome-file-list>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -56,7 +56,7 @@ under the License.
<init-param>
<param-name>allowedPaths</param-name>
<param-value>
- /ping.txt:/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/applet:/includes/maincss.css
+ /ping.txt:/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/applet
</param-value>
</init-param>
<init-param>
Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -64,7 +64,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -64,7 +64,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -49,7 +49,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -55,7 +55,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -185,7 +185,7 @@ under the License.
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/frameset:/run:/preview:/download:/parameter:/document:/output:/extract:/webcontent:/CancelTask.jsp</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/frameset:/run:/preview:/download:/parameter:/document:/output:/extract:/webcontent:/CancelTask.jsp</param-value>
</init-param>
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -55,7 +55,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/ShippingAPI.dll</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/ShippingAPI.dll</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -50,7 +50,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -54,7 +54,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -54,7 +54,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl Tue Aug 30 13:37:27 2016
@@ -21,8 +21,6 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title!}</title>
- <#-- this needs to be fully qualified to appear in email; the server must also be available -->
- <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
</head>
<body>
Modified: ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl Tue Aug 30 13:37:27 2016
@@ -21,8 +21,6 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title!}</title>
- <#-- this needs to be fully qualified to appear in email; the server must also be available -->
- <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
</head>
<body>
Modified: ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -49,7 +49,7 @@ under the License.
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/js:/ws</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/js:/ws</param-value>
</init-param>
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
Modified: ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -44,7 +44,7 @@ under the License.
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -55,7 +55,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -59,7 +59,7 @@ under the License.
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
@@ -93,4 +93,4 @@ under the License.
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
</welcome-file-list>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -49,7 +49,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl Tue Aug 30 13:37:27 2016
@@ -22,31 +22,28 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title}</title>
- <#-- this needs to be fully qualified to appear in email; the server must also be available -->
- <link rel="stylesheet" href="${baseUrl}/images/maincss.css" type="text/css"/>
</head>
<body>
<h1>${title}</h1>
<#-- custom logo or text can be inserted here -->
<br />
- <div class="screenlet-title-bar">
- <div class="h3">${uiLabelMap.OagisInventoryDescription}<b></b></div>
+ <div>
+ <h3>${uiLabelMap.OagisInventoryDescription}</h3>
</div>
- <div class="screenlet-body">
- <table class="basic-table" cellspacing="0">
- <tr valign="bottom" class="header-row">
- <td width="10%"><b>${uiLabelMap.ProductProduct}</b></td>
- <td width="10%" align="center"><b>${uiLabelMap.OagisInventoryLevelDateTime}</b></td>
- <td width="10%" align="right"><b>${uiLabelMap.OrderReturnItemInventoryStatus}</b></td>
- <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Inventory)</b></td>
- <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Message)</b></td>
- <td width="10%" align="right"><b>${uiLabelMap.OagisQuantityDiff}.</b></td>
+ <div>
+ <table cellspacing="0">
+ <tr valign="bottom">
+ <th width="10%"><b>${uiLabelMap.ProductProduct}</b></th>
+ <th width="10%" align="center">${uiLabelMap.OagisInventoryLevelDateTime}</th>
+ <th width="10%" align="right">${uiLabelMap.OrderReturnItemInventoryStatus}</th>
+ <th width="10%" align="right">${uiLabelMap.OrderQuantity} (Inventory)</th>
+ <th width="10%" align="right">${uiLabelMap.OrderQuantity} (Message)</th>
+ <th width="10%" align="right">${uiLabelMap.OagisQuantityDiff}.</th>
</tr>
<tr><td colspan="10"><hr /></td></tr>
- <#assign alt_row = false>
<#list inventoryMapList as inventoryMap>
- <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+ <tr valign="middle">
<td valign="top"> ${inventoryMap.productId!}</td>
<td align="right" valign="top"> ${inventoryMap.timestamp!!}</td>
<td align="right" valign="top"> ${inventoryMap.statusId!!}</td>
@@ -54,11 +51,9 @@
<td align="center" valign="top"> ${inventoryMap.quantityFromMessage!!}</td>
<td align="right" valign="top"> ${inventoryMap.quantityDiff!!}</td>
</tr>
- <#-- toggle the row color -->
- <#assign alt_row = !alt_row>
</#list>
<tr><td colspan="10"><hr /></td></tr>
</table>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -48,7 +48,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/js</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/js</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -48,7 +48,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css:/static:/js</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/static:/js</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -66,7 +66,7 @@ under the License.
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images
</param-value>
</init-param>
<init-param>
@@ -125,4 +125,4 @@ under the License.
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
</welcome-file-list>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml Tue Aug 30 13:37:27 2016
@@ -52,7 +52,7 @@ under the License.
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+ <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
@@ -86,4 +86,4 @@ under the License.
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
</welcome-file-list>
-</web-app>
\ No newline at end of file
+</web-app>
Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/stylertl.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/stylertl.css?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/stylertl.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/stylertl.css Tue Aug 30 13:37:27 2016
@@ -18,7 +18,7 @@
*/
/* This CSS file is used to reverse the style direction for rtl languages. */
-/* It is intended to be cascaded with maincss.css. */
+/* It is intended to be cascaded with style.css. */
/* ===== Resets/Browser Normalization ===== */
Modified: ofbiz/trunk/themes/rainbowstone/webapp/rainbowstone/stylertl.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/rainbowstone/webapp/rainbowstone/stylertl.css?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/webapp/rainbowstone/stylertl.css (original)
+++ ofbiz/trunk/themes/rainbowstone/webapp/rainbowstone/stylertl.css Tue Aug 30 13:37:27 2016
@@ -18,7 +18,7 @@
*/
/* This CSS file is used to reverse the style direction for rtl languages. */
-/* It is intended to be cascaded with maincss.css. */
+/* It is intended to be cascaded with style.css. */
/* ===== Resets/Browser Normalization ===== */
Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/stylertl.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/stylertl.css?rev=1758389&r1=1758388&r2=1758389&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/stylertl.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/stylertl.css Tue Aug 30 13:37:27 2016
@@ -18,7 +18,7 @@
*/
/* This CSS file is used to reverse the style direction for rtl languages. */
-/* It is intended to be cascaded with maincss.css. */
+/* It is intended to be cascaded with style.css. */
/* ===== Resets/Browser Normalization ===== */