Skip to content

erp5
erp5
Commit 97465970 authored by Eugene Shen's avatar Eugene Shen
Browse files
Options

Align chat with OfficeJS standards 

Remove all chat-specific modifications to common OfficeJS files
such as erp5_launcher_nojqm.js and gadget_erp5_nojqm.css;
copy the latest version of gadget_erp5_nojqm.css into
gadget_erp5_nojquery.css and only add FontAwesome icons;
keep all chat-specific styles in gadget_erp5_chat.css,
including input padding, button colours, and a hidden class;
add chat_connect and chat_disconnect pages to chat_panel.html;
rename all configurator page titles from "Gadget" to "Page";
and only store Persons in the local configurator IndexedDB.
parent 23d55cdb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2044 additions and 122 deletions
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_chat_css.css
View file @ 97465970
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
font-size: 100%; font-size: 100%;
} }
div.gadget-content > div > div.chat-box .chat-hidden {
display: none;
}
.configurator-header { .configurator-header {
padding: 1em 0 0 0; padding: 1em 0 0 0;
font-size: 150%; font-size: 150%;
...@@ -36,7 +40,7 @@ ...@@ -36,7 +40,7 @@
height: 100%; height: 100%;
width: 100%; width: 100%;
color: #000; color: #000;
background-color: #fff; background-color: white;
text-align: center; text-align: center;
border: 1px solid black; border: 1px solid black;
-webkit-box-shadow: 0 2px 2px #aaa; -webkit-box-shadow: 0 2px 2px #aaa;
...@@ -85,6 +89,22 @@ ...@@ -85,6 +89,22 @@
color: black; color: black;
} }
input[type="submit"].chat-submit {
padding: 6pt;
margin-top: 0;
margin-right: 0;
color: white;
background-color: #444;
}
input[type="submit"].chat-submit:hover, input[type="submit"].chat-submit:focus {
background-color: #666;
}
input[type="submit"].chat-submit:active {
background-color: #888;
}
.panel-header { .panel-header {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -248,4 +268,8 @@ div[data-gadget-scope='header'] .ui-header { ...@@ -248,4 +268,8 @@ div[data-gadget-scope='header'] .ui-header {
.send-form input[type="text"] { .send-form input[type="text"] {
flex: 1; flex: 1;
margin: 0 1em 0 0; margin: 0 1em 0 0;
}
.chat-storage-form > label {
display: inline;
} }
\ No newline at end of file
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_chat_css.xml
View file @ 97465970
...@@ -143,6 +143,12 @@ ...@@ -143,6 +143,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -202,4 +208,63 @@ ...@@ -202,4 +208,63 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>eyqs</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>958.51789.34297.47940</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1492612655.67</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_chat_panel_html.html
View file @ 97465970
...@@ -19,10 +19,16 @@ ...@@ -19,10 +19,16 @@
</header> </header>
<article class="panel-listview"> <article class="panel-listview">
<ul> <ul>
<li>
<a class="panel-element" href="#!display?n.page=chat_connect">
<span class="fa fa-sign-in" aria-hidden="true"></span>
Connection
</a>
</li>
<li> <li>
<a class="panel-element" href="#!display?n.page=chat_box"> <a class="panel-element" href="#!display?n.page=chat_box">
<span class="fa fa-commenting-o" aria-hidden="true"></span> <span class="fa fa-commenting-o" aria-hidden="true"></span>
Chat Box Chat Communication
</a> </a>
</li> </li>
<li> <li>
...@@ -37,6 +43,12 @@ ...@@ -37,6 +43,12 @@
Synchronization Synchronization
</a> </a>
</li> </li>
<li>
<a class="panel-element" href="#!display?n.page=chat_disconnect">
<span class="fa fa-sign-out" aria-hidden="true"></span>
Disconnection
</a>
</li>
</ul> </ul>
</article> </article>
</body> </body>
......
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_chat_panel_html.xml
View file @ 97465970
...@@ -147,6 +147,12 @@ ...@@ -147,6 +147,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -206,4 +212,63 @@ ...@@ -206,4 +212,63 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>eyqs</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>958.50293.58963.20206</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1492522987.19</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_nojquery_css.xml
View file @ 97465970
...@@ -144,6 +144,12 @@ ...@@ -144,6 +144,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -203,4 +209,63 @@ ...@@ -203,4 +209,63 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>eyqs</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>958.50038.36480.1962</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1492507730.6</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_page_jio_configurator_html.html
View file @ 97465970
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<title>jIO Configurator Gadget</title> <title>jIO Configurator Page</title>
<script src="rsvp.js"></script> <script src="rsvp.js"></script>
<script src="renderjs.js"></script> <script src="renderjs.js"></script>
<script src="gadget_erp5_page_jio_configurator.js"></script> <script src="gadget_erp5_page_jio_configurator.js"></script>
......
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_page_jio_configurator_html.xml
View file @ 97465970
...@@ -142,6 +142,12 @@ ...@@ -142,6 +142,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -201,4 +207,63 @@ ...@@ -201,4 +207,63 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>eyqs</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>958.41620.48534.44868</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1492504676.13</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_page_jio_configurator_js.js
View file @ 97465970
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* Settings modified: * Settings modified:
* - jio_storage_name, example: "local" * - jio_storage_name, example: "local"
* - jio_storage_description, example: {type: "indexeddb", database: "foo"} * - jio_storage_description, example: {type: "indexeddb", database: "foo"}
* - redirect_after_reload, to: {command: "display", options: {page: "sync"}} * - redirect_after_reload, to: undefined
*/ */
...@@ -53,9 +53,10 @@ ...@@ -53,9 +53,10 @@
* Parameters: * Parameters:
* - getSetting: jio_storage_name * - getSetting: jio_storage_name
* Effects: * Effects:
* - redirect if redirect_after_reload is set
* - updateHeader: "Storage Configurator"
* - hide document_configurator gadget based on jio_storage_name * - hide document_configurator gadget based on jio_storage_name
* - style configurator buttons based on jio_storage_name * - style configurator buttons based on jio_storage_name
* - updateHeader: "Storage Configurator"
*/ */
.declareMethod("render", function () { .declareMethod("render", function () {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
return gadget.getSetting("redirect_after_reload") return gadget.getSetting("redirect_after_reload")
.push(function (redirect) { .push(function (redirect) {
if (redirect) { if (redirect) {
return gadget.setSetting("redirect_after_reload", null) return gadget.setSetting("redirect_after_reload", undefined)
.push(function () { .push(function () {
return gadget.redirect(redirect); return gadget.redirect(redirect);
}); });
......
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_page_jio_configurator_js.xml
View file @ 97465970
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>958.41805.52664.20462</string> </value> <value> <string>958.51484.58692.33655</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1492013630.58</float> <float>1492781329.02</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_page_jio_dav_configurator_html.html
View file @ 97465970
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<title>jIO DAV Configurator Gadget</title> <title>jIO DAV Configurator Page</title>
<script src="rsvp.js"></script> <script src="rsvp.js"></script>
<script src="renderjs.js"></script> <script src="renderjs.js"></script>
<script src="gadget_erp5_page_jio_dav_configurator.js"></script> <script src="gadget_erp5_page_jio_dav_configurator.js"></script>
......
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_page_jio_dav_configurator_html.xml
View file @ 97465970
...@@ -146,6 +146,12 @@ ...@@ -146,6 +146,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -205,4 +211,63 @@ ...@@ -205,4 +211,63 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>eyqs</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>958.41620.48534.44868</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1492504670.58</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_page_jio_erp5_configurator_html.html
View file @ 97465970
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<title>jIO ERP5 Configurator Gadget</title> <title>jIO ERP5 Configurator Page</title>
<script src="rsvp.js"></script> <script src="rsvp.js"></script>
<script src="renderjs.js"></script> <script src="renderjs.js"></script>
<script src="gadget_erp5_page_jio_erp5_configurator.js"></script> <script src="gadget_erp5_page_jio_erp5_configurator.js"></script>
......
bt5/officejs_eyqs/PathTemplateItem/web_page_module/gadget_erp5_page_jio_erp5_configurator_html.xml
View file @ 97465970
...@@ -142,6 +142,12 @@ ...@@ -142,6 +142,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -201,4 +207,63 @@ ...@@ -201,4 +207,63 @@
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>eyqs</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>958.41620.48534.44868</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1492504672.64</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/officejs_eyqs/PathTemplateItem/web_page_module/officejs_chat_launcher_html.html
View file @ 97465970
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<script data-renderjs-configuration="language_map" type="text/x-renderjs-configuration">${language_map}</script> <script data-renderjs-configuration="language_map" type="text/x-renderjs-configuration">${language_map}</script>
<script data-renderjs-configuration="default_selected_language" type="text/x-renderjs-configuration">${default_selected_language}</script> <script data-renderjs-configuration="default_selected_language" type="text/x-renderjs-configuration">${default_selected_language}</script>
<script data-renderjs-configuration="website_url_set" type="text/x-renderjs-configuration">${website_url_set}</script> <script data-renderjs-configuration="website_url_set" type="text/x-renderjs-configuration">${website_url_set}</script>
<script data-renderjs-configuration="indexeddb_database_name" type="text/x-renderjs-configuration">officejs-chat</script> <script data-renderjs-configuration="indexeddb_database_name" type="text/x-renderjs-configuration">officejs_chat</script>
<script data-renderjs-configuration="jio_query" type="text/x-renderjs-configuration">portal_type: "Person" OR portal_type: "Text Post"</script> <script data-renderjs-configuration="jio_query" type="text/x-renderjs-configuration">portal_type: "Person"</script>
<script src="rsvp.js"></script> <script src="rsvp.js"></script>
<script src="renderjs.js"></script> <script src="renderjs.js"></script>
......
bt5/officejs_eyqs/PathTemplateItem/web_page_module/officejs_chat_launcher_html.xml
View file @ 97465970
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>958.41815.30245.31607</string> </value> <value> <string>958.53114.35466.29934</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1492076423.34</float> <float>1492780125.35</float>
<string>UTC</string> <string>UTC</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