From f17e1a446146f072fe7e4aafc4db5e80453ca239 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Tue, 3 Jul 2018 08:02:57 +0000
Subject: [PATCH] [erp5_web_renderjs_ui] Logout: stop using translateHTML

---
 .../rjs_gadget_erp5_pt_logoutform_html.html   | 20 ++++++----
 .../rjs_gadget_erp5_pt_logoutform_html.xml    |  4 +-
 .../rjs_gadget_erp5_pt_logoutform_js.js       | 40 +++++++++++--------
 .../rjs_gadget_erp5_pt_logoutform_js.xml      |  4 +-
 4 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_html.html b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_html.html
index 0c091f7db1..44dd0a31e5 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_html.html
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_html.html
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <html>
+<!--
+   data-i18n=Confirm
+ -->
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width" />
@@ -9,21 +12,24 @@
     <script src="rsvp.js" type="text/javascript"></script>
     <script src="renderjs.js" type="text/javascript"></script>
     <script src="jiodev.js" type="text/javascript"></script>
+    <script src="handlebars.js" type="text/javascript"></script>
 
-    <!-- custom script -->
-    <script src="gadget_erp5_page_logout.js" type="text/javascript"></script>
-
-  </head>
-  <body>
-
+    <script id="form-template" type="text/x-handlebars-template">
       <article class="ui-content ui-body-c">
         <section class="ui-body-c ui-content-section">
           <form class="logout">
 
-            <input data-theme="b" data-inline="true" type="submit" data-i18n="[value]Confirm" value="Confirm" data-icon="check" />
+            <input data-theme="b" data-inline="true" type="submit" value="{{button_text}}" data-icon="check" />
 
           </form>
         </section>
       </article>
+    </script>
+
+    <!-- custom script -->
+    <script src="gadget_erp5_page_logout.js" type="text/javascript"></script>
+
+  </head>
+  <body>
   </body>
 </html>
\ No newline at end of file
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_html.xml
index eab1231c9c..b8df2f77a9 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_html.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_html.xml
@@ -234,7 +234,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>954.45675.44850.53452</string> </value>
+                <value> <string>968.42589.6882.6638</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1476953691.35</float>
+                        <float>1530607558.33</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.js
index 0c506ae718..f00d763910 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.js
@@ -1,38 +1,46 @@
-/*global window, rJS, UriTemplate */
+/*global window, rJS, UriTemplate, Handlebars */
 /*jslint indent: 2, maxerr: 3, nomen: true */
-(function (window, rJS, UriTemplate) {
+(function (window, rJS, UriTemplate, Handlebars) {
   "use strict";
 
-  rJS(window)
+  var gadget_klass = rJS(window),
+    form_template = Handlebars.compile(
+      gadget_klass.__template_element
+                  .getElementById("form-template")
+                  .innerHTML
+    );
+
+  gadget_klass
     /////////////////////////////////////////////////////////////////
     // handle acquisition
     /////////////////////////////////////////////////////////////////
     .declareAcquiredMethod("redirect", "redirect")
     .declareAcquiredMethod("getUrlFor", "getUrlFor")
     .declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
-    .declareAcquiredMethod("translateHtml", "translateHtml")
+    .declareAcquiredMethod("translate", "translate")
     .declareAcquiredMethod("updateHeader", "updateHeader")
 
     /////////////////////////////////////////////////////////////////
     // declared methods
     /////////////////////////////////////////////////////////////////
-     .declareMethod("render", function () {
-      var gadget = this,
-        header_dict = {
-          page_title: 'Logout',
-          page_icon: 'power-off'
-        };
+    .declareMethod("render", function () {
+      var gadget = this;
 
       return gadget.getUrlFor({command: 'display'})
         .push(function (front_url) {
-          header_dict.front_url = front_url;
-          return gadget.updateHeader(header_dict);
+          return gadget.updateHeader({
+            page_title: 'Logout',
+            page_icon: 'power-off',
+            front_url: front_url
+          });
         })
         .push(function () {
-          return gadget.translateHtml(gadget.element.innerHTML);
+          return gadget.translate('Confirm');
         })
-        .push(function (my_translated_html) {
-          gadget.element.innerHTML = my_translated_html;
+        .push(function (translated_text) {
+          gadget.element.innerHTML = form_template({
+            button_text: translated_text
+          });
         });
     })
 
@@ -58,4 +66,4 @@
           });
         });
     });
-}(window, rJS, UriTemplate));
\ No newline at end of file
+}(window, rJS, UriTemplate, Handlebars));
\ No newline at end of file
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.xml
index aea0c3ceaa..5ff1151540 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.xml
@@ -230,7 +230,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>963.11788.48702.26146</string> </value>
+                <value> <string>968.42610.16476.33962</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -248,7 +248,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1518598022.73</float>
+                        <float>1530607593.22</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
-- 
2.30.9