Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_rtl_support
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
Romain Courteaud
erp5_rtl_support
Commits
b229a119
Commit
b229a119
authored
Oct 20, 2014
by
Sven Franck
Committed by
Romain Courteaud
Nov 17, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: update header UI, fix tap toggle, icons
parent
0e745a52
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_html.xml
...plateItem/web_page_module/rjs_gadget_erp5_header_html.xml
+4
-5
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
...emplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
+8
-6
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_html.xml
View file @
b229a119
...
...
@@ -121,7 +121,7 @@
<!-- custom script -->
\n
<script
src=
"gadget_erp5_header.js"
type=
"text/javascript"
></script>
\n
\n
<script
id=
"header-title-link-template"
type=
"text/x-handlebars-template"
><a
class=
"ui-btn ui-btn-icon-left ui-icon-
caret-up
"
href=
"{{url}}"
>
{{title}}
</a></script>
\n
<script
id=
"header-title-link-template"
type=
"text/x-handlebars-template"
><a
class=
"ui-btn ui-btn-icon-left ui-icon-
arrow-down
"
href=
"{{url}}"
>
{{title}}
</a></script>
\n
<script
id=
"header-title-template"
type=
"text/x-handlebars-template"
>
{{title}}
</script>
\n
\n
<script
id=
"header-link-template"
type=
"text/x-handlebars-template"
>
\n
...
...
@@ -141,8 +141,7 @@
</head>
\n
<body>
\n
\n
<!-- data-position="fixed" -->
\n
<div
data-role=
"header"
data-theme=
"a"
class=
"custom-headroom-header ui-header ui-bar-a"
data-position=
"fixed"
>
\n
<div
data-role=
"header"
data-theme=
"a"
class=
"ui-header ui-bar-a"
data-position=
"fixed"
data-tap-toggle=
"false"
>
\n
\n
<div
class=
"ui-controlgroup ui-controlgroup-horizontal ui-btn-left"
>
\n
<div
class=
"ui-controlgroup-controls"
>
\n
...
...
@@ -311,7 +310,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
938.1
6099.57174.3840
</string>
</value>
<value>
<string>
938.1
9002.31422.38075
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -329,7 +328,7 @@
</tuple>
<state>
<tuple>
<float>
1413
297257.2
4
</float>
<float>
1413
471560.
4
</float>
<string>
GMT
</string>
</tuple>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
View file @
b229a119
...
...
@@ -222,7 +222,7 @@
var gadget = this,\n
possible_left_link_list = [\n
// [\'menu_url\', \'Menu\', \'bars\'],\n
[\'selection_url\', \'
Select\', \'rotate
-left\'],\n
[\'selection_url\', \'
Back\', \'arrow
-left\'],\n
[\'view_url\', \'View\', \'check\'],\n
[\'cancel_url\', \'Cancel\', \'times\'],\n
[\'back_url\', \'Back\', \'arrow-left\']\n
...
...
@@ -231,10 +231,10 @@
[\'panel_action\', \'Menu\', \'bars\', \'panel\']\n
],\n
possible_right_link_list = [\n
[\'edit_url\', \'Edit\', \'
edit
\']\n
[\'edit_url\', \'Edit\', \'
pencil
\']\n
],\n
possible_right_button_list = [\n
[\'save_action\', \'
Save
\', \'check\', \'submit\'],\n
[\'save_action\', \'
Ok
\', \'check\', \'submit\'],\n
[\'submit_action\', \'Proceed\', \'share\', \'submit\']\n
],\n
possible_sub_header_list = [\n
...
...
@@ -261,6 +261,7 @@
left_button,\n
right_link,\n
right_button,\n
default_right_text,\n
default_right_icon = "",\n
title_link = {title: "ERP5"},\n
sub_header_list = [],\n
...
...
@@ -326,6 +327,7 @@
}
else
if
(!gadget.stats.submitted)
{\n
default_right_icon =
"spinner"
;\n
}
else
if
(gadget.stats.modified)
{\n
default_right_text =
"Save"
;\n
default_right_icon =
"warning"
;\n
}\n
for
(
i =
0;
i
<
possible_right_link_list.length;
i
+=
1)
{\n
...
...
@@ -345,7 +347,7 @@
for
(
i =
0;
i
<
possible_right_button_list.length;
i
+=
1)
{\n
if
(options.hasOwnProperty(possible_right_button_list[i][0]))
{\n
right_button =
{\n
title:
possible_right_button_list[i][1],\n
title:
default_right_text
||
possible_right_button_list[i][1],\n
icon:
default_right_icon
||
possible_right_button_list[i][2],\n
name:
possible_right_button_list[i][3]\n
};\n
...
...
@@ -554,7 +556,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
938.
15847.29908.51046
</string>
</value>
<value>
<string>
938.
20348.39960.27733
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -572,7 +574,7 @@
</tuple>
<state>
<tuple>
<float>
1413
281825.19
</float>
<float>
1413
553172.1
</float>
<string>
GMT
</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