Skip to content

erp5
erp5
Commit 2d669a1c authored by Xiaowu Zhang's avatar Xiaowu Zhang
Browse files
Options

erp5_web_renderjs_ui: change icons 

preferences icon (main menu) : f1de (sliders)
sort asc (icon in listbox header) : f160 (sort-amount-asc)
sort desc (icon in listbox header) : f161 (sort-amount-desc)
configure icon (new "configure" listbox button) : f0ad (wrench)
hide (hide button in listbox) : f2a8 (low-vision)
worklist (main menu) : fOae (tasks)
link (relation string field) : f090 (sign-in)
parent 8a567725
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 36 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
View file @ 2d669a1c
......@@ -88,7 +88,7 @@
{{/each}}
{{#if line_icon}}
<th>
<a href="{{jump}}" class="ui-body-inherit ui-btn-icon-right ui-link ui-btn ui-corner-all ui-icon-mail-forward"></a>
<a href="{{jump}}" class="ui-body-inherit ui-btn-icon-right ui-link ui-btn ui-corner-all ui-icon-sign-in"></a>
</th>
{{/if}}
</tr>
......@@ -128,7 +128,7 @@
{{/each}}
{{#if line_icon}}
<th>
<a href ="{{jump}}" class="ui-body-inherit ui-btn-icon-right ui-link ui-btn ui-corner-all ui-icon-mail-forward"></a>
<a href ="{{jump}}" class="ui-body-inherit ui-btn-icon-right ui-link ui-btn ui-corner-all ui-icon-sign-in"></a>
</th>
{{/if}}
</tr>
......@@ -177,8 +177,8 @@
<script id="listbox-template" type="text/x-handlebars-template">
<div class="ui-table-header ui-header ui-bar-c ui-corner-all">
<h1 data-i18n="{{title}}" class="ui-title ui-override-theme">{{title}}<span> <span class="listboxloader ui-icon-spinner ui-btn-icon-left"></span></span></h1>
<button data-rel="hide" data-i18n="{{hide_button_text}}" name="{{hide_button_name}}" type="submit" class="submit responsive ui-last-child ui-btn ui-icon-eye ui-btn-icon-left {{hide_class}}">{{hide_button_text}}</button>
<button data-rel="configure_columns" data-i18n="Configure" name="Configure" type="submit" class="submit responsive ui-last-child ui-btn ui-icon-filter ui-btn-icon-left {{configure_class}}">Configure</button>
<button data-rel="hide" data-i18n="{{hide_button_text}}" name="{{hide_button_name}}" type="submit" class="submit responsive ui-last-child ui-btn ui-icon-low-vision ui-btn-icon-left {{hide_class}}">{{hide_button_text}}</button>
<button data-rel="configure_columns" data-i18n="Configure" name="Configure" type="submit" class="submit responsive ui-last-child ui-btn ui-icon-wrench ui-btn-icon-left {{configure_class}}">Configure</button>
<button data-rel="Sort" data-i18n="Sort" name="Sort" type="submit" class="submit responsive ui-last-child ui-btn ui-icon-sort-amount-desc ui-btn-icon-left {{sort_class}}">Sort</button>
</div>
<table class="ui-responsive ui-body-c ui-table-inset">
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
View file @ 2d669a1c
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.45882.29366.36147</string> </value>
<value> <string>964.50166.24708.55500</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1515514305.55</float>
<float>1515768913.57</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
View file @ 2d669a1c
......@@ -395,10 +395,10 @@
if (current_sort !== undefined) {
if (current_sort[1] === 'ascending') {
class_value = "ui-icon ui-icon-arrow-up";
class_value = "ui-icon ui-icon-sort-amount-asc";
}
if (current_sort[1] === 'descending') {
class_value = "ui-icon ui-icon-arrow-down";
class_value = "ui-icon ui-icon-sort-amount-desc";
}
}
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @ 2d669a1c
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.47502.56518.25890</string> </value>
<value> <string>964.49926.23272.20514</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1515602869.96</float>
<float>1515755492.39</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
View file @ 2d669a1c
......@@ -1977,6 +1977,9 @@ div[data-gadget-scope='maximize'] button:active {
.ui-icon-eye-slash::before {
content: "\f070";
}
.ui-icon-low-vision::before {
content: "\f2a8";
}
.ui-icon-exclamation-triangle::before {
content: "\f071";
}
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @ 2d669a1c
......@@ -228,7 +228,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>vincent</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -242,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.45838.34540.6417</string> </value>
<value> <string>964.49926.23272.20514</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>1515503408.06</float>
<float>1515762544.29</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_worklist_js.js
View file @ 2d669a1c
......@@ -30,7 +30,7 @@
return gadget.updateHeader({
page_title: 'Worklist',
page_icon: 'clipboard'
page_icon: 'tasks'
})
.push(function () {
return gadget.jio_getAttachment(
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_worklist_js.xml
View file @ 2d669a1c
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.11788.48702.26146</string> </value>
<value> <string>964.44610.27477.10598</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1514540115.97</float>
<float>1515763245.19</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.html
View file @ 2d669a1c
......@@ -49,10 +49,10 @@
<script id="panel-template-body-list" type="text/x-handlebars-template">
<li class="ui-first-child"><a href="{{front_href}}" class="ui-btn ui-btn-icon-left ui-icon-home" data-i18n="Home">Home</a></li>
<li><a href="{{module_href}}" class="ui-btn ui-btn-icon-left ui-icon-puzzle-piece" data-i18n="Modules" accesskey="m">Modules</a></li>
<li><a href="{{worklist_href}}" class="ui-btn ui-btn-icon-left ui-icon-clipboard" data-i18n="Worklists" accesskey="w">Worklists</a></li>
<li><a href="{{worklist_href}}" class="ui-btn ui-btn-icon-left ui-icon-tasks" data-i18n="Worklists" accesskey="w">Worklists</a></li>
<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="Preferences">Preferences</a></li>
<li><a href="{{preference_href}}" class="ui-btn ui-btn-icon-left ui-icon-sliders" data-i18n="Preferences">Preferences</a></li>
<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>
</script>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
View file @ 2d669a1c
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.38775.35841.14779</string> </value>
<value> <string>964.50043.44596.52002</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1515079552.11</float>
<float>1515762048.41</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_preferencepage_js.js
View file @ 2d669a1c
......@@ -25,7 +25,7 @@
user = "Who are you?";
return gadget.updateHeader({
page_title: 'Preferences',
page_icon: 'gear',
page_icon: 'sliders',
save_action: true
})
.push(function () {
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_preferencepage_js.xml
View file @ 2d669a1c
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>959.65495.56765.15342</string> </value>
<value> <string>961.52328.26727.8140</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1502120025.73</float>
<float>1515763195.95</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_html.html
View file @ 2d669a1c
......@@ -30,7 +30,7 @@
{{#if list.length}}
<!--li class="ui-autocomplete ui-li ui-li-divider ui-bar-inherit ui-first-child" role="heading">Select from the {{list.length}} Search Results</li-->
{{#each list}}
<li class="ui-li-static ui-body-inherit ui-icon-mail-forward ui-btn-icon-right" data-relative-url="{{id}}" data-uid="{{uid}}">{{value}}</li>
<li class="ui-li-static ui-body-inherit ui-icon-sign-in ui-btn-icon-right" data-relative-url="{{id}}" data-uid="{{uid}}">{{value}}</li>
{{/each}}
{{#each type}}
<li class="ui-li-static ui-body-inherit ui-bar-inherit ui-icon-plus ui-btn-icon-right" data-i18n="Create New" data-create-object="{{value}}" name="{{name}}">Create New
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_html.xml
View file @ 2d669a1c
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.6712.62509.9898</string> </value>
<value> <string>964.26902.40110.53777</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1513168443.82</float>
<float>1515764984.12</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
View file @ 2d669a1c
......@@ -2191,6 +2191,9 @@ div[data-gadget-scope='maximize'] button {
.ui-icon-eye-slash::before {
content: "\f070";
}
.ui-icon-low-vision::before {
content: "\f2a8";
}
.ui-icon-exclamation-triangle::before {
content: "\f071";
}
......
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortColumn.zpt
View file @ 2d669a1c
......@@ -69,14 +69,14 @@
<tr>
<td>waitForElementPresent</td><!-- verification -->
<td>//th[@class='ui-icon ui-icon-arrow-down']/a[@data-i18n='ID']</td>
<td>//th[@class='ui-icon ui-icon-sort-amount-desc']/a[@data-i18n='ID']</td>
<td></td>
</tr>
<!-- The default sort should cycle back on the next click -->
<tr>
<td>click</td>
<td>//th[@class='ui-icon ui-icon-arrow-down']/a[@data-i18n='ID']</td>
<td>//th[@class='ui-icon ui-icon-sort-amount-desc']/a[@data-i18n='ID']</td>
<td></td>
</tr>
......@@ -84,7 +84,7 @@
<tr>
<td>waitForElementPresent</td><!-- verification -->
<td>//th[@class='ui-icon ui-icon-arrow-up']/a[@data-i18n='ID']</td>
<td>//th[@class='ui-icon ui-icon-sort-amount-asc']/a[@data-i18n='ID']</td>
<td></td>
</tr>
......@@ -131,19 +131,19 @@
<!-- Test that the first sort is DESC -->
<tr>
<td>waitForElementPresent</td><!-- verification -->
<td>//th[@class='ui-icon ui-icon-arrow-down']/a[@data-i18n='Title']</td>
<td>//th[@class='ui-icon ui-icon-sort-amount-desc']/a[@data-i18n='Title']</td>
<td></td>
</tr>
<tr>
<td>verifyElementNotPresent</td>
<td>//th[@class='ui-icon ui-icon-arrow-up']/a[@data-i18n='ID']</td>
<td>//th[@class='ui-icon ui-icon-sort-amount-asc']/a[@data-i18n='ID']</td>
<td></td>
</tr>
<tr>
<td>verifyElementNotPresent</td>
<td>//th[@class='ui-icon ui-icon-arrow-up']/a[@data-i18n='ID']</td>
<td>//th[@class='ui-icon ui-icon-sort-amount-asc']/a[@data-i18n='ID']</td>
<td></td>
</tr>
......@@ -201,7 +201,7 @@ Test whether search query stays if we change the sort order
<!-- That the last sort stayed -->
<tr>
<td>waitForElementPresent</td><!-- verification -->
<td>//th[@class='ui-icon ui-icon-arrow-down']/a[@data-i18n='Title']</td>
<td>//th[@class='ui-icon ui-icon-sort-amount-desc']/a[@data-i18n='Title']</td>
<td></td>
</tr>
......
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortDefault.zpt
View file @ 2d669a1c
......@@ -69,7 +69,7 @@ Frontend should not suppose default sorting
<td>//a[@data-i18n='ID']</td><td></td></tr>
<!-- Default sort on ID column has to be ASCENDING -->
<tr><td>verifyElementPresent</td>
<td>//th[@class='ui-icon ui-icon-arrow-up']/a[@data-i18n='ID']</td><td></td></tr>
<td>//th[@class='ui-icon ui-icon-sort-amount-asc']/a[@data-i18n='ID']</td><td></td></tr>
<!-- Verify that the default sort is visible in Sort Editor -->
<tr><td>waitForElementPresent</td>
<td>//button[@data-i18n='Sort']</td><td></td></tr>
......@@ -97,7 +97,7 @@ Frontend should not suppose default sorting
<td>//a[@data-i18n='Title']</td><td></td></tr>
<!-- Default sort on Title column has to be DESCENDING -->
<tr><td>verifyElementPresent</td>
<td>//th[@class='ui-icon ui-icon-arrow-down']/a[@data-i18n='Title']</td><td></td></tr>
<td>//th[@class='ui-icon ui-icon-sort-amount-desc']/a[@data-i18n='Title']</td><td></td></tr>
<!-- No other sort must be shown -->
<tr><td>verifyElementPresent</td>
<td>//th[@class='']/a[@data-i18n='ID']</td><td></td></tr>
......@@ -130,7 +130,7 @@ Frontend should not suppose default sorting
<tr><td>verifyElementPresent</td>
<td>//th[@class='']/a[@data-i18n='Title']</td><td></td></tr>
<tr><td>verifyElementPresent</td>
<td>//th[@class='ui-icon ui-icon-arrow-down']/a[@data-i18n='ID']</td><td></td></tr>
<td>//th[@class='ui-icon ui-icon-sort-amount-desc']/a[@data-i18n='ID']</td><td></td></tr>
</tbody></table>
</body>
......
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