diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_html.xml index c348509c58d106e3893852d4e8c5e6db8fc53cd9..32b9e3385a84adbf5be39c5ed093f9e32d656fec 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_html.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_html.xml @@ -121,20 +121,20 @@ <!-- custom script -->\n <script src="gadget_erp5_header.js" type="text/javascript"></script>\n \n - <script id="header-title-link-template" type="text/x-handlebars-template"><a class="ui-btn ui-btn-icon-left ui-icon-arrow-down" href="{{url}}">{{title}}</a></script>\n - <script id="header-title-template" type="text/x-handlebars-template">{{title}}</script>\n + <script id="header-title-link-template" type="text/x-handlebars-template"><a data-i18n="{{title}}" class="ui-btn ui-btn-icon-left ui-icon-arrow-down" href="{{url}}">{{title}}</a></script>\n + <script id="header-title-template" type="text/x-handlebars-template"><span data-i18n="{{title}}">{{title}}</span></script>\n \n <script id="header-link-template" type="text/x-handlebars-template">\n - <a role="button" href="{{url}}" class="responsive ui-btn ui-icon-{{icon}} ui-btn-icon-left ui-first-child ui-last-child {{class}}">{{title}}</a>\n + <a role="button" data-i18n="{{title}}" href="{{url}}" class="responsive ui-btn ui-icon-{{icon}} ui-btn-icon-left ui-first-child ui-last-child {{class}}">{{title}}</a>\n </script>\n \n <script id="header-button-template" type="text/x-handlebars-template">\n - <form><button name=\'{{name}}\' type=\'submit\' class=\'responsive ui-btn ui-icon-{{icon}} ui-btn-icon-left ui-first-child ui-last-child {{class}}\'>{{title}}</button></form>\n + <form><button name=\'{{name}}\' data-i18n="{{title}}" type=\'submit\' class=\'responsive ui-btn ui-icon-{{icon}} ui-btn-icon-left ui-first-child ui-last-child {{class}}\'>{{title}}</button></form>\n </script>\n \n <script id="sub-header-template" type="text/x-handlebars-template">\n {{#each sub_header_list}}\n - <li class="ui-block-{{block}}"><a href="{{url}}" class="ui-btn ui-btn-icon-top ui-icon-{{icon}} {{class}}">{{title}}</a></li>\n + <li class="ui-block-{{block}}"><a href="{{url}}" data-i18n="{{title}}" class="ui-btn ui-btn-icon-top ui-icon-{{icon}} {{class}}">{{title}}</a></li>\n {{/each}}\n </script>\n \n @@ -148,7 +148,7 @@ </div>\n </div>\n \n - <h1 class="ui-title">ERP5</h1>\n + <h1 class="ui-title"></h1>\n \n <div class="ui-controlgroup ui-controlgroup-horizontal ui-btn-right">\n <div class="ui-controlgroup-controls">\n @@ -296,7 +296,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>sven</string> </value> + <value> <string>super_sven</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -310,7 +310,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>938.19002.31422.38075</string> </value> + <value> <string>939.61178.21709.2781</string> </value> </item> <item> <key> <string>state</string> </key> @@ -328,7 +328,7 @@ </tuple> <state> <tuple> - <float>1413471560.4</float> + <float>1419935164.05</float> <string>GMT</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml index 1eceda808d4f3fc1cc87eb791f48110f257859bc..852baf6b6151f6348d235b5eeb8d2df22f8e5bfa 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml @@ -169,10 +169,15 @@ return g.render(g.stats.options);\n })\n \n + //////////////////////////////////////////////\n + // acquired methods\n + //////////////////////////////////////////////\n + .declareAcquiredMethod("translateHtml", "translateHtml")\n .declareAcquiredMethod("whoWantToDisplayThis", "whoWantToDisplayThis")\n .declareAcquiredMethod("jio_get", "jio_get")\n .declareAcquiredMethod("triggerSubmit", "triggerSubmit")\n .declareAcquiredMethod("triggerPanel", "triggerPanel")\n +\n /////////////////////////////////////////////////////////////////\n // declared methods\n /////////////////////////////////////////////////////////////////\n @@ -186,6 +191,9 @@ gadget.stats.error = false;\n });\n })\n + .declareMethod(\'notifyUpdate\', function () {\n + return this.render(this.stats.options);\n + })\n .declareMethod(\'notifyLoading\', function () {\n if (this.stats.loaded) {\n this.stats.loaded = false;\n @@ -265,7 +273,9 @@ default_right_icon = "",\n title_link = {title: "ERP5"},\n sub_header_list = [],\n - alphabet = "abcdefghijklmnopqrstuvwxyz";\n + alphabet = "abcdefghijklmnopqrstuvwxyz",\n + promise_list = [];\n +\n gadget.stats.options = options;\n // Handle main title\n if (options.hasOwnProperty("page_title")) {\n @@ -275,9 +285,11 @@ document.title = title_link.title;\n if (options.hasOwnProperty("breadcrumb_url")) {\n title_link.url = options.breadcrumb_url;\n - gadget.props.title_element.innerHTML = header_title_link_template(title_link);\n + promise_list.push(gadget.translateHtml(header_title_link_template(title_link)));\n + //gadget.props.title_element.innerHTML = header_title_link_template(title_link);\n } else {\n - gadget.props.title_element.innerHTML = header_title_template(title_link);\n + promise_list.push(gadget.translateHtml(header_title_template(title_link)));\n + //gadget.props.title_element.innerHTML = header_title_template(title_link);\n }\n \n // Handle left link\n @@ -305,11 +317,14 @@ }\n }\n if (left_button !== undefined) {\n - gadget.props.left_link.innerHTML = header_button_template(left_button);\n + //gadget.props.left_link.innerHTML = header_button_template(left_button);\n + promise_list.push(gadget.translateHtml(header_button_template(left_button)));\n } else if (left_link === undefined) {\n - gadget.props.left_link.innerHTML = "";\n + //gadget.props.left_link.innerHTML = "";\n + promise_list.push(gadget.translateHtml(""));\n } else {\n - gadget.props.left_link.innerHTML = header_link_template(left_link);\n + // gadget.props.left_link.innerHTML = header_link_template(left_link);\n + promise_list.push(gadget.translateHtml(header_link_template(left_link)));\n }\n \n // Handle right link\n @@ -357,11 +372,14 @@ }\n }\n if (right_button !== undefined) {\n - gadget.props.right_link.innerHTML = header_button_template(right_button);\n + promise_list.push(gadget.translateHtml(header_button_template(right_button)));\n + //gadget.props.right_link.innerHTML = header_button_template(right_button);\n } else if (right_link !== undefined) {\n - gadget.props.right_link.innerHTML = header_link_template(right_link);\n + promise_list.push(gadget.translateHtml(header_link_template(right_link)));\n + //gadget.props.right_link.innerHTML = header_link_template(right_link);\n } else {\n - gadget.props.right_link.innerHTML = "";\n + promise_list.push(gadget.translateHtml(""));\n + //gadget.props.right_link.innerHTML = "";\n }\n \n // Handle sub header\n @@ -387,9 +405,23 @@ sub_header_list[sub_header_list.length - 1].class += " ui-last-child";\n }\n // gadget.props.sub_header_ul.textContent = JSON.stringify(options);\n - gadget.props.sub_header_ul.innerHTML = sub_header_template({\n + //gadget.props.sub_header_ul.innerHTML = sub_header_template({\n + // sub_header_list: sub_header_list\n + //});\n + promise_list.push(gadget.translateHtml(sub_header_template({\n sub_header_list: sub_header_list\n - });\n + })));\n +\n + return new RSVP.Queue()\n + .push(function () {\n + return RSVP.all(promise_list);\n + })\n + .push(function (my_translated_html_list) {\n + gadget.props.title_element.innerHTML = my_translated_html_list[0];\n + gadget.props.left_link.innerHTML = my_translated_html_list[1];\n + gadget.props.right_link.innerHTML = my_translated_html_list[2];\n + gadget.props.sub_header_ul.innerHTML = my_translated_html_list[3];\n + });\n })\n \n //////////////////////////////////////////////\n @@ -542,7 +574,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>sven</string> </value> + <value> <string>super_sven</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -556,7 +588,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>938.24670.17693.28962</string> </value> + <value> <string>940.1374.53791.13363</string> </value> </item> <item> <key> <string>state</string> </key> @@ -574,7 +606,7 @@ </tuple> <state> <tuple> - <float>1413879432.64</float> + <float>1420191334.15</float> <string>GMT</string> </tuple> </state>