From 470af747bf93984606800dbb3e1374f40112e36f Mon Sep 17 00:00:00 2001
From: Xiaowu Zhang <xiaowu.zhang@tiolive.com>
Date: Tue, 29 Sep 2015 08:57:29 +0000
Subject: [PATCH] erp5_web_renderjs_ui: add delete icon
---
.../rjs_gadget_erp5_filtereditor_js.xml | 18 ++++++++++--------
.../rjs_gadget_erp5_sorteditor_html.xml | 6 ++----
.../rjs_gadget_erp5_sorteditor_js.xml | 11 +++++------
3 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
index 2e8c966eda..4111c0d762 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
@@ -331,7 +331,8 @@
function createFilterItem(gadget, simple_query) {\n
var div = document.createElement("div"),\n
container = document.createElement("form"),\n
- minus_button = document.createElement("input"),\n
+ minus_button = document.createElement("span"),\n
+ div_text = document.createElement("div"),\n
select_reference = document.createElement("select"),\n
i,\n
tmp = "",\n
@@ -354,11 +355,12 @@
simple_query = {};\n
}\n
\n
- minus_button.setAttribute("type", "button");\n
-\n
+ minus_button.setAttribute("class", "ui-icon ui-icon-delete ui-icon-shadow");\n
+ div_text.setAttribute("class", "ui-input-text ui-body-inherit ui-corner-all ui-shadow-inset");\n
container.appendChild(select_reference);\n
container.appendChild(select_operator);\n
- container.appendChild(text);\n
+ div_text.appendChild(text);\n
+ container.appendChild(div_text);\n
container.appendChild(minus_button);\n
container.setAttribute("class", "filterForm");\n
div.appendChild(container);\n
@@ -433,7 +435,7 @@
"click",\n
false,\n
function () {\n
- container.parentElement.removeChild(container);\n
+ div.parentElement.removeChild(div);\n
}\n
);\n
loopEventListener(\n
@@ -541,7 +543,7 @@
and.parentElement.children[0].setAttribute("class", "ui-btn ui-corner-all ui-btn-inherit ui-btn-icon-left ui-radio-on");\n
}\n
if (or.checked) {\n
- query_list = query_list.query_list[0].query_list;\n
+ query_list = query_list.query_list[0].query_list || [];\n
} else {\n
query_list = query_list.query_list || [query_list];\n
}\n
@@ -751,7 +753,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>946.3061.5336.46745</string> </value>
+ <value> <string>946.4083.26515.61815</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -769,7 +771,7 @@
</tuple>
<state>
<tuple>
- <float>1443453599.6</float>
+ <float>1443514871.92</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_html.xml
index 4ab297c53b..1f03a8bf1c 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_html.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_html.xml
@@ -152,8 +152,6 @@
</div>\n
<section class="ui-body-c ui-content-section">\n
<div class="sort_item_container">\n
- <div></div>\n
- <div></div>\n
</div>\n
<form class="plus">\n
<button type="submit" class="plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-notext"></button>\n
@@ -301,7 +299,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>945.58401.24333.56064</string> </value>
+ <value> <string>945.60934.57457.64460</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -319,7 +317,7 @@
</tuple>
<state>
<tuple>
- <float>1442993692.55</float>
+ <float>1443515526.27</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml
index cf5687a17e..8016c97d0a 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml
@@ -123,7 +123,7 @@
function createSortItem(gadget, sort_value) {\n
var div = document.createElement("div"),\n
container = document.createElement("form"),\n
- minus_button = document.createElement("input"),\n
+ minus_button = document.createElement("span"),\n
column_list = gadget.props.column_list,\n
select_reference = document.createElement("select"),\n
select_operator = document.createElement("select"),\n
@@ -133,7 +133,7 @@
if (sort_value) {\n
sort_value_list = sort_value.split(",");\n
}\n
- minus_button.setAttribute("type", "button");\n
+ minus_button.setAttribute("class", "ui-icon ui-icon-delete ui-icon-shadow");\n
container.appendChild(select_reference);\n
container.appendChild(select_operator);\n
container.appendChild(minus_button);\n
@@ -187,7 +187,7 @@
"click",\n
false,\n
function () {\n
- container.parentElement.removeChild(container);\n
+ div.parentElement.removeChild(div);\n
}\n
);\n
return div;\n
@@ -251,7 +251,6 @@
for (i = 0; i < sort_form_list.length; i += 1) {\n
sort_form_list[i].parentElement.removeChild(sort_form_list[i]);\n
}\n
- options.view = options.view || "view";\n
gadget.props.options = options;\n
\n
gadget.props.column_list = "";\n
@@ -460,7 +459,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>945.61371.18870.8157</string> </value>
+ <value> <string>945.62441.17317.23193</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -478,7 +477,7 @@
</tuple>
<state>
<tuple>
- <float>1443084075.84</float>
+ <float>1443515446.86</float>
<string>UTC</string>
</tuple>
</state>
--
2.30.9