Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
138
Merge Requests
138
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
470af747
Commit
470af747
authored
Sep 29, 2015
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: add delete icon
parent
68d21036
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
18 deletions
+17
-18
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
...eItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
+10
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_html.xml
...eItem/web_page_module/rjs_gadget_erp5_sorteditor_html.xml
+2
-4
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml
...ateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml
+5
-6
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
View file @
470af747
...
@@ -331,7 +331,8 @@
...
@@ -331,7 +331,8 @@
function
createFilterItem(gadget,
simple_query)
{\n
function
createFilterItem(gadget,
simple_query)
{\n
var
div =
document.createElement("div"),\n
var
div =
document.createElement("div"),\n
container =
document.createElement("form"),\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
select_reference =
document.createElement("select"),\n
i,\n
i,\n
tmp =
""
,\n
tmp =
""
,\n
...
@@ -354,11 +355,12 @@
...
@@ -354,11 +355,12 @@
simple_query = {};\n
simple_query = {};\n
}\n
}\n
\n
\n
minus_button.setAttribute("
type", "button
");\n
minus_button.setAttribute("
class", "ui-icon ui-icon-delete ui-icon-shadow
");\n
\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_reference);\n
container.appendChild(select_operator);\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.appendChild(minus_button);\n
container.setAttribute("class", "filterForm");\n
container.setAttribute("class", "filterForm");\n
div.appendChild(container);\n
div.appendChild(container);\n
...
@@ -433,7 +435,7 @@
...
@@ -433,7 +435,7 @@
"click",\n
"click",\n
false,\n
false,\n
function
()
{\n
function
()
{\n
container.parentElement.removeChild(container
);\n
div.parentElement.removeChild(div
);\n
}\n
}\n
);\n
);\n
loopEventListener(\n
loopEventListener(\n
...
@@ -541,7 +543,7 @@
...
@@ -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
and.parentElement.children[0].setAttribute("class",
"ui-btn
ui-corner-all
ui-btn-inherit
ui-btn-icon-left
ui-radio-on");\n
}\n
}\n
if
(or.checked)
{\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
}
else
{\n
query_list =
query_list.query_list
||
[query_list];\n
query_list =
query_list.query_list
||
[query_list];\n
}\n
}\n
...
@@ -751,7 +753,7 @@
...
@@ -751,7 +753,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.
3061.5336.4674
5
</string>
</value>
<value>
<string>
946.
4083.26515.6181
5
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -769,7 +771,7 @@
...
@@ -769,7 +771,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1443
453599.6
</float>
<float>
1443
514871.92
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_html.xml
View file @
470af747
...
@@ -152,8 +152,6 @@
...
@@ -152,8 +152,6 @@
</div>
\n
</div>
\n
<section
class=
"ui-body-c ui-content-section"
>
\n
<section
class=
"ui-body-c ui-content-section"
>
\n
<div
class=
"sort_item_container"
>
\n
<div
class=
"sort_item_container"
>
\n
<div></div>
\n
<div></div>
\n
</div>
\n
</div>
\n
<form
class=
"plus"
>
\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
<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 @@
...
@@ -301,7 +299,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
945.
58401.24333.56064
</string>
</value>
<value>
<string>
945.
60934.57457.64460
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -319,7 +317,7 @@
...
@@ -319,7 +317,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
144
2993692.55
</float>
<float>
144
3515526.27
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml
View file @
470af747
...
@@ -123,7 +123,7 @@
...
@@ -123,7 +123,7 @@
function createSortItem(gadget, sort_value) {\n
function createSortItem(gadget, sort_value) {\n
var div = document.createElement("div"),\n
var div = document.createElement("div"),\n
container = document.createElement("form"),\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
column_list = gadget.props.column_list,\n
select_reference = document.createElement("select"),\n
select_reference = document.createElement("select"),\n
select_operator = document.createElement("select"),\n
select_operator = document.createElement("select"),\n
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
if (sort_value) {\n
if (sort_value) {\n
sort_value_list = sort_value.split(",");\n
sort_value_list = sort_value.split(",");\n
}\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_reference);\n
container.appendChild(select_operator);\n
container.appendChild(select_operator);\n
container.appendChild(minus_button);\n
container.appendChild(minus_button);\n
...
@@ -187,7 +187,7 @@
...
@@ -187,7 +187,7 @@
"click",\n
"click",\n
false,\n
false,\n
function () {\n
function () {\n
container.parentElement.removeChild(container
);\n
div.parentElement.removeChild(div
);\n
}\n
}\n
);\n
);\n
return div;\n
return div;\n
...
@@ -251,7 +251,6 @@
...
@@ -251,7 +251,6 @@
for (i = 0; i < sort_form_list.length; i += 1) {\n
for (i = 0; i < sort_form_list.length; i += 1) {\n
sort_form_list[i].parentElement.removeChild(sort_form_list[i]);\n
sort_form_list[i].parentElement.removeChild(sort_form_list[i]);\n
}\n
}\n
options.view = options.view || "view";\n
gadget.props.options = options;\n
gadget.props.options = options;\n
\n
\n
gadget.props.column_list = "";\n
gadget.props.column_list = "";\n
...
@@ -460,7 +459,7 @@
...
@@ -460,7 +459,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
945.6
1371.18870.8157
</string>
</value>
<value>
<string>
945.6
2441.17317.23193
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -478,7 +477,7 @@
...
@@ -478,7 +477,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1443
084075.84
</float>
<float>
1443
515446.86
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment