diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js
index 92ef6ea57a51a65decdba15a5c5b778b52bf9c06..b11bc8c50c882f9a3b01d915f6f1db99455a2767 100644
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js
@@ -21,8 +21,7 @@
.declareMethod("render", function (options) {
return this.changeState({
jio_key: options.jio_key,
- doc: options.doc,
- editable: options.editable ? 1 : 0
+ doc: options.doc
});
})
@@ -51,7 +50,6 @@
var gadget = this;
return gadget.getDeclaredGadget('form_view')
.push(function (form_gadget) {
- var editable = gadget.state.editable;
return form_gadget.render({
erp5_document: {
"_embedded": {"_view": {
@@ -61,9 +59,9 @@
"default": gadget.state.doc.title,
"css_class": "",
"required": 1,
- "editable": 1 - editable,
+ "editable": 1,
"key": "title",
- "hidden": editable,
+ "hidden": 0,
"type": "StringField"
},
"my_reference": {
@@ -72,9 +70,9 @@
"default": gadget.state.doc.reference,
"css_class": "",
"required": 0,
- "editable": 1 - editable,
+ "editable": 1,
"key": "reference",
- "hidden": editable,
+ "hidden": 0,
"type": "StringField"
},
"my_version": {
@@ -83,9 +81,9 @@
"default": gadget.state.doc.version,
"css_class": "",
"required": 0,
- "editable": 1 - editable,
+ "editable": 1,
"key": "version",
- "hidden": editable,
+ "hidden": 0,
"type": "StringField"
},
"my_language": {
@@ -94,9 +92,9 @@
"default": gadget.state.doc.language,
"css_class": "",
"required": 0,
- "editable": 1 - editable,
+ "editable": 1,
"key": "language",
- "hidden": editable,
+ "hidden": 0,
"type": "StringField"
},
"my_description": {
@@ -105,21 +103,22 @@
"default": gadget.state.doc.description,
"css_class": "",
"required": 0,
- "editable": 1 - editable,
+ "editable": 1,
"key": "description",
- "hidden": editable,
+ "hidden": 0,
"type": "TextAreaField"
},
"my_content": {
"default": gadget.state.doc.text_content,
- "css_class": editable === 1 ? "content-iframe-maximize" : "",
+ "css_class": "",
"required": 0,
- "editable": editable,
+ "editable": 1,
"key": "text_content",
"hidden": 0,
- "type": editable === 1 ? "GadgetField" : "EditorField",
- "url": "../officejs_ckeditor_gadget/app/",
- "sandbox": "iframe"
+ "renderjs_extra": '{"editor": "fck_editor", "maximize": true}',
+ "type": "GadgetField",
+ "url": "gadget_editor.html",
+ "sandbox": "public"
}
}},
"_links": {
@@ -144,22 +143,17 @@
return RSVP.all([
gadget.getUrlFor({command: 'history_previous'}),
gadget.getUrlFor({command: 'selection_previous'}),
- gadget.getUrlFor({command: 'selection_next'}),
- gadget.getUrlFor({command: "change", options: {editable: true}})
+ gadget.getUrlFor({command: 'selection_next'})
]);
})
.push(function (url_list) {
- var header_dict = {
+ return gadget.updateHeader({
page_title: gadget.state.doc.title,
+ save_action: true,
selection_url: url_list[0],
- save_action: true
- };
- if (!gadget.state.editable) {
- header_dict.previous_url = url_list[1];
- header_dict.next_url = url_list[2];
- header_dict.edit_content = url_list[3];
- }
- return gadget.updateHeader(header_dict);
+ previous_url: url_list[1],
+ next_url: url_list[2]
+ });
});
});
}(window, rJS, RSVP));
diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml
index 8df555ab66b15d67d7f500386b2393435982c7f4..79921a4175818aa262c3f22557c315d0841f4475 100644
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml
@@ -232,7 +232,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>962.37368.2625.44083</string> </value>
+ <value> <string>964.45581.43675.37307</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -250,7 +250,7 @@
</tuple>
<state>
<tuple>
- <float>1507276723.18</float>
+ <float>1515490519.85</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.js
index 1798a619ebab2c8eebefb16ed95fefe1261b8c21..320a7d136acff83d526b414f7218a2e38a277c45 100644
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.js
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.js
@@ -10,7 +10,7 @@
"Text Editor": {
"url": "officejs_text_editor/",
"cache": "gadget_officejs_text_editor.appcache",
- "sub_gadget": ["officejs_ckeditor_gadget", "officejs_setting_gadget"]
+ "sub_gadget": ["officejs_setting_gadget"]
},
"Illustration Editor": {
"url": "officejs_svg_editor/",
diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.xml
index 6011fd085b6c6ab1c322a3a2e86432f12e0cd27a..b8927e99802985b0de76cd171908042168cb2461 100644
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_export_js.xml
@@ -254,7 +254,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>963.47833.26373.64597</string> </value>
+ <value> <string>964.45862.32132.53930</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -272,7 +272,7 @@
</tuple>
<state>
<tuple>
- <float>1511961491.29</float>
+ <float>1515504420.29</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml
index 1da1b4a0f25c6b71e6aace6ba24da51dd1ddf01b..de32f251cbbb71373ca4dcc72450da677babcde2 100644
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml
@@ -76,7 +76,7 @@
</item>
<item>
<key> <string>content_type</string> </key>
- <value> <string>text/plain</string> </value>
+ <value> <string>text/html</string> </value>
</item>
<item>
<key> <string>default_reference</string> </key>
@@ -119,7 +119,7 @@ font-awesome/font-awesome-webfont.woff\n
font-awesome/font-awesome-webfont.woff2\n
font-awesome/font-awesome-webfont.ttf\n
font-awesome/font-awesome-webfont.svg\n
-gadget_officejs_nojqm.css\n
+gadget_erp5_nojqm.css\n
jio_ojs_storage.js\n
gadget_erp5_global.js\n
URI.js\n
@@ -204,12 +204,355 @@ gadget_erp5_field_textarea.html\n
gadget_erp5_field_textarea.js\n
gadget_html5_textarea.html\n
gadget_html5_textarea.js\n
+gadget_editor.html\n
+gadget_editor.js\n
+gadget_button_maximize.html\n
+gadget_button_maximize.js\n
\n
gadget_officejs_text_editor_router.html\n
gadget_officejs_jio_web_page_view.html\n
gadget_officejs_jio_web_page_view.js\n
+\n
+#Ckeditor\n
+\n
+ckeditor.gadget.html\n
+ckeditor.gadget.js\n
+ckeditor/skins/moono-lisa/icons.png\n
+ckeditor/skins/moono-lisa/editor_iequirks.css\n
+ckeditor/skins/moono-lisa/images/lock.png\n
+ckeditor/skins/moono-lisa/images/lock-open.png\n
+ckeditor/skins/moono-lisa/images/refresh.png\n
+ckeditor/skins/moono-lisa/images/spinner.gif\n
+ckeditor/skins/moono-lisa/images/arrow.png\n
+ckeditor/skins/moono-lisa/images/close.png\n
+ckeditor/skins/moono-lisa/images/hidpi/lock.png\n
+ckeditor/skins/moono-lisa/images/hidpi/lock-open.png\n
+ckeditor/skins/moono-lisa/images/hidpi/refresh.png\n
+ckeditor/skins/moono-lisa/images/hidpi/close.png\n
+ckeditor/skins/moono-lisa/editor_ie.css\n
+ckeditor/skins/moono-lisa/dialog_iequirks.css\n
+ckeditor/skins/moono-lisa/dialog_ie8.css\n
+ckeditor/skins/moono-lisa/icons_hidpi.png\n
+ckeditor/skins/moono-lisa/editor_gecko.css\n
+ckeditor/skins/moono-lisa/editor_ie8.css\n
+ckeditor/skins/moono-lisa/editor.css\n
+ckeditor/skins/moono-lisa/dialog_ie.css\n
+ckeditor/skins/moono-lisa/dialog.css\n
+ckeditor/lang/ro.js\n
+ckeditor/lang/id.js\n
+ckeditor/lang/fi.js\n
+ckeditor/lang/mk.js\n
+ckeditor/lang/es-mx.js\n
+ckeditor/lang/az.js\n
+ckeditor/lang/bg.js\n
+ckeditor/lang/af.js\n
+ckeditor/lang/et.js\n
+ckeditor/lang/km.js\n
+ckeditor/lang/sr-latn.js\n
+ckeditor/lang/da.js\n
+ckeditor/lang/bn.js\n
+ckeditor/lang/eo.js\n
+ckeditor/lang/si.js\n
+ckeditor/lang/fa.js\n
+ckeditor/lang/fo.js\n
+ckeditor/lang/uk.js\n
+ckeditor/lang/en.js\n
+ckeditor/lang/mn.js\n
+ckeditor/lang/fr.js\n
+ckeditor/lang/pl.js\n
+ckeditor/lang/it.js\n
+ckeditor/lang/eu.js\n
+ckeditor/lang/ug.js\n
+ckeditor/lang/sr.js\n
+ckeditor/lang/ka.js\n
+ckeditor/lang/gl.js\n
+ckeditor/lang/nl.js\n
+ckeditor/lang/vi.js\n
+ckeditor/lang/lv.js\n
+ckeditor/lang/sk.js\n
+ckeditor/lang/ja.js\n
+ckeditor/lang/sq.js\n
+ckeditor/lang/no.js\n
+ckeditor/lang/th.js\n
+ckeditor/lang/en-gb.js\n
+ckeditor/lang/sl.js\n
+ckeditor/lang/en-au.js\n
+ckeditor/lang/el.js\n
+ckeditor/lang/hi.js\n
+ckeditor/lang/cy.js\n
+ckeditor/lang/ar.js\n
+ckeditor/lang/nb.js\n
+ckeditor/lang/ms.js\n
+ckeditor/lang/is.js\n
+ckeditor/lang/pt-br.js\n
+ckeditor/lang/es.js\n
+ckeditor/lang/fr-ca.js\n
+ckeditor/lang/de-ch.js\n
+ckeditor/lang/ko.js\n
+ckeditor/lang/bs.js\n
+ckeditor/lang/ku.js\n
+ckeditor/lang/tt.js\n
+ckeditor/lang/hu.js\n
+ckeditor/lang/ru.js\n
+ckeditor/lang/cs.js\n
+ckeditor/lang/zh.js\n
+ckeditor/lang/sv.js\n
+ckeditor/lang/lt.js\n
+ckeditor/lang/tr.js\n
+ckeditor/lang/hr.js\n
+ckeditor/lang/zh-cn.js\n
+ckeditor/lang/pt.js\n
+ckeditor/lang/he.js\n
+ckeditor/lang/de.js\n
+ckeditor/lang/en-ca.js\n
+ckeditor/lang/ca.js\n
+ckeditor/lang/gu.js\n
+ckeditor/lang/oc.js\n
+ckeditor/build-config.js\n
+ckeditor/plugins/icons.png\n
+ckeditor/plugins/specialchar/dialogs/lang/id.js\n
+ckeditor/plugins/specialchar/dialogs/lang/fi.js\n
+ckeditor/plugins/specialchar/dialogs/lang/es-mx.js\n
+ckeditor/plugins/specialchar/dialogs/lang/az.js\n
+ckeditor/plugins/specialchar/dialogs/lang/bg.js\n
+ckeditor/plugins/specialchar/dialogs/lang/af.js\n
+ckeditor/plugins/specialchar/dialogs/lang/et.js\n
+ckeditor/plugins/specialchar/dialogs/lang/km.js\n
+ckeditor/plugins/specialchar/dialogs/lang/da.js\n
+ckeditor/plugins/specialchar/dialogs/lang/eo.js\n
+ckeditor/plugins/specialchar/dialogs/lang/si.js\n
+ckeditor/plugins/specialchar/dialogs/lang/fa.js\n
+ckeditor/plugins/specialchar/dialogs/lang/uk.js\n
+ckeditor/plugins/specialchar/dialogs/lang/en.js\n
+ckeditor/plugins/specialchar/dialogs/lang/fr.js\n
+ckeditor/plugins/specialchar/dialogs/lang/pl.js\n
+ckeditor/plugins/specialchar/dialogs/lang/it.js\n
+ckeditor/plugins/specialchar/dialogs/lang/eu.js\n
+ckeditor/plugins/specialchar/dialogs/lang/ug.js\n
+ckeditor/plugins/specialchar/dialogs/lang/gl.js\n
+ckeditor/plugins/specialchar/dialogs/lang/nl.js\n
+ckeditor/plugins/specialchar/dialogs/lang/vi.js\n
+ckeditor/plugins/specialchar/dialogs/lang/lv.js\n
+ckeditor/plugins/specialchar/dialogs/lang/sk.js\n
+ckeditor/plugins/specialchar/dialogs/lang/ja.js\n
+ckeditor/plugins/specialchar/dialogs/lang/sq.js\n
+ckeditor/plugins/specialchar/dialogs/lang/no.js\n
+ckeditor/plugins/specialchar/dialogs/lang/th.js\n
+ckeditor/plugins/specialchar/dialogs/lang/en-gb.js\n
+ckeditor/plugins/specialchar/dialogs/lang/sl.js\n
+ckeditor/plugins/specialchar/dialogs/lang/en-au.js\n
+ckeditor/plugins/specialchar/dialogs/lang/el.js\n
+ckeditor/plugins/specialchar/dialogs/lang/cy.js\n
+ckeditor/plugins/specialchar/dialogs/lang/ar.js\n
+ckeditor/plugins/specialchar/dialogs/lang/nb.js\n
+ckeditor/plugins/specialchar/dialogs/lang/pt-br.js\n
+ckeditor/plugins/specialchar/dialogs/lang/es.js\n
+ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js\n
+ckeditor/plugins/specialchar/dialogs/lang/de-ch.js\n
+ckeditor/plugins/specialchar/dialogs/lang/ko.js\n
+ckeditor/plugins/specialchar/dialogs/lang/ku.js\n
+ckeditor/plugins/specialchar/dialogs/lang/tt.js\n
+ckeditor/plugins/specialchar/dialogs/lang/hu.js\n
+ckeditor/plugins/specialchar/dialogs/lang/ru.js\n
+ckeditor/plugins/specialchar/dialogs/lang/cs.js\n
+ckeditor/plugins/specialchar/dialogs/lang/zh.js\n
+ckeditor/plugins/specialchar/dialogs/lang/sv.js\n
+ckeditor/plugins/specialchar/dialogs/lang/lt.js\n
+ckeditor/plugins/specialchar/dialogs/lang/tr.js\n
+ckeditor/plugins/specialchar/dialogs/lang/hr.js\n
+ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js\n
+ckeditor/plugins/specialchar/dialogs/lang/pt.js\n
+ckeditor/plugins/specialchar/dialogs/lang/he.js\n
+ckeditor/plugins/specialchar/dialogs/lang/de.js\n
+ckeditor/plugins/specialchar/dialogs/lang/en-ca.js\n
+ckeditor/plugins/specialchar/dialogs/lang/ca.js\n
+ckeditor/plugins/specialchar/dialogs/lang/oc.js\n
+ckeditor/plugins/specialchar/dialogs/specialchar.js\n
+ckeditor/plugins/smiley/images/embaressed_smile.gif\n
+ckeditor/plugins/smiley/images/shades_smile.png\n
+ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif\n
+ckeditor/plugins/smiley/images/lightbulb.png\n
+ckeditor/plugins/smiley/images/tounge_smile.gif\n
+ckeditor/plugins/smiley/images/teeth_smile.png\n
+ckeditor/plugins/smiley/images/wink_smile.png\n
+ckeditor/plugins/smiley/images/tongue_smile.gif\n
+ckeditor/plugins/smiley/images/broken_heart.png\n
+ckeditor/plugins/smiley/images/tongue_smile.png\n
+ckeditor/plugins/smiley/images/confused_smile.gif\n
+ckeditor/plugins/smiley/images/heart.gif\n
+ckeditor/plugins/smiley/images/cry_smile.png\n
+ckeditor/plugins/smiley/images/omg_smile.gif\n
+ckeditor/plugins/smiley/images/regular_smile.png\n
+ckeditor/plugins/smiley/images/angel_smile.gif\n
+ckeditor/plugins/smiley/images/angel_smile.png\n
+ckeditor/plugins/smiley/images/kiss.png\n
+ckeditor/plugins/smiley/images/heart.png\n
+ckeditor/plugins/smiley/images/cry_smile.gif\n
+ckeditor/plugins/smiley/images/omg_smile.png\n
+ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png\n
+ckeditor/plugins/smiley/images/angry_smile.png\n
+ckeditor/plugins/smiley/images/shades_smile.gif\n
+ckeditor/plugins/smiley/images/angry_smile.gif\n
+ckeditor/plugins/smiley/images/lightbulb.gif\n
+ckeditor/plugins/smiley/images/kiss.gif\n
+ckeditor/plugins/smiley/images/wink_smile.gif\n
+ckeditor/plugins/smiley/images/thumbs_up.png\n
+ckeditor/plugins/smiley/images/thumbs_up.gif\n
+ckeditor/plugins/smiley/images/teeth_smile.gif\n
+ckeditor/plugins/smiley/images/devil_smile.gif\n
+ckeditor/plugins/smiley/images/broken_heart.gif\n
+ckeditor/plugins/smiley/images/thumbs_down.gif\n
+ckeditor/plugins/smiley/images/thumbs_down.png\n
+ckeditor/plugins/smiley/images/sad_smile.png\n
+ckeditor/plugins/smiley/images/embarrassed_smile.png\n
+ckeditor/plugins/smiley/images/envelope.png\n
+ckeditor/plugins/smiley/images/devil_smile.png\n
+ckeditor/plugins/smiley/images/sad_smile.gif\n
+ckeditor/plugins/smiley/images/embarrassed_smile.gif\n
+ckeditor/plugins/smiley/images/regular_smile.gif\n
+ckeditor/plugins/smiley/images/envelope.gif\n
+ckeditor/plugins/smiley/images/confused_smile.png\n
+ckeditor/plugins/smiley/dialogs/smiley.js\n
+ckeditor/plugins/pastefromword/filter/default.js\n
+ckeditor/plugins/templates/templates/images/template2.gif\n
+ckeditor/plugins/templates/templates/images/template3.gif\n
+ckeditor/plugins/templates/templates/images/template1.gif\n
+ckeditor/plugins/templates/templates/default.js\n
+ckeditor/plugins/templates/dialogs/templates.js\n
+ckeditor/plugins/templates/dialogs/templates.css\n
+ckeditor/plugins/div/dialogs/div.js\n
+ckeditor/plugins/showblocks/images/block_h3.png\n
+ckeditor/plugins/showblocks/images/block_h4.png\n
+ckeditor/plugins/showblocks/images/block_div.png\n
+ckeditor/plugins/showblocks/images/block_p.png\n
+ckeditor/plugins/showblocks/images/block_h2.png\n
+ckeditor/plugins/showblocks/images/block_pre.png\n
+ckeditor/plugins/showblocks/images/block_address.png\n
+ckeditor/plugins/showblocks/images/block_blockquote.png\n
+ckeditor/plugins/showblocks/images/block_h1.png\n
+ckeditor/plugins/showblocks/images/block_h5.png\n
+ckeditor/plugins/showblocks/images/block_h6.png\n
+ckeditor/plugins/colordialog/dialogs/colordialog.css\n
+ckeditor/plugins/colordialog/dialogs/colordialog.js\n
+ckeditor/plugins/scayt/skins/moono-lisa/scayt.css\n
+ckeditor/plugins/scayt/dialogs/options.js\n
+ckeditor/plugins/scayt/dialogs/toolbar.css\n
+ckeditor/plugins/scayt/dialogs/dialog.css\n
+ckeditor/plugins/table/dialogs/table.js\n
+ckeditor/plugins/find/dialogs/find.js\n
+ckeditor/plugins/about/dialogs/about.js\n
+ckeditor/plugins/about/dialogs/logo_ckeditor.png\n
+ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png\n
+ckeditor/plugins/image/images/noimage.png\n
+ckeditor/plugins/image/dialogs/image.js\n
+ckeditor/plugins/preview/preview.html\n
+ckeditor/plugins/copyformatting/styles/copyformatting.css\n
+ckeditor/plugins/copyformatting/cursors/cursor.svg\n
+ckeditor/plugins/copyformatting/cursors/cursor-disabled.svg\n
+ckeditor/plugins/link/images/anchor.png\n
+ckeditor/plugins/link/images/hidpi/anchor.png\n
+ckeditor/plugins/link/dialogs/anchor.js\n
+ckeditor/plugins/link/dialogs/link.js\n
+ckeditor/plugins/wsc/skins/moono-lisa/wsc.css\n
+ckeditor/plugins/wsc/dialogs/ciframe.html\n
+ckeditor/plugins/wsc/dialogs/wsc.css\n
+ckeditor/plugins/wsc/dialogs/wsc.js\n
+ckeditor/plugins/wsc/dialogs/wsc_ie.js\n
+ckeditor/plugins/wsc/dialogs/tmpFrameset.html\n
+ckeditor/plugins/icons_hidpi.png\n
+ckeditor/plugins/tabletools/dialogs/tableCell.js\n
+ckeditor/plugins/forms/images/hiddenfield.gif\n
+ckeditor/plugins/forms/dialogs/button.js\n
+ckeditor/plugins/forms/dialogs/radio.js\n
+ckeditor/plugins/forms/dialogs/checkbox.js\n
+ckeditor/plugins/forms/dialogs/textarea.js\n
+ckeditor/plugins/forms/dialogs/textfield.js\n
+ckeditor/plugins/forms/dialogs/select.js\n
+ckeditor/plugins/forms/dialogs/hiddenfield.js\n
+ckeditor/plugins/forms/dialogs/form.js\n
+ckeditor/plugins/magicline/images/icon-rtl.png\n
+ckeditor/plugins/magicline/images/icon.png\n
+ckeditor/plugins/magicline/images/hidpi/icon-rtl.png\n
+ckeditor/plugins/magicline/images/hidpi/icon.png\n
+ckeditor/plugins/liststyle/dialogs/liststyle.js\n
+ckeditor/plugins/flash/images/placeholder.png\n
+ckeditor/plugins/flash/dialogs/flash.js\n
+ckeditor/plugins/pagebreak/images/pagebreak.gif\n
+ckeditor/plugins/dialog/dialogDefinition.js\n
+ckeditor/plugins/iframe/images/placeholder.png\n
+ckeditor/plugins/iframe/dialogs/iframe.js\n
+ckeditor/plugins/tableselection/styles/tableselection.css\n
+ckeditor/plugins/a11yhelp/dialogs/lang/ro.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/id.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/fi.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/mk.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/es-mx.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/az.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/bg.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/af.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/et.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/km.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/da.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/eo.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/si.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/fa.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/fo.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/uk.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/en.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/mn.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/fr.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/pl.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/it.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/eu.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/ug.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/sr.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/gl.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/nl.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/vi.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/lv.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/sk.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/ja.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/sq.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/no.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/th.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/sl.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/el.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/hi.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/cy.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/ar.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/nb.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/es.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/ko.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/ku.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/tt.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/hu.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/ru.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/cs.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/zh.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/sv.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/lt.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/tr.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/hr.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/pt.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/he.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/de.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/ca.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/gu.js\n
+ckeditor/plugins/a11yhelp/dialogs/lang/oc.js\n
+ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js\n
+ckeditor/contents.css\n
+ckeditor/styles.js\n
+ckeditor/config.js\n
+ckeditor/ckeditor.js\n
+ckeditor/adapters/jquery.js\n
+\n
GADGET:\n
-officejs_ckeditor_gadget/\n
officejs_setting_gadget/\n
NETWORK:\n
*</string> </value>
@@ -353,7 +696,7 @@ NETWORK:\n
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>962.42958.18622.47018</string> </value>
+ <value> <string>964.45601.43317.12168</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -371,7 +714,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
- <float>1507552655.47</float>
+ <float>1515489501.83</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_text_editor/app.xml b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_text_editor/app.xml
index b02fcde57667a9c161d420272b7b300f31ab7146..a155f5119ed03f5d8e13f61e76e96521dd39960a 100644
--- a/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_text_editor/app.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_text_editor/app.xml
@@ -391,7 +391,9 @@
</item>
<item>
<key> <string>configuration_stylesheet_url</string> </key>
- <value> <string>gadget_officejs_nojqm.css</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>configuration_translation_gadget_url</string> </key>
@@ -650,7 +652,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>zope</string> </value>
+ <value> <string>vincent</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -664,7 +666,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>961.16277.24517.44253</string> </value>
+ <value> <string>964.45575.40638.63488</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -682,7 +684,7 @@
</tuple>
<state>
<tuple>
- <float>1504529296.63</float>
+ <float>1515487277.43</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditor.zpt b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditor.zpt
index 388b074f51b03f9c580d71a71759174ebb553dbd..643ecf3103a6cbcb2cceb6f42e2eff164486b084 100644
--- a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditor.zpt
+++ b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditor.zpt
@@ -57,7 +57,7 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Local is Enough</td>
+ <td>//a[@data-i18n='Storages']</td>
<td></td>
</tr>
<tr>
@@ -88,37 +88,37 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Local is Enough</td>
+ <td>//a[@data-i18n='Storages']</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>link=Local is Enough</td>
+ <td>//a[@data-i18n='Storages']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Add</td>
+ <td>link=Local is Enough</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>link=Add</td>
+ <td>link=Local is Enough</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//button[@data-i18n='Save']</td>
+ <td>link=Add</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//button[@data-i18n='Menu']</td>
+ <td>link=Add</td>
<td></td>
</tr>
<tr>
- <td>click</td>
- <td>name=editable</td>
+ <td>waitForElementPresent</td>
+ <td>//button[@data-i18n='Save']</td>
<td></td>
</tr>
<tr>
@@ -236,16 +236,6 @@
<td>//textarea[@title='Description']</td>
<td>${description}</td>
</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Content</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>link=Content</td>
- <td></td>
-</tr>
<tr>
<td>waitForElementPresent</td>
<td>identifier=cke_1_contents</td>
diff --git a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorErp5Synchronization.zpt b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorErp5Synchronization.zpt
index 9b9843622b7d197627fbf534587a3b6ad9d12d31..f20d7fa3f64fda3de7dd6e1b793dde3bb3fb1697 100644
--- a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorErp5Synchronization.zpt
+++ b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorErp5Synchronization.zpt
@@ -77,16 +77,6 @@
<td>//button[@data-i18n='Save']</td>
<td></td>
</tr>
-<tr>
- <td>click</td>
- <td>//button[@data-i18n='Menu']</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>name=editable</td>
- <td></td>
-</tr>
<tr>
<td>waitForElementPresent</td>
<td>identifier=title</td>
@@ -153,16 +143,6 @@
<td>//button[@data-i18n='Save']</td>
<td></td>
</tr>
-<tr>
- <td>click</td>
- <td>//button[@data-i18n='Menu']</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>name=editable</td>
- <td></td>
-</tr>
<tr>
<td>store</td>
<td>search</td>