Skip to content

S
slapos.core
Commit 960d9c46 authored by Rafael Monnerat's avatar Rafael Monnerat 👻
Browse files
Options

slapos_jio: Drop Handlebars 

  This follow up renderjs general directive to not use it.
parent 4a42f2f1
Show whitespace changes
Inline Side-by-side
Showing with 365 additions and 435 deletions
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_payment_result_html.html
View file @ 960d9c46
......@@ -8,17 +8,8 @@
<script src="rsvp.js"></script>
<script src="renderjs.js"></script>
<script src="handlebars.js"></script>
<script src="domsugar.js"></script>
<script src="gadget_slapos_payment_result.js"></script>
<script id="message-template" type="text/x-handlebars-template">
<p> <center><strong>{{message_to_acknowledge}} </strong> </center> </p>
<p> <center>{{advice}} </center></p>
<p> </p>
<p> <center><a class="ui-btn ui-first-child ui-btn-icon-center" data-i18n="Return to Invoice List" href="{{payment_url}}"> Return to Invoice List</a></center> </p>
</script>
</head>
<body>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_payment_result_html.xml
View file @ 960d9c46
......@@ -240,7 +240,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.64930.42858.1297</string> </value>
<value> <string>1000.2322.46712.16657</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -258,7 +258,7 @@
</tuple>
<state>
<tuple>
<float>1516648499.4</float>
<float>1655131178.92</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_css.css
View file @ 960d9c46
......@@ -7,7 +7,8 @@
float: right;
}
.box-gadget-bottom {
.box-gadget-bottom,
.box-gadget-bottom-header {
float: left;
width: 100%;
padding-top: 17px;
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_css.xml
View file @ 960d9c46
......@@ -251,7 +251,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>975.6713.31372.10752</string> </value>
<value> <string>1000.2322.46712.16657</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -269,7 +269,7 @@
</tuple>
<state>
<tuple>
<float>1555545224.77</float>
<float>1654593711.96</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_html.html
View file @ 960d9c46
......@@ -16,7 +16,7 @@
<!-- renderjs -->
<script src="rsvp.js" type="text/javascript"></script>
<script src="handlebars.js"></script>
<script src="domsugar.js"></script>
<script src="renderjs.js" type="text/javascript"></script>
<!-- custom script -->
......@@ -24,16 +24,6 @@
<script src="gadget_erp5_page_slapos.js" type="text/javascript"></script>
<link href="gadget_erp5_page_slapos.css" rel="stylesheet" type="text/css"/>
<script id="ticket-link-control-template" type="text/x-handlebars-template">
<div class="slapos-control-front">
<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-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>
</center>
</div>
</script>
</head>
<body>
......@@ -49,6 +39,8 @@
<div data-gadget-url="gadget_erp5_pt_form_view.html"
data-gadget-scope="right"></div>
</div>
<div class="box-gadget-bottom-header">
</div>
<div class="box-gadget-bottom">
<div data-gadget-url="gadget_erp5_pt_form_view.html"
data-gadget-scope="last"></div>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_html.xml
View file @ 960d9c46
......@@ -251,7 +251,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>981.53386.41888.4846</string> </value>
<value> <string>1000.49354.9268.54869</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -269,7 +269,7 @@
</tuple>
<state>
<tuple>
<float>1581602507.86</float>
<float>1654593490.4</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.js
View file @ 960d9c46
/*global document, window, Option, rJS, RSVP, Chart, UriTemplate, Handlebars*/
/*global document, window, Option, rJS, RSVP, Chart, UriTemplate, domsugar */
/*jslint nomen: true, indent: 2, maxerr: 3 */
(function (window, rJS, RSVP, Handlebars) {
(function (window, rJS, RSVP, domsugar) {
"use strict";
var gadget_klass = rJS(window),
ticket_control_source = gadget_klass.__template_element
.getElementById("ticket-link-control-template")
.innerHTML,
ticket_control_template = Handlebars.compile(ticket_control_source);
var gadget_klass = rJS(window);
gadget_klass
.ready(function (gadget) {
gadget.property_dict = {};
......@@ -22,7 +17,6 @@
/////////////////////////////////////////////////////////////////
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.declareAcquiredMethod("updatePanel", "updatePanel")
.declareAcquiredMethod("translateHtml", "translateHtml")
.declareAcquiredMethod("getTranslationList", "getTranslationList")
.declareAcquiredMethod("redirect", "redirect")
.declareAcquiredMethod("updateHeader", "updateHeader")
......@@ -249,49 +243,51 @@
"Modification Date",
"State",
"Pending Tickets to Process",
"Dashboard"
"Dashboard",
"Show All Tickets",
"RSS",
"Critical"
];
return new RSVP.Queue()
.push(function () {
return RSVP.all([
gadget.getDeclaredGadget('last'),
gadget.getTranslationList(translation_list1),
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_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]
})),
gadget.getTranslationList(translation_list1)
]);
})
.push(function (result) {
gadget.page_title_translation = result[2][4];
gadget.page_title_translation = result[1][4];
var form_list = result[0],
bottom_header = domsugar('div', {"class": "slapos-control-front"},
[
domsugar("center", {}, [
domsugar("a",
{"class": "ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-sort-alpha-asc",
"text": result[1][5],
"href": result[2]}),
domsugar("a",
{"class": "ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss",
"text": result[1][6],
"href": result[3]}),
domsugar("a",
{"class": "ui-btn ui-first-child ui-btn-white-front ui-btn-icon-left ui-icon-rss",
"text": result[1][7],
"href": result[4]})
])
]),
div_bottom_header = gadget.element.querySelector(".box-gadget-bottom-header"),
column_list = [
['title', result[2][0]],
['modification_date', result[2][1]],
['translated_simulation_state_title', result[2][2]]
['title', result[1][0]],
['modification_date', result[1][1]],
['translated_simulation_state_title', result[1][2]]
];
div_bottom_header.appendChild(bottom_header);
return form_list.render({
erp5_document: {
"_embedded": {"_view": {
"control": {
"description": "",
"title": "Link Control",
"default": result[1],
"css_class": "",
"required": 1,
"editable": 0,
"key": "control",
"hidden": 0,
"type": "EditorField"
},
"listbox": {
"column_list": column_list,
"show_anchor": 0,
......@@ -307,7 +303,7 @@
"search_column_list": column_list,
"sort_column_list": column_list,
"sort": [["modification_date", "Descending"]],
"title": result[2][3],
"title": result[1][3],
"type": "ListBox"
}
}},
......@@ -398,4 +394,4 @@
});
});
});
}(window, rJS, RSVP, Handlebars));
\ No newline at end of file
}(window, rJS, RSVP, domsugar));
\ No newline at end of file
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.xml
View file @ 960d9c46
......@@ -247,7 +247,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>994.34705.53932.19848</string> </value>
<value> <string>1000.49340.48222.40550</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -265,7 +265,7 @@
</tuple>
<state>
<tuple>
<float>1631134229.82</float>
<float>1654593493.33</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_html.html
View file @ 960d9c46
......@@ -8,30 +8,9 @@
<script src="rsvp.js"></script>
<script src="renderjs.js"></script>
<script src="handlebars.js"></script>
<script src="domsugar.js"></script>
<script src="gadget_slapos_event_discussion_entry.js"></script>
<link href="gadget_slapos_event_discussion_entry.css" rel="stylesheet" type="text/css"/>
<script id="inline-event-template" type="text/x-handlebars-template">
<div class="slapos-event-discussion-message-header">
<p>By <strong>{{author}} </strong> on {{modification_date}}: </p>
</div>
<div class="slapos-event-discussion-message-body">
<pre>{{message}}</pre>
</div>
</script>
<script id="inline-html-event-template" type="text/x-handlebars-template">
<div class="slapos-event-discussion-message-header">
<p>By <strong>{{author}} </strong> on {{modification_date}}: </p>
</div>
<div class="slapos-event-discussion-message-body">{{{message}}}</div>
</script>
</head>
<body>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_html.xml
View file @ 960d9c46
......@@ -226,7 +226,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>superthomas</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -240,7 +240,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>974.21419.55105.18158</string> </value>
<value> <string>1000.2322.46712.16657</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -258,7 +258,7 @@
</tuple>
<state>
<tuple>
<float>1552496307.06</float>
<float>1655126611.0</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.js
View file @ 960d9c46
/*globals console, window, rJS, RSVP, Handlebars, $*/
/*globals console, window, rJS, RSVP, domsugar */
/*jslint indent: 2, nomen: true, maxlen: 80*/
(function (window, rJS, RSVP, Handlebars) {
(function (window, rJS, domsugar) {
"use strict";
var gadget_klass = rJS(window),
inline_event_source = gadget_klass.__template_element
.getElementById("inline-event-template")
.innerHTML,
inline_status_template = Handlebars.compile(inline_event_source),
inline_html_event_source = gadget_klass.__template_element
.getElementById("inline-html-event-template")
.innerHTML,
inline_html_status_template = Handlebars.compile(inline_html_event_source);
gadget_klass
rJS(window)
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("translateHtml", "translateHtml")
.declareMethod("getContent", function () {
return {};
})
.declareMethod("render", function (options) {
.onStateChange(function () {
var gadget = this,
template = inline_status_template,
source = options.value.doc.source,
modification_date = options.value.doc.modification_date,
text_content = options.value.doc.text_content,
title = options.value.doc.title,
content_type = options.value.doc.content_type;
return new RSVP.Queue()
.push(function () {
if (content_type === 'text/html') {
template = inline_html_status_template;
header_text = "By " + gadget.state.author +
" on " + gadget.state.modification_date + ":",
header = domsugar("div", {
class: "slapos-event-discussion-message-header"
}, [
domsugar('p', {text: header_text})
]);
if (gadget.state.content_type === 'text/html') {
return domsugar(gadget.element, {}, [
header,
domsugar('div', {
class: "slapos-event-discussion-message-body",
text: gadget.state.text_content
})
]);
}
gadget.element.innerHTML = template({
title: title,
author: source,
modification_date: modification_date,
message: text_content
});
return domsugar(gadget.element, {}, [
header,
domsugar('div', {
class: "slapos-event-discussion-message-body"
}, [
domsugar("pre", {text: gadget.state.text_content})
])
]);
})
.declareMethod("render", function (options) {
var gadget = this;
return gadget.changeState({
author: options.value.doc.source,
modification_date: options.value.doc.modification_date,
text_content: options.value.doc.text_content,
content_type: options.value.doc.content_type
});
});
}(window, rJS, RSVP, Handlebars));
\ No newline at end of file
}(window, rJS, domsugar));
\ No newline at end of file
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.xml
View file @ 960d9c46
......@@ -222,7 +222,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>superthomas</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>974.21419.16980.58675</string> </value>
<value> <string>1000.58263.12906.59494</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1552579622.59</float>
<float>1655128468.51</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_invoice_printout_html.html
View file @ 960d9c46
......@@ -8,15 +8,9 @@
<script src="rsvp.js"></script>
<script src="renderjs.js"></script>
<script src="handlebars.js"></script>
<script src="domsugar.js"></script>
<script src="gadget_slapos_invoice_printout.js"></script>
<script id="download-link-template" type="text/x-handlebars-template">
<ul class="grid-items">
<li><a class="ui-btn ui-first-child ui-btn-icon-center" data-i18n="Download Invoice" target=_blank href={{invoice_url}} > <img src='pdf_icon.png'></img></a></li>
</ul>
</script>
</head>
<body>
<button data-i18n="loading" type="submit" class="responsive ui-btn ui-icon-spinner ui-icon-spin ui-btn-icon-center ui-disabled" style="border:none;">loading</button>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_invoice_printout_html.xml
View file @ 960d9c46
......@@ -240,7 +240,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.60140.15778.40123</string> </value>
<value> <string>1000.58223.44192.61900</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -258,7 +258,7 @@
</tuple>
<state>
<tuple>
<float>1516361248.37</float>
<float>1655126135.42</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_invoice_printout_js.js
View file @ 960d9c46
/*globals console, window, rJS, RSVP, loopEventListener, i18n, Handlebars $*/
/*globals console, window, rJS, domsugar */
/*jslint indent: 2, nomen: true, maxlen: 80*/
(function (window, rJS, RSVP, Handlebars) {
(function (window, rJS, domsugar) {
"use strict";
var gadget_klass = rJS(window),
download_invoice_source = gadget_klass.__template_element
.getElementById("download-link-template")
.innerHTML,
download_invoice_template = Handlebars.compile(download_invoice_source);
gadget_klass
rJS(window)
.declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("translateHtml", "translateHtml")
......@@ -17,20 +12,33 @@
.declareMethod("getContent", function () {
return {};
})
.declareMethod("render", function (options) {
.onStateChange(function () {
var gadget = this;
return gadget.getElement()
.push(function (element) {
return gadget.getSetting("hateoas_url")
.push(function (hateoas_url) {
var link = hateoas_url + "/" +
options.value.jio_key +
gadget.state.jio_key +
"/SaleInvoiceTransaction_viewSlapOSPrintout";
element.innerHTML = download_invoice_template({
invoice_url: link
});
return element;
return domsugar(gadget.element, {}, [
domsugar('ul', 'grid-items', [
domsugar('li', {}, [
domsugar('a',
{
class: "ui-btn ui-first-child ui-btn-icon-center",
target: "_blank",
href: link
}, [
domsugar("img", {src: 'pdf_icon.png'})
])
])
])
]);
});
})
.declareMethod("render", function (options) {
var gadget = this;
return gadget.changeState({
jio_key: options.value.jio_key
});
});
}(window, rJS, RSVP, Handlebars));
\ No newline at end of file
}(window, rJS, domsugar));
\ No newline at end of file
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_invoice_printout_js.xml
View file @ 960d9c46
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.60112.26500.11690</string> </value>
<value> <string>1000.58234.7511.30071</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1516360952.96</float>
<float>1655126122.9</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_invoice_state_html.html
View file @ 960d9c46
......@@ -8,21 +8,8 @@
<script src="rsvp.js"></script>
<script src="renderjs.js"></script>
<script src="handlebars.js"></script>
<script src="domsugar.js"></script>
<script src="gadget_slapos_invoice_state.js"></script>
<script id="payment-link-template" type="text/x-handlebars-template">
<ul class="grid-items">
<li><a class="ui-btn ui-first-child ui-btn-icon-center" data-i18n="Pay Now" href={{invoice_url}}> Pay Now</a></li>
</ul>
</script>
<script id="payment-state-template" type="text/x-handlebars-template">
<ul class="grid-items">
<li>{{invoice_state}}</li>
</ul>
</script>
</head>
<body>
<button data-i18n="loading" type="submit" class="responsive ui-btn ui-icon-spinner ui-icon-spin ui-btn-icon-center ui-disabled" style="border:none;">loading</button>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_invoice_state_html.xml
View file @ 960d9c46
......@@ -240,7 +240,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>964.60162.4991.21401</string> </value>
<value> <string>1000.58194.15602.170</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -258,7 +258,7 @@
</tuple>
<state>
<tuple>
<float>1516362382.75</float>
<float>1655123719.67</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_invoice_state_js.js
View file @ 960d9c46
/*globals console, window, rJS, RSVP, loopEventListener, i18n, Handlebars $*/
/*globals console, window, rJS, RSVP, domsugar */
/*jslint indent: 2, nomen: true, maxlen: 80*/
(function (window, rJS, RSVP, Handlebars) {
(function (window, rJS, domsugar) {
"use strict";
var gadget_klass = rJS(window),
payment_link_source = gadget_klass.__template_element
.getElementById("payment-link-template")
.innerHTML,
payment_link_template = Handlebars.compile(payment_link_source),
payment_state_source = gadget_klass.__template_element
.getElementById("payment-state-template")
.innerHTML,
payment_state_template = Handlebars.compile(payment_state_source);
gadget_klass
.declareAcquiredMethod("jio_get", "jio_get")
rJS(window)
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.declareAcquiredMethod("translateHtml", "translateHtml")
.declareAcquiredMethod("getTranslationDict", "getTranslationDict")
.declareMethod("getContent", function () {
return {};
})
.declareMethod("render", function (options) {
var gadget = this;
return new RSVP.Queue()
.push(function () {
return RSVP.all([
gadget.getElement(),
gadget.getSetting("hateoas_url")
.onStateChange(function () {
var gadget = this,
link;
return gadget.getTranslationDict(['Pay Now'])
.push(function (translation_dict) {
if (gadget.state.payment_transaction !== null) {
link = domsugar("li", {},
[
domsugar("a", {
class: "ui-btn ui-first-child ui-btn-icon-center",
// XXX Translation
text: translation_dict["Pay Now"],
href: gadget.state.hateoas_url + gadget.state.payment_transaction +
"/PaymentTransaction_redirectToManualSlapOSPayment"
})
]);
} else {
link = domsugar("li", {"text": gadget.state.payment_transaction});
}
domsugar(gadget.element, {}, [
domsugar("ul", {"class": "grid-items"}, [link])
]);
return translation_dict;
})
})
.push(function (result) {
var hateoas_url = result[1],
element = result[0];
.declareMethod("render", function (options) {
var gadget = this;
return gadget.getSetting("hateoas_url")
.push(function (hateoas_url) {
// XXX RAFAEL this should comes from the options and not from a query like this.
return gadget.jio_getAttachment(options.value.jio_key,
hateoas_url + options.value.jio_key +
"/AccountingTransaction_getPaymentStateAsHateoas")
.push(function (state) {
console.log(state);
var link, payment_transaction = state.payment_transaction;
if (payment_transaction !== null) {
link = payment_link_template({
invoice_state: state.state,
invoice_url: hateoas_url + payment_transaction +
"/PaymentTransaction_redirectToManualSlapOSPayment"
});
} else {
link = payment_state_template({
invoice_state: state.state
return gadget.changeState({
payment_transaction: state.payment_transaction,
payment_state: state.state,
hateoas_url: hateoas_url
});
}
element.innerHTML = link;
return state;
});
});
});
}(window, rJS, RSVP, Handlebars));
\ No newline at end of file
}(window, rJS, domsugar));
\ No newline at end of file
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_invoice_state_js.xml
View file @ 960d9c46
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>984.49089.34672.33348</string> </value>
<value> <string>1000.58215.43208.28603</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1593042198.73</float>
<float>1655125229.22</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_html.html
View file @ 960d9c46
......@@ -22,75 +22,38 @@
<!-- renderjs -->
<script src="rsvp.js" type="text/javascript"></script>
<script src="renderjs.js" type="text/javascript"></script>
<script src="handlebars.js" type="text/javascript"></script>
<script src="domsugar.js" type="text/javascript"></script>
<script src="gadget_global.js" type="text/javascript"></script>
<script src="gadget_slapos_utils.js" type="text/javascript"></script>
<script src="gadget_slapos_panel.js" type="text/javascript"></script>
<script id="panel-template-header" type="text/x-handlebars-template">
<div data-role="header" class="ui-bar-inherit">
<div class="ui-controlgroup ui-controlgroup-horizontal ui-btn-left">
</head>
<body>
<div>
<div data-role="header">
<div class="ui-btn-left">
<div class="ui-controlgroup-controls">
<button data-i18n="Close" class="ui-btn ui-btn-icon-notext ui-icon-delete">Close</button>
<button data-i18n="Close" class="ui-btn-icon-notext ui-icon-delete">Close</button>
</div>
</div>
<div class="panel_img">
<img class="ui-title" alt="SlapOS logo" src="gadget_slapos_panel.png?format=png"/>
</div>
</div>
</script>
<script id="panel-template-warning-link" type="text/x-handlebars-template">
<li><a href="#" id="attention-point-link" class="ui-btn-icon-notext ui-icon-warning attention-point-link">Warnings ({{amount}})</a></li>
</script>
<script id="panel-template-contextual-help" type="text/x-handlebars-template">
<dt class="ui-btn-icon-left ui-icon-question" data-i18n="Help">Help</dt>
{{#each contextual_help_list}}
<dd class="document-listview">
<a class="help" target="_blank" href="{{href}}">{{title}}</a>
</dd>
{{/each}}
</script>
<script id="panel-template-body" type="text/x-handlebars-template">
<div class="ui-content">
<ul data-role="listview" class="ui-listview" data-enhanced="true">
<li class="ui-first-child"><a href="{{instance_tree_href}}" class="ui-btn ui-btn-icon-left ui-icon-home" data-i18n="Services" accesskey="l">Services</a></li>
<li><a href="{{dashboard_href}}" class="ui-btn ui-btn-icon-left ui-icon-gears" data-i18n="Dashboard" accesskey="h">Dashboard</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="{{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="{{accounting_href}}" class="ui-btn ui-btn-icon-left ui-icon-credit-card" data-i18n="Invoices" accesskey="i">Invoices</a></li>
<li><a href="{{compute_node_href}}" class="ui-btn ui-btn-icon-left ui-icon-database" data-i18n="Servers" accesskey="c">Servers</a></li>
<li><a href="{{computer_network_href}}" class="ui-btn ui-btn-icon-left ui-icon-globe" data-i18n="Networks" accesskey="n">Networks</a></li>
<li><a href="{{language_href}}" class="ui-btn ui-btn-icon-left ui-icon-language" data-i18n="Language" accesskey="a">Language</a></li>
<li class="ui-last-child"><a href="{{logout_href}}" class="ui-btn ui-btn-icon-left ui-icon-power-off" data-i18n="Logout" accesskey="o">Logout</a></li>
</ul>
<dl></dl>
<div>
<ul></ul>
<ul class="ul-attention-point"></ul>
<hr />
<ul data-role="listview" class="ui-listview" data-enhanced="true">
<li class="ui-first-child"><a href="https://monitor.app.officejs.com/" class="ui-btn ui-btn-icon-left ui-icon-desktop" data-i18n="Access Monitor" target="_blank">Access Monitor</a></li>
<li><a href="https://handbook.rapid.space" class="ui-btn ui-btn-icon-left ui-icon-book" data-i18n="Documentation" accesskey="d" target="_blank" rel="noopener noreferrer">Documentation</a></li>
</ul>
<dl></dl>
</div>
<div class="slapos_panel_extra_menu">
<div data-gadget-url="gadget_erp5_panel_shortcut.html"
data-gadget-scope="erp5_panel_shortcut"
data-gadget-sandbox="public"></div>
<dl></dl>
<ul data-role="listview" class="ui-listview ul-attention-point" data-enhanced="true">
<li></li>
</ul>
<dl class="dl-contextual-help">
</dl>
</div>
</script>
<!-- custom script -->
<script src="gadget_slapos_utils.js" type="text/javascript"></script>
<script src="gadget_slapos_panel.js" type="text/javascript"></script>
</head>
<body>
<div class="jqm-navmenu-panel"></div>
</body>
</html>
\ No newline at end of file
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_html.xml
View file @ 960d9c46
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>superthomas</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -248,7 +248,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>996.2197.3655.23739</string> </value>
<value> <string>1000.49305.52353.8806</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -266,7 +266,7 @@
</tuple>
<state>
<tuple>
<float>1639502126.27</float>
<float>1654590574.45</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_js.js
View file @ 960d9c46
/*jslint nomen: true, indent: 2, maxerr: 3 */
/*global window, document, rJS, Handlebars, RSVP, Node, loopEventListener */
(function (window, document, rJS, Handlebars, RSVP, Node, loopEventListener) {
/*jslint nomen: true, indent: 2, maxerr: 3, unparam: true */
/*global window, document, rJS, RSVP, Node, asBoolean , ensureArray,
mergeGlobalActionWithRawActionList, domsugar*/
(function (window, document, rJS, RSVP, Node, domsugar) {
"use strict";
/////////////////////////////////////////////////////////////////
// temlates
/////////////////////////////////////////////////////////////////
// Precompile templates while loading the first gadget instance
var gadget_klass = rJS(window),
template_element = gadget_klass.__template_element,
panel_template_header = Handlebars.compile(template_element
.getElementById("panel-template-header")
.innerHTML),
panel_template_body = Handlebars.compile(template_element
.getElementById("panel-template-body")
.innerHTML),
panel_template_warning_link = Handlebars.compile(template_element
.getElementById("panel-template-warning-link")
.innerHTML),
panel_template_contextual_help = Handlebars.compile(template_element
.getElementById("panel-template-contextual-help")
.innerHTML);
gadget_klass
rJS(window)
.setState({
visible: false,
desktop: false
visible: false
})
//////////////////////////////////////////////
// acquired method
//////////////////////////////////////////////
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("getUrlForList", "getUrlForList")
.declareAcquiredMethod("getTranslationList", "getTranslationList")
.declareAcquiredMethod("getTranslationDict", "getTranslationDict")
.declareAcquiredMethod("redirect", "redirect")
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.declareAcquiredMethod("translateHtml", "translateHtml")
.declareAcquiredMethod("translate", "translate")
.declareAcquiredMethod("getUrlParameter", "getUrlParameter")
.declareAcquiredMethod("renderEditorPanel", "renderEditorPanel")
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("redirect", "redirect")
/////////////////////////////////////////////////////////////////
// declared methods
......@@ -59,13 +42,12 @@
jio_key: options.jio_key
});
})
.onStateChange(function (modification_dict) {
var context = this,
.onStateChange(function onStateChange(modification_dict) {
var i,
context = this,
gadget = this,
queue = new RSVP.Queue(),
jio_key = modification_dict.jio_key,
tmp_element;
queue = new RSVP.Queue();
if (modification_dict.hasOwnProperty("visible")) {
if (this.state.visible) {
......@@ -78,61 +60,69 @@
}
}
}
if (modification_dict.hasOwnProperty("global")) {
if (modification_dict.hasOwnProperty("editable")) {
queue
// Update the global links
.push(function () {
return RSVP.all([
context.getUrlFor({command: 'display', options: {page: "logout"}}),
context.getUrlFor({command: 'display', options: {page: "search", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_site_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_ticket_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_invoice_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_service_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_compute_node_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_network_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_project_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_person_view", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slapos", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_language_view"}})
]);
})
.push(function (result_list) {
// XXX: Customize panel header!
return context.translateHtml(
panel_template_header() +
panel_template_body({
"logout_href": result_list[0],
"search_href": result_list[1],
"organisation_href": result_list[2],
"support_request_href": result_list[3],
"accounting_href": result_list[4],
"instance_tree_href": result_list[5],
"compute_node_href": result_list[6],
"computer_network_href": result_list[7],
"project_href": result_list[8],
"person_href": result_list[9],
"dashboard_href": result_list[10],
"language_href": result_list[11]
})
);
})
.push(function (my_translated_or_plain_html) {
tmp_element = document.createElement('div');
tmp_element.innerHTML = my_translated_or_plain_html;
return context.declareGadget('gadget_erp5_panel_shortcut.html', {
scope: "gadget_erp5_panel_shortcut",
element: tmp_element.querySelector('[data-gadget-scope="erp5_panel_shortcut"]')
return RSVP.hash({
url_list: gadget.getUrlForList([
{command: 'display', options: {page: "slap_service_list", editable: true}},
{command: 'display', options: {page: "slapos", editable: true}},
{command: 'display', options: {page: "slap_person_view", editable: true}},
{command: 'display', options: {page: "slap_ticket_list", editable: true}},
{command: 'display', options: {page: "slap_site_list", editable: true}},
{command: 'display', options: {page: "slap_invoice_list", editable: true}},
{command: 'display', options: {page: "slap_compute_node_list", editable: true}},
{command: 'display', options: {page: "slap_network_list", editable: true}},
{command: 'display', options: {page: "slap_project_list", editable: true}},
{command: 'display', options: {page: "slap_language_view"}},
{command: 'display', options: {page: "logout"}}
]),
translation_list: gadget.getTranslationList([
'Services',
'Dashboard',
'Account',
'Tickets',
'Sites',
'Projects',
'Invoices',
'Servers',
'Networks',
'Language',
'Logout'
])
});
})
.push(function (panel_shortcut) {
return panel_shortcut.render({
focus: false
});
.push(function (result_dict) {
var element_list = [],
icon_and_key_list = [
'home', 'l',
'gears', 'h',
'user', 'p',
'comments', 't',
'map-marker', 'k',
'cubes', 'w',
'credit-card', 'i',
'database', 'c',
'globe', 'n',
'language', 'a',
'power-off', 'o'
];
for (i = 0; i < result_dict.url_list.length; i += 1) {
// <li><a href="URL" class="ui-btn-icon-left ui-icon-ICON" data-i18n="TITLE" accesskey="KEY"></a></li>
element_list.push(domsugar('li', [
domsugar('a', {
href: result_dict.url_list[i],
'class': 'ui-btn-icon-left ui-icon-' + icon_and_key_list[2 * i],
accesskey: icon_and_key_list[2 * i + 1],
text: result_dict.translation_list[i]
})
.push(function () {
context.element.querySelector("div").appendChild(tmp_element);
return context.listenResize();
]));
}
domsugar(gadget.element.querySelector("ul"),
[domsugar(null, element_list)]);
});
}
// Check for Alerts to pop
......@@ -145,7 +135,6 @@
return context.calculateMyAttentionPointList(jio_key, false);
});
}
return queue;
})
......@@ -163,39 +152,30 @@
}
}, false, false)
.declareJob('listenResize', function () {
// resize should be only trigger after the render method
// as displaying the panel rely on external gadget (for translation for example)
var result,
event,
context = this;
function extractSizeAndDispatch() {
if (window.matchMedia("(min-width: 90em)").matches) {
return context.changeState({
desktop: true
});
}
return context.changeState({
desktop: false
});
}
result = loopEventListener(window, 'resize', false,
extractSizeAndDispatch);
event = document.createEvent("Event");
event.initEvent('resize', true, true);
window.dispatchEvent(event);
return result;
.allowPublicAcquisition('notifyChange', function notifyChange() {
// Typing a search query should not modify the header status
return;
})
.allowPublicAcquisition('notifyChange', function () {
// Typing a search query should not modify the header status
.allowPublicAcquisition("notifyFocus", function notifyFocus() {
// All html5 fields in ERP5JS triggers this method when focus
// is triggered. This is usefull to display error text.
// But, in the case of panel, we don't need to handle anything.
return;
})
.allowPublicAcquisition("notifyBlur", function notifyBlur() {
// All html5 fields in ERP5JS triggers this method when blur
// is triggered now. This is usefull to display error text.
// But, in the case of panel, we don't need to handle anything.
return;
})
.declareJob("calculateContextualHelpList", function (jio_key) {
var context = this,
queue = new RSVP.Queue(),
contextual_help_dl = document.querySelector('dl.dl-contextual-help');
slapos_panel_extra_menu = context.element.querySelector(".slapos_panel_extra_menu"),
contextual_help_dl = domsugar('dl', {"class": "dl-contextual-help"});
return queue
.push(function () {
return context.getSetting('hateoas_url');
......@@ -210,13 +190,32 @@
);
})
.push(function (contextual_help_list) {
var i;
if (contextual_help_list.length > 0) {
if (!Boolean(document.querySelector('#contextual-help-link'))) {
contextual_help_dl.innerHTML = panel_template_contextual_help({
contextual_help_list: contextual_help_list
if (document.querySelector('.contextual-help-link') === null) {
contextual_help_dl.appendChild(domsugar("dt",
{
"class": "ui-btn-icon-left ui-icon-question",
"data-i18n": "Help",
"text": "Help"
})
);
for (i = 0; i < contextual_help_list.lenght; i += 1) {
contextual_help_dl.appendChild(
domsugar("dd", {"class": "document-listview"},
[
domsugar("a", {
"class": "help",
"target": "_blank",
"href": contextual_help_list[i].href,
"text": contextual_help_list[i].title
})])
);
}
slapos_panel_extra_menu.appendChild(contextual_help_dl);
}
}
return contextual_help_list;
});
})
.declareJob("calculateMyAttentionPointList", function (jio_key, force_open) {
......@@ -232,23 +231,34 @@
if (jio_key === false || jio_key === undefined || jio_key === null) {
return [[], 'No Alert'];
}
return RSVP.all([context.jio_getAttachment(
return RSVP.all([
context.jio_getAttachment(
jio_key,
hateoas_url + jio_key + '/Base_getAttentionPointList'
),
context.translate('No Alert!')
context.getTranslationList([
'No Alert!',
'Warnings'])
]);
})
.push(function (result_list) {
var attention_point_list = result_list[0],
no_alert_caption = result_list[1];
no_alert_caption = result_list[1][0];
if (attention_point_list.length > 0) {
if (!Boolean(document.querySelector('#attention-point-link'))) {
attention_point_ul.innerHTML = panel_template_warning_link({
amount: attention_point_list.length
});
if (document.querySelector('.attention-point-link') === null) {
attention_point_ul.innerHTML = domsugar(
"li",
{},
[
domsugar("a",
{
"class": "ui-btn-icon-notext ui-icon-warning attention-point-link",
"text": result_list[1][1] + " " + attention_point_list.length
})
]
);
}
if (force_open || (JSON.stringify(seen_attention_point_dict[jio_key]) != JSON.stringify(attention_point_list))) {
if (force_open || (JSON.stringify(seen_attention_point_dict[jio_key]) !== JSON.stringify(attention_point_list))) {
seen_attention_point_dict[jio_key] = attention_point_list;
window.sessionStorage.setItem('seen_attention_point_dict', JSON.stringify(seen_attention_point_dict));
return context.renderEditorPanel("gadget_erp5_attention_point.html", {
......@@ -266,4 +276,4 @@
});
});
}(window, document, rJS, Handlebars, RSVP, Node, loopEventListener));
}(window, document, rJS, RSVP, Node, domsugar));
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_js.xml
View file @ 960d9c46
......@@ -241,7 +241,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>superthomas</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -255,7 +255,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>987.59252.10760.63197</string> </value>
<value> <string>1000.49280.48729.39526</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -273,7 +273,7 @@
</tuple>
<state>
<tuple>
<float>1607070942.23</float>
<float>1654589423.78</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_payment_result_js.js
View file @ 960d9c46
/*globals console, window, rJS, RSVP, loopEventListener, i18n, Handlebars $*/
/*globals console, window, rJS, RSVP, domsugar */
/*jslint indent: 2, nomen: true, maxlen: 80*/
(function (window, rJS, RSVP, Handlebars) {
(function (window, rJS, RSVP, domsugar) {
"use strict";
var gadget_klass = rJS(window),
message_source = gadget_klass.__template_element
.getElementById("message-template")
.innerHTML,
message_template = Handlebars.compile(message_source);
gadget_klass
.declareAcquiredMethod("jio_get", "jio_get")
rJS(window)
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.declareAcquiredMethod("translateHtml", "translateHtml")
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("updateHeader", "updateHeader")
......@@ -28,19 +19,21 @@
if (return_page === undefined) {
return_page = "slap_invoice_list";
}
// XXX RAFAEL Missing change state
return new RSVP.Queue()
.push(function () {
return RSVP.all([
gadget.getElement(),
gadget.getTranslationDict(["Return to Invoice List"]),
gadget.getUrlFor({command: 'change',
options: {jio_key: "/", page: return_page, "result": ""}})
]);
})
.push(function (result) {
var payment_url = result[1],
element = result[0],
message, advice, page_title;
translation_dict = result[0],
message,
advice,
page_title;
if (options.result === "success") {
page_title = "Thank you for your Payment";
message = "Thank you for finalising the payment.";
......@@ -71,11 +64,27 @@
} else {
throw new Error("Unknown action to take: " + options.result);
}
element.innerHTML = message_template({
message_to_acknowledge: message,
advice: advice,
payment_url: payment_url
});
domsugar(gadget.element, {},
[
domsugar("p", {}, [
domsugar("center", {}, [
domsugar("strong", {text: message})
])
]),
domsugar("p", {}, [
domsugar("center", {text: advice})
]),
domsugar("p"),
domsugar("p", {}, [
domsugar("center", {}, [
domsugar("a", {
class: "ui-btn ui-first-child ui-btn-icon-center",
href: payment_url,
text: translation_dict["Return to Invoice List"]
})
])
])
]);
return page_title;
})
.push(function (page_title) {
......@@ -85,4 +94,4 @@
return gadget.updateHeader(header_dict);
});
});
}(window, rJS, RSVP, Handlebars));
\ No newline at end of file
}(window, rJS, RSVP, domsugar));
\ No newline at end of file
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_payment_result_js.xml
View file @ 960d9c46
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>984.11864.24475.17493</string> </value>
<value> <string>1000.2322.46712.16657</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1590639279.1</float>
<float>1655131980.97</float>
<string>UTC</string>
</tuple>
</state>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7