svn commit: r1806551 [2/3] - in /ofbiz/site: js-plugin/ajax-contact-extend/classes/ js-plugin/ajax-contact-extend/classes/twitter/ template/page/ template/region/
Modified: ofbiz/site/template/page/download.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/download.tpl.php?rev=1806551=1806550=1806551=diff == --- ofbiz/site/template/page/download.tpl.php (original) +++ ofbiz/site/template/page/download.tpl.php Tue Aug 29 10:19:35 2017 @@ -3,7 +3,7 @@ ?> - + @@ -45,33 +45,33 @@ - - 16.11.03 - >Bug - - https://issues.apache.org/jira/browse/OFBIZ-9286; target="external">[OFBIZ-9286] - ERROR: Cannot do a find that returns an EntityListIterator with no transaction in place - https://issues.apache.org/jira/browse/OFBIZ-9305; target="external">[OFBIZ-9305] - change debug.properties property value cause ofbiz can't start - https://issues.apache.org/jira/browse/OFBIZ-9373; target="external">[OFBIZ-9373] - Create new blog article entry error - https://issues.apache.org/jira/browse/OFBIZ-9284; target="external">[OFBIZ-9374] - Fix TemporalExpressions.Frequency to avoid moving job start times away from given freqCount raster - https://issues.apache.org/jira/browse/OFBIZ-9384; target="external">[OFBIZ-9384] - RequestHandlerException on request link of Quote Price page - https://issues.apache.org/jira/browse/OFBIZ-9386; target="external">[OFBIZ-9386] - RequestHandlerException on request link of Quote Profit page - https://issues.apache.org/jira/browse/OFBIZ-9387; target="external">[OFBIZ-9387] - CostServices.xml#getProductCost fail currency conversion - https://issues.apache.org/jira/browse/OFBIZ-9407; target="external">[OFBIZ-9407] - simple methods not terminating on error condition - https://issues.apache.org/jira/browse/OFBIZ-9410; target="external">[OFBIZ-9410] - Software not usable all standard installs failed - https://issues.apache.org/jira/browse/OFBIZ-9425; target="external">[OFBIZ-9425] - createShipment code logic error - - >Improvement - - https://issues.apache.org/jira/browse/OFBIZ-8202; target="external">[OFBIZ-8202] - Use try-with-resources statement wherever it's possible - https://issues.apache.org/jira/browse/OFBIZ-9380; target="external">[OFBIZ-9380] - renderDateTimeField works in IE, not working with lastest Chrome - https://issues.apache.org/jira/browse/OFBIZ-9406; target="external">[OFBIZ-9406] - Update Geo data for India - https://issues.apache.org/jira/browse/OFBIZ-9413; target="external">[OFBIZ-9413] - Update Currency Uom data - https://issues.apache.org/jira/browse/OFBIZ-9422; target="external">[OFBIZ-9422] - Accounting Manager \ Fixed Assets, press button [NEW FIXED ASSET], but action button is [Update], not [Save] - - >New Feature - - https://issues.apache.org/jira/browse/OFBIZ-7120; target="external"">[OFBIZ-7120] - Multisite support in specialpurpose/cmssite - + + 16.11.03 + >Bug + + https://issues.apache.org/jira/browse/OFBIZ-9286; target="external">[OFBIZ-9286] - ERROR: Cannot do a find that returns an EntityListIterator with no transaction in place + https://issues.apache.org/jira/browse/OFBIZ-9305; target="external">[OFBIZ-9305] - change debug.properties property value cause ofbiz can't start + https://issues.apache.org/jira/browse/OFBIZ-9373; target="external">[OFBIZ-9373] - Create new blog article entry error + https://issues.apache.org/jira/browse/OFBIZ-9284; target="external">[OFBIZ-9374] - Fix TemporalExpressions.Frequency to avoid moving job start times away from given freqCount raster + https://issues.apache.org/jira/browse/OFBIZ-9384; target="external">[OFBIZ-9384] - RequestHandlerException on request link of Quote Price page +https://issues.apache.org/jira/browse/OFBIZ-9386; target="external">[OFBIZ-9386] - RequestHandlerException on request link of Quote Profit page + https://issues.apache.org/jira/browse/OFBIZ-9387; target="external">[OFBIZ-9387] - CostServices.xml#getProductCost fail currency conversion + https://issues.apache.org/jira/browse/OFBIZ-9407; target="external">[OFBIZ-9407] - simple methods not terminating on error condition + https://issues.apache.org/jira/browse/OFBIZ-9410; target="external">[OFBIZ-9410] -
svn commit: r1806551 [3/3] - in /ofbiz/site: js-plugin/ajax-contact-extend/classes/ js-plugin/ajax-contact-extend/classes/twitter/ template/page/ template/region/
Modified: ofbiz/site/template/page/our-users.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/our-users.tpl.php?rev=1806551=1806550=1806551=diff == --- ofbiz/site/template/page/our-users.tpl.php (original) +++ ofbiz/site/template/page/our-users.tpl.php Tue Aug 29 10:19:35 2017 @@ -27,9 +27,9 @@ e-Commerce Manufacturing Retail - Distribution - Service Industries - Other + Distribution + Service Industries + Other Modified: ofbiz/site/template/page/service-providers.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/service-providers.tpl.php?rev=1806551=1806550=1806551=diff == --- ofbiz/site/template/page/service-providers.tpl.php (original) +++ ofbiz/site/template/page/service-providers.tpl.php Tue Aug 29 10:19:35 2017 @@ -20,11 +20,11 @@ All Global - Europe - Africa - Asia - America - Australasia + Europe + Africa + Asia + America + Australasia Modified: ofbiz/site/template/page/source-repository.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/source-repository.tpl.php?rev=1806551=1806550=1806551=diff == --- ofbiz/site/template/page/source-repository.tpl.php (original) +++ ofbiz/site/template/page/source-repository.tpl.php Tue Aug 29 10:19:35 2017 @@ -8,7 +8,7 @@ OFBiz Source Repository - home/Community/Source Repository + home/Community/Source Repository @@ -19,63 +19,63 @@ Public Access - Committer Access - + Committer Access + Public Access - - Anyone can checkout or browse the source code in the OFBiz public Subversion (SVN) repository. - Browsing the Repository + +Anyone can checkout or browse the source code in the OFBiz public Subversion (SVN) repository. +Browsing the Repository You can browse the repository using any of the following links. http://svn.apache.org/repos/asf/ofbiz/; target="_blank">SVN - WebDAV - http://svn.apache.org/viewvc/ofbiz/; target="_blank">SVN - ViewVC - - - Our ofbiz-framework trunk and ofbiz-plugins trunk are also available on Git at the links below: - - https://github.com/apache/ofbiz-framework; target="external">ofbiz-framework trunk on Github - https://github.com/apache/ofbiz-plugins; target="external">ofbiz-plugins trunk on Github - - - Checking out the Repository Source Code - NOTE: Apache OFBiz uses http://subversion.apache.org/; target="_blank">Apache Subversion for version control of our source repository. If you are not familiar with Apache Subversion and you don't have an SVN client tool, then following links could be useful: - http://subversion.apache.org/packages.html; target="_blank">SVN Client Tools - http://subversion.apache.org/docs/; target="_blank">SVN Documenentation - To checkout the source code, simply use the following command (if you are using a GUI client, configure it appropriately). - + http://svn.apache.org/viewvc/ofbiz/; target="_blank">SVN - ViewVC + + +Our ofbiz-framework trunk and ofbiz-plugins trunk are also available on Git at the links below: + + https://github.com/apache/ofbiz-framework; target="external">ofbiz-framework trunk on Github +https://github.com/apache/ofbiz-plugins; target="external">ofbiz-plugins trunk on Github + + +Checking out the Repository Source Code +NOTE: Apache OFBiz uses http://subversion.apache.org/; target="_blank">Apache Subversion for version control of our source repository. If you are not familiar with Apache Subversion and you don't have an SVN client tool, then following links could be useful: +http://subversion.apache.org/packages.html; target="_blank">SVN Client Tools +http://subversion.apache.org/docs/; target="_blank">SVN Documenentation +To checkout the source code, simply use the following command (if you are using a GUI client, configure it appropriately). + ofbiz-framework
svn commit: r1806560 [4/4] - in /ofbiz/site: ./ js-plugin/ajax-contact-extend/classes/twitter/ js-plugin/jquery.sharrre-1.3.4/ template/page/ template/region/
Modified: ofbiz/site/user-stories.html
URL:
http://svn.apache.org/viewvc/ofbiz/site/user-stories.html?rev=1806560=1806559=1806560=diff
==
--- ofbiz/site/user-stories.html (original)
+++ ofbiz/site/user-stories.html Tue Aug 29 11:07:52 2017
@@ -30,7 +30,7 @@
-http://fonts.googleapis.com/css?family=Open+Sans:400,300,800;
rel="stylesheet" type="text/css">
+
@@ -41,7 +41,7 @@
-
+
- https://twitter.com/ApacheOfbiz?height=250;
data-widget-id="588661945194192896" data-tweet-limit="2" data-theme="dark"
data-chrome="nofooter noheader transparent" >Tweets by @ApacheOfbiz
+ Tweets by @ApacheOfbiz
!function(d,s,id){var
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
@@ -201,10 +202,10 @@
Mailing Lists
Source Repository
(SVN)
- https://issues.apache.org/jira/browse/OFBIZ;
target="external">Issue Tracker (Jira)
- https://www.youtube.com/user/ofbiz;
target="external">OFBiz Youtube Channel
- https://vimeo.com/channels/apacheofbiz;
target="external">OFBiz Vimeo Channel
- https://www.hipchat.com/gGlwdXZZl;
target="external">OFBiz HipChat Room
+ Issue Tracker (Jira)
+ OFBiz
Youtube Channel
+ OFBiz Vimeo Channel
+ OFBiz
HipChat Room
@@ -238,7 +239,7 @@
-http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js";>
+
svn commit: r1806560 [3/4] - in /ofbiz/site: ./ js-plugin/ajax-contact-extend/classes/twitter/ js-plugin/jquery.sharrre-1.3.4/ template/page/ template/region/
Modified: ofbiz/site/template/page/developers.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/developers.tpl.php?rev=1806560=1806559=1806560=diff == --- ofbiz/site/template/page/developers.tpl.php (original) +++ ofbiz/site/template/page/developers.tpl.php Tue Aug 29 11:07:52 2017 @@ -36,7 +36,7 @@ For 16.11, the ofbiz-framework trunk and ofbiz-plugins trunk the minimum requirement you need installed is Java 1.8 SDK. Apache OFBiz can be downloaded and run on both Unix based and Windows based systems - NOTE: If you are running an older release or branch then please refer to https://cwiki.apache.org/confluence/display/OFBIZ/Home; target="_blank" >our Wiki for details + NOTE: If you are running an older release or branch then please refer to our Wiki for details @@ -51,9 +51,9 @@ Anyone can checkout or browse the source code in the OFBiz public Subversion (SVN) repository. To checkout the source code, simply use the following command (if you are using a GUI client, configure it appropriately). - ofbiz-framework trunk : $ svn co http://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk ofbiz-framework - ofbiz-plugins trunk : $ svn co http://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk ofbiz-plugins - branch release16.11 (stable): $ svn co http://svn.apache.org/repos/asf/ofbiz/branches/release16.11 ofbiz.16.11 + ofbiz-framework trunk : $ svn co //svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk ofbiz-framework + ofbiz-plugins trunk : $ svn co //svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk ofbiz-plugins + branch release16.11 (stable): $ svn co //svn.apache.org/repos/asf/ofbiz/branches/release16.11 ofbiz.16.11 @@ -86,7 +86,7 @@ gradlew ofbiz To log into OFBiz, navigate with your browser to -https://localhost:8443/accounting +//localhost:8443/accounting and login with username "admin" and password "ofbiz" Stopping OFBiz To stop OFBiz running locally, open a command line terminal window and navigate to the OFBiz directory and; @@ -105,14 +105,14 @@ You can browse the repository using any of the following links. -http://svn.apache.org/repos/asf/ofbiz/; target="_blank">SVN - WebDAV - http://svn.apache.org/viewvc/ofbiz/; target="_blank">SVN - ViewVC +SVN - WebDAV + SVN - ViewVC Our ofbiz-framework trunk and ofbiz-plugins trunk are also available on Git at the links below: - https://github.com/apache/ofbiz-framework; target="external">ofbiz-framework trunk on Github -https://github.com/apache/ofbiz-plugins; target="external">ofbiz-plugins trunk on Github + ofbiz-framework trunk on Github +ofbiz-plugins trunk on Github @@ -123,7 +123,7 @@ To help you getting started we have put together a beginners OFBiz development tutorial to get familiar with with OFBiz. It covers the fundamentals of the OFBiz application development process. The goal of this tutorial is to acquaint a developer with best practices, coding conventions. the control flow and things that the developer needs to know in order to modify OFBiz - https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Tutorial+-+A+Beginners+Development+Guide; target=_blank">Developer Tutorial + Developer Tutorial @@ -133,9 +133,9 @@ We have a range of technical documenentation and help for developers. Please see the links below. - https://cwiki.apache.org/confluence/display/OFBIZ/Technical+Documentation; target="_blank">OFBiz Technical Documentation - https://ci.apache.org/projects/ofbiz/site/javadocs/; target="_blank">OFBiz API Reference - https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo; target="_blank">Developer and Technical FAQs + OFBiz Technical Documentation + OFBiz API Reference + Developer and Technical FAQs After consulting the documentation you still have questions,please feel free to post questions on our development mailing list. Modified: ofbiz/site/template/page/download.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/download.tpl.php?rev=1806560=1806559=1806560=diff == --- ofbiz/site/template/page/download.tpl.php (original) +++ ofbiz/site/template/page/download.tpl.php Tue Aug 29 11:07:52 2017 @@ -31,10
svn commit: r1806553 - in /ofbiz/site/template: page/ region/
Author: deepak Date: Tue Aug 29 10:29:01 2017 New Revision: 1806553 URL: http://svn.apache.org/viewvc?rev=1806553=rev Log: Apply fixed in php file from those I did directly in html file committed at r#1806477, 1806487, 1806490 Added: ofbiz/site/template/page/mailing-lists.tpl.php - copied, changed from r1806552, ofbiz/site/template/page/mailinglists.tpl.php ofbiz/site/template/page/source-repositories.tpl.php - copied unchanged from r1806552, ofbiz/site/template/page/source-repository.tpl.php Removed: ofbiz/site/template/page/mailinglists.tpl.php ofbiz/site/template/page/source-repository.tpl.php Modified: ofbiz/site/template/page/download.tpl.php ofbiz/site/template/page/faqs.tpl.php ofbiz/site/template/page/index.tpl.php ofbiz/site/template/region/footer.tpl.php ofbiz/site/template/region/header.tpl.php Modified: ofbiz/site/template/page/download.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/download.tpl.php?rev=1806553=1806552=1806553=diff == --- ofbiz/site/template/page/download.tpl.php (original) +++ ofbiz/site/template/page/download.tpl.php Tue Aug 29 10:29:01 2017 @@ -3,7 +3,6 @@ ?> - Modified: ofbiz/site/template/page/faqs.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/faqs.tpl.php?rev=1806553=1806552=1806553=diff == --- ofbiz/site/template/page/faqs.tpl.php (original) +++ ofbiz/site/template/page/faqs.tpl.php Tue Aug 29 10:29:01 2017 @@ -60,6 +60,7 @@ + Modified: ofbiz/site/template/page/index.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/index.tpl.php?rev=1806553=1806552=1806553=diff == --- ofbiz/site/template/page/index.tpl.php (original) +++ ofbiz/site/template/page/index.tpl.php Tue Aug 29 10:29:01 2017 @@ -102,7 +102,7 @@ Java -Powerful Java Web Framework +Powerful Java Web Framework OFBiz is a Java based web framework including an entity engine, a service engine and a widget based UI allowing you to Copied: ofbiz/site/template/page/mailing-lists.tpl.php (from r1806552, ofbiz/site/template/page/mailinglists.tpl.php) URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/mailing-lists.tpl.php?p2=ofbiz/site/template/page/mailing-lists.tpl.php=ofbiz/site/template/page/mailinglists.tpl.php=1806552=1806553=1806553=diff == --- ofbiz/site/template/page/mailinglists.tpl.php (original) +++ ofbiz/site/template/page/mailing-lists.tpl.php Tue Aug 29 10:29:01 2017 @@ -20,7 +20,7 @@ Subscribe to Our Mailing Lists - We welcome everyone who would like to join our community and participate in our mailing lists. We expect that everyone respects the http://www.apache.org/dev/contrib-email-tips.html;>mailing list participation guidelines and the http://apache.org/foundation/policies/conduct.html;>ASF Code of Conduct . + We welcome everyone who would like to join our community and participate in our mailing lists. We expect that everyone respects the http://www.apache.org/dev/contrib-email-tips.html;>mailing list participation guidelines and the http://apache.org/foundation/policies/conduct.html;>ASF Code of Conduct . To subscribe to a mailing list please: Click the button of the mailing list you want to subscribe to Modified: ofbiz/site/template/region/footer.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/region/footer.tpl.php?rev=1806553=1806552=1806553=diff == --- ofbiz/site/template/region/footer.tpl.php (original) +++ ofbiz/site/template/region/footer.tpl.php Tue Aug 29 10:29:01 2017 @@ -15,8 +15,8 @@ https://twitter.com/ApacheOfbiz; class="icon-twitter-bird socialIcon tips" target="_blank" title="follow us on Twitter">twitter - https://www.youtube.com/user/ofbiz; class="icon-play socialIcon tips" title="follow us on Youtube">Youtube -https://www.facebook.com/Apache-OFBiz-1478219232210477/?ref=page_internal; class="icon-facebook socialIcon tips" title="follow us on Facebook">facebook + https://www.youtube.com/user/ofbiz; class="icon-play socialIcon tips" title="follow us on Youtube">Youtube + https://www.facebook.com/Apache-OFBiz-1478219232210477/?ref=page_internal; class="icon-facebook socialIcon tips" title="follow us on Facebook">facebook
svn commit: r1806560 [2/4] - in /ofbiz/site: ./ js-plugin/ajax-contact-extend/classes/twitter/ js-plugin/jquery.sharrre-1.3.4/ template/page/ template/region/
Modified: ofbiz/site/getting-involved.html
URL:
http://svn.apache.org/viewvc/ofbiz/site/getting-involved.html?rev=1806560=1806559=1806560=diff
==
--- ofbiz/site/getting-involved.html (original)
+++ ofbiz/site/getting-involved.html Tue Aug 29 11:07:52 2017
@@ -30,7 +30,7 @@
-http://fonts.googleapis.com/css?family=Open+Sans:400,300,800;
rel="stylesheet" type="text/css">
+
@@ -41,7 +41,7 @@
-
+
- https://twitter.com/ApacheOfbiz?height=250;
data-widget-id="588661945194192896" data-tweet-limit="2" data-theme="dark"
data-chrome="nofooter noheader transparent" >Tweets by @ApacheOfbiz
+ Tweets by @ApacheOfbiz
!function(d,s,id){var
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
@@ -251,10 +251,10 @@
Mailing Lists
Source Repository
(SVN)
- https://issues.apache.org/jira/browse/OFBIZ;
target="external">Issue Tracker (Jira)
- https://www.youtube.com/user/ofbiz;
target="external">OFBiz Youtube Channel
- https://vimeo.com/channels/apacheofbiz;
target="external">OFBiz Vimeo Channel
- https://www.hipchat.com/gGlwdXZZl;
target="external">OFBiz HipChat Room
+ Issue Tracker (Jira)
+ OFBiz
Youtube Channel
+ OFBiz Vimeo Channel
+ OFBiz
HipChat Room
@@ -288,7 +288,7 @@
-http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js";>
+
Modified: ofbiz/site/index.html
URL:
http://svn.apache.org/viewvc/ofbiz/site/index.html?rev=1806560=1806559=1806560=diff
==
--- ofbiz/site/index.html (original)
+++ ofbiz/site/index.html Tue Aug 29 11:07:52 2017
@@ -30,7 +30,7 @@
-http://fonts.googleapis.com/css?family=Open+Sans:400,300,800;
rel="stylesheet" type="text/css">
+
@@ -41,7 +41,7 @@
-
+
- https://twitter.com/ApacheOfbiz?height=250;
data-widget-id="588661945194192896" data-tweet-limit="2" data-theme="dark"
data-chrome="nofooter noheader transparent" >Tweets by @ApacheOfbiz
+ Tweets by @ApacheOfbiz
!function(d,s,id){var
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
@@ -355,10 +355,10 @@
Mailing Lists
Source Repository
(SVN)
- https://issues.apache.org/jira/browse/OFBIZ;
target="external">Issue Tracker (Jira)
- https://www.youtube.com/user/ofbiz;
target="external">OFBiz Youtube Channel
- https://vimeo.com/channels/apacheofbiz;
target="external">OFBiz Vimeo Channel
- https://www.hipchat.com/gGlwdXZZl;
target="external">OFBiz HipChat Room
+ Issue Tracker (Jira)
+ OFBiz
Youtube Channel
+ OFBiz Vimeo Channel
+ OFBiz
HipChat Room
@@ -392,7 +392,7 @@
-http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js";>
+
Modified:
ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php?rev=1806560=1806559=1806560=diff
==
--- ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php
(original)
+++ ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php Tue
Aug 29 11:07:52 2017
@@ -2,10 +2,10 @@
class EpiTwitter extends EpiOAuth
{
const EPITWITTER_SIGNATURE_METHOD = 'HMAC-SHA1';
- protected $requestTokenUrl = 'http://twitter.com/oauth/request_token';
- protected $accessTokenUrl = 'http://twitter.com/oauth/access_token';
- protected $authorizeUrl = 'http://twitter.com/oauth/authorize';
- protected $apiUrl = 'http://twitter.com';
+ protected $requestTokenUrl = '//twitter.com/oauth/request_token';
+ protected $accessTokenUrl = '//twitter.com/oauth/access_token';
+ protected $authorizeUrl = '//twitter.com/oauth/authorize';
+ protected $apiUrl = '//twitter.com';
public function __call($name, $params = null)
{
Modified: ofbiz/site/js-plugin/jquery.sharrre-1.3.4/sharrre.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/js-plugin/jquery.sharrre-1.3.4/sharrre.php?rev=1806560=1806559=1806560=diff
==
--- ofbiz/site/js-plugin/jquery.sharrre-1.3.4/sharrre.php (original)
+++
svn commit: r1806764 - /ofbiz/site/README.md
Author: deepak Date: Thu Aug 31 08:41:35 2017 New Revision: 1806764 URL: http://svn.apache.org/viewvc?rev=1806764=rev Log: Added Readme file Added: ofbiz/site/README.md (with props) Added: ofbiz/site/README.md URL: http://svn.apache.org/viewvc/ofbiz/site/README.md?rev=1806764=auto == --- ofbiz/site/README.md (added) +++ ofbiz/site/README.md Thu Aug 31 08:41:35 2017 @@ -0,0 +1,23 @@ +##Update Site +If anyone is going to do any fixes - please do not just do any changes or fixes in the html page itself. +It needs to be done in the php template, located under template/page, Once you are done with changes please +compile these file and generate html using following command +`php template/html.tpl.php template/page/about-ofbiz.tpl.php > about-ofbiz.html` + +###Here are the quick reference to compile all the template file + +`php template/html.tpl.php template/page/about-ofbiz.tpl.php > about-ofbiz.html` +`php template/html.tpl.php template/page/business-users.tpl.php >business-users.html` +`php template/html.tpl.php template/page/developers.tpl.php > developers.html` +`php template/html.tpl.php template/page/download.tpl.php > download.html` +`php template/html.tpl.php template/page/release-notes-16.11.03.tpl.php > release-notes-16.11.03.html` +`php template/html.tpl.php template/page/release-notes-13.07.03.tpl.php > release-notes-13.07.03.html` +`php template/html.tpl.php template/page/faqs.tpl.php > faqs.html` +`php template/html.tpl.php template/page/getting-involved.tpl.php > getting-involved.html` +`php template/html.tpl.php template/page/index.tpl.php > index.html` +`php template/html.tpl.php template/page/mailing-lists.tpl.php > mailing-lists.html` +`php template/html.tpl.php template/page/ofbiz-demos.tpl.php > ofbiz-demos.html` +`php template/html.tpl.php template/page/our-users.tpl.php >our-users.html ` +`php template/html.tpl.php template/page/service-providers.tpl.php > service-providers.html ` +`php template/html.tpl.php template/page/source-repositories.tpl.php > source-repositories.html` +`php template/html.tpl.php template/page/user-stories.tpl.php > user-stories.html` Propchange: ofbiz/site/README.md -- svn:eol-style = native Propchange: ofbiz/site/README.md -- svn:keywords = Date Rev Author URL Id Propchange: ofbiz/site/README.md -- svn:mime-type = text/plain
svn commit: r1806762 [1/2] - in /ofbiz/site: ./ template/page/ template/page/releases/
Author: deepak Date: Thu Aug 31 08:13:30 2017 New Revision: 1806762 URL: http://svn.apache.org/viewvc?rev=1806762=rev Log: Added two new pages for release notes, as release notes may be large so its good idea to have independent page for each release notes. Added: ofbiz/site/template/page/release-notes-13.07.03.tpl.php - copied, changed from r1806761, ofbiz/site/template/page/releases/release-notes-13.07.03.html ofbiz/site/template/page/release-notes-16.11.03.tpl.php - copied, changed from r1806761, ofbiz/site/template/page/releases/release-notes-16.11.03.html Removed: ofbiz/site/template/page/releases/release-notes-13.07.03.html ofbiz/site/template/page/releases/release-notes-16.11.03.html Modified: ofbiz/site/download.html ofbiz/site/release-notes-13.07.03.html ofbiz/site/release-notes-16.11.03.html ofbiz/site/template/page/download.tpl.php Modified: ofbiz/site/download.html URL: http://svn.apache.org/viewvc/ofbiz/site/download.html?rev=1806762=1806761=1806762=diff == --- ofbiz/site/download.html (original) +++ ofbiz/site/download.html Thu Aug 31 08:13:30 2017 @@ -134,169 +134,20 @@ OFBiz 16.11.03 Download - OFBiz 13.07 + OFBiz 13.07.03 Download - - - - - -16.11.03 -Bug - - [OFBIZ-9286] - ERROR: Cannot do a find that returns an EntityListIterator with no transaction in place - [OFBIZ-9305] - change debug.properties property value cause ofbiz can't start - [OFBIZ-9373] - Create new blog article entry error - [OFBIZ-9374] - Fix TemporalExpressions.Frequency to avoid moving job start times away from given freqCount raster - [OFBIZ-9384] - RequestHandlerException on request link of Quote Price page - [OFBIZ-9386] - RequestHandlerException on request link of Quote Profit page - [OFBIZ-9387] - CostServices.xml#getProductCost fail currency conversion - [OFBIZ-9407] - simple methods not terminating on error condition - [OFBIZ-9410] - Software not usable all standard installs failed - [OFBIZ-9425] - createShipment code logic error - -Improvement - - [OFBIZ-8202] - Use try-with-resources statement wherever it's possible - [OFBIZ-9380] - renderDateTimeField works in IE, not working with lastest Chrome - [OFBIZ-9406] - Update Geo data for India - [OFBIZ-9413] - Update Currency Uom data - [OFBIZ-9422] - Accounting Manager \ Fixed Assets, press button [NEW FIXED ASSET], but action button is [Update], not [Save] - -New Feature - - [OFBIZ-7120] - Multisite support in specialpurpose/cmssite - - - + OFBiz 16.11.03 + View + - - - - - -13.07.03 -Sub Task - - [OFBIZ-5634] - Error in pagination in createProductSubscriptionResource (Catalog) - [OFBIZ-5801] - Upgrade Axis2 to 1.6.3 - [OFBIZ-6568] - Update Groovy to 2.4.5 version - [OFBIZ-6726] - Update commons collections to 3.2.2 because of known possible exploit - [OFBIZ-6751] - POI security fix - [OFBIZ-6752] - Updates Tomcat to 7.0.65 - [OFBIZ-6754] - Update Spring Framework - [OFBIZ-6800] - Another .fo.ftl file use "align" attribute in "" tag. - [OFBIZ-6905] - Update Xalan libs to version 2.7.2 because of CVE-2014-0107 - [OFBIZ-6913] - Update Tomcat to 7.0.68 - [OFBIZ-6916] - Upgrade Axis2 to 1.7.1 - [OFBIZ-6942] - Comment out RMI related code because of the Java deserialization issue - [OFBIZ-6959] - Update XStream lib to prevent XML External Entity (XXE) Processing - -Bug - - [OFBIZ-293] - data import - nulling fields impossible - [OFBIZ-817] - Require Inventory of Marketing Package Product can't be shipped - [OFBIZ-4559] - InventoryWorker.getOutstandingProductQuantities returns inaccurate results when there are multiple ItemIssuances for an order - [OFBIZ-5347] - Shipping costs not recalculated after changing sales order shipment method - [OFBIZ-5579] - Error when add product to an order. - [OFBIZ-5918] - NPE at //demo-trunk-ofbiz.apache.org/ecommerce/products/ - [OFBIZ-5927] - Issue reported while performing Refund & Void (java.lang.ClassCastException: java.lang.String cannot be cast to java.math.BigDecimal) - [OFBIZ-6043] - Change of ship-to address is not persisted when stepping forward and backward in a create order process - [OFBIZ-6091] - Supplier preferred currency not considered for drop-ship order - [OFBIZ-6092] - Domai
svn commit: r1806762 [2/2] - in /ofbiz/site: ./ template/page/ template/page/releases/
Modified: ofbiz/site/template/page/download.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/download.tpl.php?rev=1806762=1806761=1806762=diff == --- ofbiz/site/template/page/download.tpl.php (original) +++ ofbiz/site/template/page/download.tpl.php Thu Aug 31 08:13:30 2017 @@ -33,17 +33,19 @@ OFBiz 16.11.03 Download - OFBiz 13.07 + OFBiz 13.07.03 Download - + OFBiz 16.11.03 + View - +OFBiz 13.07.03 + View Copied: ofbiz/site/template/page/release-notes-13.07.03.tpl.php (from r1806761, ofbiz/site/template/page/releases/release-notes-13.07.03.html) URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/release-notes-13.07.03.tpl.php?p2=ofbiz/site/template/page/release-notes-13.07.03.tpl.php=ofbiz/site/template/page/releases/release-notes-13.07.03.html=1806761=1806762=1806762=diff == --- ofbiz/site/template/page/releases/release-notes-13.07.03.html (original) +++ ofbiz/site/template/page/release-notes-13.07.03.tpl.php Thu Aug 31 08:13:30 2017 @@ -1,10 +1,22 @@ +The Apache OFBiz Project'; +?> + + + + + + Release Notes 13.07.03 + home/Download/Release Notes 17.07.03 + + + + + + - - - - -13.07.03 -Sub Task + +Sub Task [OFBIZ-5634] - Error in pagination in createProductSubscriptionResource (Catalog) [OFBIZ-5801] - Upgrade Axis2 to 1.6.3 @@ -20,7 +32,7 @@ [OFBIZ-6942] - Comment out RMI related code because of the Java deserialization issue [OFBIZ-6959] - Update XStream lib to prevent XML External Entity (XXE) Processing -Bug +Bug [OFBIZ-293] - data import - nulling fields impossible [OFBIZ-817] - Require Inventory of Marketing Package Product can't be shipped @@ -104,7 +116,7 @@ [OFBIZ-6937] - Company Check payment method should be shown when issuing chek [OFBIZ-6961] - popup fades in and out non-stop when hovers on a product image in list view -Improvement +Improvement [OFBIZ-6185] - Type-ahead regarding LookupInvoice in AP doesn't return result [OFBIZ-6415] - renderTextFindField doesn't reselect operation dropdown or ignoreCase checkbox @@ -114,9 +126,13 @@ [OFBIZ-6727] - Webtools Entity edition, the suggested date and time formats are not localised [OFBIZ-6908] - Received quantity not shown on order view screen -Task +Task [OFBIZ-6380] - Update Log4j 2.2 to 2.3 - \ No newline at end of file + + + + + \ No newline at end of file Copied: ofbiz/site/template/page/release-notes-16.11.03.tpl.php (from r1806761, ofbiz/site/template/page/releases/release-notes-16.11.03.html) URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/release-notes-16.11.03.tpl.php?p2=ofbiz/site/template/page/release-notes-16.11.03.tpl.php=ofbiz/site/template/page/releases/release-notes-16.11.03.html=1806761=1806762=1806762=diff == --- ofbiz/site/template/page/releases/release-notes-16.11.03.html (original) +++ ofbiz/site/template/page/release-notes-16.11.03.tpl.php Thu Aug 31 08:13:30 2017 @@ -1,10 +1,22 @@ +The Apache OFBiz Project'; +?> + + + + + + Release Notes 16.11.03 + home/Download/Release Notes 16.11.03 + + + + + + - - - - -16.11.03 -Bug + +Bug [OFBIZ-9286] - ERROR: Cannot do a find that returns an EntityListIterator with no transaction in place [OFBIZ-9305] - change debug.properties property value cause ofbiz can't start @@ -17,7 +29,7 @@ [OFBIZ-9410] - Software not usable all standard installs failed [OFBIZ-9425] - createShipment code logic error -Improvement +Improvement [OFBIZ-8202] - Use try-with-resources statement wherever it's possible [OFBIZ-9380] - renderDateTimeField works in IE, not working with lastest Chrome @@ -25,9 +37,13 @@ [OFBIZ-9413] - Update Currency Uom data [OFBIZ-9422] - Accounting Manager \ Fixed Assets, press button [NEW FIXED ASSET], but action button is [Update], not [Save] -New Feature +New Feature [OFBIZ-7120] - Multisite support in specialpurpose/cmssite - \ No newline at end of file + + + + + \ No newline at
svn commit: r1806897 - in /ofbiz/site: 404.html template/page/404.tpl.php
Author: deepak
Date: Fri Sep 1 08:33:47 2017
New Revision: 1806897
URL: http://svn.apache.org/viewvc?rev=1806897=rev
Log:
Added 404 page
Added:
ofbiz/site/404.html (with props)
ofbiz/site/template/page/404.tpl.php (with props)
Added: ofbiz/site/404.html
URL: http://svn.apache.org/viewvc/ofbiz/site/404.html?rev=1806897=auto
==
--- ofbiz/site/404.html (added)
+++ ofbiz/site/404.html Fri Sep 1 08:33:47 2017
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+The Apache OFBiz Project
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Home
+Getting Started
+
+Developers
+Business
Users
+
+
+News
+
+Twitter
+Blog
+
+
+Documentation
+
+User Documentation
+Technical Documentation
+Wiki
+API Reference
+
+
+Community
+
+Getting Involved
+Mailing Lists
+Source
Repository
+Downloads
+Issue Tracker
+FAQ
+
+
+Demos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Page Not found
+ home/404 error
+
+
+
+
+
+
+
+
+
+
+
+The page cannot be found
+ The page you are looking for might have been removed, had its
name changed or is temporarily unavailable
+
+
+
+
+
+
+
+
+
+
+
+
+Latest tweets
+
+
+
+twitter
+
+ Youtube
+ facebook
+
+
+ Tweets by @ApacheOfbiz
+ !function(d,s,id){var
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
+
+
+
+Contact Community
+
+
+ Mailing Lists
+ Source Repository
(SVN)
+ Issue Tracker (Jira)
+ OFBiz
Youtube Channel
+ OFBiz Vimeo Channel
+ OFBiz
HipChat Room
+
+
+
+ASF Information
+
+
+ Apache
Software Foundation
+ Sponsorship
+ Thanks
+ Security
+
+
+
+
+
+
+
+
+
+
+ Copyright © 2017 The Apache Software Foundation. Licensed under the
+ Apache License, Version 2.0. Apache OFBiz, OFBiz, the project logo
+ and the Apache feather logo are trademarks of The Apache Software
+ Foundation.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _gaq = _gaq || [];
+_gaq.push(['_setAccount', UA]);
+_gaq.push(['_trackPageview']);
+
+(function() {
+var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
+ga.src = ('https:' == document.location.protocol ? '<a rel="nofollow" href="https://ssl">https://ssl</a>' :
'<a rel="nofollow" href="http://www">http://www</a>') + '.google-analytics.com/ga.js';
+var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
+})();
+
+
+
Propchange: ofbiz/site/404.html
--
svn:eol-style = native
Propchange: ofbiz/site/404.html
--
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/site/404.html
--
svn:mime-type = text/html
Added: ofbiz/site/template/page/404.tpl.php
URL:
http://svn.apache.org/viewvc/ofbiz/site/template/page/404.tpl.php?rev=1806897=auto
==
--- ofbiz/site/template/page/404.tpl.php (added)
+++ ofbiz/site/template/page/404.tpl.php Fri Sep 1 08:33:47 2017
@@ -0,0 +1,29 @@
+The Apache OFBiz Project';
+?>
+
+
+
+
+Page Not found
+ home/404 error
+
+
+
+
+
+
+
+
+
+
+
+The page cannot be found
+ The page you are looking for might have been removed, had its
name changed or is temporarily unavailable
svn commit: r1807218 - in /ofbiz/site: README.md business-users.html template/page/business-users.tpl.php
Author: deepak Date: Mon Sep 4 12:55:45 2017 New Revision: 1807218 URL: http://svn.apache.org/viewvc?rev=1807218=rev Log: Corrected sequence of data load and start ofbiz command for business-users page. Modified: ofbiz/site/README.md ofbiz/site/business-users.html ofbiz/site/template/page/business-users.tpl.php Modified: ofbiz/site/README.md URL: http://svn.apache.org/viewvc/ofbiz/site/README.md?rev=1807218=1807217=1807218=diff == --- ofbiz/site/README.md (original) +++ ofbiz/site/README.md Mon Sep 4 12:55:45 2017 @@ -24,4 +24,5 @@ If change is done to the header or foote `php template/html.tpl.php template/page/our-users.tpl.php >our-users.html ` `php template/html.tpl.php template/page/service-providers.tpl.php > service-providers.html ` `php template/html.tpl.php template/page/source-repositories.tpl.php > source-repositories.html` -`php template/html.tpl.php template/page/user-stories.tpl.php > user-stories.html` +`php template/html.tpl.php template/page/user-stories.tpl.php > user-stories.html` +`php template/html.tpl.php template/page/404.tpl.php > 404.html` Modified: ofbiz/site/business-users.html URL: http://svn.apache.org/viewvc/ofbiz/site/business-users.html?rev=1807218=1807217=1807218=diff == --- ofbiz/site/business-users.html (original) +++ ofbiz/site/business-users.html Mon Sep 4 12:55:45 2017 @@ -291,10 +291,10 @@ navigate to the OFBiz directory then: Run the following command for Unix-like OS -./gradlew ofbiz loadDefault +./gradlew loadDefault ofbiz Run the following command for Windows -gradlew ofbiz loadDefault +gradlew loadDefault ofbiz NOTE: It is completely normal for the command line window to remain active while OFBiz is running (e.g at 91%). To log into OFBiz, navigate with your browser to Modified: ofbiz/site/template/page/business-users.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/business-users.tpl.php?rev=1807218=1807217=1807218=diff == --- ofbiz/site/template/page/business-users.tpl.php (original) +++ ofbiz/site/template/page/business-users.tpl.php Mon Sep 4 12:55:45 2017 @@ -190,10 +190,10 @@ navigate to the OFBiz directory then: Run the following command for Unix-like OS -./gradlew ofbiz loadDefault +./gradlew loadDefault ofbiz Run the following command for Windows -gradlew ofbiz loadDefault +gradlew loadDefault ofbiz NOTE: It is completely normal for the command line window to remain active while OFBiz is running (e.g at 91%). To log into OFBiz, navigate with your browser to
svn commit: r1806560 [1/4] - in /ofbiz/site: ./ js-plugin/ajax-contact-extend/classes/twitter/ js-plugin/jquery.sharrre-1.3.4/ template/page/ template/region/
Author: deepak
Date: Tue Aug 29 11:07:52 2017
New Revision: 1806560
URL: http://svn.apache.org/viewvc?rev=1806560=rev
Log:
Fixed Mixed Content issue while accessing ofbiz site, replaced http:// and
https:// wth // to fix this issue. After changing this it will not work locally
as locally we access using file:/// protocol and cdb library files not
accessible
Modified:
ofbiz/site/about-ofbiz.html
ofbiz/site/business-users.html
ofbiz/site/developers.html
ofbiz/site/download.html
ofbiz/site/faqs.html
ofbiz/site/getting-involved.html
ofbiz/site/index.html
ofbiz/site/js-plugin/ajax-contact-extend/classes/twitter/EpiTwitter.php
ofbiz/site/js-plugin/jquery.sharrre-1.3.4/sharrre.php
ofbiz/site/mailing-lists.html
ofbiz/site/ofbiz-demos.html
ofbiz/site/our-users.html
ofbiz/site/service-providers.html
ofbiz/site/source-repositories.html
ofbiz/site/template/page/about-ofbiz.tpl.php
ofbiz/site/template/page/business-users.tpl.php
ofbiz/site/template/page/developers.tpl.php
ofbiz/site/template/page/download.tpl.php
ofbiz/site/template/page/getting-involved.tpl.php
ofbiz/site/template/page/index.tpl.php
ofbiz/site/template/page/mailing-lists.tpl.php
ofbiz/site/template/page/ofbiz-demos.tpl.php
ofbiz/site/template/page/source-repositories.tpl.php
ofbiz/site/template/region/footer.tpl.php
ofbiz/site/template/region/head.tpl.php
ofbiz/site/template/region/header.tpl.php
ofbiz/site/template/region/scripts.tpl.php
ofbiz/site/user-stories.html
Modified: ofbiz/site/about-ofbiz.html
URL:
http://svn.apache.org/viewvc/ofbiz/site/about-ofbiz.html?rev=1806560=1806559=1806560=diff
==
--- ofbiz/site/about-ofbiz.html (original)
+++ ofbiz/site/about-ofbiz.html Tue Aug 29 11:07:52 2017
@@ -30,7 +30,7 @@
-http://fonts.googleapis.com/css?family=Open+Sans:400,300,800;
rel="stylesheet" type="text/css">
+
@@ -41,7 +41,7 @@
-
+
- https://twitter.com/ApacheOfbiz?height=250;
data-widget-id="588661945194192896" data-tweet-limit="2" data-theme="dark"
data-chrome="nofooter noheader transparent" >Tweets by @ApacheOfbiz
+ Tweets by @ApacheOfbiz
!function(d,s,id){var
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
@@ -193,10 +193,10 @@
Mailing Lists
Source Repository
(SVN)
- https://issues.apache.org/jira/browse/OFBIZ;
target="external">Issue Tracker (Jira)
- https://www.youtube.com/user/ofbiz;
target="external">OFBiz Youtube Channel
- https://vimeo.com/channels/apacheofbiz;
target="external">OFBiz Vimeo Channel
- https://www.hipchat.com/gGlwdXZZl;
target="external">OFBiz HipChat Room
+ Issue Tracker (Jira)
+ OFBiz
Youtube Channel
+ OFBiz Vimeo Channel
+ OFBiz
HipChat Room
@@ -230,7 +230,7 @@
-http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"</a>;>
+
Modified: ofbiz/site/business-users.html
URL:
http://svn.apache.org/viewvc/ofbiz/site/business-users.html?rev=1806560=1806559=1806560=diff
==
--- ofbiz/site/business-users.html (original)
+++ ofbiz/site/business-users.html Tue Aug 29 11:07:52 2017
@@ -30,7 +30,7 @@
-http://fonts.googleapis.com/css?family=Open+Sans:400,300,800;
rel="stylesheet" type="text/css">
+
@@ -41,7 +41,7 @@
-
+
- https://twitter.com/ApacheOfbiz?height=250;
data-widget-id="588661945194192896" data-tweet-limit="2" data-theme="dark"
data-chrome="nofooter noheader transparent" >Tweets by @ApacheOfbiz
+ Tweets by @ApacheOfbiz
!function(d,s,id){var
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
@@ -354,10 +354,10 @@
Mailing Lists
Source Repository
(SVN)
- https://issues.apache.org/jira/browse/OFBIZ;
target="external">Issue Tracker (Jira)
- https://www.youtube.com/user/ofbiz;
target="external">OFBiz Youtube Channel
- https://vimeo.com/channels/apacheofbiz;
target="external&qu
svn commit: r1806568 - /ofbiz/site/index.html
Author: deepak Date: Tue Aug 29 11:28:49 2017 New Revision: 1806568 URL: http://svn.apache.org/viewvc?rev=1806568=rev Log: Commented out thansk link to test https://ofbiz.apache.org I doubt its not updating Modified: ofbiz/site/index.html Modified: ofbiz/site/index.html URL: http://svn.apache.org/viewvc/ofbiz/site/index.html?rev=1806568=1806567=1806568=diff == --- ofbiz/site/index.html (original) +++ ofbiz/site/index.html Tue Aug 29 11:28:49 2017 @@ -367,7 +367,7 @@ Apache Software Foundation Sponsorship - Thanks + Security
svn commit: r1806571 - in /ofbiz/site: ./ js/ template/region/
Author: deepak Date: Tue Aug 29 11:45:56 2017 New Revision: 1806571 URL: http://svn.apache.org/viewvc?rev=1806571=rev Log: Added jquery-1.8.2.min.js instead of getting it from cdn Added: ofbiz/site/js/jquery-1.8.2.min.js (with props) Modified: ofbiz/site/about-ofbiz.html ofbiz/site/business-users.html ofbiz/site/developers.html ofbiz/site/download.html ofbiz/site/faqs.html ofbiz/site/getting-involved.html ofbiz/site/index.html ofbiz/site/mailing-lists.html ofbiz/site/ofbiz-demos.html ofbiz/site/our-users.html ofbiz/site/service-providers.html ofbiz/site/source-repositories.html ofbiz/site/template/region/scripts.tpl.php ofbiz/site/user-stories.html Modified: ofbiz/site/about-ofbiz.html URL: http://svn.apache.org/viewvc/ofbiz/site/about-ofbiz.html?rev=1806571=1806570=1806571=diff == --- ofbiz/site/about-ofbiz.html (original) +++ ofbiz/site/about-ofbiz.html Tue Aug 29 11:45:56 2017 @@ -230,7 +230,7 @@ - + Modified: ofbiz/site/business-users.html URL: http://svn.apache.org/viewvc/ofbiz/site/business-users.html?rev=1806571=1806570=1806571=diff == --- ofbiz/site/business-users.html (original) +++ ofbiz/site/business-users.html Tue Aug 29 11:45:56 2017 @@ -391,7 +391,7 @@ - + Modified: ofbiz/site/developers.html URL: http://svn.apache.org/viewvc/ofbiz/site/developers.html?rev=1806571=1806570=1806571=diff == --- ofbiz/site/developers.html (original) +++ ofbiz/site/developers.html Tue Aug 29 11:45:56 2017 @@ -323,7 +323,7 @@ - + Modified: ofbiz/site/download.html URL: http://svn.apache.org/viewvc/ofbiz/site/download.html?rev=1806571=1806570=1806571=diff == --- ofbiz/site/download.html (original) +++ ofbiz/site/download.html Tue Aug 29 11:45:56 2017 @@ -436,7 +436,7 @@ - + Modified: ofbiz/site/faqs.html URL: http://svn.apache.org/viewvc/ofbiz/site/faqs.html?rev=1806571=1806570=1806571=diff == --- ofbiz/site/faqs.html (original) +++ ofbiz/site/faqs.html Tue Aug 29 11:45:56 2017 @@ -237,7 +237,7 @@ - + Modified: ofbiz/site/getting-involved.html URL: http://svn.apache.org/viewvc/ofbiz/site/getting-involved.html?rev=1806571=1806570=1806571=diff == --- ofbiz/site/getting-involved.html (original) +++ ofbiz/site/getting-involved.html Tue Aug 29 11:45:56 2017 @@ -288,7 +288,7 @@ - + Modified: ofbiz/site/index.html URL: http://svn.apache.org/viewvc/ofbiz/site/index.html?rev=1806571=1806570=1806571=diff == --- ofbiz/site/index.html (original) +++ ofbiz/site/index.html Tue Aug 29 11:45:56 2017 @@ -367,7 +367,7 @@ Apache Software Foundation Sponsorship - + Thanks Security @@ -392,7 +392,7 @@ - + Added: ofbiz/site/js/jquery-1.8.2.min.js URL: http://svn.apache.org/viewvc/ofbiz/site/js/jquery-1.8.2.min.js?rev=1806571=auto == --- ofbiz/site/js/jquery-1.8.2.min.js (added) +++ ofbiz/site/js/jquery-1.8.2.min.js Tue Aug 29 11:45:56 2017 @@ -0,0 +1,2 @@ +/*! jQuery v1.8.2 jquery.com | jquery.org/license */ [... 3 lines stripped ...] Propchange: ofbiz/site/js/jquery-1.8.2.min.js -- svn:eol-style = native Propchange: ofbiz/site/js/jquery-1.8.2.min.js -- svn:keywords = Date Rev Author URL Id Propchange: ofbiz/site/js/jquery-1.8.2.min.js -- svn:mime-type = text/plain Modified: ofbiz/site/mailing-lists.html URL: http://svn.apache.org/viewvc/ofbiz/site/mailing-lists.html?rev=1806571=1806570=1806571=diff == --- ofbiz/site/mailing-lists.html (original) +++ ofbiz/site/mailing-lists.html Tue Aug 29 11:45:56 2017 @@ -247,7 +247,7 @@ - + Modified: ofbiz/site/ofbiz-demos.html URL: http://svn.apache.org/viewvc/ofbiz/site/ofbiz-demos.html?rev=1806571=1806570=1806571=diff == --- ofbiz/site/ofbiz-demos.html (original) +++ ofbiz/site/ofbiz-demos.html Tue Aug 29 11:45:56 2017 @@ -254,7 +254,7 @@ - + Modified: ofbiz/site/our-users.html URL: http://svn.apache.org/viewvc/ofbiz/site/our-users.html?rev
svn commit: r1806903 - in /ofbiz/site: 404.html template/page/404.tpl.php
Author: deepak Date: Fri Sep 1 09:06:14 2017 New Revision: 1806903 URL: http://svn.apache.org/viewvc?rev=1806903=rev Log: Fix typo Modified: ofbiz/site/404.html ofbiz/site/template/page/404.tpl.php Modified: ofbiz/site/404.html URL: http://svn.apache.org/viewvc/ofbiz/site/404.html?rev=1806903=1806902=1806903=diff == --- ofbiz/site/404.html (original) +++ ofbiz/site/404.html Fri Sep 1 09:06:14 2017 @@ -106,7 +106,7 @@ -Page Not found +Page Not Found home/404 error Modified: ofbiz/site/template/page/404.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/404.tpl.php?rev=1806903=1806902=1806903=diff == --- ofbiz/site/template/page/404.tpl.php (original) +++ ofbiz/site/template/page/404.tpl.php Fri Sep 1 09:06:14 2017 @@ -5,7 +5,7 @@ -Page Not found +Page Not Found home/404 error
svn commit: r1806901 - /ofbiz/site/.htaccess
Author: deepak Date: Fri Sep 1 09:05:46 2017 New Revision: 1806901 URL: http://svn.apache.org/viewvc?rev=1806901=rev Log: Added .htaccess file, also added redirect rule to redirect documentation.html to index.html and community.html to getting-involved.html page. Thanks Sandeep Kose Added: ofbiz/site/.htaccess Added: ofbiz/site/.htaccess URL: http://svn.apache.org/viewvc/ofbiz/site/.htaccess?rev=1806901=auto == --- ofbiz/site/.htaccess (added) +++ ofbiz/site/.htaccess Fri Sep 1 09:05:46 2017 @@ -0,0 +1 @@ +ErrorDocument 404 /404.html
svn commit: r1806907 - /ofbiz/site/.htaccess
Author: deepak Date: Fri Sep 1 09:14:12 2017 New Revision: 1806907 URL: http://svn.apache.org/viewvc?rev=1806907=rev Log: Added missing redirect rule in htaccess file Modified: ofbiz/site/.htaccess Modified: ofbiz/site/.htaccess URL: http://svn.apache.org/viewvc/ofbiz/site/.htaccess?rev=1806907=1806906=1806907=diff == --- ofbiz/site/.htaccess (original) +++ ofbiz/site/.htaccess Fri Sep 1 09:14:12 2017 @@ -1 +1,4 @@ -ErrorDocument 404 /404.html +ErrorDocument 404 /404.html + +RewriteRule ^documentation.html /index.html [R=301,NC,L] +RewriteRule ^community.html /getting-involved.html [R=301,NC,L]
svn commit: r1807330 - /ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy
Author: deepak Date: Tue Sep 5 09:44:05 2017 New Revision: 1807330 URL: http://svn.apache.org/viewvc?rev=1807330=rev Log: Fixed: Removed unused code Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy?rev=1807330=1807329=1807330=diff == --- ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy Tue Sep 5 09:44:05 2017 @@ -41,7 +41,6 @@ if (userLogin) cart = ShoppingCartEvents.getCartObject(request) -VisualTheme visualTheme = currencyUomId = cart.getCurrency() productStoreId = ProductStoreWorker.getProductStoreId(request)
svn commit: r1806759 - in /ofbiz/site: ./ template/region/
Author: deepak Date: Thu Aug 31 06:21:44 2017 New Revision: 1806759 URL: http://svn.apache.org/viewvc?rev=1806759=rev Log: Uncomment Security link from footer, it was added to test site update issue Modified: ofbiz/site/about-ofbiz.html ofbiz/site/business-users.html ofbiz/site/developers.html ofbiz/site/download.html ofbiz/site/faqs.html ofbiz/site/getting-involved.html ofbiz/site/index.html ofbiz/site/mailing-lists.html ofbiz/site/ofbiz-demos.html ofbiz/site/our-users.html ofbiz/site/service-providers.html ofbiz/site/source-repositories.html ofbiz/site/template/region/footer.tpl.php ofbiz/site/user-stories.html Modified: ofbiz/site/about-ofbiz.html URL: http://svn.apache.org/viewvc/ofbiz/site/about-ofbiz.html?rev=1806759=1806758=1806759=diff == --- ofbiz/site/about-ofbiz.html (original) +++ ofbiz/site/about-ofbiz.html Thu Aug 31 06:21:44 2017 @@ -206,7 +206,7 @@ Apache Software Foundation Sponsorship Thanks - + Security Modified: ofbiz/site/business-users.html URL: http://svn.apache.org/viewvc/ofbiz/site/business-users.html?rev=1806759=1806758=1806759=diff == --- ofbiz/site/business-users.html (original) +++ ofbiz/site/business-users.html Thu Aug 31 06:21:44 2017 @@ -367,7 +367,7 @@ Apache Software Foundation Sponsorship Thanks - + Security Modified: ofbiz/site/developers.html URL: http://svn.apache.org/viewvc/ofbiz/site/developers.html?rev=1806759=1806758=1806759=diff == --- ofbiz/site/developers.html (original) +++ ofbiz/site/developers.html Thu Aug 31 06:21:44 2017 @@ -299,7 +299,7 @@ Apache Software Foundation Sponsorship Thanks - + Security Modified: ofbiz/site/download.html URL: http://svn.apache.org/viewvc/ofbiz/site/download.html?rev=1806759=1806758=1806759=diff == --- ofbiz/site/download.html (original) +++ ofbiz/site/download.html Thu Aug 31 06:21:44 2017 @@ -406,7 +406,7 @@ Apache Software Foundation Sponsorship Thanks - + Security Modified: ofbiz/site/faqs.html URL: http://svn.apache.org/viewvc/ofbiz/site/faqs.html?rev=1806759=1806758=1806759=diff == --- ofbiz/site/faqs.html (original) +++ ofbiz/site/faqs.html Thu Aug 31 06:21:44 2017 @@ -213,7 +213,7 @@ Apache Software Foundation Sponsorship Thanks - + Security Modified: ofbiz/site/getting-involved.html URL: http://svn.apache.org/viewvc/ofbiz/site/getting-involved.html?rev=1806759=1806758=1806759=diff == --- ofbiz/site/getting-involved.html (original) +++ ofbiz/site/getting-involved.html Thu Aug 31 06:21:44 2017 @@ -264,7 +264,7 @@ Apache Software Foundation Sponsorship Thanks - + Security Modified: ofbiz/site/index.html URL: http://svn.apache.org/viewvc/ofbiz/site/index.html?rev=1806759=1806758=1806759=diff == --- ofbiz/site/index.html (original) +++ ofbiz/site/index.html Thu Aug 31 06:21:44 2017 @@ -368,7 +368,7 @@ Apache Software Foundation Sponsorship Thanks - + Security Modified: ofbiz/site/mailing-lists.html URL: http://svn.apache.org/viewvc/ofbiz/site/mailing-lists.html?rev=1806759=1806758=1806759=diff == --- ofbiz/site/mailing-lists.html (original) +++ ofbiz/site/mailing-lists.html Thu Aug 31 06:21:44 2017 @@ -223,7 +223,7 @@ Apache Software Foundation Sponsorship Thanks - + Security Modified: ofbiz/site/ofbiz-demos.html URL: http://svn.apache.org/viewvc/ofbiz/site/ofbiz-demos.html?rev=1806759=1806758=1806759=diff == --- ofbiz/site/ofbiz-demos.html (original) +++ ofbiz/site/ofbiz-demos.html Thu Aug 31 06:21:44 2017 @@ -230,7 +230,7 @@ Apache Software Foundation Sponsorship Thanks - + Security Modified: ofbiz/site/our-users.html URL: http://svn.apache.org/viewvc/ofbiz/site/our-users.html?rev=1806759=1806758
svn commit: r1811116 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: data/EcommerceTypeData.xml template/includes/Header.ftl template/includes/HeaderHead.ftl widget/CommonScreens.xml widget/Theme.xml
Author: deepak
Date: Wed Oct 4 18:15:40 2017
New Revision: 186
URL: http://svn.apache.org/viewvc?rev=186=rev
Log:
Fixed: Added EC_DEFAULT as theme for ecommerce. (OFBIZ-9805)
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml (with props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml?rev=186=185=186=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/data/EcommerceTypeData.xml Wed Oct 4
18:15:40 2017
@@ -21,6 +21,7 @@ under the License.
+
@@ -29,4 +30,5 @@ under the License.
+
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl?rev=186=185=186=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl Wed Oct 4
18:15:40 2017
@@ -25,7 +25,7 @@ under the License.
<#elseif catalogHeaderLogo??>
<#elseif layoutSettings.VT_HDR_IMAGE_URL?has_content>
-
+
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl?rev=186=185=186=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl Wed
Oct 4 18:15:40 2017
@@ -28,7 +28,7 @@ under the License.
: ${(productStore.storeName)!}
<#if layoutSettings.VT_SHORTCUT_ICON?has_content>
-<#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/>
+<#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON/>
<#elseif layoutSettings.shortcutIcon?has_content>
<#assign shortcutIcon = layoutSettings.shortcutIcon/>
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=186=185=186=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Wed Oct 4
18:15:40 2017
@@ -56,11 +56,7 @@ under the License.
-
-
-
-
-
+
@@ -273,11 +269,8 @@ under the License.
-
-
-
-
-
+
+
Added: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml?rev=186=auto
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml (added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml Wed Oct 4 18:15:40
2017
@@ -0,0 +1,45 @@
+
+
+
+http://www.w3.org/2001/XMLSchema-instance;
+ xmlns="http://ofbiz.apache.org/Widget-Theme;
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme
http://ofbiz.apache.org/dtds/widget-theme.xsd;>
+
+
+${str:label('CommonEntityLabels',
'VisualTheme.description.EC_DEFAULT', locale)}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml
--
svn:eol-style = native
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml
--
svn:keywords = Date Rev Author URL Id
Propchang
svn commit: r1811117 - /ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Author: deepak Date: Wed Oct 4 18:26:43 2017 New Revision: 187 URL: http://svn.apache.org/viewvc?rev=187=rev Log: Fixed: Get the header and footer template location correctly in ecommerce main decorator. Now multiflex theme will work fine with ecommerce.(OFBIZ-9805) Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=187=186=187=diff == --- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Wed Oct 4 18:26:43 2017 @@ -57,8 +57,8 @@ under the License. - - + +
svn commit: r1811118 - in /ofbiz: ofbiz-framework/trunk/themes/multiflex/ ofbiz-plugins/trunk/multiflex/
Author: deepak Date: Wed Oct 4 18:35:31 2017 New Revision: 188 URL: http://svn.apache.org/viewvc?rev=188=rev Log: Improved: Moved multiflex theme from themes to plugins (OFBIZ-9789) Added: ofbiz/ofbiz-plugins/trunk/multiflex/ (props changed) - copied from r187, ofbiz/ofbiz-framework/trunk/themes/multiflex/ Removed: ofbiz/ofbiz-framework/trunk/themes/multiflex/ Propchange: ofbiz/ofbiz-plugins/trunk/multiflex/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Oct 4 18:35:31 2017 @@ -0,0 +1,12 @@ +/ofbiz/branches/2013_RemoveJavolution/themes/multiflex:1462755 +/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/multiflex:1535171-1654698 +/ofbiz/branches/OFBIZ-6275/themes/multiflex:1675394-1675466 +/ofbiz/branches/addbirt/themes/multiflex:831210-885099,885686-886087 +/ofbiz/branches/boostrap_theme/themes/multiflex:1635411,1635439,1635465 +/ofbiz/branches/dojo1.4/themes/multiflex:951708-952957 +/ofbiz/branches/framework-api-cleanup/themes/multiflex:1619853-1620529 +/ofbiz/branches/jackrabbit20100709/themes/multiflex:962442-1231517 +/ofbiz/branches/jquery/themes/multiflex:952958-1044489 +/ofbiz/branches/json-integration-refactoring/themes/multiflex:1634077-1635900 +/ofbiz/branches/multitenant20100310/themes/multiflex:921280-927264 +/ofbiz/branches/release13.07/themes/multiflex:1547657
svn commit: r1811121 - /ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/images/wrap.css
Author: deepak Date: Wed Oct 4 18:45:09 2017 New Revision: 1811121 URL: http://svn.apache.org/viewvc?rev=1811121=rev Log: Improved: Removed unused file Removed: ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/images/wrap.css
svn commit: r1809826 - in /ofbiz/site: download.html template/page/download.tpl.php
Author: deepak Date: Wed Sep 27 10:30:28 2017 New Revision: 1809826 URL: http://svn.apache.org/viewvc?rev=1809826=rev Log: Fixed: Release Notes link on downloads page in OFBiz new website are not working for individual releases (OFBIZ-9796) Thanks Aditya Sharma for reporting the issue Modified: ofbiz/site/download.html ofbiz/site/template/page/download.tpl.php Modified: ofbiz/site/download.html URL: http://svn.apache.org/viewvc/ofbiz/site/download.html?rev=1809826=1809825=1809826=diff == --- ofbiz/site/download.html (original) +++ ofbiz/site/download.html Wed Sep 27 10:30:28 2017 @@ -166,7 +166,7 @@ [PGP] [MD5] [SHA12] -[Release Notes] +[Release Notes] Apache OFBiz 13.07.03 Released in April 2016, is the third and final release of the 13.07 series, that has been stabilized with bug fixes since July 2013. @@ -175,10 +175,10 @@ [PGP] [MD5] [SHA12] -[Release Notes] +[Release Notes] Special Notice Regarding Branches 14.12 and 15.12 The branches 14.12 and 15.12 contain the complete codebase including the specialpurpose components and will remain as unreleased branches so will be accessible for developers and service providers to support their client base. The project has changed the Apache OFBiz build system from Apache Ant to Gradle beginning with the 16.11* series of releases so 14.12 and 15.12 are still using Ant. - Branches 14.12 and 15.12 will be supported until July 2017 and during this period bug fixes will be backported to them + Branches 14.12 and 15.12 will be no longer supported Apache OFBiz 12.04 and earlier Modified: ofbiz/site/template/page/download.tpl.php URL: http://svn.apache.org/viewvc/ofbiz/site/template/page/download.tpl.php?rev=1809826=1809825=1809826=diff == --- ofbiz/site/template/page/download.tpl.php (original) +++ ofbiz/site/template/page/download.tpl.php Wed Sep 27 10:30:28 2017 @@ -66,7 +66,7 @@ [PGP] [MD5] [SHA12] -[Release Notes] +[Release Notes] Apache OFBiz 13.07.03 Released in April 2016, is the third and final release of the 13.07 series, that has been stabilized with bug fixes since July 2013. @@ -75,10 +75,10 @@ [PGP] [MD5] [SHA12] -[Release Notes] +[Release Notes] Special Notice Regarding Branches 14.12 and 15.12 The branches 14.12 and 15.12 contain the complete codebase including the specialpurpose components and will remain as unreleased branches so will be accessible for developers and service providers to support their client base. The project has changed the Apache OFBiz build system from Apache Ant to Gradle beginning with the 16.11* series of releases so 14.12 and 15.12 are still using Ant. - Branches 14.12 and 15.12 will be supported until July 2017 and during this period bug fixes will be backported to them + Branches 14.12 and 15.12 will be no longer supported Apache OFBiz 12.04 and earlier
svn commit: r1811997 - in /ofbiz/ofbiz-framework/trunk/themes/common/webapp/images: AdvantageDbLogo.gif myportal_load_bg.png next.gif next_year.gif prev.gif prev_year.gif
Author: deepak Date: Thu Oct 12 19:02:47 2017 New Revision: 1811997 URL: http://svn.apache.org/viewvc?rev=1811997=rev Log: Improved: Removed some old and unused images. Removed: ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/AdvantageDbLogo.gif ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/myportal_load_bg.png ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/next.gif ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/next_year.gif ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/prev.gif ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/prev_year.gif
svn commit: r1815060 - in /ofbiz/branches/release16.11: ./ applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
Author: deepak
Date: Mon Nov 13 06:28:25 2017
New Revision: 1815060
URL: http://svn.apache.org/viewvc?rev=1815060=rev
Log:
Applied fix from trunk for revision: 1815059
===
Fixed: Content related changes needs OFBiz server restart (OFBIZ-9922)
DataResourceWorker call the FreeMarkerWorker.renderTemplateFromString if
dataTemplateTypeId is FTL,
and pass the dataResource.lastUpdatedStamp to update the ftl cache.
But if you use ftl file as objectInfo so dataResource.lastUpdatedStamp will not
change if you update the ftl file
Thanks Suraj Khurana for reporting the issue.
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
Propchange: ofbiz/branches/release16.11/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 13 06:28:25 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified:
ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java?rev=1815060=1815059=1815060=diff
==
---
ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
(original)
+++
ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
Mon Nov 13 06:28:25 2017
@@ -56,6 +56,7 @@ import org.apache.ofbiz.base.util.FileUt
import org.apache.ofbiz.base.util.GeneralException;
import org.apache.ofbiz.base.util.StringUtil;
import org.apache.ofbiz.base.util.StringUtil.StringWrapper;
+import org.apache.ofbiz.base.util.UtilDateTime;
import org.apache.ofbiz.base.util.UtilGenerics;
import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.base.util.UtilIO;
@@ -657,7 +658,17 @@ public class DataResourceWorker impleme
// render the FTL template
boolean useTemplateCache = cache &&
!UtilProperties.getPropertyAsBoolean("content", "disable.ftl.template.cache",
false);
-Timestamp lastUpdatedStamp =
dataResource.getTimestamp("lastUpdatedStamp");
+//Do not use dataResource.lastUpdatedStamp for
dataResource template caching as it may use ftl file or electronicText
+// If dataResource using ftl file use nowTimestamp to
avoid freemarker caching
+Timestamp lastUpdatedStamp = UtilDateTime.nowTimestamp();
+//If dataResource is
svn commit: r1815059 - /ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
Author: deepak
Date: Mon Nov 13 06:26:53 2017
New Revision: 1815059
URL: http://svn.apache.org/viewvc?rev=1815059=rev
Log:
Fixed: Content related changes needs OFBiz server restart (OFBIZ-9922)
DataResourceWorker call the FreeMarkerWorker.renderTemplateFromString if
dataTemplateTypeId is FTL,
and pass the dataResource.lastUpdatedStamp to update the ftl cache.
But if you use ftl file as objectInfo so dataResource.lastUpdatedStamp will not
change if you update the ftl file
Thanks Suraj Khurana for reporting the issue.
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java?rev=1815059=1815058=1815059=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
Mon Nov 13 06:26:53 2017
@@ -57,6 +57,7 @@ import org.apache.ofbiz.base.util.Genera
import org.apache.ofbiz.base.util.StringUtil;
import org.apache.ofbiz.base.util.StringUtil.StringWrapper;
import org.apache.ofbiz.base.util.UtilCodec;
+import org.apache.ofbiz.base.util.UtilDateTime;
import org.apache.ofbiz.base.util.UtilGenerics;
import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.base.util.UtilIO;
@@ -674,7 +675,17 @@ public class DataResourceWorker impleme
// render the FTL template
boolean useTemplateCache = cache &&
!UtilProperties.getPropertyAsBoolean("content", "disable.ftl.template.cache",
false);
-Timestamp lastUpdatedStamp =
dataResource.getTimestamp("lastUpdatedStamp");
+//Do not use dataResource.lastUpdatedStamp for
dataResource template caching as it may use ftl file or electronicText
+// If dataResource using ftl file use nowTimestamp to
avoid freemarker caching
+Timestamp lastUpdatedStamp = UtilDateTime.nowTimestamp();
+//If dataResource is type of ELECTRONIC_TEXT then only use
the lastUpdatedStamp of electronicText entity for freemarker caching
+if
("ELECTRONIC_TEXT".equals(dataResource.getString("dataResourceTypeId"))) {
+GenericValue electronicText =
dataResource.getRelatedOne("ElectronicText", true);
+if (electronicText != null) {
+lastUpdatedStamp =
electronicText.getTimestamp("lastUpdatedStamp");
+}
+}
+
FreeMarkerWorker.renderTemplateFromString("delegator:" +
delegator.getDelegatorName() + ":DataResource:" + dataResourceId, templateText,
templateContext, out, lastUpdatedStamp.getTime(), useTemplateCache);
} catch (TemplateException e) {
throw new GeneralException("Error rendering FTL template",
e);
svn commit: r1816537 - /ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js
Author: deepak
Date: Tue Nov 28 10:38:06 2017
New Revision: 1816537
URL: http://svn.apache.org/viewvc?rev=1816537=rev
Log:
Improved: Use console.log instead of alert to show error message if
setLocaleFromBrowser return error.
setLocaleFromBrowser request called setUserLocale.js and its executed for
each request,
auth is set true for setLocaleFromBrowser service so it return error if it
executed from login screen.
Still need to refine way to set setLocaleFromBrowser as this request
executed with each time when page refreshed.
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js?rev=1816537=1816536=1816537=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/setUserLocale.js
Tue Nov 28 10:38:06 2017
@@ -25,7 +25,7 @@ $.ajax({
data: "localeName=" + timezone,
error: function(error) {
if (error != "") {
-alert("Error while setting user locale: " + error);
+console.log("Error while setting user locale: ", error);
}
}
});
svn commit: r1816263 - in /ofbiz/ofbiz-framework/trunk/themes: ./ common/webapp/common/js/jquery/ui/js/ common/widget/
Author: deepak Date: Sat Nov 25 06:50:51 2017 New Revision: 1816263 URL: http://svn.apache.org/viewvc?rev=1816263=rev Log: Reverted: Jquery ui upgrade breaks some of js functions, reverting r1816242 and r1816241, we will upgrade dependent code and then will upgrade jquery ui from 1.10 to 1.12 (OFBIZ-9978) Added: ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/ui/js/jquery-ui-1.10.3.js - copied unchanged from r1816240, ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/ui/js/jquery-ui-1.10.3.js ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/ui/js/jquery-ui-1.10.3.min.js - copied unchanged from r1816240, ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/ui/js/jquery-ui-1.10.3.min.js Removed: ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/ui/js/jquery-ui-1.12.1.js ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/jquery/ui/js/jquery-ui-1.12.1.min.js Modified: ofbiz/ofbiz-framework/trunk/themes/README.md ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml Modified: ofbiz/ofbiz-framework/trunk/themes/README.md URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/README.md?rev=1816263=1816262=1816263=diff == --- ofbiz/ofbiz-framework/trunk/themes/README.md (original) +++ ofbiz/ofbiz-framework/trunk/themes/README.md Sat Nov 25 06:50:51 2017 @@ -255,7 +255,7 @@ The blue light theme has been these prop - + Modified: ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml?rev=1816263=1816262=1816263=diff == --- ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml Sat Nov 25 06:50:51 2017 @@ -432,7 +432,7 @@ under the License. - + Modified: ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml?rev=1816263=1816262=1816263=diff == --- ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml Sat Nov 25 06:50:51 2017 @@ -60,7 +60,7 @@ under the License. - +
svn commit: r1816274 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/includes/ webapp/ecommerce/WEB-INF/ webapp/ecommerce/css/ webapp/ecommerce/images/ webapp/ecommerce/js/ widget/
Author: deepak
Date: Sat Nov 25 09:22:54 2017
New Revision: 1816274
URL: http://svn.apache.org/viewvc?rev=1816274=rev
Log:
Improved: Using Bootstrap Framework for E-Commerce Website (OFBIZ-9760)
Applied patch from jira issue. Now Header and footer will be according to
bootstrap markup.
Thanks Mayank, Parakh and Saurabh for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/bootstrap.min.css
(with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/js/
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/js/bootstrap.min.js
(with props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/web.xml
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/Theme.xml
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl?rev=1816274=1816273=1816274=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl Sat Nov 25
09:22:54 2017
@@ -19,9 +19,8 @@ under the License.
<#assign nowTimestamp =
Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
-
-
-
+
+
http://jigsaw.w3.org/css-validator/;>
@@ -29,15 +28,14 @@ under the License.
-
-
+
http://ofbiz.apache.org;>${uiLabelMap.EcommerceAboutUs}
Copyright (c) 2001-${nowTimestamp?string("")} The Apache Software
Foundation -
http://www.apache.org;>www.apache.org
Powered by http://ofbiz.apache.org;>Apache OFBiz
-
- ${uiLabelMap.EcommerceSeeStorePoliciesHere}
+
+${uiLabelMap.EcommerceSeeStorePoliciesHere}
+
-
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl?rev=1816274=1816273=1816274=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Header.ftl Sat Nov 25
09:22:54 2017
@@ -17,9 +17,8 @@ specific language governing permissions
under the License.
-->
-
-
-
+
+
<#if sessionAttributes.overrideLogo??>
<#elseif catalogHeaderLogo??>
@@ -27,72 +26,78 @@ under the License.
<#elseif layoutSettings.VT_HDR_IMAGE_URL?has_content>
-
-
-${screens.render("component://ecommerce/widget/CartScreens.xml#microcart")}
-
-
+
+
<#if !productStore??>
${uiLabelMap.EcommerceNoProductStore}
<#if (productStore.title)??>
- ${productStore.title}
+ ${productStore.title}
<#if (productStore.subtitle)??>
${productStore.subtitle}
-<#if sessionAttributes.autoName?has_content>
- ${uiLabelMap.CommonWelcome}${sessionAttributes.autoName?html}!
- (${uiLabelMap.CommonNotYou}?
- ${uiLabelMap.CommonClickHere})
-<#else>
- ${uiLabelMap.CommonWelcome}!
-
+ <#if sessionAttributes.autoName?has_content>
+${uiLabelMap.CommonWelcome}${sessionAttributes.autoName}!
+(${uiLabelMap.CommonNotYou}?
+${uiLabelMap.CommonClickHere})
+ <#else>
+${uiLabelMap.CommonWelcome}!
+
+
-
-
+
+${screens.render("component://ecommerce/widget/CartScreens.xml#microcart")}
+
+
-
-
+
+ <#if userLogin?has_content && userLogin.userLoginId != "anonymous">
+
+ ${uiLabelMap.CommonLogout}
+
+ <#else>
+
+ ${uiLabelMap.CommonLogin}
+
+
+ ${uiLabelMap.EcommerceRegister}
+
+
+
<#if userLogin?has_content && userLogin.userLoginId != "anonymous">
- ${uiLabelMap.CommonLogout}
+ ${uiLabelMap.CommonContactUs}
<#else>
- ${uiLabelMap.CommonLogin}
- ${uiLabelMap.EcommerceRegister}
+ ${uiLabelMap.CommonContactUs}
-
-<#if userLogin?has_content && userLogin.userLoginId != "anonymous">
- ${uiLabelMap.CommonContactUs}
-<#else>
- ${uiLabelMap.CommonContactUs}
-
-${uiLabelMap.CommonMain}
-
-
-
-<#if !userLogin?has_content || (userLogin.userLoginId)! != "
svn commit: r1816275 - /ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/ofbiz_logo.png
Author: deepak Date: Sat Nov 25 09:24:00 2017 New Revision: 1816275 URL: http://svn.apache.org/viewvc?rev=1816275=rev Log: Improved: Added ofbiz_logo.ping (OFBIZ-9760) Added: ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/ofbiz_logo.png (with props) Added: ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/ofbiz_logo.png URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/ofbiz_logo.png?rev=1816275=auto == Binary file - no diff available. Propchange: ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/ofbiz_logo.png -- svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/ofbiz_logo.png -- svn:mime-type = image/png
svn commit: r1816277 - /ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
Author: deepak
Date: Sat Nov 25 10:25:12 2017
New Revision: 1816277
URL: http://svn.apache.org/viewvc?rev=1816277=rev
Log:
Improved: Removed some inline styling from xhtml and w3c images, alos removed
protocol from external url and used //, browser automatically append the
appropriate protocol (OFBIZ-9760)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl?rev=1816277=1816276=1816277=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl Sat Nov 25
10:25:12 2017
@@ -21,19 +21,19 @@ under the License.
-http://jigsaw.w3.org/css-validator/;>
+
-http://validator.w3.org/check?uri=referer;>
-
+
+
-http://ofbiz.apache.org;>${uiLabelMap.EcommerceAboutUs}
-Copyright (c) 2001-${nowTimestamp?string("")} The Apache Software
Foundation -
- http://www.apache.org;>www.apache.org
+${uiLabelMap.EcommerceAboutUs}
+Copyright 2001-${nowTimestamp?string("")} The Apache
Software Foundation -
+ www.apache.org
-Powered by http://ofbiz.apache.org;>Apache OFBiz
+Powered by Apache OFBiz
${uiLabelMap.EcommerceSeeStorePoliciesHere}
svn commit: r1816269 - in /ofbiz/ofbiz-framework/trunk/themes/common: template/macro/HtmlFormMacroLibrary.ftl webapp/common/js/util/OfbizUtil.js
Author: deepak
Date: Sat Nov 25 08:40:17 2017
New Revision: 1816269
URL: http://svn.apache.org/viewvc?rev=1816269=rev
Log:
Improved: Replace Inline js with External js in renderDisplayField macro
(OFBIZ-9843)
Thanks Aditya Sharma for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl?rev=1816269=1816268=1816269=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
Sat Nov 25 08:40:17 2017
@@ -28,7 +28,7 @@ under the License.
<#lt/>
<#else>
<#if inPlaceEditorUrl?has_content || class?has_content || alert=="true" ||
title?has_content>
- id="cc_${idName}" <#if
title?has_content>title="${title}" <@renderClass class alert />><#t/>
+ id="cc_${idName}" <#if
title?has_content>title="${title}" <@renderClass class alert />><#t/>
<#if description?has_content>
@@ -39,11 +39,6 @@ under the License.
<#if inPlaceEditorUrl?has_content || class?has_content || alert=="true">
<#lt/>
-<#if inPlaceEditorUrl?has_content && idName?has_content>
- <#lt/>
-ajaxInPlaceEditDisplayField('cc_${idName}', '${inPlaceEditorUrl}',
${inPlaceEditorParams});<#lt/>
- <#lt/>
-
<#macro renderHyperlinkField>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js?rev=1816269=1816268=1816269=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js
Sat Nov 25 08:40:17 2017
@@ -67,6 +67,13 @@ function bindObservers(bind_element) {
}
element.elrte(opts);
});
+jQuery(bind_element).find("[data-inplace-editor-url]").each(function(){
+var element = jQuery(this);
+var id = element.attr("id");
+var url = element.data("inplace-editor-url");
+var params = element.data("inplace-editor-params");
+ajaxInPlaceEditDisplayField(id, url, (new Function("return " + params
+ ";")()));
+});
}
svn commit: r1816271 - in /ofbiz/ofbiz-framework/trunk/themes/common/webapp: common/js/plugins/imagemanagement/ images/imagemanagement/
Author: deepak Date: Sat Nov 25 09:00:52 2017 New Revision: 1816271 URL: http://svn.apache.org/viewvc?rev=1816271=rev Log: Improved: Moved imagemanagement plugin from images to common/js/plugins (OFBIZ-5776) Added: ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/imagemanagement/ - copied from r1816270, ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/imagemanagement/ Removed: ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/imagemanagement/
svn commit: r1816272 - in /ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement: ImageCrop.ftl ImageRotating.ftl ResizeImage.ftl ShowPeopleApprove.ftl
Author: deepak
Date: Sat Nov 25 09:01:52 2017
New Revision: 1816272
URL: http://svn.apache.org/viewvc?rev=1816272=rev
Log:
Improved: Updated imagemanagement plugin path from images to common/js/plugins
(OFBIZ-5776)
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ResizeImage.ftl
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl?rev=1816272=1816271=1816272=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageCrop.ftl
Sat Nov 25 09:01:52 2017
@@ -16,9 +16,9 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
-
-
+
+
+
jQuery.noConflict();
jQuery(document).ready(function(){
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl
URL:
<a rel="nofollow" href="http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl?rev=1816272&r1=1816271&r2=1816272&view=diff">http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl?rev=1816272&r1=1816271&r2=1816272&view=diff</a>
==
---
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ImageRotating.ftl
Sat Nov 25 09:01:52 2017
@@ -16,8 +16,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<script language="javascript" type="text/javascript"
src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>">
-
+
+
svn commit: r1817986 - in /ofbiz/ofbiz-plugins/trunk: bi/src/main/java/org/apache/ofbiz/bi/util/ ebaystore/template/store/ ecommerce/template/order/ passport/groovyScripts/login/ passport/src/main/jav
Author: deepak
Date: Wed Dec 13 09:02:59 2017
New Revision: 1817986
URL: http://svn.apache.org/viewvc?rev=1817986=rev
Log:
Improved: Replace all delegator findByAnd and findOne method calling by
EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly,
Thanks Suraj Khurana for your contribution
Modified:
ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java
ofbiz/ofbiz-plugins/trunk/ebaystore/template/store/ProductSearchExport.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderHistory.ftl
ofbiz/ofbiz-plugins/trunk/passport/groovyScripts/login/GetThirdPartyLogins.groovy
ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/event/GitHubEvents.java
ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java
ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java
ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java
ofbiz/ofbiz-plugins/trunk/pricat/groovyScripts/pricat/FindMyExcelImport.groovy
ofbiz/ofbiz-plugins/trunk/pricat/groovyScripts/pricat/FindMyExcelImportLog.groovy
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatEvents.java
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java
ofbiz/ofbiz-plugins/trunk/projectmgr/template/project/EditTaskAndAssoc.ftl
ofbiz/ofbiz-plugins/trunk/scrum/template/includes/BurnDown.ftl
ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java
ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java
Modified:
ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java?rev=1817986=1817985=1817986=diff
==
---
ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java
Wed Dec 13 09:02:59 2017
@@ -35,7 +35,7 @@ import org.apache.ofbiz.base.util.UtilVa
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.GenericEntityException;
import org.apache.ofbiz.entity.GenericValue;
-import org.apache.ofbiz.entity.util.EntityUtil;
+import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.service.DispatchContext;
import org.apache.ofbiz.service.ServiceUtil;
@@ -52,7 +52,7 @@ public class DimensionServices {
GenericValue lastDimensionValue = null;
try {
// TODO: improve performance
-lastDimensionValue =
EntityUtil.getFirst(delegator.findByAnd(dimensionEntityName,
UtilMisc.toMap(naturalKeyFields), UtilMisc.toList("-createdTxStamp"), false));
+lastDimensionValue =
EntityQuery.use(delegator).from(dimensionEntityName).where(naturalKeyFields).orderBy("-createdTxStamp").queryFirst();
} catch (GenericEntityException gee) {
return ServiceUtil.returnError(gee.getMessage());
}
@@ -79,7 +79,7 @@ public class DimensionServices {
}
List existingDimensionValues = null;
try {
-existingDimensionValues =
delegator.findByAnd(dimensionValue.getEntityName(),
UtilMisc.toMap(andCondition), null, false);
+existingDimensionValues =
EntityQuery.use(delegator).from(dimensionValue.getEntityName()).where(andCondition).queryList();
} catch (GenericEntityException gee) {
return ServiceUtil.returnError(gee.getMessage());
}
@@ -136,7 +136,7 @@ public class DimensionServices {
while (currentDate.compareTo(thruDate) <= 0) {
GenericValue dateValue = null;
try {
-dateValue =
EntityUtil.getFirst(delegator.findByAnd("DateDimension",
UtilMisc.toMap("dateValue", currentDate), null, false));
+dateValue =
EntityQuery.use(delegator).from("DateDimension").where("dateValue",
currentDate).queryFirst();
} catch (GenericEntityException gee) {
return ServiceUtil.returnError(gee.getMessage());
}
Modified:
ofbiz/ofbiz-plugins/trunk/ebaystore/template/store/ProductSearchExport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/template
svn commit: r1817998 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/groovyScripts/reports/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/ applications/acc
Author: deepak Date: Wed Dec 13 10:42:32 2017 New Revision: 1817998 URL: http://svn.apache.org/viewvc?rev=1817998=rev Log: Reverted r#1817989, workign fine locally, reverted for now will check and commit again Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/reports/InvoiceAcctgTransEntryParameters.groovy ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/ShowGlTransactions.ftl ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/FindFacility.groovy ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProductStoreAndWebSite.groovy ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/bom/FindProductBom.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/CuttingListReport.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnLinks.ftl ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContentUrlFilter.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/template/category/CreateProductInCategoryStart.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/product/ViewProductOrders.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/ical/IsCalOwner.groovy ofbiz/ofbiz-framework/trunk/applications/workeffort/template/calendar/CalendarEventContent.ftl ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/GeoLocation.groovy ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/GetParentPortalPageId.groovy ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/EntityPerformanceTest.groovy ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/HomeMenu.ftl ofbiz/ofbiz-framework/trunk/themes/rainbowstone
svn commit: r1817989 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/groovyScripts/reports/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/ applications/acc
Author: deepak Date: Wed Dec 13 09:21:33 2017 New Revision: 1817989 URL: http://svn.apache.org/viewvc?rev=1817989=rev Log: Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029) Applied slightly modified patch, rearrange import properly, Thanks Suraj Khurana for your contribution Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/reports/InvoiceAcctgTransEntryParameters.groovy ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/ShowGlTransactions.ftl ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/FindFacility.groovy ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProductStoreAndWebSite.groovy ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/bom/FindProductBom.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/CuttingListReport.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnLinks.ftl ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContentUrlFilter.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/template/category/CreateProductInCategoryStart.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/product/ViewProductOrders.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/ical/IsCalOwner.groovy ofbiz/ofbiz-framework/trunk/applications/workeffort/template/calendar/CalendarEventContent.ftl ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/GeoLocation.groovy ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/GetParentPortalPageId.groovy ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/EntityPerformanceTest.groovy ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy ofbiz/ofbiz
svn commit: r1817989 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/groovyScripts/reports/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/ applications/acc
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy?rev=1817989=1817988=1817989=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy
Wed Dec 13 09:21:33 2017
@@ -17,13 +17,11 @@
* under the License.
***/
-import org.apache.ofbiz.entity.util.EntityQuery
-import org.apache.ofbiz.service.GenericServiceException
import org.apache.ofbiz.service.ServiceUtil
public Map setLocaleFromBrowser() {
Map results = ServiceUtil.returnSuccess()
-userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
parameters.userLogin.userLoginId).queryFirst();
+userLogin = from("UserLogin").where("userLoginId",
parameters.userLogin.userLoginId).queryFirst();
if (userLogin) {
if (!userLogin.lastTimeZone || "null".equals(userLogin.lastTimeZone)) {
userLogin.lastTimeZone = parameters.localeName
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java?rev=1817989=1817988=1817989=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
Wed Dec 13 09:21:33 2017
@@ -31,6 +31,7 @@ import org.apache.ofbiz.base.util.UtilVa
import org.apache.ofbiz.entity.GenericEntityException;
import org.apache.ofbiz.entity.GenericValue;
import org.apache.ofbiz.entity.util.EntityListIterator;
+import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.service.ServiceUtil;
import org.apache.ofbiz.service.testtools.OFBizTestCase;
@@ -54,7 +55,7 @@ public class PerformFindTests extends OF
}
private void prepareData() throws Exception {
-if (delegator.findOne("TestingType", false, "testingTypeId",
"PERFOMFINDTEST") == null) {
+if (EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne() == null) {
delegator.create("TestingType", "testingTypeId", "PERFOMFINDTEST");
delegator.create("Testing", "testingId", "PERF_TEST_1",
"testingTypeId", "PERFOMFINDTEST", "testingName", "nice name one");
delegator.create("Testing", "testingId", "PERF_TEST_2",
"testingTypeId", "PERFOMFINDTEST", "testingName", "nice other name two");
@@ -111,7 +112,7 @@ public class PerformFindTests extends OF
}
private void performFindConditionFieldEquals() throws Exception {
-GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
+GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
prepareData();
Map inputFields = new HashMap();
@@ -148,7 +149,7 @@ public class PerformFindTests extends OF
}
private void performFindConditionFieldLike() throws Exception {
-GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
+GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
prepareData();
//first test like condition
@@ -185,7 +186,7 @@ public class PerformFindTests extends OF
}
private void performFindConditionDistinct() throws Exception {
-GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
+GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
prepareData();
//first test without distinct condition
@@ -206,7 +207,7 @@ public class PerformFindTests extends OF
}
private void performFindFilterByDate() throws Exception {
-GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
+GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
prepareData();
//first test without filterDate condition
@@ -226,7 +227,7 @@ public class PerformFindTests extends OF
}
private void performFindFilterByDateWithDedicateDateField() throws
Exception {
-
svn commit: r1817998 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/groovyScripts/reports/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/ applications/acc
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy?rev=1817998=1817997=1817998=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy
Wed Dec 13 10:42:32 2017
@@ -17,11 +17,13 @@
* under the License.
***/
+import org.apache.ofbiz.entity.util.EntityQuery
+import org.apache.ofbiz.service.GenericServiceException
import org.apache.ofbiz.service.ServiceUtil
public Map setLocaleFromBrowser() {
Map results = ServiceUtil.returnSuccess()
-userLogin = from("UserLogin").where("userLoginId",
parameters.userLogin.userLoginId).queryFirst();
+userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
parameters.userLogin.userLoginId).queryFirst();
if (userLogin) {
if (!userLogin.lastTimeZone || "null".equals(userLogin.lastTimeZone)) {
userLogin.lastTimeZone = parameters.localeName
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java?rev=1817998=1817997=1817998=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
Wed Dec 13 10:42:32 2017
@@ -31,7 +31,6 @@ import org.apache.ofbiz.base.util.UtilVa
import org.apache.ofbiz.entity.GenericEntityException;
import org.apache.ofbiz.entity.GenericValue;
import org.apache.ofbiz.entity.util.EntityListIterator;
-import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.service.ServiceUtil;
import org.apache.ofbiz.service.testtools.OFBizTestCase;
@@ -55,7 +54,7 @@ public class PerformFindTests extends OF
}
private void prepareData() throws Exception {
-if (EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne() == null) {
+if (delegator.findOne("TestingType", false, "testingTypeId",
"PERFOMFINDTEST") == null) {
delegator.create("TestingType", "testingTypeId", "PERFOMFINDTEST");
delegator.create("Testing", "testingId", "PERF_TEST_1",
"testingTypeId", "PERFOMFINDTEST", "testingName", "nice name one");
delegator.create("Testing", "testingId", "PERF_TEST_2",
"testingTypeId", "PERFOMFINDTEST", "testingName", "nice other name two");
@@ -112,7 +111,7 @@ public class PerformFindTests extends OF
}
private void performFindConditionFieldEquals() throws Exception {
-GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
+GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
prepareData();
Map inputFields = new HashMap();
@@ -149,7 +148,7 @@ public class PerformFindTests extends OF
}
private void performFindConditionFieldLike() throws Exception {
-GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
+GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
prepareData();
//first test like condition
@@ -186,7 +185,7 @@ public class PerformFindTests extends OF
}
private void performFindConditionDistinct() throws Exception {
-GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
+GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
prepareData();
//first test without distinct condition
@@ -207,7 +206,7 @@ public class PerformFindTests extends OF
}
private void performFindFilterByDate() throws Exception {
-GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
+GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
prepareData();
//first test without filterDate condition
@@ -227,7 +226,7 @@ public class PerformFindTests extends OF
}
private void performFindFilterByDateWithDedicateDateField() throws
Exception {
-
svn commit: r1818003 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/groovyScripts/reports/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/ applications/acc
Author: deepak Date: Wed Dec 13 12:03:17 2017 New Revision: 1818003 URL: http://svn.apache.org/viewvc?rev=1818003=rev Log: Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029) Applied slightly modified patch, rearrange import properly, Thanks Suraj Khurana for your contribution Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/reports/InvoiceAcctgTransEntryParameters.groovy ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/FinAccountTrans.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/ofbiz-framework/trunk/applications/accounting/template/finaccounttrans/ShowGlTransactions.ftl ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/FindFacility.groovy ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProdCatalog.groovy ofbiz/ofbiz-framework/trunk/applications/commonext/groovyScripts/ofbizsetup/GetProductStoreAndWebSite.groovy ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/ContentJsonEvents.java ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/content/template/content/DisplayContentNav.ftl ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/bom/FindProductBom.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/reports/CuttingListReport.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/ProductSummary.groovy ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java ofbiz/ofbiz-framework/trunk/applications/order/template/order/EditOrderItems.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderItems.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/quote/ViewQuoteItemInfo.ftl ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnLinks.ftl ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContentUrlFilter.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogAltUrlSeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/template/category/CreateProductInCategoryStart.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/facility/PrintPickSheets.fo.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/ShowPeopleApprove.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/product/ViewProductOrders.ftl ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java ofbiz/ofbiz-framework/trunk/applications/workeffort/groovyScripts/ical/IsCalOwner.groovy ofbiz/ofbiz-framework/trunk/applications/workeffort/template/calendar/CalendarEventContent.ftl ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/GeoLocation.groovy ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/GetParentPortalPageId.groovy ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/test/ServiceEntityAutoTests.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/EntityPerformanceTest.groovy ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy ofbiz/ofbiz
svn commit: r1818003 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/groovyScripts/reports/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/ applications/acc
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy?rev=1818003=1818002=1818003=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/SetLocaleFromBrowser.groovy
Wed Dec 13 12:03:17 2017
@@ -17,13 +17,11 @@
* under the License.
***/
-import org.apache.ofbiz.entity.util.EntityQuery
-import org.apache.ofbiz.service.GenericServiceException
import org.apache.ofbiz.service.ServiceUtil
public Map setLocaleFromBrowser() {
Map results = ServiceUtil.returnSuccess()
-userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
parameters.userLogin.userLoginId).queryFirst();
+userLogin = from("UserLogin").where("userLoginId",
parameters.userLogin.userLoginId).queryFirst();
if (userLogin) {
if (!userLogin.lastTimeZone || "null".equals(userLogin.lastTimeZone)) {
userLogin.lastTimeZone = parameters.localeName
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java?rev=1818003=1818002=1818003=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
Wed Dec 13 12:03:17 2017
@@ -33,6 +33,7 @@ import org.apache.ofbiz.entity.GenericVa
import org.apache.ofbiz.entity.util.EntityListIterator;
import org.apache.ofbiz.service.ServiceUtil;
import org.apache.ofbiz.service.testtools.OFBizTestCase;
+import org.apache.ofbiz.entity.util.EntityQuery;
public class PerformFindTests extends OFBizTestCase {
@@ -54,7 +55,7 @@ public class PerformFindTests extends OF
}
private void prepareData() throws Exception {
-if (delegator.findOne("TestingType", false, "testingTypeId",
"PERFOMFINDTEST") == null) {
+if
(EntityQuery.use(delegator).from("TestingType").where("testingTypeId",
"PERFOMFINDTEST").cache().queryOne() == null) {
delegator.create("TestingType", "testingTypeId", "PERFOMFINDTEST");
delegator.create("Testing", "testingId", "PERF_TEST_1",
"testingTypeId", "PERFOMFINDTEST", "testingName", "nice name one");
delegator.create("Testing", "testingId", "PERF_TEST_2",
"testingTypeId", "PERFOMFINDTEST", "testingName", "nice other name two");
@@ -111,7 +112,7 @@ public class PerformFindTests extends OF
}
private void performFindConditionFieldEquals() throws Exception {
-GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
+GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
prepareData();
Map inputFields = new HashMap();
@@ -148,7 +149,7 @@ public class PerformFindTests extends OF
}
private void performFindConditionFieldLike() throws Exception {
-GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
+GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
prepareData();
//first test like condition
@@ -185,7 +186,7 @@ public class PerformFindTests extends OF
}
private void performFindConditionDistinct() throws Exception {
-GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
+GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
prepareData();
//first test without distinct condition
@@ -206,7 +207,7 @@ public class PerformFindTests extends OF
}
private void performFindFilterByDate() throws Exception {
-GenericValue userLogin = delegator.findOne("UserLogin", true,
"userLoginId", "system");
+GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne();
prepareData();
//first test without filterDate condition
@@ -226,7 +227,7 @@ public class PerformFindTests extends OF
}
private void performFindFilterByDateWithDedicateDateField() throws
Exception {
-GenericValue userLogin =
svn commit: r1818639 - /ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Author: deepak
Date: Tue Dec 19 06:29:13 2017
New Revision: 1818639
URL: http://svn.apache.org/viewvc?rev=1818639=rev
Log:
Reverted: Local changes committed at r#1818600
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java?rev=1818639=1818638=1818639=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Tue Dec 19 06:29:13 2017
@@ -987,7 +987,7 @@ public class RequestHandler {
//resp.setHeader("Content-Security-Policy", "default-src 'self'");
//resp.setHeader("Content-Security-Policy-Report-Only", "default-src
'self'; report-uri webtools/control/ContentSecurityPolicyReporter");
-//resp.setHeader("Content-Security-Policy-Report-Only", "default-src
'self'");
+resp.setHeader("Content-Security-Policy-Report-Only", "default-src
'self'");
// TODO in custom project. Public-Key-Pins-Report-Only is interesting
but can't be used OOTB because of demos (the letsencrypt certificate is renewed
every 3 months)
svn commit: r1818606 - /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy
Author: deepak
Date: Mon Dec 18 18:38:54 2017
New Revision: 1818606
URL: http://svn.apache.org/viewvc?rev=1818606=rev
Log:
Fixed: Fixed typo done at r#1818003
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy?rev=1818606=1818605=1818606=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/ViewGeneric.groovy
Mon Dec 18 18:38:54 2017
@@ -81,7 +81,7 @@ context.put("curFindString", curFindStri
GenericValue value = null
//only try to find it if this is a valid primary key...
if (findByPK.isPrimaryKey()) {
-value = from("findByPK.getEntityName()").where(findByPK).queryOne();
+value = from(findByPK.getEntityName()).where(findByPK).queryOne();
}
context.put("value", value)
svn commit: r1818596 - /ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/AnonContactus.ftl
Author: deepak
Date: Mon Dec 18 17:46:16 2017
New Revision: 1818596
URL: http://svn.apache.org/viewvc?rev=1818596=rev
Log:
Improved: Update markup of ContactUs page according to standard markup given by
Bootstrap v4.0.0 (OFBIZ-10041)
Thanks Nitish Mishra for your contribution
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/AnonContactus.ftl
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/AnonContactus.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/AnonContactus.ftl?rev=1818596=1818595=1818596=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/AnonContactus.ftl
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/AnonContactus.ftl Mon
Dec 18 17:46:16 2017
@@ -17,9 +17,9 @@ specific language governing permissions
under the License.
-->
-
-
-${uiLabelMap.CommonContactUs}
+
+
+${uiLabelMap.CommonContactUs}
<!--
@@ -31,7 +31,7 @@ under the License.
}
//-->
-
+
@@ -39,62 +39,68 @@ under the License.
-
-
-
- ${uiLabelMap.EcommerceSubject}
-
-*
-
-
-
- ${uiLabelMap.CommonMessage}
-
-
- ${requestParameters.content!}
-*
-
-
-
- ${uiLabelMap.FormFieldTitle_emailAddress}
-
-*
-
-
-
- ${uiLabelMap.PartyFirstName}
-
-
-
-
-
- ${uiLabelMap.PartyLastName}
-
-
-
-
-
- ${uiLabelMap.CommonCaptchaCode}
-
-
-
+
+
+${uiLabelMap.EcommerceSubject}
+
+
+
+
+
+${uiLabelMap.CommonMessage}
+
+
+${requestParameters.content!}
+
+
+
+
+${uiLabelMap.FormFieldTitle_emailAddress}
+
+
+
+
+
+
+
+${uiLabelMap.PartyFirstName}
+
+
+
+
+
+
+
+${uiLabelMap.PartyLastName}
+
+
-${uiLabelMap.CommonReloadCaptchaCode}
-
-
-
- ${uiLabelMap.CommonVerifyCaptchaCode}
- *
-
-
-
-
-
-
-
+
+
+
+
+${uiLabelMap.CommonCaptchaCode}
+
+
+
+
+
+
+
+ ${uiLabelMap.CommonReloadCaptchaCode}
+
+
+
+${uiLabelMap.CommonVerifyCaptchaCode}
+
+
+
+
+
+
+
+
+
svn commit: r1818601 - in /ofbiz/ofbiz-plugins/trunk: example/widget/example/FormWidgetExampleScreens.xml myportal/widget/PortalAdmScreens.xml projectmgr/widget/ProjectScreens.xml
Author: deepak Date: Mon Dec 18 18:17:03 2017 New Revision: 1818601 URL: http://svn.apache.org/viewvc?rev=1818601=rev Log: Improved: Moved plugins js from images to common/js (OFBIZ-5776) Modified: ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml ofbiz/ofbiz-plugins/trunk/myportal/widget/PortalAdmScreens.xml ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ProjectScreens.xml Modified: ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml?rev=1818601=1818600=1818601=diff == --- ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleScreens.xml Mon Dec 18 18:17:03 2017 @@ -25,7 +25,7 @@ under the License. - + http://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk/example/widget/example/FormWidgetExampleForms.xml"/> Modified: ofbiz/ofbiz-plugins/trunk/myportal/widget/PortalAdmScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/myportal/widget/PortalAdmScreens.xml?rev=1818601=1818600=1818601=diff == --- ofbiz/ofbiz-plugins/trunk/myportal/widget/PortalAdmScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/myportal/widget/PortalAdmScreens.xml Mon Dec 18 18:17:03 2017 @@ -81,8 +81,8 @@ under the License. - - + + Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ProjectScreens.xml?rev=1818601=1818600=1818601=diff == --- ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ProjectScreens.xml Mon Dec 18 18:17:03 2017 @@ -416,8 +416,8 @@ under the License. - - + + @@ -972,8 +972,8 @@ under the License. - - + +
svn commit: r1818611 - /ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/javascript.css
Author: deepak
Date: Mon Dec 18 19:06:40 2017
New Revision: 1818611
URL: http://svn.apache.org/viewvc?rev=1818611=rev
Log:
Improved: Removed empty css attribute
Modified:
ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/javascript.css
Modified:
ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/javascript.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/javascript.css?rev=1818611=1818610=1818611=diff
==
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/javascript.css
(original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/javascript.css
Mon Dec 18 19:06:40 2017
@@ -625,7 +625,6 @@ button.ui-button::-moz-focus-inner {
position: absolute;
top: 0;
left: 0;
-padding;
padding: .2em;
width: 300px;
overflow: hidden;
svn commit: r1818243 - /ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml
Author: deepak Date: Fri Dec 15 08:39:39 2017 New Revision: 1818243 URL: http://svn.apache.org/viewvc?rev=1818243=rev Log: Fxied: Corrected fk-name warning for newly added entities, fk-name was greater than 18 character.(OFBIZ-10040) Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml?rev=1818243=1818242=1818243=diff == --- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml Fri Dec 15 08:39:39 2017 @@ -1085,13 +1085,13 @@ under the License. - + - + - +
svn commit: r1818244 - in /ofbiz/ofbiz-framework/trunk/applications: content/servicedef/secas.xml order/servicedef/services_shoppinglist.xml
Author: deepak Date: Fri Dec 15 08:46:55 2017 New Revision: 1818244 URL: http://svn.apache.org/viewvc?rev=1818244=rev Log: Fixed xml validation error found while console read Modified: ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml Modified: ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml?rev=1818244=1818243=1818244=diff == --- ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/servicedef/secas.xml Fri Dec 15 08:46:55 2017 @@ -138,10 +138,10 @@ under the License. + + - - Modified: ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml?rev=1818244=1818243=1818244=diff == --- ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_shoppinglist.xml Fri Dec 15 08:46:55 2017 @@ -33,16 +33,16 @@ under the License. Create a shopping list entity + - Update a shopping list entity - + @@ -120,8 +120,8 @@ under the License. Create a shopping list item - + @@ -130,8 +130,8 @@ under the License. Update a shopping list item - +
svn commit: r1818245 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/cart/MiniCart.ftl template/catalog/CompareProductsList.ftl template/catalog/KeywordSearchBox.ftl widget/CartScreens.xml widget/
Author: deepak
Date: Fri Dec 15 08:56:27 2017
New Revision: 1818245
URL: http://svn.apache.org/viewvc?rev=1818245=rev
Log:
Improved: Update markup of Home page according to standard markup given by
Bootstrap v4.0.0 (OFBIZ-10011)
Thanks Parakh and Mayank for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniCart.ftl (with
props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CompareProductsList.ftl
(with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/KeywordSearchBox.ftl
(with props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CartScreens.xml
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CatalogScreens.xml
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Added: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniCart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniCart.ftl?rev=1818245=auto
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniCart.ftl (added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniCart.ftl Fri Dec 15
08:56:27 2017
@@ -0,0 +1,91 @@
+<#--
+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.
+-->
+
+<#assign shoppingCart = sessionAttributes.shoppingCart!>
+<#if shoppingCart?has_content>
+ <#assign shoppingCartSize = shoppingCart.size()>
+<#else>
+ <#assign shoppingCartSize = 0>
+
+
+
+
+ ${uiLabelMap.OrderCartSummary}
+
+
+ <#if (shoppingCartSize > 0)>
+<#if hidetoplinks?default("N") != "Y">
+
+${uiLabelMap.OrderViewCart}
+${uiLabelMap.OrderCheckout}
+${uiLabelMap.OrderCheckoutQuick}
+${uiLabelMap.EcommerceOnePageCheckout}
+
+
+
+
+
+${uiLabelMap.OrderQty}
+${uiLabelMap.OrderItem}
+${uiLabelMap.CommonSubtotal}
+
+
+
+
+
+${uiLabelMap.OrderTotal}: <@ofbizCurrency
amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/>
+
+
+
+
+<#list shoppingCart.items() as cartLine>
+
+ ${cartLine.getQuantity()?string.number}
+
+<#if cartLine.getProductId()??>
+ <#if cartLine.getParentProductId()??>
+${cartLine.getName(dispatcher)}
+ <#else>
+${cartLine.getName(dispatcher)}
+
+<#else>
+ ${cartLine.getItemTypeDescription()!}
+
+
+ <@ofbizCurrency amount=cartLine.getDisplayItemSubTotal()
isoCode=shoppingCart.getCurrency()/>
+
+ <#if cartLine.getReservStart()??>
+ (${cartLine.getReservStart()?string("-MM-dd")},
${cartLine.getReservLength()} <#if cartLine.getReservLength() ==
1>${uiLabelMap.CommonDay}<#else>${uiLabelMap.CommonDays})
+
+
+
+
+<#if hidebottomlinks?default("N") != "Y">
+
+${uiLabelMap.OrderViewCart}
+${uiLabelMap.OrderCheckout}
+${uiLabelMap.OrderCheckoutQuick}
+${uiLabelMap.EcommerceOnePageCheckout}
+
+
+ <#else>
+${uiLabelMap.OrderShoppingCartEmpty}
+
+
+
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniCart.ftl
--
svn:eol-style = native
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniCart.ftl
--
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniCart.ftl
--
svn:mime-type = text/plain
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CompareProductsList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CompareProductsList.ftl?rev=1818245=auto
==
svn commit: r1818259 - /ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml
Author: deepak Date: Fri Dec 15 10:28:56 2017 New Revision: 1818259 URL: http://svn.apache.org/viewvc?rev=1818259=rev Log: Fixed: RuntimeException on viewroles page of Scrum component (OFBIZ-10033) ViewPartyRoles form was changed to grid at r#18151933 Thanks Aditya Sharma for reporting the issue. Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml?rev=1818259=1818258=1818259=diff == --- ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml Fri Dec 15 10:28:56 2017 @@ -195,7 +195,7 @@ under the License. - +
svn commit: r1818255 - /ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Author: deepak Date: Fri Dec 15 09:58:38 2017 New Revision: 1818255 URL: http://svn.apache.org/viewvc?rev=1818255=rev Log: Fixed: PropertyNotFoundException occuring while accessing ecommerce applicaiton, moved InitTheme.groovy code at the starting of man-decorator, as layoutSettings variable was used to set some valies. Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=1818255=1818254=1818255=diff == --- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Fri Dec 15 09:58:38 2017 @@ -33,6 +33,9 @@ under the License. + + + @@ -60,11 +63,8 @@ under the License. - - -
svn commit: r1818270 - in /ofbiz/branches/release16.11: ./ applications/party/widget/partymgr/ProfileScreens.xml
Author: deepak Date: Fri Dec 15 11:34:10 2017 New Revision: 1818270 URL: http://svn.apache.org/viewvc?rev=1818270=rev Log: Applied fix from trunk for revision: 1818269 === Fixed: Edit Party Group page does not shows current set values (OFBIZ-9532) Thansk Aditya Sharma for reporting the issue. Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 15 11:34:10 2017 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369,1816373, 1816461,1816635,1816795,1818101 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369,1816373, 1816461,1816635,1816795,1818101,1818269 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520 Modified: ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml?rev=1818270=1818269=1818270=diff == --- ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml (original) +++ ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml Fri Dec 15 11:34:10 2017 @@ -25,6 +25,9 @@ + + +
svn commit: r1818250 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: webapp/ecommerce/js/popper.js widget/CommonScreens.xml
Author: deepak
Date: Fri Dec 15 09:25:37 2017
New Revision: 1818250
URL: http://svn.apache.org/viewvc?rev=1818250=rev
Log:
Fixed: Added popper.js file to fix ecommerce js console error (OFBIZ-10016)
currently, there is an open issue with bootstrap.bundle.min.js, It gives
'Uncaught ReferenceError: Popper is not defined' so, to fix this issue I am
including separate popper.js from it.
popper.js is temporarily included when this issue is fixed in the stable
version we will remove it from here.
Here is the link for reference:
https://github.com/FezVrasta/popper.js/issues/501
Thanks Parakh Maheshwari for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/js/popper.js (with
props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Added: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/js/popper.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/js/popper.js?rev=1818250=auto
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/js/popper.js (added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/js/popper.js Fri Dec
15 09:25:37 2017
@@ -0,0 +1,2445 @@
+/**!
+ * @fileOverview Kickass library to create and place poppers near their
reference elements.
+ * @version 1.13.0
+ * @license
+ * Copyright (c) 2016 Federico Zivolo and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE
+ * SOFTWARE.
+ */
+(function (global, factory) {
+ typeof exports === 'object' && typeof module !== 'undefined' ?
module.exports = factory() :
+ typeof define === 'function' && define.amd ? define(factory) :
+ (global.Popper = factory());
+}(this, (function () { 'use strict';
+
+var isBrowser = typeof window !== 'undefined' && typeof document !==
'undefined';
+var longerTimeoutBrowsers = ['Edge', 'Trident', 'Firefox'];
+var timeoutDuration = 0;
+for (var i = 0; i < longerTimeoutBrowsers.length; i += 1) {
+ if (isBrowser && navigator.userAgent.indexOf(longerTimeoutBrowsers[i]) >= 0)
{
+timeoutDuration = 1;
+break;
+ }
+}
+
+function microtaskDebounce(fn) {
+ var called = false;
+ return function () {
+if (called) {
+ return;
+}
+called = true;
+window.Promise.resolve().then(function () {
+ called = false;
+ fn();
+});
+ };
+}
+
+function taskDebounce(fn) {
+ var scheduled = false;
+ return function () {
+if (!scheduled) {
+ scheduled = true;
+ setTimeout(function () {
+scheduled = false;
+fn();
+ }, timeoutDuration);
+}
+ };
+}
+
+var supportsMicroTasks = isBrowser && window.Promise;
+
+/**
+* Create a debounced version of a method, that's asynchronously deferred
+* but called in the minimum time possible.
+*
+* @method
+* @memberof Popper.Utils
+* @argument {Function} fn
+* @returns {Function}
+*/
+var debounce = supportsMicroTasks ? microtaskDebounce : taskDebounce;
+
+/**
+ * Check if the given variable is a function
+ * @method
+ * @memberof Popper.Utils
+ * @argument {Any} functionToCheck - variable to check
+ * @returns {Boolean} answer to: is a function?
+ */
+function isFunction(functionToCheck) {
+ var getType = {};
+ return functionToCheck && getType.toString.call(functionToCheck) ===
'[object Function]';
+}
+
+/**
+ * Get CSS computed property of the given element
+ * @method
+ * @memberof Popper.Utils
+ * @argument {Eement} element
+ * @argument {String} property
+ */
+function getStyleComputedProperty(element, property) {
+ if (element.nodeType !== 1) {
+return [];
+ }
+ // NOTE: 1 DOM access here
+ var css = getComputedStyle(element, null);
+ return property ? css[property] : css;
+}
+
+/**
+ * Returns the parentNode or the host of the element
+ * @method
+ * @memberof Popper.Utils
+ * @argument {Element}
svn commit: r1818269 - /ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
Author: deepak Date: Fri Dec 15 11:30:48 2017 New Revision: 1818269 URL: http://svn.apache.org/viewvc?rev=1818269=rev Log: Fixed: Edit Party Group page does not shows current set values (OFBIZ-9532) Thansk Aditya Sharma for reporting the issue. Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1818269=1818268=1818269=diff == --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml Fri Dec 15 11:30:48 2017 @@ -25,6 +25,9 @@ + + +
svn commit: r1818254 - /ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl
Author: deepak
Date: Fri Dec 15 09:51:39 2017
New Revision: 1818254
URL: http://svn.apache.org/viewvc?rev=1818254=rev
Log:
Improved: Update markup of Register page according to standard markup given by
Bootstrap v4.0.0 (OFBIZ-10018)
Thanks Nitish Mishra for your contribution
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl?rev=1818254=1818253=1818254=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl Fri
Dec 15 09:51:39 2017
@@ -68,23 +68,25 @@ NOTE: all page headings should start wit
there should generally always only be one h1 tag on the page and that
will generally always be reserved for the logo at the top of the page.
--->
-
-${uiLabelMap.PartyRequestNewAccount}
-
-${uiLabelMap.PartyAlreadyHaveAccount}, ${uiLabelMap.CommonLoginHere}
-
-
+
+ ${uiLabelMap.PartyRequestNewAccount}
+
+
+
+${uiLabelMap.PartyAlreadyHaveAccount},
+${uiLabelMap.CommonLoginHere}
+
+
<#macro fieldErrors fieldName>
<#if errorMessageList?has_content>
<#assign fieldMessages =
Static["org.apache.ofbiz.base.util.MessageString"].getMessagesForField(fieldName,
true, errorMessageList)>
-
-<#list fieldMessages as errorMsg>
- ${errorMsg}
-
-
+
+<#list fieldMessages as errorMsg>
+ ${errorMsg}
+
+
<#macro fieldErrorsMulti fieldName1 fieldName2 fieldName3 fieldName4>
@@ -99,186 +101,212 @@ will generally always be reserved for th
-
-${uiLabelMap.CommonCancel}
-${uiLabelMap.CommonSave}
+
+ ${uiLabelMap.CommonCancel}
+ ${uiLabelMap.CommonSave}
+
+
+
-
-<#--
-If you need to include a brief explanation of the form, or certain
-elements in the form (such as explaining asterisks denote REQUIRED),
-then you should use a tag with a class name of "desc"
>
-
- ${uiLabelMap.CommonFieldsMarkedAreRequired}
-
-<#--
-There are two types of fieldsets, regular (full width) fielsets, and
-column (half width) fieldsets. If you want to group two sets of inputs
-side by side in two columns, give each fieldset a class name of "col"
>
-
-
-${uiLabelMap.PartyFullName}
-
- <#--
- Each input row should be enclosed in a .
- This will ensure than each input field clears the one
- above it. Alternately, if you want several inputs to float next to
- each other, you can enclose them in a table as illustrated below for
- the phone numbers, or you can enclose each label/input pair in a span
-
- Example:
-
-
-
- Exp. Month
-
-
-
- Exp. Year
-
+
+${uiLabelMap.CommonFieldsMarkedAreRequired}
- --->
-
- ${uiLabelMap.CommonTitle}
-<@fieldErrors fieldName="USER_TITLE"/>
-
- <#if requestParameters.USER_TITLE?has_content >
-${requestParameters.USER_TITLE}
- --
- <#else>
-${uiLabelMap.CommonSelectOne}
-
-${uiLabelMap.CommonTitleMr}
-${uiLabelMap.CommonTitleMrs}
-${uiLabelMap.CommonTitleMs}
-${uiLabelMap.CommonTitleDr}
-
-
-
- ${uiLabelMap.PartyFirstName}*
-<@fieldErrors fieldName="USER_FIRST_NAME"/>
-
-
+
+
+
+ ${uiLabelMap.PartyFullName}
+
+
+
+ ${uiLabelMap.CommonTitle}
+ <@fieldErrors fieldName="USER_TITLE"/>
+
+ <#if requestParameters.USER_TITLE?has_content >
+${requestParameters.USER_TITLE}
+ --
+ <#else>
+${uiLabelMap.CommonSelectOne}
+
+${uiLabelMap.CommonTitleMr}
+${uiLabelMap.CommonTitleMrs}
+${uiLabelMap.CommonTitleMs}
+${uiLabelMap.CommonTitleDr}
+
+
+
-
- ${uiLabelMap.PartyMiddleInitial}
-<@fieldErrors fieldName="USER_MIDDLE_NAME"/>
-
-
+
+
+ ${uiLabelMap.PartyFirstName}*
+ <@fieldErrors fieldName="USER_FIRST_NAME"/>
+
svn commit: r1818260 - /ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ResourceScreens.xml
Author: deepak Date: Fri Dec 15 10:34:14 2017 New Revision: 1818260 URL: http://svn.apache.org/viewvc?rev=1818260=rev Log: Fixed: Updated ViewPartyRoles inclusion from include-form to include-grid in projectmgr application Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ResourceScreens.xml Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ResourceScreens.xml?rev=1818260=1818259=1818260=diff == --- ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ResourceScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/projectmgr/widget/ResourceScreens.xml Fri Dec 15 10:34:14 2017 @@ -102,7 +102,7 @@ under the License. - + @@ -161,7 +161,7 @@ under the License. - +
svn commit: r1818274 - in /ofbiz/branches/release16.11: ./ applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
Author: deepak
Date: Fri Dec 15 12:03:41 2017
New Revision: 1818274
URL: http://svn.apache.org/viewvc?rev=1818274=rev
Log:
Applied fix from trunk for revision: 1818273
===
Fixed: Screen rendering error on Content Advanced Search page (OFBIZ-9365)
Thanks Aditya Sharma for reporting the issue.
Content Advanced search was broken since long, still need to review work done
at r#1102554, In this commit most of the issue has been fixed.
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
Propchange: ofbiz/branches/release16.11/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 15 12:03:41 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369,1816373,
1816461,1816635,1816795,1818101,1818269
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369,1816373,
1816461,1816635,1816795,1818101,1818269,1818273
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified:
ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java?rev=1818274=1818273=1818274=diff
==
---
ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
(original)
+++
ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
Fri Dec 15 12:03:41 2017
@@ -77,7 +77,7 @@ public class ContentSearch {
// now find all sub-categories, filtered by effective dates, and call
this routine for them
try {
-List contentAssocList =
EntityQuery.use(delegator).from("ContentAssoc").where("contentIdFrom",
contentId).cache().queryList();
+List contentAssocList =
EntityQuery.use(delegator).from("ContentAssoc").where("contentId",
contentId).cache().queryList();
for (GenericValue contentAssoc: contentAssocList) {
String subContentId = contentAssoc.getString("contentIdTo");
if (contentIdSet.contains(subContentId)) {
@@ -93,8 +93,8 @@ public class ContentSearch {
// Find Content where current contentId = contentParentId; only
select minimal fields to keep the size low
List childContentList = EntityQuery.use(delegator)
-.select("contentId", "contentParentId").from("Content")
-.where("contentParentId&q
svn commit: r1818273 - /ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
Author: deepak
Date: Fri Dec 15 12:01:39 2017
New Revision: 1818273
URL: http://svn.apache.org/viewvc?rev=1818273=rev
Log:
Fixed: Screen rendering error on Content Advanced Search page (OFBIZ-9365)
Thanks Aditya Sharma for reporting the issue.
Content Advanced search was broken since long, still need to review work done
at r#1102554, In this commit most of the issue has been fixed.
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java?rev=1818273=1818272=1818273=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearch.java
Fri Dec 15 12:01:39 2017
@@ -77,7 +77,7 @@ public class ContentSearch {
// now find all sub-categories, filtered by effective dates, and call
this routine for them
try {
-List contentAssocList =
EntityQuery.use(delegator).from("ContentAssoc").where("contentIdFrom",
contentId).cache().queryList();
+List contentAssocList =
EntityQuery.use(delegator).from("ContentAssoc").where("contentId",
contentId).cache().queryList();
for (GenericValue contentAssoc: contentAssocList) {
String subContentId = contentAssoc.getString("contentIdTo");
if (contentIdSet.contains(subContentId)) {
@@ -93,8 +93,8 @@ public class ContentSearch {
// Find Content where current contentId = contentParentId; only
select minimal fields to keep the size low
List childContentList = EntityQuery.use(delegator)
-.select("contentId", "contentParentId").from("Content")
-.where("contentParentId", contentId)
+.select("contentId", "ownerContentId").from("Content")
+.where("ownerContentId", contentId)
.cache().queryList();
for (GenericValue childContent: childContentList) {
String subContentId = childContent.getString("contentId");
@@ -476,12 +476,12 @@ public class ContentSearch {
contentSearchContext.index++;
contentSearchContext.dynamicViewEntity.addMemberEntity(entityAlias,
"ContentAssoc");
-contentSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "ContentIdFrom", "contentIdFrom", null, null, null, null);
+contentSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "ContentIdFrom", "contentId", null, null, null, null);
contentSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "ContentIdTo", "contentIdTo", null, null, null, null);
contentSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "ContentAssocTypeId", "contentAssocTypeId", null, null, null, null);
contentSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "FromDate", "fromDate", null, null, null, null);
contentSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "ThruDate", "thruDate", null, null, null, null);
-contentSearchContext.dynamicViewEntity.addViewLink("CNT",
entityAlias, Boolean.TRUE,
ModelKeyMap.makeKeyMapList("contentId","contentIdFrom"));
+contentSearchContext.dynamicViewEntity.addViewLink("CNT",
entityAlias, Boolean.TRUE, ModelKeyMap.makeKeyMapList("contentId"));
List assocConditionFromTo = new
LinkedList();
assocConditionFromTo.add(EntityCondition.makeCondition(prefix +
"ContentIdTo", EntityOperator.IN, contentIdSet));
@@ -497,7 +497,7 @@ public class ContentSearch {
contentSearchContext.index++;
contentSearchContext.dynamicViewEntity.addMemberEntity(entityAlias,
"ContentAssoc");
-contentSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "ContentIdFrom", "contentIdFrom", null, null, null, null);
+contentSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "ContentIdFrom", "contentId", null, null, null, null);
contentSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "C
svn commit: r1818101 - /ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml
Author: deepak Date: Thu Dec 14 10:56:49 2017 New Revision: 1818101 URL: http://svn.apache.org/viewvc?rev=1818101=rev Log: Fixed: Corrected engine name for updateWorkEffortFixedAssetStd service, Thanks Suraj Khurana for reporting. Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml?rev=1818101=1818100=1818101=diff == --- ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml Thu Dec 14 10:56:49 2017 @@ -554,7 +554,7 @@ under the License. - Updates an existing WorkEffortFixedAssetStd entry
svn commit: r1818102 - in /ofbiz/branches/release16.11: ./ applications/workeffort/servicedef/services.xml
Author: deepak Date: Thu Dec 14 10:58:48 2017 New Revision: 1818102 URL: http://svn.apache.org/viewvc?rev=1818102=rev Log: Applied fix from trunk for revision: 1818101 === Fixed: Corrected engine name for updateWorkEffortFixedAssetStd service, Thanks Suraj Khurana for reporting. Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 14 10:58:48 2017 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369,1816373, 1816461,1816635,1816795 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369,1816373, 1816461,1816635,1816795,1818101 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520 Modified: ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml?rev=1818102=1818101=1818102=diff == --- ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml (original) +++ ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml Thu Dec 14 10:58:48 2017 @@ -554,7 +554,7 @@ under the License. - Updates an existing WorkEffortFixedAssetStd entry
svn commit: r1818774 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/request/ widget/
Author: deepak
Date: Wed Dec 20 11:15:54 2017
New Revision: 1818774
URL: http://svn.apache.org/viewvc?rev=1818774=rev
Log:
Improved: Update markup of List Requests page according to standard markup
given by Bootstrap v4.0.s (OFBIZ-10092)
Thanks Nitish Mishra for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
(with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestDate.ftl
(with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/ViewRequestItemInfo.ftl
(with props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestInfo.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestList.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestRoles.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustRequestScreens.xml
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl?rev=1818774=auto
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
(added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/request/RequestContactMech.ftl
Wed Dec 20 11:15:54 2017
@@ -0,0 +1,78 @@
+<#--
+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.
+-->
+
+<#if fulfillContactMech?has_content>
+
+<#if "POSTAL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyAddressMailingShipping>
+ <#assign postalAddress = fulfillContactMech.getRelatedOne("PostalAddress",
true)!>
+<#elseif "EMAIL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyToEmailAddress>
+ <#assign emailAddress = fulfillContactMech.infoString!>
+<#elseif "TELECOM_NUMBER" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyPhoneNumber>
+ <#assign telecomNumber = fulfillContactMech.getRelatedOne("TelecomNumber",
true)!>
+
+
+
+
+${uiLabelMap.PartyContactInformation}
+
+
+
+
+
+${label?default(uiLabelMap.PartyUnknown)}
+
+
+
+ <#if emailAddress?has_content>${emailAddress}
+
+ <#if postalAddress?has_content>
+<#if postalAddress.toName?has_content>${uiLabelMap.PartyAddrToName}${postalAddress.toName}
+<#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}${postalAddress.attnName}
+${postalAddress.address1!}
+<#if
postalAddress.address2?has_content>${postalAddress.address2}
+${postalAddress.city!},
+<#if postalAddress.stateProvinceGeoId?has_content>
+<#assign stateProvince =
postalAddress.getRelatedOne("StateProvinceGeo", true)>
+
${stateProvince.abbreviation?default(stateProvince.geoId)}
+
+${postalAddress.postalCode!}
+<#if postalAddress.countryGeoId?has_content>
+ <#assign country =
postalAddress.getRelatedOne("CountryGeo", true)>
+ ${country.geoName?default(country.geoId)}
+
+
+
+ <#if telecomNumber?has_content>
+${telecomNumber.countryCode!}
+<#if
telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-${telecomNumber.contactNumber?default("000-")}
+<#if (telecomNumber?has_content &&
!telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
+ ${uiLabelMap.CommonLookupAnywho}
+
svn commit: r1818776 - /ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl
Author: deepak
Date: Wed Dec 20 11:19:54 2017
New Revision: 1818776
URL: http://svn.apache.org/viewvc?rev=1818776=rev
Log:
Improved: Update markup of List Quotes page according to standard markup given
by Bootstrap v4.0.s (OFBIZ-10095)
Thanks Nitish Mishra for your contribution
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl?rev=1818776=1818775=1818776=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/QuoteList.ftl Wed Dec 20
11:19:54 2017
@@ -17,70 +17,67 @@ specific language governing permissions
under the License.
-->
-
-${uiLabelMap.EcommerceQuoteHistory}
-
-
-
-
-${uiLabelMap.OrderQuote} ${uiLabelMap.CommonNbr}
-
-
-
-${uiLabelMap.CommonName}
-
-
-
-${uiLabelMap.CommonDescription}
-
-
-
-${uiLabelMap.CommonStatus}
-
-
-
-${uiLabelMap.OrderOrderQuoteIssueDate}
-${uiLabelMap.CommonValidFromDate}
-${uiLabelMap.CommonValidThruDate}
-
-
-
-
+
+
+ ${uiLabelMap.EcommerceQuoteHistory}
+
+
+<#if quoteList?has_content>
+
+
+
+
+${uiLabelMap.OrderQuote} ${uiLabelMap.CommonNbr}
+
+
+${uiLabelMap.CommonName}
+
+
+${uiLabelMap.CommonDescription}
+
+
+${uiLabelMap.CommonStatus}
+
+
+${uiLabelMap.OrderOrderQuoteIssueDate}
+
+${uiLabelMap.CommonValidFromDate}
+${uiLabelMap.CommonValidThruDate}
+
+
+
+
<#list quoteList as quote>
<#assign status = quote.getRelatedOne("StatusItem", true)>
-
-${quote.quoteId}
+ ${quote.quoteId!}
-
-${quote.quoteName!}
+ ${quote.quoteName?default("N/A")}
-
-${quote.description!}
+ ${quote.description?default("N/A")}
-
-${status.get("description",locale)}
+ ${status.get("description",locale)?default("N/A")}
-
-${quote.issueDate!}
-${quote.validFromDate!}
-${quote.validThruDate!}
+ ${quote.issueDate?default("N/A")}
-
-
+${quote.validFromDate?default("N/A")}
+${quote.validThruDate?default("N/A")}
+
${uiLabelMap.CommonView}
-
-<#if !quoteList?has_content>
-${uiLabelMap.OrderNoQuoteFound}
-
+
+<#else>
+
+ ${uiLabelMap.OrderNoQuoteFound}
+
+
svn commit: r1818773 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/catalog/CategoryDetail.ftl template/catalog/ProductSummary.ftl template/catalog/ShowBestSellingCategory.ftl webapp/ecommerce/cs
Author: deepak
Date: Wed Dec 20 11:08:53 2017
New Revision: 1818773
URL: http://svn.apache.org/viewvc?rev=1818773=rev
Log:
Improved: Update markup of Home page product summary section to standard markup
given by Bootstrap v4.0.0 (OFBIZ-10055)
Thanks Saurabh Dixit for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
(with props)
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductSummary.ftl
(with props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CatalogScreens.xml
Added: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl?rev=1818773=auto
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
(added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl Wed
Dec 20 11:08:53 2017
@@ -0,0 +1,187 @@
+<#--
+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.
+-->
+
+function callDocumentByPaginate(info) {
+var str = info.split('~');
+var checkUrl = '<@ofbizUrl>categoryAjaxFired</@ofbizUrl>';
+if(checkUrl.search("http"))
+var ajaxUrl = '<@ofbizUrl>categoryAjaxFired</@ofbizUrl>';
+else
+var ajaxUrl = '<@ofbizUrl>categoryAjaxFiredSecure</@ofbizUrl>';
+
+//jQuerry Ajax Request
+jQuery.ajax({
+url: ajaxUrl,
+type: 'POST',
+data: {"category_id" : str[0], "VIEW_SIZE" : str[1], "VIEW_INDEX"
: str[2]},
+error: function(msg) {
+alert("An error occurred loading content! : " + msg);
+},
+success: function(msg) {
+jQuery('#div3').html(msg);
+}
+});
+ }
+
+
+ <#macro paginationControls>
+<#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize)?double /
viewSize?double)/>
+<#if (viewIndexMax?int > 0)>
+
+
+
+
+ ${uiLabelMap.CommonPage} ${viewIndex?int + 1}
${uiLabelMap.CommonOf} ${viewIndexMax}
+ <#if (viewIndex?int > 1)>
+<#list 1..viewIndexMax as curViewNum>
+ ${uiLabelMap.CommonGotoPage}
${curViewNum}
+
+
+
+<#-- End Page Select Drop-Down -->
+ <#if (viewIndex?int > 0)>
+${uiLabelMap.CommonPrevious} |
+
+ <#if ((listSize?int - viewSize?int) > 0)>
+${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf}
${listSize}
+
+ <#if highIndex?int < listSize?int>
+ | ${uiLabelMap.CommonNext}
+
+
+
+
+
+
+
+
+ <#if productCategory??>
+<#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME",
"html")!/>
+<#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION",
"html")!/>
+<#if categoryName?has_content>
+
+
+
+${categoryName} <#if
categoryDescription?has_content>${(categoryDescription)!}
+
+
+
+ <#if hasQuantities??>
+
+
+ <#if requestParameters.product_id??>
+ <#if requestParameters.category_id??>
+ <#if requestParameters.VIEW_INDEX??>
+ <#if requestParameters.SEARCH_STRING??>
+ <#if requestParameters.SEARCH_CATEGORY_ID??>
+ ${uiLabelMap.ProductAddProductsUsingDefaultQuantities}
+
+
+ <#if "Y" == searchInCategory?default("Y")>
+${uiLabelMap.ProductSearchInCategory}
+
+
svn commit: r1818787 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/catalog/ProductDetail.ftl template/customer/MiniSignUpForContactList.ftl webapp/ecommerce/css/custom.css webapp/ecommerce/image
Author: deepak
Date: Wed Dec 20 12:19:24 2017
New Revision: 1818787
URL: http://svn.apache.org/viewvc?rev=1818787=rev
Log:
Improved: Update markup of Product Detail page according to standard markup
given by Bootstrap v4.0.s (OFBIZ-10099)
Thanks Mayank Lambhate for your contribution.
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl?rev=1818787=1818786=1818787=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl Wed
Dec 20 12:19:24 2017
@@ -334,7 +334,7 @@ $(function(){
-
+
<#assign productAdditionalImage1 =
productContentWrapper.get("ADDITIONAL_IMAGE_1", "url")! />
<#assign productAdditionalImage2 =
productContentWrapper.get("ADDITIONAL_IMAGE_2", "url")! />
<#assign productAdditionalImage3 =
productContentWrapper.get("ADDITIONAL_IMAGE_3", "url")! />
@@ -345,22 +345,25 @@ $(function(){
<#if previousProductId??>
${uiLabelMap.CommonPrevious}|
+>${uiLabelMap.CommonPrevious}|
${(category.categoryName)?default(category.description)!}
<#if nextProductId??>|
${uiLabelMap.CommonNext}
+>${uiLabelMap.CommonNext}
-
-<#if productImageList?has_content>
+
+
+
+
+ <#if productImageList?has_content>
<#-- Product image/name/price -->
-
+
<#assign productLargeImageUrl =
productContentWrapper.get("LARGE_IMAGE_URL", "url")! />
<#-- remove the next two lines to always display the virtual image
first (virtual images must exist) -->
<#if firstLargeImage?has_content>
@@ -379,19 +382,19 @@ $(function(){
<#-- Show Image Approved -->
-
<#if productImageList?has_content>
- <#list productImageList as productImage>
-
-
-
-
-
-
+
+<#list productImageList as productImage>
+
+
+
+
+
+
+
-
<#else>
<#-- Product image/name/price -->
@@ -451,11 +454,11 @@ $(function(){
-
-
+
+
${productContentWrapper.get("PRODUCT_NAME", "html")!}
- ${productContentWrapper.get("DESCRIPTION", "html")!}
- ${product.productId!}
+ ${productContentWrapper.get("DESCRIPTION", "html")!}
+ ${product.productId!}
<#-- example of showing a certain type of feature with the product -->
<#if sizeProductFeatureAndAppls?has_content>
@@ -627,7 +630,7 @@ $(function(){
${uiLabelMap.CommonTellAFriend}
+>${uiLabelMap.CommonTellAFriend}
<#if disFeatureList?? && 0 disFeatureList.size()>
@@ -645,18 +648,18 @@ $(function(){
-
-
<#assign inStock = true />
<#assign commentEnable =
Static["org.apache.ofbiz.entity.util.EntityUtilProperties"]
.getPropertyValue("order", "order.item.comment.enable", delegator)>
<#if commentEnable.equals("Y")>
<#assign orderItemAttr =
Static["org.apache.ofbiz.entity.util.EntityUtilProperties"]
.getPropertyValue("order", "order.item.attr.prefix", delegator)>
- ${uiLabelMap.CommonComment}
+
+ ${uiLabelMap.CommonComment}
+
<#-- Variant Selection -->
<#if "Y" == product.isVirtual!?upper_case>
@@ -666,7 +669,7 @@ $(function(){
<#if feature_index == 0>
${feature.description}:
-
${uiLabelMap.EcommerceSelectOption}
@@ -686,16 +689,16 @@ $(function(){
${uiLabelMap.CommonQuantity}:
-
-
+ ${uiLabelMap.OrderAddToCart}
svn commit: r1818789 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/includes/Footer.ftl webapp/ecommerce/css/custom.css webapp/ecommerce/images/ecommain.css widget/CommonScreens.xml
Author: deepak
Date: Wed Dec 20 12:41:25 2017
New Revision: 1818789
URL: http://svn.apache.org/viewvc?rev=1818789=rev
Log:
Improved: Updated footer markup, now footer will be render properly on all
pages.
Thanks Parakh for your contribution
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl?rev=1818789=1818788=1818789=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Footer.ftl Wed Dec 20
12:41:25 2017
@@ -19,6 +19,7 @@ under the License.
<#assign nowTimestamp =
Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
+
@@ -39,3 +40,4 @@ under the License.
${uiLabelMap.EcommerceSeeStorePoliciesHere}
+
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css?rev=1818789=1818788=1818789=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css Wed Dec
20 12:41:25 2017
@@ -58,4 +58,8 @@
.quick-links a, #paginationBox a {
color: #00;
+}
+
+.footer-block {
+background: #f8f9fa;
}
\ No newline at end of file
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css?rev=1818789=1818788=1818789=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
Wed Dec 20 12:41:25 2017
@@ -259,8 +259,16 @@ margin-top:10px;
position:relative;
width:100%;
text-align:left;
+flex:1;
}
+#parentContainer {
+display: flex;
+min-height: 100vh;
+flex-direction: column;
+}
+
+
#ecom-mainarea .left {
background:#fff;
float:left;
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=1818789=1818788=1818789=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Wed Dec 20
12:41:25 2017
@@ -81,6 +81,7 @@ under the License.
+
@@ -99,6 +100,7 @@ under the License.
+
svn commit: r1818600 - in /ofbiz/ofbiz-framework/trunk: framework/common/widget/ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ framework/widget/dtd/ themes/ themes/common/webapp/comm
Author: deepak
Date: Mon Dec 18 18:16:09 2017
New Revision: 1818600
URL: http://svn.apache.org/viewvc?rev=1818600=rev
Log:
Improved: Moved plugins js from images to common/js (OFBIZ-5776)
Added:
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/OpenLayers-2.13.1-modified-for-CSP-.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/OpenLayers-2.13.1-modified-for-CSP-.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/jsgantt/
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/jsgantt/jsgantt.css
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jsgantt.css
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/jsgantt/jsgantt.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jsgantt.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/moment-timezone/
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/moment-timezone/moment-timezone-with-data.min.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/moment-timezone-with-data.min.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/moment-timezone/moment-with-locales.min.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/moment-with-locales.min.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/myportal.css
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/myportal.css
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/plugins/myportal.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/myportal.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/combobox.js
- copied unchanged from r1818599,
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/combobox.js
Removed:
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/OpenLayers-2.13.1-modified-for-CSP-.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/combobox.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jsgantt.css
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/jsgantt.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/moment-timezone-with-data.min.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/moment-with-locales.min.js
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/myportal.css
ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/myportal.js
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
ofbiz/ofbiz-framework/trunk/framework/widget/dtd/widget-form.xsd
ofbiz/ofbiz-framework/trunk/themes/README.md
ofbiz/ofbiz-framework/trunk/themes/common/widget/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml?rev=1818600=1818599=1818600=diff
==
--- ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/widget/PortalPageScreens.xml
Mon Dec 18 18:16:09 2017
@@ -70,8 +70,8 @@ under the License.
-
-
+
+
@@ -91,8 +91,8 @@ under the License.
-
-
+
+
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java?rev=1818600=1818599=1818600=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Mon Dec 18 18:16:09 2017
@@ -987,7 +987,7 @@ public class RequestHandler {
//resp.setHeader("Content-Security-Policy", "default-src 'self'");
//resp.setHeader("Content-Security-Policy-Report-Only", "default-src
svn commit: r1815446 - in /ofbiz/site: bootstrap/js/with carousel/ css/ font-icons/custom-icons/ font-icons/custom-icons/BCk-safari-pc/ images/ images/slides/ images/team/ images/textures/ images/text
Author: deepak Date: Thu Nov 16 12:26:05 2017 New Revision: 1815446 URL: http://svn.apache.org/viewvc?rev=1815446=rev Log: Removed some more unused files Removed: ofbiz/site/bootstrap/js/with carousel/ ofbiz/site/css/black-white.css ofbiz/site/css/blue.css ofbiz/site/css/coffee.css ofbiz/site/css/dark-black-white.css ofbiz/site/css/dark-blue.css ofbiz/site/css/dark-coffee.css ofbiz/site/css/dark-green.css ofbiz/site/css/dark-light.css ofbiz/site/css/dark-orange.css ofbiz/site/css/dark-pink.css ofbiz/site/css/dark-red.css ofbiz/site/css/dark-sea-green.css ofbiz/site/css/dark-yellow.css ofbiz/site/css/green.css ofbiz/site/css/icon-demo.css ofbiz/site/css/light.css ofbiz/site/css/orange.css ofbiz/site/css/pink.css ofbiz/site/css/red.css ofbiz/site/css/sea-green.css ofbiz/site/css/yellow.css ofbiz/site/font-icons/custom-icons/BCk-safari-pc/ ofbiz/site/font-icons/custom-icons/demo.html ofbiz/site/images/Sans-titre-2.png ofbiz/site/images/apple-touch-icon-114x114_old.png ofbiz/site/images/apple-touch-icon-144x144_old.png ofbiz/site/images/apple-touch-icon-72x72_old.png ofbiz/site/images/apple-touch-icon57x57_old.png ofbiz/site/images/apple-touch-icon_old.png ofbiz/site/images/big-logo.png ofbiz/site/images/blog-pic1.jpg ofbiz/site/images/blog-pic2.jpg ofbiz/site/images/blog-pic3.jpg ofbiz/site/images/bubble1.jpg ofbiz/site/images/bubble2.jpg ofbiz/site/images/client1.jpg ofbiz/site/images/client2.jpg ofbiz/site/images/client3.jpg ofbiz/site/images/img-fullwidth.jpg ofbiz/site/images/img-help1.jpg ofbiz/site/images/img-help2.jpg ofbiz/site/images/map-trigger.png ofbiz/site/images/news1.jpg ofbiz/site/images/news2.jpg ofbiz/site/images/news3.jpg ofbiz/site/images/news4.jpg ofbiz/site/images/news5.jpg ofbiz/site/images/news6.jpg ofbiz/site/images/slides/ ofbiz/site/images/subscribe.png ofbiz/site/images/subtle-noise.png ofbiz/site/images/team/ ofbiz/site/images/textures/Little-Neko-_0003_BOKEY-blue-green-light.jpg ofbiz/site/images/textures/Little-Neko-_0008_BOKEY-blue5.jpg ofbiz/site/images/textures/Little-Neko-_0017_BOKEY-orange8.jpg ofbiz/site/images/textures/Little-Neko-_0026_BOKEY-light7- (2).jpg ofbiz/site/images/textures/Little-Neko-_0026_BOKEY-light7.jpg ofbiz/site/images/textures/Little-Neko__BLUR1.jpg ofbiz/site/images/textures/Little-Neko_0003_woody4.jpg ofbiz/site/images/textures/Little-Neko_0007_tree8.jpg ofbiz/site/images/textures/Little-Neko_pixel.jpg ofbiz/site/images/textures/bg-footer.png ofbiz/site/images/textures/bg-texture-grey-dark.png ofbiz/site/images/textures/bg-texture-grey.png ofbiz/site/images/textures/bg-texture-light-grey.png ofbiz/site/images/textures/bg-texture-orange.png ofbiz/site/images/textures/full-size/ ofbiz/site/images/textures/texture-pixel.png ofbiz/site/images/textures/texture-psychedelic-pattern-orange.png ofbiz/site/images/vign1.jpg ofbiz/site/images/vign2.jpg ofbiz/site/images/vign3-zoom.jpg ofbiz/site/images/vign3.jpg ofbiz/site/images/vign4.jpg ofbiz/site/images/works/
svn commit: r1814944 - in /ofbiz/site: images/awards/ images/clients/ our-users.html template/page/our-users.tpl.php
Author: deepak Date: Sat Nov 11 11:54:24 2017 New Revision: 1814944 URL: http://svn.apache.org/viewvc?rev=1814944=rev Log: Improved: Removed unused our-users.html files, if needed we will add this in future. Removed: ofbiz/site/images/awards/ ofbiz/site/images/clients/ ofbiz/site/our-users.html ofbiz/site/template/page/our-users.tpl.php
svn commit: r1815418 - in /ofbiz/site: ./ js-plugin/ js/ js/plugins/ js/plugins/ajax-contact-extend/assets/js/ template/region/
Author: deepak Date: Thu Nov 16 07:56:03 2017 New Revision: 1815418 URL: http://svn.apache.org/viewvc?rev=1815418=rev Log: Improved: Moved from js-plugin/ in js/plugins Added: ofbiz/site/js/plugins/ - copied from r1815417, ofbiz/site/js-plugin/ Removed: ofbiz/site/js-plugin/ Modified: ofbiz/site/404.html ofbiz/site/about-ofbiz.html ofbiz/site/business-users.html ofbiz/site/developers.html ofbiz/site/download.html ofbiz/site/faqs.html ofbiz/site/getting-involved.html ofbiz/site/index.html ofbiz/site/js/custom.js ofbiz/site/js/plugins/ajax-contact-extend/assets/js/jquery.jigowatt.js ofbiz/site/mailing-lists.html ofbiz/site/ofbiz-demos.html ofbiz/site/release-notes-13.07.03.html ofbiz/site/release-notes-16.11.03.html ofbiz/site/service-providers.html ofbiz/site/source-repositories.html ofbiz/site/template/region/head.tpl.php ofbiz/site/template/region/scripts.tpl.php ofbiz/site/user-stories.html Modified: ofbiz/site/404.html URL: http://svn.apache.org/viewvc/ofbiz/site/404.html?rev=1815418=1815417=1815418=diff == --- ofbiz/site/404.html (original) +++ ofbiz/site/404.html Thu Nov 16 07:56:03 2017 @@ -32,9 +32,9 @@ - - - + + + @@ -192,18 +192,18 @@ - + - + - - - + + + - - + + Modified: ofbiz/site/about-ofbiz.html URL: <a rel="nofollow" href="http://svn.apache.org/viewvc/ofbiz/site/about-ofbiz.html?rev=1815418&r1=1815417&r2=1815418&view=diff">http://svn.apache.org/viewvc/ofbiz/site/about-ofbiz.html?rev=1815418&r1=1815417&r2=1815418&view=diff</a> == --- ofbiz/site/about-ofbiz.html (original) +++ ofbiz/site/about-ofbiz.html Thu Nov 16 07:56:03 2017 @@ -32,9 +32,9 @@ <!-- web font --> <link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,800" rel="stylesheet" type="text/css"> <!-- plugin css --> -<link rel="stylesheet" type="text/css" href="js-plugin/pretty-photo/css/prettyPhoto.css" /> -<link rel="stylesheet" type="text/css" href="js-plugin/rs-plugin/css/settings.css" media="screen" /> -<link type="text/css" rel="stylesheet" href="js-plugin/hoverdir/css/style.css"> +<link rel="stylesheet" type="text/css" href="js/plugins/pretty-photo/css/prettyPhoto.css" /> +<link rel="stylesheet" type="text/css" href="js/plugins/rs-plugin/css/settings.css" media="screen" /> +<link type="text/css" rel="stylesheet" href="js/plugins/hoverdir/css/style.css"> <!-- icon fonts --> <link type="text/css" rel="stylesheet" href="font-icons/custom-icons/css/custom-icons.css"> <link type="text/css" rel="stylesheet" href="font-icons/custom-icons/css/custom-icons-ie7.css"> @@ -227,18 +227,18 @@ <!-- footer --> </div> <!-- globalWrapper --> -<script type="text/javascript" src="js-plugin/respond/respond.min.js"> + - + - - - + + + - - + + Modified: ofbiz/site/business-users.html URL: <a rel="nofollow" href="http://svn.apache.org/viewvc/ofbiz/site/business-users.html?rev=1815418&r1=1815417&r2=1815418&view=diff">http://svn.apache.org/viewvc/ofbiz/site/business-users.html?rev=1815418&r1=1815417&r2=1815418&view=diff</a> == --- ofbiz/site/business-users.html (original) +++ ofbiz/site/business-users.html Thu Nov 16 07:56:03 2017 @@ -32,9 +32,9 @@ <!-- web font --> <link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,800" rel="stylesheet" type="text/css"> <!-- plugin css --> -<link rel="stylesheet" type="text/css" href="js-plugin/pretty-photo/css/prettyPhoto.css" /> -<link rel="stylesheet" type="text/css" href="js-plugin/rs-plugin/css/settings.css" media="screen" /> -<link type="text/css" rel="stylesheet" href="js-plugin/hoverdir/css/style.css"> +<link rel="stylesheet" type="text/css" href="js/plugins/pretty-photo/css/prettyPhoto.css" /> +<link rel="stylesheet" type="text/css" href="js/plugins/rs-plugin/css/settings.css" media="screen" /> +<link type="text/css" rel="stylesheet" href="js/plugins/hoverdir/css/style.css"> <!-- icon fonts -->
svn commit: r1815417 - /ofbiz/site/images/slides/
Author: deepak Date: Thu Nov 16 07:50:19 2017 New Revision: 1815417 URL: http://svn.apache.org/viewvc?rev=1815417=rev Log: Improved:Removed some more unused images. Removed: ofbiz/site/images/slides/thumb1.jpg ofbiz/site/images/slides/thumb2.jpg ofbiz/site/images/slides/thumb3.jpg ofbiz/site/images/slides/thumb4.jpg ofbiz/site/images/slides/transition_bg.png ofbiz/site/images/slides/transition_boxes.png ofbiz/site/images/slides/transition_curtainone.png ofbiz/site/images/slides/transition_curtainthree.png ofbiz/site/images/slides/transition_curtaintwo.png ofbiz/site/images/slides/transition_fade.png ofbiz/site/images/slides/transition_mixed.png ofbiz/site/images/slides/transition_slidedown.png ofbiz/site/images/slides/transition_slideleft.png ofbiz/site/images/slides/transition_slideright.png ofbiz/site/images/slides/transition_slideup.png ofbiz/site/images/slides/transition_slotfadehorizontal.png ofbiz/site/images/slides/transition_slotfadevertical.png ofbiz/site/images/slides/transition_slotslidehorizontal.png ofbiz/site/images/slides/transition_slotslidevertical.png ofbiz/site/images/slides/transition_slotzoomhorizontal.png ofbiz/site/images/slides/transition_slotzoomvertical.png
svn commit: r1815415 - in /ofbiz/site: documentation/ images/portfolio/ images/slider/ images/slider/rs/
Author: deepak Date: Thu Nov 16 06:43:04 2017 New Revision: 1815415 URL: http://svn.apache.org/viewvc?rev=1815415=rev Log: Improved: Removed some usused images, also removed unused documentation folder(OFBIZ-7792) Removed: ofbiz/site/documentation/ ofbiz/site/images/portfolio/project0.jpg ofbiz/site/images/portfolio/project0_v.jpg ofbiz/site/images/portfolio/project1.jpg ofbiz/site/images/portfolio/project1_v.jpg ofbiz/site/images/portfolio/project2.jpg ofbiz/site/images/portfolio/project2_v.jpg ofbiz/site/images/portfolio/vign1-big.jpg ofbiz/site/images/portfolio/vign1.jpg ofbiz/site/images/portfolio/vign2-big.jpg ofbiz/site/images/portfolio/vign2.jpg ofbiz/site/images/portfolio/vign3-big.jpg ofbiz/site/images/portfolio/vign3.jpg ofbiz/site/images/portfolio/vign4-big.jpg ofbiz/site/images/portfolio/vign4.jpg ofbiz/site/images/portfolio/vign5-big.jpg ofbiz/site/images/portfolio/vign5.jpg ofbiz/site/images/portfolio/vign6-big.jpg ofbiz/site/images/portfolio/vign6.jpg ofbiz/site/images/portfolio/vign7-big.jpg ofbiz/site/images/portfolio/vign7.jpg ofbiz/site/images/portfolio/vign8-big.jpg ofbiz/site/images/portfolio/vign8.jpg ofbiz/site/images/portfolio/vign9-big.jpg ofbiz/site/images/portfolio/vign9.jpg ofbiz/site/images/slider/camera-slide1.jpg ofbiz/site/images/slider/camera-slide2.jpg ofbiz/site/images/slider/camera-slide3.jpg ofbiz/site/images/slider/camera-v-slide1.jpg ofbiz/site/images/slider/camera-v-slide2.jpg ofbiz/site/images/slider/camera-v-slide3.jpg ofbiz/site/images/slider/rs/logo-slider.png ofbiz/site/images/slider/rs/logos-css3.png ofbiz/site/images/slider/rs/logos-html5.png ofbiz/site/images/slider/rs/ofbiz1.jpg ofbiz/site/images/slider/rs/ofbiz2.jpg ofbiz/site/images/slider/rs/ofbiz3.jpg ofbiz/site/images/slider/rs/ohmy1.png ofbiz/site/images/slider/rs/ohmy2.png ofbiz/site/images/slider/rs/ohmy3.png ofbiz/site/images/slider/rs/ohmy4.png ofbiz/site/images/slider/rs/old_ofbiz1.png ofbiz/site/images/slider/rs/old_ofbiz2.png ofbiz/site/images/slider/rs/old_ofbiz3.png ofbiz/site/images/slider/rs/old_screen1.png ofbiz/site/images/slider/rs/old_screen2.png ofbiz/site/images/slider/rs/old_screen3.png ofbiz/site/images/slider/rs/pic2.png ofbiz/site/images/slider/rs/pic3.png ofbiz/site/images/slider/rs/screen1.jpg ofbiz/site/images/slider/rs/screen2.jpg ofbiz/site/images/slider/rs/screen3.jpg ofbiz/site/images/slider/rs/v-sequence1.png ofbiz/site/images/slider/rs/v-sequence3.png ofbiz/site/images/slider/rs/v-sequence4.png ofbiz/site/images/slider/slide1.jpg ofbiz/site/images/slider/slide2.jpg ofbiz/site/images/slider/slide3.jpg
svn commit: r1814927 - /ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
Author: deepak
Date: Sat Nov 11 08:33:29 2017
New Revision: 1814927
URL: http://svn.apache.org/viewvc?rev=1814927=rev
Log:
Fixed: Fixed typo introdued at r#1814924
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl?rev=1814927=1814926=1814927=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
Sat Nov 11 08:33:29 2017
@@ -48,7 +48,7 @@ under the License.
<#macro renderHyperlinkField>
-<#macro renderTextField name className alert value="" textSize="" maxlength=""
id="" event="" action="" disabled="" clientAutocomplete"" ajaxUrl=""
ajaxEnabled="" mask="" tabindex="" readonly="" placeholder=""
delegatorName="default">
+<#macro renderTextField name className alert value="" textSize="" maxlength=""
id="" event="" action="" disabled="" clientAutocomplete="" ajaxUrl=""
ajaxEnabled="" mask="" tabindex="" readonly="" placeholder=""
delegatorName="default">
<@renderClass className alert />
<#if value?has_content> value="${value}"<#rt/>
svn commit: r1814929 - in /ofbiz/branches/release16.11: ./ applications/marketing/servicedef/services.xml applications/marketing/widget/ContactListForms.xml
Author: deepak Date: Sat Nov 11 08:49:28 2017 New Revision: 1814929 URL: http://svn.apache.org/viewvc?rev=1814929=rev Log: Applied fix from trunk for revision: 1814928 === Fixed: Party Id field missing while creating contact list party in the marketing component (OFBIZ-9698) Thanks Rubia Elza Joshep for reporting the issue. Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/applications/marketing/servicedef/services.xml ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 11 08:49:28 2017 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520 Modified: ofbiz/branches/release16.11/applications/marketing/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/servicedef/services.xml?rev=1814929=1814928=1814929=diff == --- ofbiz/branches/release16.11/applications/marketing/servicedef/services.xml (original) +++ ofbiz/branches/release16.11/applications/marketing/servicedef/services.xml Sat Nov 11 08:49:28 2017 @@ -135,7 +135,8 @@ under the License. location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="updateContactListParty" auth="true"> Update Party to ContactList Join - + + Modified: ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml?rev=1814929=1814928=1814929=diff == --- ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml (original) +++ ofbiz/branches/release16.11/applications/marketing/widget/ContactListForms.xml Sat Nov 11 08:49:28 2017 @@ -147,11 +147,11 @@ under the License. - - + + + + - - @@ -167,8 +167,8 @@ under the License. - - + +
svn commit: r1814928 - in /ofbiz/ofbiz-framework/trunk/applications/marketing: servicedef/services.xml widget/ContactListForms.xml
Author: deepak Date: Sat Nov 11 08:47:12 2017 New Revision: 1814928 URL: http://svn.apache.org/viewvc?rev=1814928=rev Log: Fixed: Party Id field missing while creating contact list party in the marketing component (OFBIZ-9698) Thanks Rubia Elza Joshep for reporting the issue. Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml?rev=1814928=1814927=1814928=diff == --- ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml Sat Nov 11 08:47:12 2017 @@ -191,7 +191,8 @@ under the License. location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="updateContactListParty" auth="true"> Update Party to ContactList Join - + + Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml?rev=1814928=1814927=1814928=diff == --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml Sat Nov 11 08:47:12 2017 @@ -147,11 +147,11 @@ under the License. - - + + + + - - @@ -167,8 +167,8 @@ under the License. - - + +
svn commit: r1814920 - /ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoFormMacroLibrary.ftl
Author: deepak
Date: Sat Nov 11 06:03:23 2017
New Revision: 1814920
URL: http://svn.apache.org/viewvc?rev=1814920=rev
Log:
Improved: Set the default value for Fo Form Macro Library. (OFBIZ-7932)
Thanks Renuka Srishti for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoFormMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoFormMacroLibrary.ftl?rev=1814920=1814919=1814920=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoFormMacroLibrary.ftl
Sat Nov 11 06:03:23 2017
@@ -42,9 +42,9 @@ under the License.
<#escape x as x?xml>
-<#macro makeBlock style text><fo:block<#if style?has_content> <@getFoStyle
style/>><#if text??>${text}
+<#macro makeBlock style="" text=""><fo:block<#if style?has_content>
<@getFoStyle style/>><#if text??>${text}
-<#macro renderField text><#if text??>${text}
+<#macro renderField text=""><#if text??>${text}
<#macro renderDisplayField type imageLocation idName description title class
alert inPlaceEditorUrl="" inPlaceEditorParams="">
<@makeBlock class description />
@@ -57,7 +57,7 @@ under the License.
<#macro renderDateTimeField name className alert title value size maxlength
step timeValues id event action dateType shortDateInput timeDropdownParamName
defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString
hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName mask="" event="" action="" step="" timeValues=""
tabindex=""><@makeBlock className value />
-<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars
choices autoSelect partialSearch partialChars ignoreCase fullSearch tabindex>
+<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size explicitDescription allowEmpty options
fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled
noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect
partialSearch partialChars ignoreCase fullSearch tabindex firstInList=""
currentValue="">
<#if currentValue?has_content && firstInList?has_content>
<@makeBlock "" explicitDescription />
<#else>
@@ -94,7 +94,7 @@ under the License.
<#-- FIXME: this is an hack to avoid FOP rendering errors for empty lists
(fo:table-body cannot be null) -->
-<#macro renderFormatHeaderRowCellOpen style positionSpan>number-columns-spanned="${positionSpan}"<#if
style?has_content><@getFoStyle "${style}"/><#else><@getFoStyle
"listtitlestyle"/>>
+<#macro renderFormatHeaderRowCellOpen style="" positionSpan="">number-columns-spanned="${positionSpan}"<#if
style?has_content><@getFoStyle "${style}"/><#else><@getFoStyle
"listtitlestyle"/>>
<#macro renderFormatHeaderRowCellClose>
<#macro renderFormatHeaderRowFormCellOpen style>
@@ -103,7 +103,7 @@ under the License.
<#macro renderFormatItemRowOpen formName itemIndex altRowStyles evenRowStyle
oddRowStyle>>
<#macro renderFormatItemRowClose formName>
-<#macro renderFormatItemRowCellOpen fieldName style
positionSpan>number-columns-spanned="${positionSpan}"<#if
style?has_content><@getFoStyle style/><#else><@getFoStyle
"tabletext"/>>
+<#macro renderFormatItemRowCellOpen fieldName style=""
positionSpan="">number-columns-spanned="${positionSpan}"<#if
style?has_content><@getFoStyle style/><#else><@getFoStyle
"tabletext"/>>
<#macro renderFormatItemRowCellClose
fieldName>
<#macro renderFormatItemRowFormCellOpen style>
<#macro renderFormatItemRowFormCellClose>
@@ -116,7 +116,7 @@ under the License.
<#macro renderFormatFieldRowTitleCellOpen style>
<#macro renderFormatFieldRowTitleCellClose>
<#macro renderFormatFieldRowSpacerCell>
-<#macro renderFormatFieldRowWidgetCellOpen positionSpan style>number-columns-spanned="${positionSpan}">
+<#macro renderFormatFieldRowWidgetCellOpen positionSpan=""
style="">number-columns-spanned="${positionSpan}">
<#macro
renderFormatFieldRowWidgetCellClose>
<#macro renderFormatEmptySpace> <@makeBlock "" " " />
svn commit: r1814922 - /ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlTreeMacroLibrary.ftl
Author: deepak
Date: Sat Nov 11 06:14:20 2017
New Revision: 1814922
URL: http://svn.apache.org/viewvc?rev=1814922=rev
Log:
Improved: Set the default value for Html Tree Macro Library.(OFBIZ-7988)
Thanks Renuka Srishti for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlTreeMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlTreeMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlTreeMacroLibrary.ftl?rev=1814922=1814921=1814922=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlTreeMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlTreeMacroLibrary.ftl
Sat Nov 11 06:14:20 2017
@@ -17,17 +17,17 @@ specific language governing permissions
under the License.
-->
-<#macro renderNodeBegin style>
+<#macro renderNodeBegin style="">
<#if style?has_content>
<#rt/>
-<#macro renderLastElement style>
+<#macro renderLastElement style="">
<ul<#if style?has_content> class="${style}">
<#rt/>
-<#macro renderNodeEnd processChildren isRootNode>
+<#macro renderNodeEnd processChildren="" isRootNode="">
<#if processChildren?has_content && processChildren>
<#lt/>
@@ -37,9 +37,9 @@ under the License.
-<#macro renderLabel id style labelText>
+<#macro renderLabel id="" style="" labelText="">
<span<#if id?has_content> id="${id}"<#if style?has_content>
class="${style}"><#rt/>
-<#if id?has_content>{labelText}<#rt/>
+<#if labelText?has_content>${labelText}<#rt/>
@@ -47,7 +47,7 @@ under the License.
-<#macro renderLink id style name title targetWindow linkUrl linkText imgStr>
+<#macro renderLink id="" style="" name="" title="" targetWindow="" linkUrl=""
linkText="" imgStr="">
<a<#if id?has_content> id="${id}"<#rt/>
<#if style?has_content> class="${style}"<#rt/>
<#if name?has_content> name="${name}"<#rt/>
@@ -56,7 +56,7 @@ under the License.
<#if imgStr?has_content>${imgStr}<#elseif
linkText?has_content/>${linkText}<#else><#rt/>
-<#macro renderImage src id style wid hgt border alt urlString>
+<#macro renderImage src="" id="" style="" wid="" hgt="" border="" alt=""
urlString="">
<#if src?has_content>
id="${id}"<#if style?has_content>
class="${style}"<#if wid?has_content> width="${wid}"<#if
hgt?has_content> height="${hgt}"<#if border?has_content>
border="${border}" alt="<#if alt?has_content>${alt}"
src="${urlString}" /><#rt/>
svn commit: r1814923 - in /ofbiz/ofbiz-framework/trunk/themes/common/template/macro: CsvScreenMacroLibrary.ftl TextScreenMacroLibrary.ftl XlsFormMacroLibrary.ftl XmlFormMacroLibrary.ftl
Author: deepak
Date: Sat Nov 11 06:19:48 2017
New Revision: 1814923
URL: http://svn.apache.org/viewvc?rev=1814923=rev
Log:
Improved: Set the default value for Csv Screen Macro Library, Text Screen Macro
Library, Xml Form Macro Library and Xls Form Macro Library. (OFBIZ-7992)
Thanks Renuka Srishti for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl?rev=1814923=1814922=1814923=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl
Sat Nov 11 06:19:48 2017
@@ -39,7 +39,7 @@ under the License.
<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest
enableEditValue>
<#macro renderHorizontalSeparator id style>
-<#macro renderLabel text id style>
+<#macro renderLabel id="" style="" text="">
<#if text??>
${text}<#lt/>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl?rev=1814923=1814922=1814923=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl
Sat Nov 11 06:19:48 2017
@@ -39,7 +39,7 @@ under the License.
<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest
enableEditValue>
<#macro renderHorizontalSeparator id style>
-<#macro renderLabel text id style>
+<#macro renderLabel text="" id="" style="">
<#if text??>
${text}<#lt/>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl?rev=1814923=1814922=1814923=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl
Sat Nov 11 06:19:48 2017
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#macro renderField text><#if text??>${text}
+<#macro renderField text=""><#if text??>${text}
<#macro renderItemField value cellType cellStyle="">${cellStyle!}>${value!}
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl?rev=1814923=1814922=1814923=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl
Sat Nov 11 06:19:48 2017
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#macro renderField text><#if text??>${text?xml}
+<#macro renderField text=""><#if text??>${text?xml}
<#macro renderFormatListWrapperOpen formName style
columnStyles><${formName}Export>
svn commit: r1814924 - /ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
Author: deepak
Date: Sat Nov 11 06:38:09 2017
New Revision: 1814924
URL: http://svn.apache.org/viewvc?rev=1814924=rev
Log:
Improved: Set the default value for Html Form Macro Library. (OFBIZ-7985)
Thanks Renuka Srishti for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl?rev=1814924=1814923=1814924=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
Sat Nov 11 06:38:09 2017
@@ -17,13 +17,13 @@ specific language governing permissions
under the License.
-->
-<#macro renderField text>
+<#macro renderField text="">
<#if text??>
${text}<#lt/>
-<#macro renderDisplayField type imageLocation idName description title class
alert inPlaceEditorUrl="" inPlaceEditorParams="">
+<#macro renderDisplayField imageLocation alert type="" idName=""
description="" title="" class="" inPlaceEditorUrl="" inPlaceEditorParams="">
<#if type?has_content && type=="image">
<#lt/>
<#else>
@@ -48,7 +48,7 @@ under the License.
<#macro renderHyperlinkField>
-<#macro renderTextField name className alert value textSize maxlength id event
action disabled clientAutocomplete ajaxUrl ajaxEnabled mask tabindex readonly
placeholder="" delegatorName="default">
+<#macro renderTextField name className alert value="" textSize="" maxlength=""
id="" event="" action="" disabled="" clientAutocomplete"" ajaxUrl=""
ajaxEnabled="" mask="" tabindex="" readonly="" placeholder=""
delegatorName="default">
<@renderClass className alert />
<#if value?has_content> value="${value}"<#rt/>
@@ -67,11 +67,11 @@ under the License.
<#if ajaxEnabled?has_content && ajaxEnabled>
<#assign defaultMinLength = modelTheme.getAutocompleterDefaultMinLength()>
<#assign defaultDelay = modelTheme.getAutocompleterDefaultDelay()>
-ajaxAutoCompleter('${ajaxUrl}', false,
${defaultMinLength!2}, ${defaultDelay!300});<#lt/>
+ajaxAutoCompleter('${ajaxUrl!}', false,
${defaultMinLength!2}, ${defaultDelay!300});<#lt/>
-<#macro renderTextareaField name className alert cols rows maxlength id
readonly value visualEditorEnable buttons tabindex language="">
+<#macro renderTextareaField name className alert cols="" rows="" maxlength=""
id="" readonly="" value="" visualEditorEnable="" buttons="" tabindex=""
language="">
<#if visualEditorEnable?has_content>
<#local className = className + " visual-editor">
@@ -90,7 +90,7 @@ under the License.
<#lt/>
-<#macro renderDateTimeField name className alert title value size maxlength id
dateType shortDateInput timeDropdownParamName defaultDateTimeString
localizedIconTitle timeDropdown timeHourName classString hour1 hour2
timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType formName="" mask="" event="" action="" step="" timeValues=""
tabindex="" >
+<#macro renderDateTimeField name className alert dateType
timeDropdownParamName defaultDateTimeString localizedIconTitle timeHourName
timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected
compositeType timeDropdown="" classString="" hour1="" hour2=""
shortDateInput="" title="" value="" size="" maxlength="" id="" formName=""
mask="" event="" action="" step="" timeValues="" tabindex="" >
<#if dateType!="time" >
tabindex="${tabindex}" name="${name}_i18n" <@renderClass className alert
/><#rt/>
@@ -212,7 +212,7 @@ under the License.
-<#macro renderDropDownField name className alert id multiple formName
otherFieldName event action size firstInList currentValue explicitDescription
allowEmpty options fieldName otherFieldName otherValue otherFieldSize
dDFCurrent ajaxEnabled noCurrent
svn commit: r1814926 - /ofbiz/ofbiz-plugins/trunk/example/build.gradle
Author: deepak
Date: Sat Nov 11 07:09:50 2017
New Revision: 1814926
URL: http://svn.apache.org/viewvc?rev=1814926=rev
Log:
Improved: Updated tomcat-embed-websocket jar to 8.5.23
Modified:
ofbiz/ofbiz-plugins/trunk/example/build.gradle
Modified: ofbiz/ofbiz-plugins/trunk/example/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/build.gradle?rev=1814926=1814925=1814926=diff
==
--- ofbiz/ofbiz-plugins/trunk/example/build.gradle (original)
+++ ofbiz/ofbiz-plugins/trunk/example/build.gradle Sat Nov 11 07:09:50 2017
@@ -18,5 +18,5 @@
*/
dependencies {
-pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:8.0.39'
+pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23'
}
\ No newline at end of file
svn commit: r1814919 - /ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl
Author: deepak
Date: Sat Nov 11 05:55:58 2017
New Revision: 1814919
URL: http://svn.apache.org/viewvc?rev=1814919=rev
Log:
Improved: Set the default value for Html screen Macro Library.(OFBIZ-7879)
Thanks Renuka Srishti for your contribution.
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl?rev=1814919=1814918=1814919=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlScreenMacroLibrary.ftl
Sat Nov 11 05:55:58 2017
@@ -36,33 +36,33 @@ under the License.
-<#macro renderContainerBegin id style autoUpdateLink autoUpdateInterval>
+<#macro renderContainerBegin id autoUpdateInterval style="" autoUpdateLink="">
<#if autoUpdateLink?has_content>
ajaxUpdateAreaPeriodic('${id}',
'${autoUpdateLink}', '', '${autoUpdateInterval}');
<div<#if id?has_content> id="${id}"<#if style?has_content>
class="${style}">
<#macro renderContainerEnd>
-<#macro renderContentBegin editRequest enableEditValue editContainerStyle><#if
editRequest?has_content && "true" == enableEditValue>
+<#macro renderContentBegin enableEditValue editContainerStyle
editRequest=""><#if editRequest?has_content && "true" == enableEditValue>
<#macro renderContentBody>
-<#macro renderContentEnd urlString editMode editContainerStyle editRequest
enableEditValue>
+<#macro renderContentEnd editMode editContainerStyle enableEditValue
editRequest="" urlString="" >
<#if editRequest?? && "true" == enableEditValue>
<#if urlString??>${editMode}<#rt/>
<#if editContainerStyle??><#rt/>
-<#macro renderSubContentBegin editContainerStyle editRequest
enableEditValue><#if editRequest?? && "true" == enableEditValue>
+<#macro renderSubContentBegin editContainerStyle enableEditValue
editRequest=""><#if editRequest?? && "true" == enableEditValue>
<#macro renderSubContentBody>
-<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest
enableEditValue>
+<#macro renderSubContentEnd editMode editContainerStyle enableEditValue
editRequest="" urlString="">
<#if editRequest?? && "true" == enableEditValue>
<#if urlString??>${editMode}<#rt/>
<#if editContainerStyle??><#rt/>
-<#macro renderHorizontalSeparator id style><hr<#if id?has_content>
id="${id}"<#if style?has_content> class="${style}"/>
+<#macro renderHorizontalSeparator id="" style=""><hr<#if id?has_content>
id="${id}"<#if style?has_content> class="${style}"/>
-<#macro renderLabel text id style>
+<#macro renderLabel text id="" style="">
<#if text?has_content>
<#-- If a label widget has one of the h1-h6 styles, then it is considered
block level element.
Otherwise it is considered an inline element. -->
@@ -90,7 +90,7 @@ under the License.
-<#macro renderLink parameterList targetWindow target uniqueItemName linkType
actionUrl id style name height width linkUrl text imgStr>
+<#macro renderLink parameterList target uniqueItemName linkType actionUrl
height width linkUrl targetWindow="" id="" style="" name="" text="" imgStr="">
<#if "layered-modal" != linkType>
<#if "hidden-form" == linkType>
target="${targetWindow}"
onsubmit="javascript:submitFormDisableSubmits(this)"
name="${uniqueItemName}"><#rt/>
@@ -152,8 +152,8 @@ under the License.
-<#macro renderContentFrame fullUrl width height border>border="${border}" />
-<#macro renderScreenletBegin id title collapsible saveCollapsed
collapsibleAreaId expandToolTip collapseToolTip fullUrlString padded menuString
showMore collapsed javaScriptEnabled>
+<#macro renderContentFrame fullUrl width height border="">border="${border}" />
+<#macro renderScreenletBegin collapsible saveCollapsed collapsibleAreaId
expandToolTip collapseToolTip fullUrlString padded menuString showMore
collapsed javaScriptEnabled id="" title="">
id="${id}"><
svn commit: r1814921 - /ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoScreenMacroLibrary.ftl
Author: deepak
Date: Sat Nov 11 06:06:52 2017
New Revision: 1814921
URL: http://svn.apache.org/viewvc?rev=1814921=rev
Log:
Improved: Set the default value for Fo Screen Macro Library. (OFBIZ-7933)
Thanks Renuka Srishti for your contribution.
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoScreenMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoScreenMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoScreenMacroLibrary.ftl?rev=1814921=1814920=1814921=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoScreenMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/FoScreenMacroLibrary.ftl
Sat Nov 11 06:06:52 2017
@@ -51,7 +51,7 @@ under the License.
<#macro renderSectionEnd boundaryComment>
-<#macro renderContainerBegin id style autoUpdateLink
autoUpdateInterval><@getFoStyle
style/>>
+<#macro renderContainerBegin id autoUpdateLink autoUpdateInterval
style=""><@getFoStyle style/>>
<#macro renderContainerEnd>
<#macro renderContentBegin editRequest enableEditValue
editContainerStyle>
<#macro renderContentBody>
@@ -61,7 +61,7 @@ under the License.
<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest
enableEditValue>
<#macro renderHorizontalSeparator id style>
-<#macro renderLabel text id style><#if text?has_content><@getFoStyle style/> <#if id?has_content>
id="${id}">${text}
+<#macro renderLabel text="" id="" style=""><#if text?has_content><@getFoStyle style/> <#if id?has_content>
id="${id}">${text}
<#macro renderLink parameterList targetWindow target uniqueItemName linkType
actionUrl id style name height width linkUrl text imgStr>
<#macro renderImage src id style wid hgt border alt
urlString>
@@ -72,7 +72,7 @@ under the License.
<#macro renderScreenletPaginateMenu lowIndex actualPageSize ofLabel listSize
paginateLastStyle lastLinkUrl paginateLastLabel paginateNextStyle nextLinkUrl
paginateNextLabel paginatePreviousStyle paginatePreviousLabel previousLinkUrl
paginateFirstStyle paginateFirstLabel firstLinkUrl>
-<#macro renderColumnContainerBegin id style>
+<#macro renderColumnContainerBegin id="" style="">
id="${id}"<#if style?has_content> <@getFoStyle style/>>
@@ -84,7 +84,7 @@ under the License.
-<#macro renderColumnBegin id style>
+<#macro renderColumnBegin id="" style="">
<fo:table-cell<#if id?has_content> id="${id}"<#if
style?has_content> <@getFoStyle style/>>
svn commit: r1814161 - /ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
Author: deepak
Date: Fri Nov 3 10:31:06 2017
New Revision: 1814161
URL: http://svn.apache.org/viewvc?rev=1814161=rev
Log:
Improved: Added toString() method in ServiceEcaAction class file
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java?rev=1814161=1814160=1814161=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
Fri Nov 3 10:31:06 2017
@@ -233,6 +233,23 @@ public class ServiceEcaAction implements
}
@Override
+public String toString() {
+StringBuilder buf = new StringBuilder();
+if (UtilValidate.isNotEmpty(eventName))
buf.append("[").append(eventName).append("]");
+if (UtilValidate.isNotEmpty(ignoreError))
buf.append("[").append(ignoreError).append("]");
+if (UtilValidate.isNotEmpty(ignoreFailure))
buf.append("[").append(ignoreFailure).append("]");
+if (UtilValidate.isNotEmpty(newTransaction))
buf.append("[").append(newTransaction).append("]");
+if (UtilValidate.isNotEmpty(persist))
buf.append("[").append(persist).append("]");
+if (UtilValidate.isNotEmpty(resultMapName))
buf.append("[").append(resultMapName).append("]");
+if (UtilValidate.isNotEmpty(resultToContext))
buf.append("[").append(resultToContext).append("]");
+if (UtilValidate.isNotEmpty(resultToResult))
buf.append("[").append(resultToResult).append("]");
+if (UtilValidate.isNotEmpty(runAsUser))
buf.append("[").append(runAsUser).append("]");
+if (UtilValidate.isNotEmpty(serviceMode))
buf.append("[").append(serviceMode).append("]");
+if (UtilValidate.isNotEmpty(serviceName))
buf.append("[").append(serviceName).append("]");
+return buf.toString();
+}
+
+@Override
public int hashCode() {
final int prime = 31;
int result = 1;
svn propchange: r1814160 - svn:log
Author: deepak Revision: 1814160 Modified property: svn:log Modified: svn:log at Fri Nov 3 10:30:06 2017 -- --- svn:log (original) +++ svn:log Fri Nov 3 10:30:06 2017 @@ -1,4 +1,4 @@ -Add ability to disable entity eca rule (OFBIZ-9897) +Improved: Add ability to disable entity eca rule (OFBIZ-9897) We have enabled flag in EntityEcaRule class, if its set false then entity eca rule will not be execute.
svn commit: r1814160 - in /ofbiz/ofbiz-framework/trunk/framework: entity/dtd/ entityext/src/main/java/org/apache/ofbiz/entityext/eca/
Author: deepak
Date: Fri Nov 3 10:28:05 2017
New Revision: 1814160
URL: http://svn.apache.org/viewvc?rev=1814160=rev
Log:
Add ability to disable entity eca rule (OFBIZ-9897)
We have enabled flag in EntityEcaRule class, if its set false then entity eca
rule will not be execute.
But there is not way to disable entity eca.
We can add enabled flag in Entity ECA definition to disable the existing entity
eca rule.
Add new attribute on entity eca tag named enabled
Default value will be true for this.
If user want to disable existing OOTB entity eca rule, then user can define
same rule in custom component and set the enabled=false
Also as per current flow if same seca rule is define more then once, system
will execute all the rule, ideally it should not execute same rule (same rule,
condition and action) if its defined more than one.
Also need to ovride hasCode, equals and toString method for EntityEcaRule,
EntityEcaAction and EntityEcaCondition class file.
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd
ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaCondition.java
ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java
ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaUtil.java
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd?rev=1814160=1814159=1814160=diff
==
--- ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/dtd/entity-eca.xsd Fri Nov 3
10:28:05 2017
@@ -77,6 +77,14 @@ under the License.
+
+
+
+
+
+
+
+
Modified:
ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java?rev=1814160=1814159=1814160=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaAction.java
Fri Nov 3 10:28:05 2017
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilMisc;
+import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.entity.GenericEntity;
import org.apache.ofbiz.entity.GenericEntityException;
import org.apache.ofbiz.entity.GenericValue;
@@ -115,4 +116,50 @@ public final class EntityEcaAction imple
}
}
}
+
+public String toString() {
+StringBuilder buf = new StringBuilder();
+if (UtilValidate.isNotEmpty(serviceName))
buf.append("[").append(serviceName).append("]");
+if (UtilValidate.isNotEmpty(serviceMode))
buf.append("[").append(serviceMode).append("]");
+if (UtilValidate.isNotEmpty(runAsUser))
buf.append("[").append(runAsUser).append("]");
+if (UtilValidate.isNotEmpty(valueAttr))
buf.append("[").append(valueAttr).append("]");
+if (UtilValidate.isNotEmpty(resultToValue))
buf.append("[").append(resultToValue).append("]");
+if (UtilValidate.isNotEmpty(abortOnError))
buf.append("[").append(abortOnError).append("]");
+if (UtilValidate.isNotEmpty(rollbackOnError))
buf.append("[").append(rollbackOnError).append("]");
+if (UtilValidate.isNotEmpty(persist))
buf.append("[").append(persist).append("]");
+return buf.toString();
+}
+
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + ((serviceName == null) ? 0 :
serviceName.hashCode());
+result = prime * result + ((serviceMode == null) ? 0 :
serviceMode.hashCode());
+result = prime * result + ((runAsUser == null) ? 0 :
runAsUser.hashCode());
+result = prime * result + ((valueAttr == null) ? 0 :
valueAttr.hashCode());
+result = prime * result + (resultToValue ? 1231 : 1237);
+result = prime * result + (abortOnError ? 1231
svn commit: r1813961 - /ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java
Author: deepak
Date: Wed Nov 1 10:37:51 2017
New Revision: 1813961
URL: http://svn.apache.org/viewvc?rev=1813961=rev
Log:
Fixed: Added check in checkoutValidation method, as it should validate only for
Sales order, as shipping method, and payment mehtod not set in purchase order
(OFBIZ-9755)
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1813961=1813960=1813961=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java
Wed Nov 1 10:37:51 2017
@@ -423,6 +423,7 @@ public class CheckOutEvents {
// Check for payment method and shipping method exist for checkout process
of anonymous user
public static String checkoutValidation(HttpServletRequest request,
HttpServletResponse response) {
ShoppingCart cart = (ShoppingCart)
request.getSession().getAttribute("shoppingCart");
+if (cart.isSalesOrder()) {
List paymentMethodTypes = cart.getPaymentMethodTypes();
if (UtilValidate.isEmpty(paymentMethodTypes)) {
String errMsg = UtilProperties.getMessage(resource_error,
"OrderNoPaymentMethodTypeSelected", (cart != null ? cart.getLocale() :
UtilHttp.getLocale(request)));
@@ -435,6 +436,7 @@ public class CheckOutEvents {
request.setAttribute("_ERROR_MESSAGE_",errMsg);
return "error";
}
+}
return "success";
}
// Create order event - uses createOrder service for processing
svn commit: r1813964 - /ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
Author: deepak
Date: Wed Nov 1 10:43:14 2017
New Revision: 1813964
URL: http://svn.apache.org/viewvc?rev=1813964=rev
Log:
Fixed: doDecrypt method may return ClassNotFoundException,
BadPaddingException,so instead of handling GeneralException used Exception
class to handle all exception
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java?rev=1813964=1813963=1813964=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
Wed Nov 1 10:43:14 2017
@@ -124,7 +124,7 @@ public final class EntityCrypto {
public Object decrypt(String keyName, EncryptMethod encryptMethod, String
encryptedString) throws EntityCryptoException {
try {
return doDecrypt(keyName, encryptMethod, encryptedString,
handlers[0]);
-} catch (GeneralException e) {
+} catch (Exception e) {
Debug.logInfo("Decrypt with DES key from standard key name hash
failed, trying old/funny variety of key name hash", module);
for (int i = 1; i < handlers.length; i++) {
try {
svn commit: r1814049 - /ofbiz/ofbiz-framework/trunk/build.gradle
Author: deepak
Date: Thu Nov 2 09:05:29 2017
New Revision: 1814049
URL: http://svn.apache.org/viewvc?rev=1814049=rev
Log:
Improved: Removed io.jsonwebtoken:jjwt dependecy from build.gradle, as these
dependency will be downloaded with io.jsonwebtoken:jjwt
Modified:
ofbiz/ofbiz-framework/trunk/build.gradle
Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1814049=1814048=1814049=diff
==
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Thu Nov 2 09:05:29 2017
@@ -142,9 +142,6 @@ dependencies {
compile 'oro:oro:2.0.8'
compile 'wsdl4j:wsdl4j:1.6.3'
compile 'io.jsonwebtoken:jjwt:0.9.0'
-compile 'com.fasterxml.jackson.core:jackson-core:2.7.3'
-compile 'com.fasterxml.jackson.core:jackson-annotations:2.7.3'
-compile 'com.fasterxml.jackson.core:jackson-databind:2.7.3'
// ofbiz unit-test compile libs
testCompile 'org.mockito:mockito-core:2.+'
svn commit: r1814708 - in /ofbiz/ofbiz-framework/trunk/framework/webapp: config/fop.properties src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java
Author: deepak
Date: Thu Nov 9 08:25:36 2017
New Revision: 1814708
URL: http://svn.apache.org/viewvc?rev=1814708=rev
Log:
Improved: Use FlexibleLocation.resolveLocation to resolve the fop.path and
fop.font.base.url (OFBIZ-9974)
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/config/fop.properties
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/config/fop.properties
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/config/fop.properties?rev=1814708=1814707=1814708=diff
==
--- ofbiz/ofbiz-framework/trunk/framework/webapp/config/fop.properties
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/config/fop.properties Thu Nov
9 08:25:36 2017
@@ -18,13 +18,13 @@
###
#Set fop.xconf path
-fop.path=/framework/webapp/config
+fop.path=component://webapp/config
#Set default font family
fop.font.family=NotoSans
#Set font base url
-fop.font.base.url=/framework/webapp/config/
+fop.font.base.url=component://webapp/config/
###
# FOP Encryption Parameters
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java?rev=1814708=1814707=1814708=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java
Thu Nov 9 08:25:36 2017
@@ -105,14 +105,16 @@ public final class ApacheFopWorker {
}
try {
-String ofbizHome = System.getProperty("ofbiz.home");
-File userConfigFile = FileUtil.getFile(ofbizHome + fopPath
+ "/fop.xconf");
+URL configFilePath =
FlexibleLocation.resolveLocation(fopPath + "/fop.xconf");
+File userConfigFile =
FileUtil.getFile(configFilePath.getFile());
if (userConfigFile.exists()) {
fopFactory = FopFactory.newInstance(userConfigFile);
} else {
Debug.logWarning("FOP configuration file not found: "
+ userConfigFile, module);
}
-File fontBaseFile = FileUtil.getFile(ofbizHome +
fopFontBaseProperty);
+URL fontBaseFileUrl =
FlexibleLocation.resolveLocation(fopFontBaseProperty);
+File fontBaseFile =
FileUtil.getFile(fontBaseFileUrl.getFile());
+
if (fontBaseFile.isDirectory()) {
fopFactory.getFontManager().setResourceResolver(ResourceResolverFactory.createDefaultInternalResourceResolver(fontBaseFile.toURI()));
} else {
svn commit: r1814703 - /ofbiz/ofbiz-framework/trunk/framework/webapp/config/url.properties
Author: deepak Date: Thu Nov 9 05:18:26 2017 New Revision: 1814703 URL: http://svn.apache.org/viewvc?rev=1814703=rev Log: Reverted: Unwanted changes from url.properties done at r#1345849, this commit was reverted in r#1446913, but url.properties changes missed during revert. Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/config/url.properties Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/config/url.properties URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/config/url.properties?rev=1814703=1814702=1814703=diff == --- ofbiz/ofbiz-framework/trunk/framework/webapp/config/url.properties (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/config/url.properties Thu Nov 9 05:18:26 2017 @@ -48,9 +48,3 @@ link.remove_lsessionid.user_agent_list = # Should HTTP parameters sent to services require encryption? # This is generally advised for more secure webapps as it makes it more difficult to spoof requests (XSRF) that change data. service.http.parameters.require.encrypted=Y - -# FOP configurable folder -fop.path=component://webapp/config -# Font path for FOP -fop.font.base.path=component://webapp/config/ -
svn commit: r1814704 - /ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
Author: deepak
Date: Thu Nov 9 05:45:47 2017
New Revision: 1814704
URL: http://svn.apache.org/viewvc?rev=1814704=rev
Log:
Reverted: At r#1814155 RuntimeException was added to handle runtime exception
as per pattern/best practise, but to maintain backward compatibility we need to
handle Exception instead of throwing it.
Reason: When the field is encrypted with the old algorithm (3-DES), the new
Shiro code will fail to decrypt it (using AES) and then it will
throw an org.apache.shiro.crypto.CryptoException that is a RuntimeException.
For backward compatibility we want instead to catch the exception and decrypt
the code using the old algorithm.
This has been discussed at https://s.apache.org/b520
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java?rev=1814704=1814703=1814704=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityCrypto.java
Thu Nov 9 05:45:47 2017
@@ -124,9 +124,12 @@ public final class EntityCrypto {
public Object decrypt(String keyName, EncryptMethod encryptMethod, String
encryptedString) throws EntityCryptoException {
try {
return doDecrypt(keyName, encryptMethod, encryptedString,
handlers[0]);
-} catch (RuntimeException e) {
-throw e;
} catch (Exception e) {
+/*
+When the field is encrypted with the old algorithm (3-DES), the
new Shiro code will fail to decrypt it (using AES) and then it will
+throw an org.apache.shiro.crypto.CryptoException that is a
RuntimeException.
+For backward compatibility we want instead to catch the exception
and decrypt the code using the old algorithm.
+ */
Debug.logInfo("Decrypt with DES key from standard key name hash
failed, trying old/funny variety of key name hash", module);
for (int i = 1; i < handlers.length; i++) {
try {
svn commit: r1816836 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/Login.ftl webapp/ecommerce/js/bootstrap.bundle.min.js widget/CommonScreens.xml
Author: deepak
Date: Fri Dec 1 11:29:01 2017
New Revision: 1816836
URL: http://svn.apache.org/viewvc?rev=1816836=rev
Log:
Improved: Update markup of Login page according to standard markup given by
Bootstrap v4.0.0 (OFBIZ-10016)
Thanks Parakh Maheshwari for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/js/bootstrap.bundle.min.js
(with props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl?rev=1816836=1816835=1816836=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl Fri Dec 1 11:29:01
2017
@@ -47,98 +47,99 @@ under the License.
s.parentNode.insertBefore(e, s);
})();
-${uiLabelMap.CommonLogin}
-
- ${uiLabelMap.CommonRegistered}
-
-
-
-
-
-
-
-${uiLabelMap.CommonUsername}
-
-
- <#if autoUserLogin?has_content>
-(${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? ${uiLabelMap.CommonClickHere})
-
-
-${uiLabelMap.CommonPassword}:
-
-
-
-
-
-
-${uiLabelMap.CommonMayCreateNewAccountHere}:
-${uiLabelMap.CommonMayCreate}
-
-
-
-
-
-
-
+
+
+
+
+
+ ${uiLabelMap.CommonRegistered}
+
+
+
+
+ ${uiLabelMap.CommonUsername}
+
+ <#if autoUserLogin?has_content>
+(${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? ${uiLabelMap.CommonClickHere})
+
+
+
+ ${uiLabelMap.CommonPassword}
+
+
+
+
+
+
+ ${uiLabelMap.CommonMayCreateNewAccountHere}:
+${uiLabelMap.CommonMayCreate}
+
+
+
+
+
<#else>
-${uiLabelMap.CommonLogin}
-
- ${uiLabelMap.CommonRegistered}
-
-
-
-
+
+
+
+ ${uiLabelMap.CommonRegistered}
+
+
+
+
${uiLabelMap.CommonUsername}
-
+
+ <#if autoUserLogin?has_content>
+(${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? ${uiLabelMap.CommonClickHere})
+
-<#if autoUserLogin?has_content>
- (${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? ${uiLabelMap.CommonClickHere})
-
-
- ${uiLabelMap.CommonPassword}:
-
-
-
-
-
-
- ${uiLabelMap.CommonMayCreateNewAccountHere}:
- ${uiLabelMap.CommonMayCreate}
+
+ ${uiLabelMap.CommonPassword}
+
-
-
+
+
+
+
+ ${uiLabelMap.CommonMayCreateNewAccountHere}:
+${uiLabelMap.CommonMayCreate}
+
+
+
+
-
-
- ${uiLabelMap.CommonForgotYourPassword}
-
-
-
- ${uiLabelMap.CommonUsername}
-
-
-
-
-
+
+
+${uiLabelMap.CommonForgotYourPassword}
+
+
+
+
+
+
+${uiLabelMap.CommonForgotYourPassword}
+
+
+
+
+ ${uiLabelMap.CommonUsername}
+
+
+
+
+
+
+
+
-
-<#--
-
- ${uiLabelMap.CommonNewUser}
-
-
- ${uiLabelMap.CommonMayCreateNewAccountHere}:
-
-
-
-
--->
+
+
svn commit: r1816840 - in /ofbiz/ofbiz-plugins/trunk/ecommerce: template/blog/ template/cart/ template/catalog/ template/content/ template/customer/ template/forum/ template/includes/ webapp/ecommerce
Author: deepak
Date: Fri Dec 1 11:36:44 2017
New Revision: 1816840
URL: http://svn.apache.org/viewvc?rev=1816840=rev
Log:
Improved: Update markup of Home page according to standard markup given by
Bootstrap v4.0.0 (OFBIZ-10011)
Applied OFBIZ-10011.patch as there are some improvement in other patch
Thanks Mayank, Saurabh and Parakh for your contribution
Added:
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css (with
props)
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ChooseCatalog.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniAssocProds.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastProductSearches.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniLastViewedCategories.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/PopularTags.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategories.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ContentCategories.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/Factoids.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/MiniPoll.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MiniSignUpForContactList.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/Forums.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/Language.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl?rev=1816840=1816839=1816840=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/Blogs.ftl Fri Dec 1
11:36:44 2017
@@ -17,15 +17,12 @@ specific language governing permissions
under the License.
-->
-
-
-
- ${uiLabelMap.ProductBrowseBlogs}
-
-
+
+
+${uiLabelMap.ProductBrowseBlogs}
-
-
+
+
<#list blogs as blog>
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl?rev=1816840=1816839=1816840=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MiniPromoText.ftl Fri Dec
1 11:36:44 2017
@@ -18,14 +18,11 @@ under the License.
-->
<#if showPromoText>
-
-
-
-${uiLabelMap.OrderSpecialOffers}
-
-
+
+
+ ${uiLabelMap.OrderSpecialOffers}
-
+
<#-- show promotions text -->
<#list productPromos as productPromo>
@@ -38,7 +35,7 @@ under the License.
-
+
${uiLabelMap.OrderViewAllPromotions}
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ChooseCatalog.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ChooseCatalog.ftl?rev=1816840=1816839=1816840=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ChooseCatalog.ftl
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ChooseCatalog.ftl Fri
Dec 1 11:36:44 2017
@@ -23,25 +23,26 @@ under the License.
<#-- Only show if there is more than 1 (one) catalog, no sense selecting when
there is only one option... -->
<#if (catalogCol?size > 1)>
-
-
-
-${uiLabelMap.ProductChooseCatalog}
-
-
-
-
-
-
- ${currentCatalogName}
-
- <#list catalogCol as catalogId>
-<#assign thisCatalogName =
-
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request,
catalogId)>
-${thisCatalogName}
-
-
-
-
+
+
+${uiLabelMap.ProductChooseCatalog}
+
+
+
+ ${currentCatalogName}
+
+ <#list catalogCol as catalogId>
+<#assign thisCatalogName =
+
Static["org.apache.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request,
catalogId)>
+${thisCatalogName}
+
+
+
+
+
+
+
+
+
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniAssocProds.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plu
svn commit: r1817693 - /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
Author: deepak
Date: Sun Dec 10 11:07:07 2017
New Revision: 1817693
URL: http://svn.apache.org/viewvc?rev=1817693=rev
Log:
Fixed: Used entityName instead of null while using FormFactory.readFormDocument
method, as this parameter is used to prepare formLocationCache, and its causing
issue to view different entity from webtools. Now form will be cached based on
enittyName#formName so it will working fine for all possible scenaraio
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy?rev=1817693=1817692=1817693=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
Sun Dec 10 11:07:07 2017
@@ -65,7 +65,7 @@ if (modelEntity) {
}
dynamicAutoEntityFieldSearchForm = dynamicAutoEntityFieldSearchForm +
''
Document dynamicAutoEntityFieldSearchFormXml =
UtilXml.readXmlDocument(dynamicAutoEntityFieldSearchForm, true, true)
-Map<String, ModelForm> modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldSearchFormXml,
entityModelReader, dispatcher.getDispatchContext(), null)
+Map<String, ModelForm> modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldSearchFormXml,
entityModelReader, dispatcher.getDispatchContext(), entityName)
if (UtilValidate.isNotEmpty(modelFormMap)) {
Map.Entry<String, ModelForm> entry =
modelFormMap.entrySet().iterator().next()
modelForm = entry.getValue()
@@ -96,7 +96,7 @@ if (modelEntity) {
''
//Debug.logInfo(dynamicAutoEntityFieldForm, "")
Document dynamicAutoEntityFieldListFormXml =
UtilXml.readXmlDocument(dynamicAutoEntityFieldListForm, true, true)
-modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldListFormXml,
entityModelReader, dispatcher.getDispatchContext(), null)
+modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldListFormXml,
entityModelReader, dispatcher.getDispatchContext(), entityName)
if (UtilValidate.isNotEmpty(modelFormMap)) {
Map.Entry<String, ModelForm> entry =
modelFormMap.entrySet().iterator().next()
modelForm = entry.getValue()
svn commit: r1813273 - in /ofbiz/ofbiz-plugins/trunk: ecommerce/template/shoppinglist/EditShoppingList.ftl solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java
Author: deepak
Date: Wed Oct 25 12:49:55 2017
New Revision: 1813273
URL: http://svn.apache.org/viewvc?rev=1813273=rev
Log:
Fixed: Removed getRelatedOneCache cache call, as this method is removed from
trunk.
Thanks Suraj Khurana for reporting the issue
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl
ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl?rev=1813273=1813272=1813273=diff
==
---
ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl
(original)
+++
ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl
Wed Oct 25 12:49:55 2017
@@ -505,7 +505,7 @@ under the License.
<#list productVariantAssocs as
productVariantAssoc>
-<#assign variantProduct =
productVariantAssoc.getRelatedOneCache("AssocProduct") />
+<#assign variantProduct =
productVariantAssoc.getRelatedOne("AssocProduct", true) />
<#if variantProduct??>
<#assign variantProductContentWrapper =
Static["org.apache.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(variantProduct,
request) />
${variantproductContentWrapper.get("PRODUCT_NAME",
"html")?default("No Name")} [${variantProduct.productId}]
Modified:
ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java?rev=1813273=1813272=1813273=diff
==
---
ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java
Wed Oct 25 12:49:55 2017
@@ -69,8 +69,6 @@ public final class ProductUtil {
// if (product.get("sku") != null) dispatchContext.put("sku",
product.get("sku"));
if (product.get("internalName") != null)
dispatchContext.put("internalName",
product.get("internalName"));
-// GenericValue manu =
product.getRelatedOneCache("Manufacturer");
-// if (product.get("manu") != null)
dispatchContext.put("manu", "");
String smallImage = (String) product.get("smallImageUrl");
if (smallImage != null)
dispatchContext.put("smallImage", smallImage);
svn commit: r1813219 - /ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd
Author: deepak Date: Tue Oct 24 18:33:04 2017 New Revision: 1813219 URL: http://svn.apache.org/viewvc?rev=1813219=rev Log: Fixed: Moved enabled attribute definition to its correct place, it was added in wrong attribute group Modified: ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd Modified: ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd?rev=1813219=1813218=1813219=diff == --- ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/dtd/service-eca.xsd Tue Oct 24 18:33:04 2017 @@ -74,6 +74,14 @@ under the License. + + + + + + + + @@ -258,14 +266,6 @@ under the License. - - - - - - - -
svn commit: r1813218 - /ofbiz/site/dtds/service-eca.xsd
Author: deepak Date: Tue Oct 24 18:31:41 2017 New Revision: 1813218 URL: http://svn.apache.org/viewvc?rev=1813218=rev Log: Moved enabled atrribute definition to its correct place, it was added in wrong attribute group. Modified: ofbiz/site/dtds/service-eca.xsd Modified: ofbiz/site/dtds/service-eca.xsd URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/service-eca.xsd?rev=1813218=1813217=1813218=diff == --- ofbiz/site/dtds/service-eca.xsd (original) +++ ofbiz/site/dtds/service-eca.xsd Tue Oct 24 18:31:41 2017 @@ -74,6 +74,14 @@ under the License. + + + + + + + + @@ -258,14 +266,6 @@ under the License. - - - - - - - -
svn commit: r1818912 - /ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml
Author: deepak Date: Thu Dec 21 11:06:14 2017 New Revision: 1818912 URL: http://svn.apache.org/viewvc?rev=1818912=rev Log: Fixed: Corrected file name in content ofbiz-component.xml file Modified: ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml Modified: ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml?rev=1818912=1818911=1818912=diff == --- ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/ofbiz-component.xml Thu Dec 21 11:06:14 2017 @@ -28,7 +28,7 @@ under the License. - +
svn commit: r1830938 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/content/servicedef/services.xml framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Author: deepak
Date: Fri May 4 19:35:37 2018
New Revision: 1830938
URL: http://svn.apache.org/viewvc?rev=1830938=rev
Log:
Applied fix from trunk for revision: 1830936
===
Fixed: Fix typo 'paramters' => 'parameters'
(OFBIZ-10394)
Thanks Mathieu Lirzin for your contribution
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 4 19:35:37 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml?rev=1830938=1830937=1830938=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml
Fri May 4 19:35:37 2018
@@ -25,7 +25,7 @@
-Contains necessary paramters for all file upload requests
via service event handler
+Contains necessary parameters for all file upload
requests via service event handler
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1830938=1830937=1830938=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Fri May 4 19:35:37 2018
@@ -1245,7 +1245,7 @@ public final class UtilHttp {
/**
* Utility to make a composite parameter from the given prefix and suffix.
- * The prefix should be a regular paramter name such as meetingDate. The
+ * The prefix should be a regular parameter name such as meetingDate. The
* suffix is the composite field, such as the hour of the meeting. The
* result would be meetingDate_${COMPOSITE_DELIMITER}_hour.
*
svn commit: r1830936 - in /ofbiz/ofbiz-framework/trunk: applications/content/servicedef/services.xml framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Author: deepak
Date: Fri May 4 19:34:07 2018
New Revision: 1830936
URL: http://svn.apache.org/viewvc?rev=1830936=rev
Log:
Fixed: Fix typo 'paramters' => 'parameters'
(OFBIZ-10394)
Thanks Mathieu Lirzin for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/servicedef/services.xml
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/servicedef/services.xml?rev=1830936=1830935=1830936=diff
==
--- ofbiz/ofbiz-framework/trunk/applications/content/servicedef/services.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/servicedef/services.xml
Fri May 4 19:34:07 2018
@@ -25,7 +25,7 @@
-Contains necessary paramters for all file upload requests
via service event handler
+Contains necessary parameters for all file upload
requests via service event handler
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1830936=1830935=1830936=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Fri May 4 19:34:07 2018
@@ -1229,7 +1229,7 @@ public final class UtilHttp {
/**
* Utility to make a composite parameter from the given prefix and suffix.
- * The prefix should be a regular paramter name such as meetingDate. The
+ * The prefix should be a regular parameter name such as meetingDate. The
* suffix is the composite field, such as the hour of the meeting. The
* result would be meetingDate_${COMPOSITE_DELIMITER}_hour.
*
