From 4aaaff415d8ea34378851bc31357daa0347d4762 Mon Sep 17 00:00:00 2001
From: Xiaowu Zhang <xiaowu.zhang@tiolive.com>
Date: Mon, 8 Jun 2015 03:20:46 +0000
Subject: [PATCH] erp5_web_renderjs_ui: display language list when availables
languages. are set
---
.../web_page_module/rjs_gadget_erp5_panel_html.xml | 11 ++++++-----
.../web_page_module/rjs_gadget_erp5_panel_js.xml | 12 ++++++++----
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
index 9785db9d09..6b8a61aa79 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
@@ -154,10 +154,11 @@
</h4>\n
<div class="ui-collapsible-content ui-collapsible-content-collapsed" aria-hidden="true">\n
<fieldset data-role="controlgroup">\n
- {{#each document_list}}\n
+ {{#each language_list}}\n
<form method="POST" action="">\n
<div class="ui-btn ui-input-btn ui-corner-all ui-shadow ui-btn-icon-right ui-icon-carat-r" data-i18n="[node]{{lang}}">\n
- \n
+ {{lang}}\n
+ \n
<input type="submit" data-enhanced="true" name="lang" id="lang-{{count}}" value="{{lang}}" />\n
</div>\n
<label class="ui-hidden-accessible" for="lang-{{count}}" data-i18n="{{lang}}"></label>\n
@@ -304,7 +305,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>xiaowu</string> </value>
+ <value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -318,7 +319,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>942.20332.24952.65262</string> </value>
+ <value> <string>943.36089.56695.38741</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -336,7 +337,7 @@
</tuple>
<state>
<tuple>
- <float>1429861586.7</float>
+ <float>1433731300.43</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
index 1ef1249d21..97d1fdb1f8 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
@@ -183,7 +183,7 @@
if (len > 0) {\n
language_list = [];\n
for (i = 0, i_len = len; i < i_len; i += 1) {\n
- language_list.push({"count": i, "lang": language_list[i]});\n
+ language_list.push({"count": i, "lang": raw_language_list[i]});\n
}\n
}\n
\n
@@ -193,6 +193,10 @@
"language_list": language_list,\n
"logout_href": all_result[3]\n
});\n
+\n
+ if (len > 0) {\n
+ return g.translateHtml(tmp);\n
+ }\n
return tmp;\n
})\n
.push(function (my_translated_or_plain_html) {\n
@@ -375,7 +379,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>xiaowu</string> </value>
+ <value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -389,7 +393,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>942.40517.64847.10325</string> </value>
+ <value> <string>943.36081.11434.7048</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -407,7 +411,7 @@
</tuple>
<state>
<tuple>
- <float>1430146351.8</float>
+ <float>1433732853.87</float>
<string>UTC</string>
</tuple>
</state>
--
2.30.9