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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Łukasz Nowak
erp5
Commits
c3d27c57
Commit
c3d27c57
authored
Nov 22, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Simplify panel code
parent
7774b4de
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
96 deletions
+34
-96
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.html
...plateItem/web_page_module/rjs_gadget_erp5_panel_html.html
+0
-30
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
...mplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js
...hTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js
+30
-62
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
...TemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.html
View file @
c3d27c57
...
...
@@ -21,11 +21,6 @@
<
div
class
=
"
panel_img
"
>
<
img
class
=
"
ui-title
"
alt
=
"
ERP5
"
src
=
"
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJcAAAA/CAMAAADaDqrIAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowMEM5NUE4MzQ5NjQxMUUzOUZEQUU2NUY1RTI1RjdCQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDowMEM5NUE4NDQ5NjQxMUUzOUZEQUU2NUY1RTI1RjdCQiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjAwQzk1QTgxNDk2NDExRTM5RkRBRTY1RjVFMjVGN0JCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjAwQzk1QTgyNDk2NDExRTM5RkRBRTY1RjVFMjVGN0JCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+J9MJsAAAAwBQTFRF///////M//+Z//9m//8z//8A/8z//8zM/8yZ/8xm/8wz/8wA/5n//5nM/5mZ/5lm/5kz/5kA/2b//2bM/2aZ/2Zm/2Yz/2YA/zP//zPM/zOZ/zNm/zMz/zMA/wD//wDM/wCZ/wBm/wAz/wAAzP//zP/MzP+ZzP9mzP8zzP8AzMz/zMzMzMyZzMxmzMwzzMwAzJn/zJnMzJmZzJlmzJkzzJkAzGb/zGbMzGaZzGZmzGYzzGYAzDP/zDPMzDOZzDNmzDMzzDMAzAD/zADMzACZzABmzAAzzAAAmf//mf/Mmf+Zmf9mmf8zmf8Amcz/mczMmcyZmcxmmcwzmcwAmZn/mZnMmZmZmZlmmZkzmZkAmWb/mWbMmWaZmWZmmWYzmWYAmTP/mTPMmTOZmTNmmTMzmTMAmQD/mQDMmQCZmQBmmQAzmQAAZv//Zv/MZv+ZZv9mZv8zZv8AZsz/ZszMZsyZZsxmZswzZswAZpn/ZpnMZpmZZplmZpkzZpkAZmb/ZmbMZmaZZmZmZmYzZmYAZjP/ZjPMZjOZZjNmZjMzZjMAZgD/ZgDMZgCZZgBmZgAzZgAAM///M//MM/+ZM/9mM/8zM/8AM8z/M8zMM8yZM8xmM8wzM8wAM5n/M5nMM5mZM5lmM5kzM5kAM2b/M2bMM2aZM2ZmM2YzM2YAMzP/MzPMMzOZMzNmMzMzMzMAMwD/MwDMMwCZMwBmMwAzMwAAAP//AP/MAP+ZAP9mAP8zAP8AAMz/AMzMAMyZAMxmAMwzAMwAAJn/AJnMAJmZAJlmAJkzAJkAAGb/AGbMAGaZAGZmAGYzAGYAADP/ADPMADOZADNmADMzADMAAAD/AADMAACZAABmAAAzAAAAHHa7K3/AOojESZHJWZvNaKTSd63Whrbblb/fpMjks9Howtrt4e320uTx8Pb6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdfKHSQAAAOh0Uk5T////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////ALItoLoAAAJkSURBVHja7NlZsqsgEABQ979C5kGGddxo4os0Q8BAynoFn0nUU23TNGRB9xzLdE3XdE3XdP2fLnIzF2VSrsYvC72HizAh9eZ5DVuOl15S4/jWwC+kDC8HPzCSJVHcRY8QXV2PwQuujUYTsYrvYlBv1yKLrsXHsPghnvR3Lazoip/JKuwpF8sm6/bY01Ow9CBlTXi53PNoRcUktEZT1NV1PIPnXAjtMJIMlzerFIzU1dVWF7aPj3Tetae4gjdxktG2et/qQjJ4kZFrv6ED4bK4eR1qduHzvEi4+PbGwD0EGu9CQQLFrv1F4jBc6BcuW3YhkPiPX1hOfxQvnHfh0HVMRqc4HuqiQf5k3mO6dq1s8Hx0H/Le5kq9YaNcxAcrZLpOvAv+ClcgNcZFtnrucd5Fwx4mXj0drnbBYXMuJmFDAV3Uhm4qlbHh3ddOrmholHNxFTVC+xTl2mf6pI4uVe4LwSp0DPGOmh/hAnM94bKZjkHlWuiLeV+cTab4luMKk82wy/Px2fLJskvKUk03hRf9RZ0wiYiZ4uVwVwTb9E71y0XboTYXGuTaa33Y47W5zBjXM3P11y7TfR2ycFdxyaW7uwSc5m0un9ix91m3TWJfW+1ijfW+wcVAfjS5dOP62LyvZZdcLHnA1MkFAtbgwq+Vm47po8OA1buwyy/a1ec5urzveAes2sV8kfW963mFaHNhlT0b6+Yi5+StchH1CtaK0ThXELDPLiyOPZHldzm/J1z9O/B14g7/K+DtkP7U8ivSeD4xaPCTSQvy+YIfubZWzRgtRe1iMP+3mq7pmq7p6jv+BBgAPrgi/TzwWzkAAAAASUVORK5CYII=
"
/>
<
/div
>
<!--
div
class
=
"
ui-controlgroup ui-controlgroup-horizontal ui-btn-right
"
>
<
div
class
=
"
ui-controlgroup-controls
"
>
<
a
href
=
"
#
"
class
=
"
ui-btn ui-btn-icon-notext ui-icon-home
"
data
-
i18n
=
"
Home
"
>
Home
<
/a
>
<
/div
>
<
/div--
>
<
/div
>
</script>
...
...
@@ -38,31 +33,6 @@
<
li
><
a
href
=
"
{{history_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-history
"
data
-
i18n
=
"
History
"
accesskey
=
"
h
"
>
History
<
/a></
li
>
<
li
><
a
href
=
"
{{search_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-search
"
data
-
i18n
=
"
Search
"
accesskey
=
"
s
"
>
Search
<
/a></
li
>
<
li
><
a
href
=
"
{{preference_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-gear
"
data
-
i18n
=
"
Preference
"
>
Preferences
<
/a></
li
>
<!--
div
>
{{
#
if
language_list
}}
<
li
data
-
role
=
"
collapsible
"
data
-
enhanced
=
"
true
"
data
-
collapsed
=
"
true
"
data
-
collapsed
-
icon
=
"
comment-o
"
class
=
"
ui-collapsible ui-collapsible-collapsed
"
>
<
h4
class
=
"
ui-collapsible-heading ui-collapsible-heading-collapsed ui-li-divider ui-li-has-icon
"
>
<
a
class
=
"
ui-collapsible-heading-toggle ui-icon-comment-o ui-btn-icon-left ui-btn-inherit
"
href
=
"
#
"
data
-
i18n
=
"
[last]Languages
"
>
<
span
data
-
i18n
=
"
Click to expand content
"
class
=
"
ui-collapsible-heading-status
"
><
/span>Language
s
<
/a
>
<
/h4
>
<
div
class
=
"
ui-collapsible-content ui-collapsible-content-collapsed
"
aria
-
hidden
=
"
true
"
>
<
fieldset
data
-
role
=
"
controlgroup
"
>
{{
#
each
language_list
}}
<
form
method
=
"
POST
"
action
=
""
>
<
div
class
=
"
ui-btn ui-input-btn ui-corner-all ui-shadow ui-btn-icon-right ui-icon-carat-r
"
data
-
i18n
=
"
[node]{{lang}}
"
>
{{
lang
}}
&
nbsp
;
<
input
type
=
"
submit
"
data
-
enhanced
=
"
true
"
name
=
"
lang
"
id
=
"
lang-{{count}}
"
value
=
"
{{lang}}
"
/>
<
/div
>
<
label
class
=
"
ui-hidden-accessible
"
for
=
"
lang-{{count}}
"
data
-
i18n
=
"
{{lang}}
"
><
/label
>
<
/form
>
{{
/
each
}}
<
/fieldset
>
<
/div
>
<
/li
>
{{
/
if
}}
<
div
-->
<
li
class
=
"
ui-last-child
"
><
a
href
=
"
{{logout_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-power-off
"
data
-
i18n
=
"
Logout
"
accesskey
=
"
o
"
>
Logout
<
/a></
li
>
<
/ul
>
<
/div
>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
View file @
c3d27c57
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
3.6580.58198.13568
</string>
</value>
<value>
<string>
95
5.28179.50134.44526
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
147
3162224.3
9
</float>
<float>
147
9745244.5
9
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js
View file @
c3d27c57
/*jslint nomen: true, indent: 2, maxerr: 3 */
/*global window, rJS, Handlebars, RSVP,
loopEventListener
*/
(
function
(
window
,
rJS
,
Handlebars
,
RSVP
,
loopEventListener
)
{
/*global window, rJS, Handlebars, RSVP,
Node
*/
(
function
(
window
,
rJS
,
Handlebars
,
RSVP
,
Node
)
{
"
use strict
"
;
/////////////////////////////////////////////////////////////////
...
...
@@ -8,48 +8,30 @@
/////////////////////////////////////////////////////////////////
// Precompile templates while loading the first gadget instance
var
gadget_klass
=
rJS
(
window
),
source_header
=
gadget_klass
.
__template_element
template_element
=
gadget_klass
.
__template_element
,
panel_template_header
=
Handlebars
.
compile
(
template_element
.
getElementById
(
"
panel-template-header
"
)
.
innerHTML
,
panel_template_header
=
Handlebars
.
compile
(
source_header
),
source_body
=
gadget_klass
.
__template_element
.
innerHTML
),
panel_template_body
=
Handlebars
.
compile
(
template_element
.
getElementById
(
"
panel-template-body
"
)
.
innerHTML
,
panel_template_body
=
Handlebars
.
compile
(
source_body
);
.
innerHTML
);
gadget_klass
/////////////////////////////////////////////////////////////////
// ready
/////////////////////////////////////////////////////////////////
// Init local properties
.
ready
(
function
(
g
)
{
g
.
props
=
{};
})
//////////////////////////////////////////////
// acquired method
//////////////////////////////////////////////
.
declareAcquiredMethod
(
"
translateHtml
"
,
"
translateHtml
"
)
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
// Assign the element to a variable
.
ready
(
function
(
g
)
{
return
g
.
getElement
()
.
push
(
function
(
element
)
{
g
.
props
.
element
=
element
;
g
.
props
.
render_deferred
=
RSVP
.
defer
();
});
})
.
declareAcquiredMethod
(
"
translateHtml
"
,
"
translateHtml
"
)
/////////////////////////////////////////////////////////////////
// declared methods
/////////////////////////////////////////////////////////////////
.
declareMethod
(
'
toggle
'
,
function
()
{
this
.
props
.
element
.
classList
.
toggle
(
'
visible
'
);
this
.
element
.
classList
.
toggle
(
'
visible
'
);
})
.
declareMethod
(
'
close
'
,
function
()
{
if
(
this
.
props
.
element
.
classList
.
contains
(
'
visible
'
))
{
this
.
props
.
element
.
classList
.
remove
(
'
visible
'
);
if
(
this
.
element
.
classList
.
contains
(
'
visible
'
))
{
this
.
element
.
classList
.
remove
(
'
visible
'
);
}
})
...
...
@@ -68,46 +50,32 @@
})
.
push
(
function
(
all_result
)
{
// XXX: Customize panel header!
var
tmp
=
panel_template_header
();
tmp
+=
panel_template_body
({
"
module_href
"
:
all_result
[
0
],
"
history_href
"
:
all_result
[
1
],
"
preference_href
"
:
all_result
[
2
],
// "language_list": language_list,
"
logout_href
"
:
all_result
[
3
],
"
search_href
"
:
all_result
[
4
],
"
worklist_href
"
:
all_result
[
5
]
});
return
g
.
translateHtml
(
tmp
);
return
g
.
translateHtml
(
panel_template_header
()
+
panel_template_body
({
"
module_href
"
:
all_result
[
0
],
"
history_href
"
:
all_result
[
1
],
"
preference_href
"
:
all_result
[
2
],
// "language_list": language_list,
"
logout_href
"
:
all_result
[
3
],
"
search_href
"
:
all_result
[
4
],
"
worklist_href
"
:
all_result
[
5
]
})
);
})
.
push
(
function
(
my_translated_or_plain_html
)
{
g
.
props
.
element
.
querySelector
(
"
div
"
).
innerHTML
=
my_translated_or_plain_html
;
g
.
props
.
render_deferred
.
resolve
();
g
.
element
.
querySelector
(
"
div
"
).
innerHTML
=
my_translated_or_plain_html
;
});
})
/////////////////////////////////////////////////////////////////
// declared services
/////////////////////////////////////////////////////////////////
.
declareService
(
function
()
{
var
panel_gadget
=
this
;
function
formSubmit
()
{
panel_gadget
.
toggle
();
.
onEvent
(
'
click
'
,
function
(
evt
)
{
if
((
evt
.
target
.
nodeType
===
Node
.
ELEMENT_NODE
)
&&
(
evt
.
target
.
tagName
===
'
BUTTON
'
))
{
return
this
.
toggle
();
}
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
panel_gadget
.
props
.
render_deferred
.
promise
;
})
.
push
(
function
()
{
return
loopEventListener
(
panel_gadget
.
props
.
element
.
querySelector
(
'
button
'
),
'
click
'
,
false
,
formSubmit
);
});
});
},
false
,
false
);
}(
window
,
rJS
,
Handlebars
,
RSVP
,
loopEventListener
));
\ No newline at end of file
}(
window
,
rJS
,
Handlebars
,
RSVP
,
Node
));
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
View file @
c3d27c57
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
3.6580.58198.13568
</string>
</value>
<value>
<string>
95
5.32296.8972.20241
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
147
3161369.59
</float>
<float>
147
9992698.26
</float>
<string>
UTC
</string>
</tuple>
</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