You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2026/04/30 08:21:58 UTC
(ofbiz-plugins) branch trunk updated (a3e2ffd68 -> 589dd4d91)
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
from a3e2ffd68 Bump io.swagger.core.v3:swagger-jaxrs2 in /rest-api
new c1fda5ae3 Improved: Remove old elrte editor, replace with plain <textarea>
new 1a6138346 Improved: Migrate from jstree 1.x to 3.x API
new 0d8eb60d5 Implemented: Update js-cookie and jgrowl paths to use the new location, managed by npm
new 589dd4d91 Fixed: Update ecommerce's ProductCategory jstree to load theme styles properly
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ebaystore/template/store/ProductSearchExport.ftl | 26 --------------
ecommerce/template/catalog/ProductCategories.ftl | 45 ++++++++++--------------
ecommerce/widget/Theme.xml | 6 ++--
3 files changed, 22 insertions(+), 55 deletions(-)
(ofbiz-plugins) 04/04: Fixed: Update ecommerce's ProductCategory jstree to load theme styles properly
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit 589dd4d9182993ab8400a067059d2aecd2315049
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Thu Apr 30 09:17:40 2026 +0200
Fixed: Update ecommerce's ProductCategory jstree to load theme styles properly
---
ecommerce/template/catalog/ProductCategories.ftl | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ecommerce/template/catalog/ProductCategories.ftl b/ecommerce/template/catalog/ProductCategories.ftl
index 852fd284d..5bc01d380 100644
--- a/ecommerce/template/catalog/ProductCategories.ftl
+++ b/ecommerce/template/catalog/ProductCategories.ftl
@@ -67,13 +67,15 @@
<#-------------------------------------------------------------------------------------create Tree-->
function createTree() {
- importLibrary(["/common/js/node_modules/jstree/dist/jstree.min.js",
- "/common/js/node_modules/jstree/dist/themes/default/style.min.css"], function(){
+ importLibrary(["/common/js/node_modules/jstree/dist/jstree.min.js"], function(){
jQuery(function () {
jQuery("#tree").jstree({
"core": {
+ "themes": {
+ "url": "/common/js/node_modules/jstree/dist/themes/default/style.min.css",
+ "icons": false
+ },
"data": rawdata,
- "themes": {"icons": false}
},
"state": {"key": "ec_categories_tree"},
"plugins": ["themes", "state"]
(ofbiz-plugins) 01/04: Improved: Remove old elrte editor, replace with plain
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit c1fda5ae396a421551bfbffeffb8934972ad9f2e
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Sat Apr 11 09:20:33 2026 +0200
Improved: Remove old elrte editor, replace with plain <textarea>
---
ebaystore/template/store/ProductSearchExport.ftl | 26 ------------------------
1 file changed, 26 deletions(-)
diff --git a/ebaystore/template/store/ProductSearchExport.ftl b/ebaystore/template/store/ProductSearchExport.ftl
index df6dca828..70027f62a 100644
--- a/ebaystore/template/store/ProductSearchExport.ftl
+++ b/ebaystore/template/store/ProductSearchExport.ftl
@@ -582,35 +582,9 @@ under the License.
<table cellspacing="0">
<tr>
<td>
- <script
- src="<@o...@ofbizContentUrl>"
- type="text/javascript">
- </script>
- <#if language?has_content && language != "en">
- <script
- src="<@o...@ofbizContentUrl>"
- type="text/javascript">
- </script>
- <#rt/>
- </#if>
- <link href="<@o...@ofbizContentUrl>"
- rel="stylesheet" type="text/css">
- <script type="text/javascript">
- var opts = {
- cssClass: 'el-rte',
- lang: '${language}',
- toolbar: 'maxi',
- doctype: '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">',
- //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
- cssfiles: ['/common/js/jquery/plugins/elrte-1.3/css/elrte-inner.css']
- }
- </script>
<textarea id="description" name="description" style="width:800px; height:300px">
<#if item.getDescription()??>description<#else>${item.getDescription()!}</#if>
</textarea>
- <script type="text/javascript">
- jQuery('#description').elrte(opts);
- </script>
</td>
</tr>
</table>
(ofbiz-plugins) 02/04: Improved: Migrate from jstree 1.x to 3.x API
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit 1a613834631beb79b7c7940387ae09a9a42e10d9
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Sat Apr 11 09:21:42 2026 +0200
Improved: Migrate from jstree 1.x to 3.x API
---
ecommerce/template/catalog/ProductCategories.ftl | 45 ++++++++++--------------
1 file changed, 18 insertions(+), 27 deletions(-)
diff --git a/ecommerce/template/catalog/ProductCategories.ftl b/ecommerce/template/catalog/ProductCategories.ftl
index 6ec8d4b9e..852fd284d 100644
--- a/ecommerce/template/catalog/ProductCategories.ftl
+++ b/ecommerce/template/catalog/ProductCategories.ftl
@@ -36,16 +36,14 @@
<#if (rootCat?has_content)>
<#list rootCat?sort_by("productCategoryId") as root>
{
- "data": {
- "title": unescapeHtmlText(
- "<#if root.categoryName??>${root.categoryName?js_string}<#elseif root.categoryDescription??>${root.categoryDescription?js_string}<#else>${root.productCategoryId?js_string}</#if>"),
- "attr": {
- "href": "javascript: void(0);",
- "onClick": "callDocument('${root.productCategoryId}', '${root.parentCategoryId}')",
- "class": "${root.cssClass!}"
- }
- },
- "attr": {"id": "${root.productCategoryId}"}
+ "id": "${root.productCategoryId}",
+ "text": unescapeHtmlText(
+ "<#if root.categoryName??>${root.categoryName?js_string}<#elseif root.categoryDescription??>${root.categoryDescription?js_string}<#else>${root.productCategoryId?js_string}</#if>"),
+ "a_attr": {
+ "href": "javascript: void(0);",
+ "onClick": "callDocument('${root.productCategoryId}', '${root.parentCategoryId}')",
+ "class": "${root.cssClass!}"
+ }
<#if root.child?has_content>
, "children": [
<@fillTree rootCat=root.child/>]
@@ -69,23 +67,16 @@
<#-------------------------------------------------------------------------------------create Tree-->
function createTree() {
- importLibrary(["/common/js/jquery/ui/js/jquery.cookie-1.4.0.js"], function(){
- importLibrary(["/common/js/jquery/plugins/jsTree/jquery.jstree.js"], function(){
- jQuery(function () {
- jQuery("#tree").jstree({
- "themes": {
- "theme": "classic",
- "url": "/common/js/jquery/plugins/jsTree/themes/classic/style.css",
- "icons": false
- },
- "cookies": {
- "cookie_options": {path: '/'}
- },
- "plugins": ["themes", "json_data", "cookies"],
- "json_data": {
- "data": rawdata
- }
- });
+ importLibrary(["/common/js/node_modules/jstree/dist/jstree.min.js",
+ "/common/js/node_modules/jstree/dist/themes/default/style.min.css"], function(){
+ jQuery(function () {
+ jQuery("#tree").jstree({
+ "core": {
+ "data": rawdata,
+ "themes": {"icons": false}
+ },
+ "state": {"key": "ec_categories_tree"},
+ "plugins": ["themes", "state"]
});
});
});
(ofbiz-plugins) 03/04: Implemented: Update js-cookie and jgrowl paths to use the new location, managed by npm
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit 0d8eb60d5aa2b4dbe8637f5ed678325c938c4f35
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Sat Apr 11 09:45:47 2026 +0200
Implemented: Update js-cookie and jgrowl paths to use the new location, managed by npm
---
ecommerce/widget/Theme.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ecommerce/widget/Theme.xml b/ecommerce/widget/Theme.xml
index d14fc76e7..998abc0a8 100644
--- a/ecommerce/widget/Theme.xml
+++ b/ecommerce/widget/Theme.xml
@@ -33,14 +33,14 @@ under the License.
<theme-properties>
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/node_modules/jquery-validation/dist/additional-methods.min.js"/>
- <property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/plugins/Readmore.js-master/readmore.js"/>
- <property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/plugins/jquery-jgrowl/jquery.jgrowl-1.4.6.min.js"/>
+ <property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/node_modules/readmore-js/readmore.js"/>
+ <property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/node_modules/jgrowl/jquery.jgrowl.min.js"/>
<property name="VT_HDR_JAVASCRIPT['add']" value="/ecommerce/js/bootstrap/js/bootstrap.bundle-4.3.1.min.js"/>
<property name="VT_HDR_JAVASCRIPT['add']" value="/ecommerce/js/bsgdprcookies/jquery.bs.gdpr.cookies.min.js"/>
<!--Css style-->
<property name="VT_STYLESHEET['add']" value="/ecommerce/js/bootstrap/css/bootstrap-4.3.1.min.css"/>
- <property name="VT_STYLESHEET['add']" value="/common/js/jquery/plugins/jquery-jgrowl/jquery.jgrowl-1.4.6.min.css"/>
+ <property name="VT_STYLESHEET['add']" value="/common/js/node_modules/jgrowl/jquery.jgrowl.min.css"/>
<property name="VT_STYLESHEET['add']" value="/contentimages/css/contentForum.css"/>
<property name="VT_STYLESHEET['add']" value="/ecommerce/images/blog.css"/>
<property name="VT_STYLESHEET['add']" value="/ecommerce/css/custom.css"/>