Commit 2a242387 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

WIP slapos_jio: translate hostingjs site in Chinese

parent 80c5bf8f
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Title
data-i18n=Reference
data-i18n=Allocation Scope
data-i18n=Status
data-i18n=Servers
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>962.57354.18371.5888</string> </value> <value> <string>980.36988.11538.20002</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1508415987.5</float> <float>1581615033.79</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
.declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("jio_get", "jio_get") .declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("translate", "translate")
.allowPublicAcquisition("jio_allDocs", function (param_list) { .allowPublicAcquisition("jio_allDocs", function (param_list) {
var gadget = this; var gadget = this;
...@@ -57,30 +58,36 @@ ...@@ -57,30 +58,36 @@
return gadget.triggerSubmit.apply(gadget, argument_list); return gadget.triggerSubmit.apply(gadget, argument_list);
}); });
}) })
.declareMethod("render", function (options) { .declareMethod("render", function () {
var gadget = this, var gadget = this,
default_strict_allocation_scope_uid, default_strict_allocation_scope_uid,
lines_limit; lines_limit,
servers_translation;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getDeclaredGadget('form_list'),
gadget.getSetting("listbox_lines_limit", 20), gadget.getSetting("listbox_lines_limit", 20),
gadget.jio_get("portal_categories/allocation_scope/close/forever") gadget.jio_get("portal_categories/allocation_scope/close/forever"),
gadget.translate("Title"),
gadget.translate("Reference"),
gadget.translate("Allocation Scope"),
gadget.translate("Status"),
gadget.translate("Servers")
]); ]);
}) })
.push(function (result) { .push(function (result) {
lines_limit = result[0];
default_strict_allocation_scope_uid = result[1].uid;
return gadget.getDeclaredGadget('form_list');
})
.push(function (form_list) {
var column_list = [ var column_list = [
['title', 'Title'], ['title', result[3]],
['reference', 'Reference'], ['reference', result[4]],
['allocation_scope_title', 'Allocation Scope'], ['allocation_scope_title', result[5]],
['Computer_getNewsDict', 'Status'] ['Computer_getNewsDict', result[6]]
]; ],
form_list = result[0];
lines_limit = result[1];
default_strict_allocation_scope_uid = result[2].uid;
servers_translation = result[7];
return form_list.render({ return form_list.render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
...@@ -99,7 +106,7 @@ ...@@ -99,7 +106,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["title", "ascending"]], "sort": [["title", "ascending"]],
"title": "Servers", "title": servers_translation,
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -123,7 +130,7 @@ ...@@ -123,7 +130,7 @@
jio_key: "computer_module" jio_key: "computer_module"
}); });
}) })
.push(function (result) { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_computer"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_add_computer"}}),
gadget.getUrlFor({command: "change", options: {page: "slap_computer_get_token"}}), gadget.getUrlFor({command: "change", options: {page: "slap_computer_get_token"}}),
...@@ -133,7 +140,7 @@ ...@@ -133,7 +140,7 @@
}) })
.push(function (result) { .push(function (result) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "Servers", page_title: servers_translation,
token_url: result[1], token_url: result[1],
selection_url: result[2], selection_url: result[2],
filter_action: true, filter_action: true,
......
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>974.61498.11899.44253</string> </value> <value> <string>980.3967.45207.31880</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1554901061.9</float> <float>1581614996.59</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Date
data-i18n=Price
data-i18n=Currency
data-i18n=Payment
data-i18n=Download
data-i18n=Invoices
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>962.57216.18037.29013</string> </value> <value> <string>980.36988.11538.20002</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1508407708.9</float> <float>1581614039.46</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
.declareAcquiredMethod("setSetting", "setSetting") .declareAcquiredMethod("setSetting", "setSetting")
.declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("translate", "translate")
.allowPublicAcquisition("jio_allDocs", function (param_list) { .allowPublicAcquisition("jio_allDocs", function (param_list) {
var gadget = this; var gadget = this;
...@@ -92,26 +93,35 @@ ...@@ -92,26 +93,35 @@
return gadget.triggerSubmit.apply(gadget, argument_list); return gadget.triggerSubmit.apply(gadget, argument_list);
}); });
}) })
.declareMethod("render", function (options) { .declareMethod("render", function () {
var gadget = this, var gadget = this,
lines_limit; lines_limit,
invoices_translation;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return gadget.getSetting("listbox_lines_limit", 20); return RSVP.all([
}) gadget.getDeclaredGadget('form_list'),
.push(function (listbox_lines_limit) { gadget.getSetting("listbox_lines_limit", 20),
lines_limit = listbox_lines_limit; gadget.translate("Date"),
return gadget.getDeclaredGadget('form_list'); gadget.translate("Price"),
gadget.translate("Currency"),
gadget.translate("Payment"),
gadget.translate("Download"),
gadget.translate("Invoices")
]);
}) })
.push(function (form_list) { .push(function (result) {
var column_list = [ var column_list = [
['start_date', 'Date'], ['start_date', result[2]],
['total_price', 'Price'], ['total_price', result[3]],
['resource_reference', 'Currency'], ['resource_reference', result[4]],
['translated_simulation_state_title', 'Payment'], ['translated_simulation_state_title', result[5]],
['download', 'Download'] ['download', result[6]]
]; ],
form_list = result[0];
lines_limit = result[1];
invoices_translation = result[7];
return form_list.render({ return form_list.render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
...@@ -130,7 +140,7 @@ ...@@ -130,7 +140,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["creation_date", "descending"]], "sort": [["creation_date", "descending"]],
"title": "Invoices", "title": invoices_translation,
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -154,14 +164,14 @@ ...@@ -154,14 +164,14 @@
jio_key: "accounting_module" jio_key: "accounting_module"
}); });
}) })
.push(function (result) { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}) gadget.getUrlFor({command: "change", options: {"page": "slapos"}})
]); ]);
}) })
.push(function (result) { .push(function (result) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "Invoices", page_title: invoices_translation,
selection_url: result[0], selection_url: result[0],
filter_action: true filter_action: true
}); });
......
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>974.61498.36227.27835</string> </value> <value> <string>981.53734.45184.6621</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1554901051.44</float> <float>1581613848.42</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Title
data-i18n=Reference
data-i18n=Status
data-i18n=Networks
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>962.57355.44771.45687</string> </value> <value> <string>980.36988.11538.20002</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1508416076.67</float> <float>1581615268.76</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
.declareAcquiredMethod("setSetting", "setSetting") .declareAcquiredMethod("setSetting", "setSetting")
.declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("translate", "translate")
.allowPublicAcquisition("jio_allDocs", function (param_list) { .allowPublicAcquisition("jio_allDocs", function (param_list) {
var gadget = this; var gadget = this;
...@@ -55,24 +56,31 @@ ...@@ -55,24 +56,31 @@
return gadget.triggerSubmit.apply(gadget, argument_list); return gadget.triggerSubmit.apply(gadget, argument_list);
}); });
}) })
.declareMethod("render", function (options) { .declareMethod("render", function () {
var gadget = this, var gadget = this,
lines_limit; lines_limit,
networks_translation;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return gadget.getSetting("listbox_lines_limit", 20); return RSVP.all([
}) gadget.getDeclaredGadget('form_list'),
.push(function (listbox_lines_limit) { gadget.getSetting("listbox_lines_limit", 20),
lines_limit = listbox_lines_limit; gadget.translate("Title"),
return gadget.getDeclaredGadget('form_list'); gadget.translate("Reference"),
gadget.translate("Status"),
gadget.translate("Networks")
]);
}) })
.push(function (form_list) { .push(function (result) {
var column_list = [ var column_list = [
['title', 'Title'], ['title', result[2]],
['reference', 'Reference'], ['reference', result[3]],
['ComputerNetwork_getNewsDict', 'Status'] ['ComputerNetwork_getNewsDict', result[4]]
]; ],
form_list = result[0];
lines_limit = result[1];
networks_translation = result[5];
return form_list.render({ return form_list.render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
...@@ -92,7 +100,7 @@ ...@@ -92,7 +100,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["reference", "ascending"]], "sort": [["reference", "ascending"]],
"title": "Networks", "title": networks_translation,
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -116,7 +124,7 @@ ...@@ -116,7 +124,7 @@
jio_key: "computer_network_module" jio_key: "computer_network_module"
}); });
}) })
.push(function (result) { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_network"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_add_network"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}) gadget.getUrlFor({command: "change", options: {"page": "slapos"}})
...@@ -124,7 +132,7 @@ ...@@ -124,7 +132,7 @@
}) })
.push(function (result) { .push(function (result) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "Networks", page_title: networks_translation,
filter_action: true, filter_action: true,
selection_url: result[1], selection_url: result[1],
add_url: result[0] add_url: result[0]
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>974.61513.15083.40157</string> </value> <value> <string>981.53757.50718.33655</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1554901041.21</float> <float>1581615233.75</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Data updated
data-i18n=Title
data-i18n=Email
data-i18n=Organisation
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>962.59091.25023.39253</string> </value> <value> <string>980.36988.11538.20002</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1508520213.46</float> <float>1581688268.04</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
/*global window, rJS, RSVP, jIO, Blob */ /*global window, rJS, RSVP */
/*jslint nomen: true, indent: 2, maxerr: 3 */ /*jslint nomen: true, indent: 2, maxerr: 3 */
(function (window, rJS, RSVP, jIO, Blob) { (function (window, rJS, RSVP) {
"use strict"; "use strict";
rJS(window) rJS(window)
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
.declareAcquiredMethod("notifySubmitting", "notifySubmitting") .declareAcquiredMethod("notifySubmitting", "notifySubmitting")
.declareAcquiredMethod("notifySubmitted", 'notifySubmitted') .declareAcquiredMethod("notifySubmitted", 'notifySubmitted')
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("translate", "translate")
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// declared methods // declared methods
...@@ -34,7 +35,7 @@ ...@@ -34,7 +35,7 @@
var gadget = this; var gadget = this;
return gadget.jio_allDocs(param_list[0]) return gadget.jio_allDocs(param_list[0])
.push(function (result) { .push(function (result) {
var i, value, jio_key_value, len = result.data.total_rows; var i, value, len = result.data.total_rows;
for (i = 0; i < len; i += 1) { for (i = 0; i < len; i += 1) {
if (1 || (result.data.rows[i].value.hasOwnProperty("title"))) { if (1 || (result.data.rows[i].value.hasOwnProperty("title"))) {
value = result.data.rows[i].value.title; value = result.data.rows[i].value.title;
...@@ -85,7 +86,10 @@ ...@@ -85,7 +86,10 @@
return gadget.updateDocument(content); return gadget.updateDocument(content);
}) })
.push(function () { .push(function () {
return gadget.notifySubmitted({message: 'Data updated.', status: 'success'}); return gadget.translate('Data updated');
})
.push(function (result) {
return gadget.notifySubmitted({message: result, status: 'success'});
}); });
}) })
...@@ -94,26 +98,33 @@ ...@@ -94,26 +98,33 @@
}) })
.onStateChange(function () { .onStateChange(function () {
var gadget = this, data; var gadget = this,
organisation_translation;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getDeclaredGadget('form_view'), gadget.getDeclaredGadget('form_view'),
gadget.getSetting("hateoas_url") gadget.getSetting("hateoas_url"),
gadget.translate("Title"),
gadget.translate("Email"),
gadget.translate("Reference"),
gadget.translate("Associated Persons"),
gadget.translate("Organisation")
]); ]);
}) })
.push(function (result) { .push(function (result) {
var column_list = [ var column_list = [
['title', 'Title'], ['title', result[2]],
['default_email_text', 'Email'] ['default_email_text', result[3]]
], ],
editable = gadget.state.editable; editable = gadget.state.editable;
organisation_translation = result[6];
return result[0].render({ return result[0].render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
"my_title": { "my_title": {
"description": "", "description": "",
"title": "Title", "title": result[2],
"default": gadget.state.doc.title, "default": gadget.state.doc.title,
"css_class": "", "css_class": "",
"required": 1, "required": 1,
...@@ -124,7 +135,7 @@ ...@@ -124,7 +135,7 @@
}, },
"my_reference": { "my_reference": {
"description": "", "description": "",
"title": "Reference", "title": result[4],
"default": gadget.state.doc.reference, "default": gadget.state.doc.reference,
"css_class": "", "css_class": "",
"required": 1, "required": 1,
...@@ -150,7 +161,7 @@ ...@@ -150,7 +161,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["title", "ascending"]], "sort": [["title", "ascending"]],
"title": "Associated Persons", "title": result[5],
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -183,7 +194,7 @@ ...@@ -183,7 +194,7 @@
.push(function (url_list) { .push(function (url_list) {
var header_dict = { var header_dict = {
selection_url: url_list[1], selection_url: url_list[1],
page_title: "Organisation : " + gadget.state.doc.title, page_title: organisation_translation + ": " + gadget.state.doc.title,
delete_url: url_list[2], delete_url: url_list[2],
invitation_url: url_list[3], invitation_url: url_list[3],
save_action: true save_action: true
...@@ -194,4 +205,4 @@ ...@@ -194,4 +205,4 @@
return gadget.updateHeader(header_dict); return gadget.updateHeader(header_dict);
}); });
}); });
}(window, rJS, RSVP, jIO, Blob)); }(window, rJS, RSVP));
\ No newline at end of file \ No newline at end of file
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>976.51816.56601.26897</string> </value> <value> <string>981.55007.2386.62327</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1562012361.29</float> <float>1581692426.72</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Password is different from confirmation
data-i18n=New User Login created
data-i18n=Login Name
data-i18n=Password
data-i18n=Confirm your Password
data-i18n=Add New User Login
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>976.3557.5699.51524</string> </value> <value> <string>981.54798.39582.64972</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1559201605.46</float> <float>1581688625.32</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
.declareAcquiredMethod("jio_putAttachment", "jio_putAttachment") .declareAcquiredMethod("jio_putAttachment", "jio_putAttachment")
.declareAcquiredMethod("notifySubmitting", "notifySubmitting") .declareAcquiredMethod("notifySubmitting", "notifySubmitting")
.declareAcquiredMethod("notifySubmitted", 'notifySubmitted') .declareAcquiredMethod("notifySubmitted", 'notifySubmitted')
.declareAcquiredMethod("translate", "translate")
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// declared methods // declared methods
...@@ -31,17 +32,24 @@ ...@@ -31,17 +32,24 @@
return gadget.getDeclaredGadget('form_view'); return gadget.getDeclaredGadget('form_view');
}) })
.push(function (form_gadget) { .push(function (form_gadget) {
return form_gadget.getContent(); return RSVP.all([
form_gadget.getContent(),
gadget.translate("Password is different from confirmation"),
gadget.translate("New User Login created")
]);
}) })
.push(function (content) { .push(function (result) {
var k; var k,
content = result[0];
for (k in content) { for (k in content) {
if (content.hasOwnProperty(k)) {
if (k !== "password_confirmation") { if (k !== "password_confirmation") {
doc[k] = content[k]; doc[k] = content[k];
} }
if ((k === "password_confirmation") && if ((k === "password_confirmation") &&
(content.password !== content.password_confirmation)) { (content.password !== content.password_confirmation)) {
return gadget.notifySubmitted({message: 'Password is different from confirmation', status: 'error'}); return gadget.notifySubmitted({message: result[1], status: 'error'});
}
} }
} }
return gadget.getSetting("hateoas_url") return gadget.getSetting("hateoas_url")
...@@ -49,7 +57,7 @@ ...@@ -49,7 +57,7 @@
return gadget.jio_putAttachment(content.parent_relative_url, return gadget.jio_putAttachment(content.parent_relative_url,
hateoas_url + gadget.state.jio_key + "/Person_newLogin", doc) hateoas_url + gadget.state.jio_key + "/Person_newLogin", doc)
.push(function () { .push(function () {
return gadget.notifySubmitted({message: 'New User Login created.', status: 'success'}); return gadget.notifySubmitted({message: result[2], status: 'success'});
}) })
.push(function () { .push(function () {
return gadget.redirect({"command": "change", return gadget.redirect({"command": "change",
...@@ -63,22 +71,29 @@ ...@@ -63,22 +71,29 @@
return this.element.querySelector('button[type="submit"]').click(); return this.element.querySelector('button[type="submit"]').click();
}) })
.declareMethod("render", function (options) { .declareMethod("render", function (options) {
var gadget = this; var gadget = this,
page_title_translation;
gadget.state.jio_key = options.jio_key; gadget.state.jio_key = options.jio_key;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getDeclaredGadget('form_view') gadget.getDeclaredGadget('form_view'),
// XXXX use getTranslationList when ERP5 will be upgraded
gadget.translate("Login Name"),
gadget.translate("Password"),
gadget.translate("Confirm your Password"),
gadget.translate("Add New User Login")
]); ]);
}) })
.push(function (result) { .push(function (result) {
page_title_translation = result[4];
return result[0].render({ return result[0].render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
"my_reference": { "my_reference": {
"description": "", "description": "",
"title": "Login Name", "title": result[1],
"default": "", "default": "",
"css_class": "", "css_class": "",
"required": 1, "required": 1,
...@@ -89,7 +104,7 @@ ...@@ -89,7 +104,7 @@
}, },
"my_new_password": { "my_new_password": {
"description": "", "description": "",
"title": "Password", "title": result[2],
"default": "", "default": "",
"css_class": "", "css_class": "",
"required": 1, "required": 1,
...@@ -100,7 +115,7 @@ ...@@ -100,7 +115,7 @@
}, },
"my_confirmation_password": { "my_confirmation_password": {
"description": "", "description": "",
"title": "Confirm your Password", "title": result[3],
"default": "", "default": "",
"css_class": "", "css_class": "",
"required": 1, "required": 1,
...@@ -154,7 +169,7 @@ ...@@ -154,7 +169,7 @@
}) })
.push(function (url_list) { .push(function (url_list) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "Add New User Login", page_title: page_title_translation,
selection_url: url_list[0], selection_url: url_list[0],
submit_action: true submit_action: true
}); });
......
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>976.5545.8476.36522</string> </value> <value> <string>981.54984.13404.50141</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1559514750.72</float> <float>1581688830.01</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!doctype html> <!doctype html>
<html> <html>
<!--
data-i18n=New organisation created
data-i18n=Title
data-i18n=New Organisation
-->
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
......
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>976.40551.4801.13755</string> </value> <value> <string>980.36988.11538.20002</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1561421236.39</float> <float>1581687090.07</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
.declareAcquiredMethod("jio_post", "jio_post") .declareAcquiredMethod("jio_post", "jio_post")
.declareAcquiredMethod("notifySubmitting", "notifySubmitting") .declareAcquiredMethod("notifySubmitting", "notifySubmitting")
.declareAcquiredMethod("notifySubmitted", 'notifySubmitted') .declareAcquiredMethod("notifySubmitted", 'notifySubmitted')
.declareAcquiredMethod("translate", "translate")
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// declared methods // declared methods
...@@ -41,14 +42,17 @@ ...@@ -41,14 +42,17 @@
if (content_type.hasOwnProperty(doc.portal_type)) { if (content_type.hasOwnProperty(doc.portal_type)) {
doc.content_type = content_type[doc.portal_type]; doc.content_type = content_type[doc.portal_type];
} }
return gadget.jio_post(doc); return RSVP.all([
gadget.jio_post(doc),
gadget.translate("New organisation created")
]);
}) })
.push(function (key) { .push(function (result) {
return gadget.notifySubmitted({message: 'New Organisation created.', status: 'success'}) return gadget.notifySubmitted({message: result[1], status: 'success'})
.push(function () { .push(function () {
// Workaround, find a way to open document without break gadget. // Workaround, find a way to open document without break gadget.
return gadget.redirect({"command": "change", return gadget.redirect({"command": "change",
"options": {"jio_key": key, "page": "slap_controller"}}); "options": {"jio_key": result[0], "page": "slap_controller"}});
}); });
}); });
}) })
...@@ -58,20 +62,24 @@ ...@@ -58,20 +62,24 @@
}) })
.declareMethod("render", function () { .declareMethod("render", function () {
var gadget = this; var gadget = this,
page_title_translation;
return RSVP.Queue() return RSVP.Queue()
.push(function () { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getDeclaredGadget('form_view') gadget.getDeclaredGadget('form_view'),
gadget.translate("Title"),
gadget.translate("New Organisation")
]); ]);
}) })
.push(function (result) { .push(function (result) {
page_title_translation = result[2];
return result[0].render({ return result[0].render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
"my_title": { "my_title": {
"description": "The name of a document in ERP5", "description": "The name of a document in ERP5",
"title": "Title", "title": result[1],
"default": "", "default": "",
"css_class": "", "css_class": "",
"required": 0, "required": 0,
...@@ -129,14 +137,14 @@ ...@@ -129,14 +137,14 @@
} }
}); });
}) })
.push(function (result) { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: 'change', options: {page: "slap_person_view"}}) gadget.getUrlFor({command: 'change', options: {page: "slap_person_view"}})
]); ]);
}) })
.push(function (url_list) { .push(function (url_list) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "New Organisation", page_title: page_title_translation,
selection_url: url_list[0], selection_url: url_list[0],
submit_action: true submit_action: true
}); });
......
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>976.40456.42027.2525</string> </value> <value> <string>981.54951.54249.4164</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1561421261.51</float> <float>1581687094.72</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Your Account
data-i18n=Logins
data-i18n=Reference
data-i18n=Type
data-i18n=Title
data-i18n=Region
data-i18n=Status
data-i18n=First Name
data-i18n=Last Name
data-i18n=Email
data-i18n=Logins
data-i18n=Organisations
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.6873.14525.36027</string> </value> <value> <string>981.53572.16676.62344</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1574960455.23</float> <float>1581611639.72</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -70,18 +70,25 @@ ...@@ -70,18 +70,25 @@
return gadget.getDeclaredGadget('form_view'); return gadget.getDeclaredGadget('form_view');
}) })
.push(function (form_gadget) { .push(function (form_gadget) {
return form_gadget.getContent(); return RSVP.all([
form_gadget.getContent(),
gadget.translate("Your Account")
]);
}) })
.push(function (content) { .push(function (result) {
var content = result[0];
return gadget.updateDocument(content) return gadget.updateDocument(content)
.push(function () { .push(function () {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "Your Account : " + content.first_name + " " + content.last_name page_title: result[1] + " : " + content.first_name + " " + content.last_name
}); });
}); });
}) })
.push(function () { .push(function () {
return gadget.notifySubmitted({message: 'Data updated.', status: 'success'}); return gadget.translate("Data updated");
})
.push(function (result) {
return gadget.notifySubmitted({message: result, status: 'success'});
}); });
}) })
...@@ -90,24 +97,39 @@ ...@@ -90,24 +97,39 @@
}) })
.onStateChange(function () { .onStateChange(function () {
var gadget = this, var gadget = this;
i, destination_list, return new RSVP.Queue()
.push(function () {
return RSVP.all([
gadget.getDeclaredGadget('form_view'),
// XXXX use getTranslationList when ERP5 will be upgraded
gadget.translate("Reference"),
gadget.translate("Type"),
gadget.translate("Title"),
gadget.translate("Region"),
gadget.translate("Status"),
gadget.translate("First Name"),
gadget.translate("Last Name"),
gadget.translate("Email"),
gadget.translate("Logins"),
gadget.translate("Organisations")
]);
})
.push(function (result) {
var form_gadget = result[0],
i,
destination_list,
column_list = [ column_list = [
['reference', 'Reference'], ['reference', result[1]],
['portal_type', 'Type'] ['portal_type', result[2]]
], ],
organisation_column_list = [ organisation_column_list = [
['title', 'Title'], ['title', result[3]],
['reference', 'Reference'], ['reference', result[1]],
['default_address_region_title', 'Region'], ['default_address_region_title', result[4]],
['Organisation_getNewsDict', 'Status'] ['Organisation_getNewsDict', result[5]]
], ],
data; data;
return new RSVP.Queue()
.push(function () {
return gadget.getDeclaredGadget('form_view');
})
.push(function (form_gadget) {
destination_list = "%22NULL%22%2C"; destination_list = "%22NULL%22%2C";
for (i in gadget.state.doc.assignment_destination_list) { for (i in gadget.state.doc.assignment_destination_list) {
destination_list += "%22" + gadget.state.doc.assignment_destination_list[i] + "%22%2C"; destination_list += "%22" + gadget.state.doc.assignment_destination_list[i] + "%22%2C";
...@@ -117,7 +139,7 @@ ...@@ -117,7 +139,7 @@
"_embedded": {"_view": { "_embedded": {"_view": {
"my_first_name": { "my_first_name": {
"description": "", "description": "",
"title": "First Name", "title": result[6],
"default": gadget.state.doc.first_name, "default": gadget.state.doc.first_name,
"css_class": "", "css_class": "",
"required": 1, "required": 1,
...@@ -128,7 +150,7 @@ ...@@ -128,7 +150,7 @@
}, },
"my_last_name": { "my_last_name": {
"description": "", "description": "",
"title": "Last Name", "title": result[7],
"default": gadget.state.doc.last_name, "default": gadget.state.doc.last_name,
"css_class": "", "css_class": "",
"required": 1, "required": 1,
...@@ -139,7 +161,7 @@ ...@@ -139,7 +161,7 @@
}, },
"my_default_email_text": { "my_default_email_text": {
"description": "", "description": "",
"title": "Email", "title": result[8],
"default": gadget.state.doc.default_email_text, "default": gadget.state.doc.default_email_text,
"css_class": "", "css_class": "",
"required": 1, "required": 1,
...@@ -166,7 +188,7 @@ ...@@ -166,7 +188,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["reference", "ascending"]], "sort": [["reference", "ascending"]],
"title": "Logins", "title": result[9],
"type": "ListBox" "type": "ListBox"
}, },
"organisation_listbox": { "organisation_listbox": {
...@@ -185,7 +207,7 @@ ...@@ -185,7 +207,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["reference", "ascending"]], "sort": [["reference", "ascending"]],
"title": "Organisations", "title": result[10],
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -218,22 +240,23 @@ ...@@ -218,22 +240,23 @@
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_get_token"}}), gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_get_token"}}),
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_add_erp5_login"}}), gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_add_erp5_login"}}),
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_add_organisation"}}), gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_add_organisation"}}),
gadget.getUrlFor({command: "change", options: {page: "slapos"}}) gadget.getUrlFor({command: "change", options: {page: "slapos"}}),
gadget.translate("Your Account")
]); ]);
}) })
.push(function (url_list) { .push(function (result) {
var header_dict = { var header_dict = {
page_title: "Your Account : " + gadget.state.doc.first_name + " " + gadget.state.doc.last_name, page_title: result[7] + " : " + gadget.state.doc.first_name + " " + gadget.state.doc.last_name,
save_action: true, save_action: true,
request_certificate_url: url_list[2], request_certificate_url: result[2],
revoke_certificate_url: url_list[1], revoke_certificate_url: result[1],
token_url: url_list[3], token_url: result[3],
add_login_url: url_list[4], add_login_url: result[4],
add_organisation_url: url_list[5], add_organisation_url: result[5],
selection_url: url_list[6] selection_url: result[6]
}; };
if (!gadget.state.editable) { if (!gadget.state.editable) {
header_dict.edit_content = url_list[0]; header_dict.edit_content = result[0];
} }
return gadget.updateHeader(header_dict); return gadget.updateHeader(header_dict);
}); });
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.7943.45013.43144</string> </value> <value> <string>981.53696.63191.47069</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1575023357.88</float> <float>1581611751.8</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Title
data-i18n=Reference
data-i18n=Status
data-i18n=Projects
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.25270.11198.51746</string> </value> <value> <string>980.36988.11538.20002</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1575973846.43</float> <float>1581613388.39</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
.declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment") .declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.declareAcquiredMethod("translate", "translate")
.allowPublicAcquisition("jio_allDocs", function (param_list) { .allowPublicAcquisition("jio_allDocs", function (param_list) {
var gadget = this; var gadget = this;
...@@ -55,9 +56,10 @@ ...@@ -55,9 +56,10 @@
return gadget.triggerSubmit.apply(gadget, argument_list); return gadget.triggerSubmit.apply(gadget, argument_list);
}); });
}) })
.declareMethod("render", function (options) { .declareMethod("render", function () {
var gadget = this, var gadget = this,
lines_limit, destination_project_list; lines_limit,
projects_translation;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
...@@ -70,20 +72,27 @@ ...@@ -70,20 +72,27 @@
lines_limit = settings[0]; lines_limit = settings[0];
return RSVP.all([ return RSVP.all([
gadget.getDeclaredGadget('form_list'), gadget.getDeclaredGadget('form_list'),
gadget.jio_get(settings[1]) gadget.jio_get(settings[1]),
gadget.translate("Title"),
gadget.translate("Reference"),
gadget.translate("Status"),
gadget.translate("Projects")
]); ]);
}) })
.push(function (result) { .push(function (result) {
var destination_project_list, i, var destination_project_list, i,
column_list = [ column_list = [
['title', 'Title'], ['title', result[2]],
['reference', 'Reference'], ['reference', result[3]],
['Project_getNewsDict', 'Status'] ['Project_getNewsDict', result[4]]
]; ];
projects_translation = result[5];
destination_project_list = "%22NULL%22%2C"; destination_project_list = "%22NULL%22%2C";
for (i in result[1].assignment_destination_project_list) { for (i in result[1].assignment_destination_project_list) {
if (result[1].assignment_destination_project_list.hasOwnProperty(i)) {
destination_project_list += "%22" + result[1].assignment_destination_project_list[i] + "%22%2C"; destination_project_list += "%22" + result[1].assignment_destination_project_list[i] + "%22%2C";
} }
}
return result[0].render({ return result[0].render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
...@@ -104,7 +113,7 @@ ...@@ -104,7 +113,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["title", "ascending"]], "sort": [["title", "ascending"]],
"title": "Projects", "title": projects_translation,
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -128,7 +137,7 @@ ...@@ -128,7 +137,7 @@
jio_key: "project_module" jio_key: "project_module"
}); });
}) })
.push(function (result) { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_project"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_add_project"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}) gadget.getUrlFor({command: "change", options: {"page": "slapos"}})
...@@ -136,7 +145,7 @@ ...@@ -136,7 +145,7 @@
}) })
.push(function (result) { .push(function (result) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "Projects", page_title: projects_translation,
filter_action: true, filter_action: true,
selection_url: result[1], selection_url: result[1],
add_url: result[0] add_url: result[0]
......
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.7946.28171.30583</string> </value> <value> <string>981.53726.24431.13277</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1575020906.65</float> <float>1581613354.95</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Title
data-i18n=Description
data-i18n=Software Products
data-i18n=1/3 Select one Software
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.302.17486.60552</string> </value> <value> <string>980.36988.11538.20002</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1508925065.93</float> <float>1583146125.77</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
.declareAcquiredMethod("getUrlForList", "getUrlForList") .declareAcquiredMethod("getUrlForList", "getUrlForList")
.declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("translate", "translate")
.allowPublicAcquisition("getUrlForList", function (promise_list) { .allowPublicAcquisition("getUrlForList", function (promise_list) {
var index, param_list, gadget = this; var index, gadget = this;
for (index in promise_list[0]) { for (index in promise_list[0]) {
if ((promise_list[0][index].command === "display_with_history_and_cancel") && (promise_list[0][index].options.jio_key) && if ((promise_list[0].hasOwnProperty(index)) &&
(promise_list[0][index].command === "display_with_history_and_cancel") && (promise_list[0][index].options.jio_key) &&
(promise_list[0][index].options.jio_key.startsWith("software_product_module"))) { (promise_list[0][index].options.jio_key.startsWith("software_product_module"))) {
promise_list[0][index].options.page = "slap_select_software_release"; promise_list[0][index].options.page = "slap_select_software_release";
if (gadget.computer_jio_key !== undefined) { if (gadget.computer_jio_key !== undefined) {
...@@ -40,7 +42,8 @@ ...@@ -40,7 +42,8 @@
}) })
.declareMethod("render", function (options) { .declareMethod("render", function (options) {
var gadget = this, var gadget = this,
lines_limit; lines_limit,
page_title_translation;
if (options.computer_jio_key !== undefined) { if (options.computer_jio_key !== undefined) {
gadget.computer_jio_key = options.computer_jio_key; gadget.computer_jio_key = options.computer_jio_key;
...@@ -48,17 +51,23 @@ ...@@ -48,17 +51,23 @@
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return gadget.getSetting("listbox_lines_limit", 100); return RSVP.all([
}) gadget.getDeclaredGadget('form_list'),
.push(function (listbox_lines_limit) { gadget.getSetting("listbox_lines_limit", 100),
lines_limit = listbox_lines_limit; gadget.translate("Title"),
return gadget.getDeclaredGadget('form_list'); gadget.translate("Description"),
gadget.translate("Software Products"),
gadget.translate("1/3 Select one Software")
]);
}) })
.push(function (form_list) { .push(function (result) {
var column_list = [ var form_list = result[0],
['title', 'Title'], column_list = [
['description', 'Description'] ['title', result[2]],
['description', result[3]]
]; ];
lines_limit = result[1];
page_title_translation = result[5];
return form_list.render({ return form_list.render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
...@@ -78,7 +87,7 @@ ...@@ -78,7 +87,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["title", "ascending"]], "sort": [["title", "ascending"]],
"title": "Software Products", "title": result[4],
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -104,7 +113,7 @@ ...@@ -104,7 +113,7 @@
}) })
.push(function (url_list) { .push(function (url_list) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "1/3 Select one Software", page_title: page_title_translation,
cancel_url: url_list[0], cancel_url: url_list[0],
filter_action: true filter_action: true
}); });
......
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>975.59381.43838.41676</string> </value> <value> <string>982.16627.63365.49032</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1558620300.85</float> <float>1583146812.34</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Title
data-i18n=Short Title
data-i18n=Status
data-i18n=Services
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>962.57447.20466.40192</string> </value> <value> <string>980.36988.11538.20002</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1508421571.41</float> <float>1581614510.79</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
.declareAcquiredMethod("setSetting", "setSetting") .declareAcquiredMethod("setSetting", "setSetting")
.declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("translate", "translate")
.allowPublicAcquisition("jio_allDocs", function (param_list) { .allowPublicAcquisition("jio_allDocs", function (param_list) {
var gadget = this; var gadget = this;
...@@ -56,24 +57,31 @@ ...@@ -56,24 +57,31 @@
return gadget.triggerSubmit.apply(gadget, argument_list); return gadget.triggerSubmit.apply(gadget, argument_list);
}); });
}) })
.declareMethod("render", function (options) { .declareMethod("render", function () {
var gadget = this, var gadget = this,
lines_limit; lines_limit,
services_translation;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return gadget.getSetting("listbox_lines_limit", 20); return RSVP.all([
}) gadget.getDeclaredGadget('form_list'),
.push(function (listbox_lines_limit) { gadget.getSetting("listbox_lines_limit", 20),
lines_limit = listbox_lines_limit; gadget.translate("Title"),
return gadget.getDeclaredGadget('form_list'); gadget.translate("Short Title"),
gadget.translate("Status"),
gadget.translate("Services")
]);
}) })
.push(function (form_list) { .push(function (result) {
var column_list = [ var column_list = [
['title', 'Title'], ['title', result[2]],
['short_title', 'Short Title'], ['short_title', result[3]],
['HostingSubscription_getNewsDict', 'Status'] ['HostingSubscription_getNewsDict', result[4]]
]; ],
form_list = result[0];
lines_limit = result[1];
services_translation = result[5];
return form_list.render({ return form_list.render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
...@@ -93,7 +101,7 @@ ...@@ -93,7 +101,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["title", "ascending"]], "sort": [["title", "ascending"]],
"title": "Services", "title": services_translation,
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -117,7 +125,7 @@ ...@@ -117,7 +125,7 @@
jio_key: "hosting_subscription_module" jio_key: "hosting_subscription_module"
}); });
}) })
.push(function (result) { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "display_dialog_with_history", options: {"page": "slap_select_software_product"}}), gadget.getUrlFor({command: "display_dialog_with_history", options: {"page": "slap_select_software_product"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}) gadget.getUrlFor({command: "change", options: {"page": "slapos"}})
...@@ -126,7 +134,7 @@ ...@@ -126,7 +134,7 @@
}) })
.push(function (result) { .push(function (result) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "Services", page_title: services_translation,
filter_action: true, filter_action: true,
add_url: result[0], add_url: result[0],
selection_url: result[1] selection_url: result[1]
......
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>975.58079.59045.43946</string> </value> <value> <string>981.53744.26294.36147</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1558616829.7</float> <float>1581614534.16</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Title
data-i18n=Reference
data-i18n=Region
data-i18n=Status
data-i18n=Sites
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.6873.14525.36027</string> </value> <value> <string>981.53720.59574.64921</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1575974102.28</float> <float>1581613018.77</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
/*global window, rJS, RSVP */ /*global window, rJS, RSVP */
/*jslint nomen: true, indent: 2, maxerr: 3*/ /*jslint nomen: true, indent: 2, maxerr: 3*/
(function (window, rJS, RSVP) { (function (window, rJS, RSVP) {
"use strict"; 'use strict';
rJS(window) rJS(window)
.declareAcquiredMethod("updateHeader", "updateHeader") .declareAcquiredMethod('updateHeader', 'updateHeader')
.declareAcquiredMethod("updatePanel", "updatePanel") .declareAcquiredMethod('updatePanel', 'updatePanel')
.declareAcquiredMethod("redirect", "redirect") .declareAcquiredMethod('redirect', 'redirect')
.declareAcquiredMethod("reload", "reload") .declareAcquiredMethod('reload', 'reload')
.declareAcquiredMethod("getSetting", "getSetting") .declareAcquiredMethod('getSetting', 'getSetting')
.declareAcquiredMethod("jio_get", "jio_get") .declareAcquiredMethod('jio_get', 'jio_get')
.declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod('getUrlFor', 'getUrlFor')
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod('jio_allDocs', 'jio_allDocs')
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment") .declareAcquiredMethod('jio_getAttachment', 'jio_getAttachment')
.declareAcquiredMethod('translate', 'translate')
.allowPublicAcquisition("jio_allDocs", function (param_list) { .allowPublicAcquisition('jio_allDocs', function (param_list) {
var gadget = this; var gadget = this;
return gadget.jio_allDocs(param_list[0]) return gadget.jio_allDocs(param_list[0]).push(function (result) {
.push(function (result) { var i,
var i, value, value_jio_key, len = result.data.total_rows; value,
value_jio_key,
len = result.data.total_rows;
for (i = 0; i < len; i += 1) { for (i = 0; i < len; i += 1) {
if (1 || (result.data.rows[i].value.hasOwnProperty("Organisation_getNewsDict"))) { if (
1 ||
result.data.rows[i].value.hasOwnProperty('Organisation_getNewsDict')
) {
value_jio_key = result.data.rows[i].id; value_jio_key = result.data.rows[i].id;
value = result.data.rows[i].value.Organisation_getNewsDict; value = result.data.rows[i].value.Organisation_getNewsDict;
result.data.rows[i].value.Organisation_getNewsDict = { result.data.rows[i].value.Organisation_getNewsDict = {
field_gadget_param : { field_gadget_param: {
css_class: "", css_class: '',
description: "The Status", description: 'The Status',
hidden: 0, hidden: 0,
"default": {jio_key: value_jio_key, result: value}, default: { jio_key: value_jio_key, result: value },
key: "status", key: 'status',
url: "gadget_slapos_site_status.html", url: 'gadget_slapos_site_status.html',
title: "Status", title: 'Status',
type: "GadgetField" type: 'GadgetField'
} }
}; };
result.data.rows[i].value["listbox_uid:list"] = { result.data.rows[i].value['listbox_uid:list'] = {
key: "listbox_uid:list", key: 'listbox_uid:list',
value: 2713 value: 2713
}; };
} }
...@@ -48,21 +54,21 @@ ...@@ -48,21 +54,21 @@
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// declared methods // declared methods
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
.declareMethod("triggerSubmit", function () { .declareMethod('triggerSubmit', function () {
var argument_list = arguments; var argument_list = arguments;
return this.getDeclaredGadget('form_list') return this.getDeclaredGadget('form_list').push(function (gadget) {
.push(function (gadget) {
return gadget.triggerSubmit.apply(gadget, argument_list); return gadget.triggerSubmit.apply(gadget, argument_list);
}); });
}) })
.declareMethod("render", function (options) { .declareMethod('render', function () {
var gadget = this, var gadget = this,
lines_limit; lines_limit,
sites_translation;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getSetting("listbox_lines_limit", 20), gadget.getSetting('listbox_lines_limit', 20),
window.getSettingMe(gadget) window.getSettingMe(gadget)
]); ]);
}) })
...@@ -70,72 +76,89 @@ ...@@ -70,72 +76,89 @@
lines_limit = settings[0]; lines_limit = settings[0];
return RSVP.all([ return RSVP.all([
gadget.getDeclaredGadget('form_list'), gadget.getDeclaredGadget('form_list'),
gadget.jio_get(settings[1]) gadget.jio_get(settings[1]),
gadget.translate('Title'),
gadget.translate('Reference'),
gadget.translate('Region'),
gadget.translate('Status'),
gadget.translate('Sites')
]); ]);
}) })
.push(function (result) { .push(function (result) {
var i, destination_list, column_list = [ var i,
['title', 'Title'], destination_list,
['reference', 'Reference'], column_list = [
['default_address_region_title', 'Region'], ['title', result[2]],
['Organisation_getNewsDict', 'Status'] ['reference', result[3]],
['default_address_region_title', result[4]],
['Organisation_getNewsDict', result[5]]
]; ];
destination_list = "%22NULL%22%2C"; destination_list = '%22NULL%22%2C';
sites_translation = result[6];
for (i in result[1].assignment_destination_list) { for (i in result[1].assignment_destination_list) {
destination_list += "%22" + result[1].assignment_destination_list[i] + "%22%2C"; if (result[1].assignment_destination_list.hasOwnProperty(i)) {
destination_list +=
'%22' + result[1].assignment_destination_list[i] + '%22%2C';
}
} }
return result[0].render({ return result[0].render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { _embedded: {
"listbox": { _view: {
"column_list": column_list, listbox: {
"show_anchor": 0, column_list: column_list,
"default_params": {}, show_anchor: 0,
"editable": 0, default_params: {},
"editable_column_list": [], editable: 0,
"key": "slap_site_listbox", editable_column_list: [],
"lines": lines_limit, key: 'slap_site_listbox',
"list_method": "portal_catalog", lines: lines_limit,
"query": "urn:jio:allDocs?query=portal_type%3A%22" + list_method: 'portal_catalog',
"Organisation" + "%22%20AND%20role_title%3A%22Host%22%20AND%20" + query:
"relative_url%3A(" + destination_list + ")", 'urn:jio:allDocs?query=portal_type%3A%22' +
"portal_type": [], 'Organisation' +
"search_column_list": column_list, '%22%20AND%20role_title%3A%22Host%22%20AND%20' +
"sort_column_list": column_list, 'relative_url%3A(' +
"sort": [["title", "ascending"]], destination_list +
"title": "Sites", ')',
"type": "ListBox" portal_type: [],
search_column_list: column_list,
sort_column_list: column_list,
sort: [['title', 'ascending']],
title: sites_translation,
type: 'ListBox'
}
} }
}}, },
"_links": { _links: {
"type": { type: {
// form_list display portal_type in header // form_list display portal_type in header
name: "" name: ''
} }
} }
}, },
form_definition: { form_definition: {
group_list: [[ group_list: [['bottom', [['listbox']]]]
"bottom",
[["listbox"]]
]]
} }
}); });
}) })
.push(function () { .push(function () {
return gadget.updatePanel({ return gadget.updatePanel({
jio_key: "organisation_module" jio_key: 'organisation_module'
}); });
}) })
.push(function (result) { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_organisation"}}), gadget.getUrlFor({
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}) command: 'change',
options: { page: 'slap_add_organisation' }
}),
gadget.getUrlFor({ command: 'change', options: { page: 'slapos' } })
]); ]);
}) })
.push(function (result) { .push(function (result) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "Sites", page_title: sites_translation,
selection_url: result[1], selection_url: result[1],
filter_action: true, filter_action: true,
add_url: result[0] add_url: result[0]
......
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.6873.14525.36027</string> </value> <value> <string>981.53718.43497.43810</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1575020879.49</float> <float>1581612966.9</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Title
data-i18n=Reference
data-i18n=State
data-i18n=Tickets
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.6925.1989.65006</string> </value> <value> <string>980.36988.11538.20002</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1574960436.86</float> <float>1581612316.56</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("jio_allDocs", "jio_allDocs")
.declareAcquiredMethod("jio_get", "jio_get") .declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment") .declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.declareAcquiredMethod("translate", "translate")
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
...@@ -26,9 +27,10 @@ ...@@ -26,9 +27,10 @@
return gadget.triggerSubmit.apply(gadget, argument_list); return gadget.triggerSubmit.apply(gadget, argument_list);
}); });
}) })
.declareMethod("render", function (options) { .declareMethod("render", function () {
var gadget = this, var gadget = this,
lines_limit; lines_limit,
tickets_translation;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
...@@ -41,15 +43,20 @@ ...@@ -41,15 +43,20 @@
lines_limit = setting[0]; lines_limit = setting[0];
return RSVP.all([ return RSVP.all([
gadget.getDeclaredGadget('form_list'), gadget.getDeclaredGadget('form_list'),
gadget.jio_get(setting[1]) gadget.jio_get(setting[1]),
gadget.translate("Title"),
gadget.translate("Reference"),
gadget.translate("State"),
gadget.translate("Tickets")
]); ]);
}) })
.push(function (result) { .push(function (result) {
var column_list = [ var column_list = [
['title', 'Title'], ['title', result[2]],
['reference', 'Reference'], ['reference', result[3]],
['translated_simulation_state_title', 'State'] ['translated_simulation_state_title', result[4]]
]; ];
tickets_translation = result[5];
return result[0].render({ return result[0].render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
...@@ -67,7 +74,7 @@ ...@@ -67,7 +74,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["modification_date", "Descending"]], "sort": [["modification_date", "Descending"]],
"title": "Tickets", "title": tickets_translation,
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -91,7 +98,7 @@ ...@@ -91,7 +98,7 @@
jio_key: "support_request_module" jio_key: "support_request_module"
}); });
}) })
.push(function (result) { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_ticket"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_add_ticket"}}),
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_ticket"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_rss_ticket"}}),
...@@ -101,7 +108,7 @@ ...@@ -101,7 +108,7 @@
}) })
.push(function (result) { .push(function (result) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "Tickets", page_title: tickets_translation,
filter_action: true, filter_action: true,
selection_url: result[2], selection_url: result[2],
add_url: result[0], add_url: result[0],
......
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.7933.50073.58436</string> </value> <value> <string>981.53707.7724.34918</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1575023625.93</float> <float>1581612203.2</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
<html> <html>
<!-- <!--
data-i18n=Slapos data-i18n=Slapos
data-i18n=Sites
data-i18n=Title
data-i18n=Modification Date
data-i18n=State
data-i18n=Pending Tickets to Process
data-i18n=Dashboard
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
...@@ -21,9 +27,9 @@ ...@@ -21,9 +27,9 @@
<script id="ticket-link-control-template" type="text/x-handlebars-template"> <script id="ticket-link-control-template" type="text/x-handlebars-template">
<div class="slapos-control-front"> <div class="slapos-control-front">
<center> <center>
<a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-sort-alpha-asc" href={{ show_all_url }} data-i18n="Show All Tickets" > Show All Tickets</a> <a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-sort-alpha-asc" href="{{ show_all_url }}" data-i18n="Show All Tickets" > Show All Tickets</a>
<a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss" href={{ rss_all_url }} data-i18n="RSS (all)" > RSS </a> <a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss" href="{{ rss_all_url }}" data-i18n="RSS (all)" > RSS </a>
<a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss" href={{ rss_critical_url }} data-i18n="RSS Critical" > Critical </a> <a class="ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss" href="{{ rss_critical_url }}" data-i18n="RSS Critical" > Critical </a>
</center> </center>
</div> </div>
</script> </script>
......
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.6873.14525.36027</string> </value> <value> <string>981.53386.41888.4846</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1575974254.82</float> <float>1581602507.86</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment") .declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.declareAcquiredMethod("updatePanel", "updatePanel") .declareAcquiredMethod("updatePanel", "updatePanel")
.declareAcquiredMethod("translateHtml", "translateHtml") .declareAcquiredMethod("translateHtml", "translateHtml")
.declareAcquiredMethod("translate", "translate")
.declareAcquiredMethod("redirect", "redirect") .declareAcquiredMethod("redirect", "redirect")
.declareAcquiredMethod("updateHeader", "updateHeader") .declareAcquiredMethod("updateHeader", "updateHeader")
.declareAcquiredMethod("updateConfiguration", "updateConfiguration") .declareAcquiredMethod("updateConfiguration", "updateConfiguration")
...@@ -114,7 +115,7 @@ ...@@ -114,7 +115,7 @@
var gadget = this; var gadget = this;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
var lines_limit, logout_url_template; var lines_limit;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
...@@ -128,19 +129,25 @@ ...@@ -128,19 +129,25 @@
lines_limit = settings[0]; lines_limit = settings[0];
return RSVP.all([ return RSVP.all([
gadget.getDeclaredGadget('right'), gadget.getDeclaredGadget('right'),
gadget.jio_get(settings[1]) gadget.jio_get(settings[1]),
// XXXX Use getTranslationList when we upgrade ERP5
gadget.translate("Title"),
gadget.translate("Status"),
gadget.translate("Sites")
]); ]);
}) })
.push(function (result) { .push(function (result) {
var i, destination_list, column_list = [ var i, destination_list, column_list = [
['title', 'Title'], ['title', result[2]],
['Organisation_getNewsDict', 'Status'] ['Organisation_getNewsDict', result[3]]
]; ];
gadget.me_dict = result[1]; gadget.me_dict = result[1];
destination_list = "%22NULL%22%2C"; destination_list = "%22NULL%22%2C";
for (i in result[1].assignment_destination_list) { for (i in result[1].assignment_destination_list) {
if (result[1].assignment_destination_list.hasOwnProperty(i)) {
destination_list += "%22" + result[1].assignment_destination_list[i] + "%22%2C"; destination_list += "%22" + result[1].assignment_destination_list[i] + "%22%2C";
} }
}
return result[0].render({ return result[0].render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
...@@ -160,7 +167,7 @@ ...@@ -160,7 +167,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["title", "ascending"]], "sort": [["title", "ascending"]],
"title": "Sites", "title": result[4],
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -238,31 +245,40 @@ ...@@ -238,31 +245,40 @@
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getDeclaredGadget('last'),
gadget.getUrlFor({command: 'change', options: {page: "slap_ticket_list"}}), gadget.getUrlFor({command: 'change', options: {page: "slap_ticket_list"}}),
gadget.getUrlFor({command: 'change', options: {page: "slap_rss_ticket"}}), gadget.getUrlFor({command: 'change', options: {page: "slap_rss_ticket"}}),
gadget.getUrlFor({command: 'change', options: {page: "slap_rss_critical_ticket"}}) gadget.getUrlFor({command: 'change', options: {page: "slap_rss_critical_ticket"}})
]); ]);
}) })
.push(function (result) {
return RSVP.all([
gadget.getDeclaredGadget('last'),
gadget.translateHtml(ticket_control_template({
show_all_url: result[0],
rss_all_url: result[1],
rss_critical_url: result[2]
})),
//XXX use getTranslationList when we upgrade ERP5 code
gadget.translate("Title"),
gadget.translate("Modification Date"),
gadget.translate("State"),
gadget.translate("Pending Tickets to Process")
]);
})
.push(function (result) { .push(function (result) {
var form_list = result[0], var form_list = result[0],
column_list = [ column_list = [
['title', 'Title'], ['title', result[2]],
['modification_date', 'Modification Date'], ['modification_date', result[3]],
['translated_simulation_state_title', 'State'] ['translated_simulation_state_title', result[4]]
]; ];
return form_list.render({ return form_list.render({
erp5_document: { erp5_document: {
"_embedded": {"_view": { "_embedded": {"_view": {
"control": { "control": {
"description": "", "description": "",
"title": "Link Control", "title": "Link Control",
"default": ticket_control_template({ "default": result[1],
show_all_url: result[1],
rss_all_url: result[2],
rss_critical_url: result[3]
}),
"css_class": "", "css_class": "",
"required": 1, "required": 1,
"editable": 0, "editable": 0,
...@@ -285,7 +301,7 @@ ...@@ -285,7 +301,7 @@
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
"sort": [["modification_date", "Descending"]], "sort": [["modification_date", "Descending"]],
"title": "Pending Tickets to Process", "title": result[5],
"type": "ListBox" "type": "ListBox"
} }
}}, }},
...@@ -311,8 +327,11 @@ ...@@ -311,8 +327,11 @@
}); });
}) })
.push(function () { .push(function () {
return gadget.translate("Dashboard");
})
.push(function (result) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: 'Dashboard' page_title: result[0]
}); });
}); });
}) })
...@@ -326,8 +345,10 @@ ...@@ -326,8 +345,10 @@
var i; var i;
destination_list = '"NULL"'; destination_list = '"NULL"';
for (i in person_doc.assignment_destination_list) { for (i in person_doc.assignment_destination_list) {
if (person_doc.assignment_destination_list.hasOwnProperty(i)) {
destination_list += ' ,"' + person_doc.assignment_destination_list[i] + '"'; destination_list += ' ,"' + person_doc.assignment_destination_list[i] + '"';
} }
}
return gadget.jio_allDocs({ return gadget.jio_allDocs({
query: "portal_type:Organisation AND role_title:Host AND relative_url:(" + destination_list + ")", query: "portal_type:Organisation AND role_title:Host AND relative_url:(" + destination_list + ")",
select_list: ['title', select_list: ['title',
...@@ -340,6 +361,7 @@ ...@@ -340,6 +361,7 @@
.push(function (result) { .push(function (result) {
var idx, marker_list = []; var idx, marker_list = [];
for (idx in result.data.rows) { for (idx in result.data.rows) {
if (result.data.rows.hasOwnProperty(idx)) {
marker_list.push({ marker_list.push({
"jio_key": result.data.rows[idx].id, "jio_key": result.data.rows[idx].id,
"doc": {"title": result.data.rows[idx].value.title, "doc": {"title": result.data.rows[idx].value.title,
...@@ -349,6 +371,7 @@ ...@@ -349,6 +371,7 @@
"longitude": result.data.rows[idx].value.default_geographical_location_longitude} "longitude": result.data.rows[idx].value.default_geographical_location_longitude}
}); });
} }
}
return gadget.getElement() return gadget.getElement()
.push(function (element) { .push(function (element) {
return gadget.declareGadget("gadget_erp5_page_map.html", { return gadget.declareGadget("gadget_erp5_page_map.html", {
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.6873.14525.36027</string> </value> <value> <string>981.53545.9233.1570</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1575021126.08</float> <float>1581604372.73</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -239,9 +239,9 @@ gadget_html5_select.js\n ...@@ -239,9 +239,9 @@ gadget_html5_select.js\n
gadget_erp5_global.js\n gadget_erp5_global.js\n
gadget_jio.html\n gadget_jio.html\n
gadget_jio.js\n gadget_jio.js\n
gadget_translation.html\n gadget_slapos_translation.html\n
gadget_translation.js\n gadget_translation.js\n
gadget_translation_data.js\n gadget_slapos_translation_data.js\n
handlebars.js\n handlebars.js\n
jiodev.js\n jiodev.js\n
renderjs.js\n renderjs.js\n
...@@ -318,7 +318,7 @@ gadget_erp5_page_slap_load_schema.js\n ...@@ -318,7 +318,7 @@ gadget_erp5_page_slap_load_schema.js\n
gadget_erp5_page_slap_network_list.html\n gadget_erp5_page_slap_network_list.html\n
gadget_erp5_page_slap_network_list.js\n gadget_erp5_page_slap_network_list.js\n
gadget_erp5_page_slap_organisation_view.html\n gadget_erp5_page_slap_organisation_view.html\n
gadget_erp5_page_slap_organisation_view.js\n #gadget_erp5_page_slap_organisation_view.js\n
gadget_erp5_page_slap_site_view.html\n gadget_erp5_page_slap_site_view.html\n
gadget_erp5_page_slap_site_view.js\n gadget_erp5_page_slap_site_view.js\n
gadget_erp5_page_slap_parameter_form.css\n gadget_erp5_page_slap_parameter_form.css\n
...@@ -388,7 +388,7 @@ gadget_erp5_page_slap_notify_and_redirect.html\n ...@@ -388,7 +388,7 @@ gadget_erp5_page_slap_notify_and_redirect.html\n
gadget_erp5_page_slap_notify_and_redirect.js\n gadget_erp5_page_slap_notify_and_redirect.js\n
gadget_erp5_page_slapos.css\n gadget_erp5_page_slapos.css\n
gadget_erp5_page_slapos.html\n gadget_erp5_page_slapos.html\n
gadget_erp5_page_slapos.js\n #gadget_erp5_page_slapos.js\n
gadget_erp5_page_slapos_request_form.html\n gadget_erp5_page_slapos_request_form.html\n
gadget_erp5_page_trial.css\n gadget_erp5_page_trial.css\n
gadget_erp5_page_trial.html\n gadget_erp5_page_trial.html\n
...@@ -581,7 +581,7 @@ NETWORK:\n ...@@ -581,7 +581,7 @@ NETWORK:\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>981.14498.3807.21930</string> </value> <value> <string>981.54984.55898.16640</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -599,7 +599,7 @@ NETWORK:\n ...@@ -599,7 +599,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1579259797.54</float> <float>1581689221.25</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -2,30 +2,47 @@ ...@@ -2,30 +2,47 @@
<html> <html>
<head> <head>
<!-- <!--
data-i18n=Front data-i18n=Accept
data-i18n=Previous data-i18n=Actions
data-i18n=Cancel
data-i18n=Back
data-i18n=Editable
data-i18n=Viewable
data-i18n=New
data-i18n=Save
data-i18n=Proceed
data-i18n=Add data-i18n=Add
data-i18n=Filter data-i18n=Add Login
data-i18n=Views data-i18n=Add Organisation
data-i18n=Jump data-i18n=Add Ticket
data-i18n=Back
data-i18n=Cancel
data-i18n=Close
data-i18n=Critical RSS
data-i18n=Cut
data-i18n=Delete data-i18n=Delete
data-i18n=Destroy
data-i18n=Download
data-i18n=Editable
data-i18n=Export data-i18n=Export
data-i18n=Actions
data-i18n=Cut
data-i18n=Add
data-i18n=Previous
data-i18n=Next
data-i18n=Loading
data-i18n=Fast Input data-i18n=Fast Input
data-i18n=Filter
data-i18n=Front
data-i18n=Invite User
data-i18n=Jump
data-i18n=Language data-i18n=Language
data-i18n=Loading
data-i18n=Menu
data-i18n=New
data-i18n=Next
data-i18n=Previous
data-i18n=Proceed
data-i18n=Reject
data-i18n=Request Certificate
data-i18n=Revoke Certificate
data-i18n=RSS
data-i18n=Save
data-i18n=Start
data-i18n=Stop
data-i18n=Supply
data-i18n=Token
data-i18n=Transfer
data-i18n=Upload
data-i18n=Viewable
data-i18n=Views
--> -->
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>972.32024.53732.34406</string> </value> <value> <string>981.53554.36648.23688</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1545648648.56</float> <float>1581605167.12</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<!--
data-i18n=Home
data-i18n=Login Account
data-i18n=Tickets
data-i18n=Sites
data-i18n=Projects
data-i18n=Invoices
data-i18n=Services
data-i18n=Servers
data-i18n=Networks
data-i18n=Logout
data-i18n=Access Monitor
-->
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, user-scalable=no" /> <meta name="viewport" content="width=device-width, user-scalable=no" />
<title>ERP5 Panel</title> <title>ERP5 Panel</title>
...@@ -31,7 +44,7 @@ ...@@ -31,7 +44,7 @@
<div class="ui-content"> <div class="ui-content">
<ul data-role="listview" class="ui-listview" data-enhanced="true"> <ul data-role="listview" class="ui-listview" data-enhanced="true">
<li class="ui-first-child"><a href="#?editable=true" class="ui-btn ui-btn-icon-left ui-icon-home" data-i18n="Home" accesskey="h">Home</a></li> <li class="ui-first-child"><a href="#?editable=true" class="ui-btn ui-btn-icon-left ui-icon-home" data-i18n="Home" accesskey="h">Home</a></li>
<li><a href="{{person_href}}" class="ui-btn ui-btn-icon-left ui-icon-user" data-i18n="Account" accesskey="p">Account</a></li> <li><a href="{{person_href}}" class="ui-btn ui-btn-icon-left ui-icon-user" data-i18n="Login Account" accesskey="p">Account</a></li>
<li><a href="{{support_request_href}}" class="ui-btn ui-btn-icon-left ui-icon-comments" data-i18n="Tickets" accesskey="t">Tickets</a></li> <li><a href="{{support_request_href}}" class="ui-btn ui-btn-icon-left ui-icon-comments" data-i18n="Tickets" accesskey="t">Tickets</a></li>
<li><a href="{{organisation_href}}" class="ui-btn ui-btn-icon-left ui-icon-map-marker" data-i18n="Sites" accesskey="k">Sites</a></li> <li><a href="{{organisation_href}}" class="ui-btn ui-btn-icon-left ui-icon-map-marker" data-i18n="Sites" accesskey="k">Sites</a></li>
<li><a href="{{project_href}}" class="ui-btn ui-btn-icon-left ui-icon-cubes" data-i18n="Projects" accesskey="w">Projects</a></li> <li><a href="{{project_href}}" class="ui-btn ui-btn-icon-left ui-icon-cubes" data-i18n="Projects" accesskey="w">Projects</a></li>
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>980.6873.14525.36027</string> </value> <value> <string>981.53553.60693.32631</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1576494063.72</float> <float>1581609475.31</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<string>Associate</string> <string>Associate</string>
<string>Auditor</string> <string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -59,7 +58,6 @@ ...@@ -59,7 +58,6 @@
<string>Associate</string> <string>Associate</string>
<string>Auditor</string> <string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -71,7 +69,7 @@ ...@@ -71,7 +69,7 @@
</item> </item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>gadget_translation_data.js</string> </value> <value> <string>gadget_slapos_translation_data.js</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -81,7 +79,7 @@ ...@@ -81,7 +79,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>rjs_gadget_translation_data_js</string> </value> <value> <string>rjs_gadget_slapos_translation_data_js</string> </value>
</item> </item>
<item> <item>
<key> <string>language</string> </key> <key> <string>language</string> </key>
...@@ -101,7 +99,7 @@ ...@@ -101,7 +99,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Gadget Translation Data JS</string> </value> <value> <string>Gadget SlapOS Translation Data JS</string> </value>
</item> </item>
<item> <item>
<key> <string>version</string> </key> <key> <string>version</string> </key>
...@@ -167,7 +165,7 @@ ...@@ -167,7 +165,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>cedric.le.ninivin</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -189,7 +187,7 @@ ...@@ -189,7 +187,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1438012175.94</float> <float>1581585903.15</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -202,6 +200,7 @@ ...@@ -202,6 +200,7 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
<none/>
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
...@@ -234,7 +233,7 @@ ...@@ -234,7 +233,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>972.31995.48177.21845</string> </value> <value> <string>982.16622.24406.13004</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +251,7 @@ ...@@ -252,7 +251,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1552957380.36</float> <float>1583146548.65</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -261,6 +260,7 @@ ...@@ -261,6 +260,7 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
<none/>
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>cedric.le.ninivin</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1438012143.53</float> <float>1581585795.07</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -318,6 +318,7 @@ ...@@ -318,6 +318,7 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
<none/>
</tuple> </tuple>
</pickle> </pickle>
</record> </record>
......
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<title>Translation Gadget</title>
<link rel="http://www.renderjs.org/rel/interface" href="interface_translation.html">
<!-- renderjs -->
<script src="rsvp.js" type="text/javascript"></script>
<script src="renderjs.js" type="text/javascript"></script>
<!-- custom script -->
<script src="gadget_slapos_translation_data.js" type="text/javascript"></script>
<script src="gadget_translation.js" type="text/javascript"></script>
</head>
<body>
</body>
</html>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Page" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Change_local_roles_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>content_md5</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>gadget_slapos_translation.html</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>rjs_gadget_slapos_translation_html</string> </value>
</item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Page</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Gadget SlapOS Translation</string> </value>
</item>
<item>
<key> <string>version</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -299,6 +299,26 @@ ...@@ -299,6 +299,26 @@
<value> <string>string</string> </value> <value> <string>string</string> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_slapos_master_api</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_computer_install_command_line</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -329,6 +349,7 @@ ...@@ -329,6 +349,7 @@
<value> <value>
<tuple> <tuple>
<string>en</string> <string>en</string>
<string>zh</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -345,6 +366,10 @@ ...@@ -345,6 +366,10 @@
<key> <string>configuration_application_title</string> </key> <key> <string>configuration_application_title</string> </key>
<value> <string>ERP5</string> </value> <value> <string>ERP5</string> </value>
</item> </item>
<item>
<key> <string>configuration_computer_install_command_line</string> </key>
<value> <string>wget https://deploy.erp5.net/slapos ; bash slapos</string> </value>
</item>
<item> <item>
<key> <string>configuration_content_security_policy</string> </key> <key> <string>configuration_content_security_policy</string> </key>
<value> <string>default-src \'self\'; img-src \'self\' data: *.openstreetmap.org; media-src \'self\' blob:; connect-src \'self\' data: lab.node.vifib.com lab.nexedi.com; script-src \'self\' \'unsafe-eval\'; font-src \'self\'; style-src \'self\' data: \'unsafe-inline\'; frame-src \'self\' data:</string> </value> <value> <string>default-src \'self\'; img-src \'self\' data: *.openstreetmap.org; media-src \'self\' blob:; connect-src \'self\' data: lab.node.vifib.com lab.nexedi.com; script-src \'self\' \'unsafe-eval\'; font-src \'self\'; style-src \'self\' data: \'unsafe-inline\'; frame-src \'self\' data:</string> </value>
...@@ -385,9 +410,13 @@ ...@@ -385,9 +410,13 @@
<key> <string>configuration_payment_result</string> </key> <key> <string>configuration_payment_result</string> </key>
<value> <string>slap_payment_result</string> </value> <value> <string>slap_payment_result</string> </value>
</item> </item>
<item>
<key> <string>configuration_slapos_master_api</string> </key>
<value> <string>https://slap.vifib.com</string> </value>
</item>
<item> <item>
<key> <string>configuration_translation_gadget_url</string> </key> <key> <string>configuration_translation_gadget_url</string> </key>
<value> <string>gadget_translation.html</string> </value> <value> <string>gadget_slapos_translation.html</string> </value>
</item> </item>
<item> <item>
<key> <string>configuration_view_action_category</string> </key> <key> <string>configuration_view_action_category</string> </key>
...@@ -627,7 +656,7 @@ ...@@ -627,7 +656,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>969.36476.25776.58999</string> </value> <value> <string>981.53285.53652.51182</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -645,7 +674,7 @@ ...@@ -645,7 +674,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1542718253.4</float> <float>1581587590.88</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.9361.64926.12219</string> </value> <value> <string>980.3967.45207.31880</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -380,7 +380,7 @@ ...@@ -380,7 +380,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1509468722.47</float> <float>1581586037.41</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -449,7 +449,7 @@ ...@@ -449,7 +449,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.6526.41124.38758</string> </value> <value> <string>980.3967.45207.31880</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1509468550.49</float> <float>1581586037.4</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -385,7 +385,7 @@ ...@@ -385,7 +385,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>966.9871.6009.22135</string> </value> <value> <string>980.3967.45207.31880</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -403,7 +403,7 @@ ...@@ -403,7 +403,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1520950177.79</float> <float>1581586037.41</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.6526.41124.38758</string> </value> <value> <string>980.3967.45207.31880</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1509468550.5</float> <float>1581586037.41</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -192,7 +192,7 @@ web_page_module/rjs_gadget_slapos_project_status_html ...@@ -192,7 +192,7 @@ web_page_module/rjs_gadget_slapos_project_status_html
web_page_module/rjs_gadget_slapos_project_status_js web_page_module/rjs_gadget_slapos_project_status_js
web_page_module/rjs_gadget_slapos_site_status_html web_page_module/rjs_gadget_slapos_site_status_html
web_page_module/rjs_gadget_slapos_site_status_js web_page_module/rjs_gadget_slapos_site_status_js
web_page_module/rjs_gadget_translation_data_js web_page_module/rjs_gadget_slapos_translation_data_js
web_page_module/rjs_gadget_trial_panel_html web_page_module/rjs_gadget_trial_panel_html
web_page_module/rjs_gadget_trial_panel_js web_page_module/rjs_gadget_trial_panel_js
web_page_module/rjs_gadget_slapos_utils_js web_page_module/rjs_gadget_slapos_utils_js
......
...@@ -192,8 +192,9 @@ web_page_module/rjs_gadget_slapos_project_status_html ...@@ -192,8 +192,9 @@ web_page_module/rjs_gadget_slapos_project_status_html
web_page_module/rjs_gadget_slapos_project_status_js web_page_module/rjs_gadget_slapos_project_status_js
web_page_module/rjs_gadget_slapos_site_status_html web_page_module/rjs_gadget_slapos_site_status_html
web_page_module/rjs_gadget_slapos_site_status_js web_page_module/rjs_gadget_slapos_site_status_js
web_page_module/rjs_gadget_slapos_translation_data_js
web_page_module/rjs_gadget_slapos_translation_html
web_page_module/rjs_gadget_slapos_utils_js web_page_module/rjs_gadget_slapos_utils_js
web_page_module/rjs_gadget_translation_data_js
web_page_module/rjs_gadget_trial_panel_html web_page_module/rjs_gadget_trial_panel_html
web_page_module/rjs_gadget_trial_panel_js web_page_module/rjs_gadget_trial_panel_js
web_page_module/rjs_leaflet_css web_page_module/rjs_leaflet_css
......
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