diff --git a/config/alfresco/messages/portlets_ru.properties b/config/alfresco/messages/portlets_ru.properties index f9dc7030bf..6644507319 100755 --- a/config/alfresco/messages/portlets_ru.properties +++ b/config/alfresco/messages/portlets_ru.properties @@ -26,7 +26,7 @@ portlets.panel.kb=\u041A\u0411 portlets.myspaces.create_space=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u043E portlets.myspaces.create_space.title=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u043E\u0435 \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u043E portlets.myspaces.upload=\u041F\u0435\u0440\u0435\u0434\u0430\u0442\u044C -portlets.myspaces.upload.title=\u041F\u0435\u0440\u0435\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442 +portlets.myspaces.upload.title=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043D\u043E\u0432\u044B\u0439 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442 portlets.myspaces.name=\u0418\u043C\u044F portlets.myspaces.title=\u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A portlets.myspaces.description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 diff --git a/config/alfresco/messages/webclient_ru.properties b/config/alfresco/messages/webclient_ru.properties index 9f621721de..b4d1a0f5cb 100755 --- a/config/alfresco/messages/webclient_ru.properties +++ b/config/alfresco/messages/webclient_ru.properties @@ -262,7 +262,7 @@ navigation=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F next_item=\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0439 \u044D\u043B\u0435\u043C\u0435\u043D\u0442 previous_item=\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0438\u0439 \u044D\u043B\u0435\u043C\u0435\u043D\u0442 cancel=\u041E\u0442\u043C\u0435\u043D\u0430 -upload=\u041F\u0435\u0440\u0435\u0434\u0430\u0442\u044C +upload=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c homespace=\u0414\u043E\u043C\u0430\u0448\u043D\u0435\u0435 \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u043E network_folder=\u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0441\u0435\u0442\u0435\u0432\u0443\u044E \u043F\u0430\u043F\u043A\u0443 other_action=\u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 @@ -309,7 +309,7 @@ reset=\u0421\u0431\u0440\u043E\u0441 label=\u042F\u0440\u043B\u044B\u043A edit_doc_offline=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432 \u0430\u0432\u0442\u043E\u043D\u043E\u043C\u043D\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435 edit_doc_online=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432 \u0438\u043D\u0442\u0435\u0440\u0430\u043A\u0442\u0438\u0432\u043D\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435 -upload_new_version=\u041F\u0435\u0440\u0435\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u0443\u044E \u0432\u0435\u0440\u0441\u0438\u044E +upload_new_version=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043D\u043E\u0432\u0443\u044E \u0432\u0435\u0440\u0441\u0438\u044E checkin_this_file=\u0418\u0437\u0432\u043B\u0435\u0447\u044C \u044D\u0442\u043E\u0442 \u0444\u0430\u0439\u043B cannot_delete_node_has_working_copy=\u041D\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044F \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0444\u0430\u0439\u043B \"{0}\", \u0442\u0430\u043A \u043A\u0430\u043A \u043E\u043D \u0441\u0432\u044F\u0437\u0430\u043D \u0441 \u0440\u0430\u0431\u043E\u0447\u0435\u0439 \u043A\u043E\u043F\u0438\u0435\u0439. unknown=\u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E @@ -841,7 +841,7 @@ caused_by=\u0432\u044B\u0437\u0432\u0430\u043D\u043E: # Content Wizard messages add_content_dialog_title=\u0414\u0438\u0430\u043B\u043E\u0433\u043E\u0432\u043E\u0435 \u043E\u043A\u043D\u043E \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u043A\u043E\u043D\u0442\u0435\u043D\u0442\u0430 add_content_dialog_desc=\u0414\u0430\u043D\u043D\u043E\u0435 \u0434\u0438\u0430\u043B\u043E\u0433\u043E\u0432\u043E\u0435 \u043E\u043A\u043D\u043E \u043F\u043E\u043C\u043E\u0433\u0430\u0435\u0442 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043D\u0442\u0435\u043D\u0442 \u0432 \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u043E. -upload_content=\u041F\u0435\u0440\u0435\u0434\u0430\u0442\u044C \u043A\u043E\u043D\u0442\u0435\u043D\u0442 +upload_content=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043A\u043E\u043D\u0442\u0435\u043D\u0442 properties=\u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430 general=\u041E\u0431\u0449\u0438\u0435 file_name=\u0418\u043C\u044F \u0444\u0430\u0439\u043B\u0430 @@ -851,7 +851,7 @@ inline_editable=\u0421 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0 locate_content=\u041D\u0430\u0439\u0442\u0438 \u043A\u043E\u043D\u0442\u0435\u043D\u0442 \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u0434\u0430\u0447\u0438 content_location=\u041C\u0435\u0441\u0442\u043E\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435 uploaded_content=\u041F\u0435\u0440\u0435\u0434\u0430\u043D\u043D\u044B\u0439 \u043A\u043E\u043D\u0442\u0435\u043D\u0442 -click_upload=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 '\u041F\u0435\u0440\u0435\u0434\u0430\u0442\u044C' +click_upload=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 ''\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c'' file_upload_success=''{0}'' \u0443\u0441\u043F\u0435\u0448\u043D\u043E \u043F\u0435\u0440\u0435\u0434\u0430\u043D. modify_props_when_page_closes=\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0435 \u0432\u0441\u0435\u0445 \u0441\u0432\u043E\u0439\u0441\u0442\u0432 \u043F\u043E\u0441\u043B\u0435 \u0437\u0430\u043A\u0440\u044B\u0442\u0438\u044F \u044D\u0442\u043E\u0439 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B. modify_props_when_wizard_closes=\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0435 \u0432\u0441\u0435\u0445 \u0441\u0432\u043E\u0439\u0441\u0442\u0432 \u043F\u043E\u0441\u043B\u0435 \u0437\u0430\u043A\u0440\u044B\u0442\u0438\u044F \u044D\u0442\u043E\u0433\u043E \u043C\u0430\u0441\u0442\u0435\u0440\u0430. diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js index ed8a615e65..4cd0f2fdbf 100644 --- a/source/web/scripts/ajax/xforms.js +++ b/source/web/scripts/ajax/xforms.js @@ -1003,6 +1003,22 @@ alfresco.xforms.RichTextEditor = alfresco.xforms.Widget.extend({ { editorDocument.widget = t; + var height = t._params["height"]; + + if(!isNaN(parseInt(height))) + { + var num = 1; + + while($(ed.id + '_toolbar' + num) != null) + { + height -= 26; + num++; + } + + $(ed.id + '_tbl').style.height = t._params["height"] + "px"; + $(ed.id + '_ifr').style.height = height + "px"; + } + if ("false" == t._params["convert_fonts_to_spans"]) { ed.settings.convert_fonts_to_spans = false; @@ -4767,6 +4783,15 @@ alfresco.xforms.XForm = new Class({ this.rootWidget.render(alfUI); this.loadWidgets(rootGroup, this.rootWidget); + + var resolver = alfresco.xforms.FOCUS_RESOLVER; + var root = document.getElementById("alfresco-xforms-root-group-childContainerNode"); + var firstControl = resolver.findControl(root, false, true); + + if (null != firstControl) + { + firstControl.focus(); + } }, /** Creates the widget for the provided xforms node. */ @@ -5407,7 +5432,6 @@ alfresco.xforms.FocusResolver = new Class({ if (frameParent.id != resolver._currentParent) { - resolver._navigationDirection = 0; resolver._navigationDirection = 0; resolver._forced = true; resolver._currentElement.focus(); @@ -5536,10 +5560,10 @@ alfresco.xforms.FocusResolver = new Class({ _searchForTheBestElement: function(start) { - var result = this._findControl(start, true, false); + var result = this.findControl(start, true, false); if ((null != result) && ((0 != result.tabIndex) || ("DIV" == result.tagName) || ("SPAN" == result.tagName)) && (null != result.children)) { - result = this._findControl(result, false, true); + result = this.findControl(result, false, true); } return result; }, @@ -5563,16 +5587,16 @@ alfresco.xforms.FocusResolver = new Class({ return null; }, - _findControl: function(element, ignoreTabIndex, dontCareAboutValidity) + findControl: function(element, ignoreTabIndex, dontCareAboutValidity) { - if (null == element) + if ((null == element) || (("DIV" == element.tagName) && element.hasClass("xformsItemLabelContainer"))) { return null; } var result = null; - if ((!dontCareAboutValidity || (("DIV" != element.tagName) && ("SPAN" != element.tagName))) && (ignoreTabIndex || (0 == element.tabIndex)) + if ((!dontCareAboutValidity || (("LABEL" != element.tagName) && ("DIV" != element.tagName) && ("SPAN" != element.tagName))) && (ignoreTabIndex || (0 == element.tabIndex)) && (dontCareAboutValidity || ((null != element.widget) && (!element.widget.isValidForSubmit())))) { result = element; @@ -5582,7 +5606,7 @@ alfresco.xforms.FocusResolver = new Class({ { for (var i = 0; (null == result) && (i < element.children.length); i++) { - result = this._findControl(element.children[i], ignoreTabIndex, dontCareAboutValidity); + result = this.findControl(element.children[i], ignoreTabIndex, dontCareAboutValidity); } } @@ -5645,7 +5669,7 @@ alfresco.xforms.FocusResolver = new Class({ _ensureInUniqueId: function(element) { - if ((null != element) && (null == element.id) || (0 == element.id.length)) + if ((null != element) && ((null == element.id) || (0 == element.id.length))) { element.id = (((null != element.type) && (element.type.length > 0)) ? (element.type) : (element.tagName)) + "_generated_id_" + (new Date()).getTime(); }