Skip to content

erp5
erp5
Commit b229a119 authored by Sven Franck's avatar Sven Franck Committed by Romain Courteaud
Browse files
Options

erp5_web_renderjs_ui: update header UI, fix tap toggle, icons

parent 0e745a52
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 11 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_html.xml
View file @ b229a119
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<!-- custom script -->\n <!-- custom script -->\n
<script src="gadget_erp5_header.js" type="text/javascript"></script>\n <script src="gadget_erp5_header.js" type="text/javascript"></script>\n
\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 <script id="header-title-template" type="text/x-handlebars-template">{{title}}</script>\n
\n \n
<script id="header-link-template" type="text/x-handlebars-template">\n <script id="header-link-template" type="text/x-handlebars-template">\n
...@@ -141,8 +141,7 @@ ...@@ -141,8 +141,7 @@
</head>\n </head>\n
<body>\n <body>\n
\n \n
<!-- 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
<div data-role="header" data-theme="a" class="custom-headroom-header ui-header ui-bar-a" data-position="fixed">\n
\n \n
<div class="ui-controlgroup ui-controlgroup-horizontal ui-btn-left">\n <div class="ui-controlgroup ui-controlgroup-horizontal ui-btn-left">\n
<div class="ui-controlgroup-controls">\n <div class="ui-controlgroup-controls">\n
...@@ -311,7 +310,7 @@ ...@@ -311,7 +310,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>938.16099.57174.3840</string> </value> <value> <string>938.19002.31422.38075</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -329,7 +328,7 @@ ...@@ -329,7 +328,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1413297257.24</float> <float>1413471560.4</float>
<string>GMT</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
View file @ b229a119
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
var gadget = this,\n var gadget = this,\n
possible_left_link_list = [\n possible_left_link_list = [\n
// [\'menu_url\', \'Menu\', \'bars\'],\n // [\'menu_url\', \'Menu\', \'bars\'],\n
[\'selection_url\', \'Select\', \'rotate-left\'],\n [\'selection_url\', \'Back\', \'arrow-left\'],\n
[\'view_url\', \'View\', \'check\'],\n [\'view_url\', \'View\', \'check\'],\n
[\'cancel_url\', \'Cancel\', \'times\'],\n [\'cancel_url\', \'Cancel\', \'times\'],\n
[\'back_url\', \'Back\', \'arrow-left\']\n [\'back_url\', \'Back\', \'arrow-left\']\n
...@@ -231,10 +231,10 @@ ...@@ -231,10 +231,10 @@
[\'panel_action\', \'Menu\', \'bars\', \'panel\']\n [\'panel_action\', \'Menu\', \'bars\', \'panel\']\n
],\n ],\n
possible_right_link_list = [\n possible_right_link_list = [\n
[\'edit_url\', \'Edit\', \'edit\']\n [\'edit_url\', \'Edit\', \'pencil\']\n
],\n ],\n
possible_right_button_list = [\n possible_right_button_list = [\n
[\'save_action\', \'Save\', \'check\', \'submit\'],\n [\'save_action\', \'Ok\', \'check\', \'submit\'],\n
[\'submit_action\', \'Proceed\', \'share\', \'submit\']\n [\'submit_action\', \'Proceed\', \'share\', \'submit\']\n
],\n ],\n
possible_sub_header_list = [\n possible_sub_header_list = [\n
...@@ -261,6 +261,7 @@ ...@@ -261,6 +261,7 @@
left_button,\n left_button,\n
right_link,\n right_link,\n
right_button,\n right_button,\n
default_right_text,\n
default_right_icon = "",\n default_right_icon = "",\n
title_link = {title: "ERP5"},\n title_link = {title: "ERP5"},\n
sub_header_list = [],\n sub_header_list = [],\n
...@@ -326,6 +327,7 @@ ...@@ -326,6 +327,7 @@
} else if (!gadget.stats.submitted) {\n } else if (!gadget.stats.submitted) {\n
default_right_icon = "spinner";\n default_right_icon = "spinner";\n
} else if (gadget.stats.modified) {\n } else if (gadget.stats.modified) {\n
default_right_text = "Save";\n
default_right_icon = "warning";\n default_right_icon = "warning";\n
}\n }\n
for (i = 0; i < possible_right_link_list.length; i += 1) {\n for (i = 0; i < possible_right_link_list.length; i += 1) {\n
...@@ -345,7 +347,7 @@ ...@@ -345,7 +347,7 @@
for (i = 0; i < possible_right_button_list.length; i += 1) {\n for (i = 0; i < possible_right_button_list.length; i += 1) {\n
if (options.hasOwnProperty(possible_right_button_list[i][0])) {\n if (options.hasOwnProperty(possible_right_button_list[i][0])) {\n
right_button = {\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 icon: default_right_icon || possible_right_button_list[i][2],\n
name: possible_right_button_list[i][3]\n name: possible_right_button_list[i][3]\n
};\n };\n
...@@ -554,7 +556,7 @@ ...@@ -554,7 +556,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>938.15847.29908.51046</string> </value> <value> <string>938.20348.39960.27733</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -572,7 +574,7 @@ ...@@ -572,7 +574,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1413281825.19</float> <float>1413553172.1</float>
<string>GMT</string> <string>GMT</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7