diff --git a/core/src/plugins/action.share/class.ShareCenter.js b/core/src/plugins/action.share/class.ShareCenter.js index cfc0324436..5a9b3d3263 100644 --- a/core/src/plugins/action.share/class.ShareCenter.js +++ b/core/src/plugins/action.share/class.ShareCenter.js @@ -193,7 +193,7 @@ Class.create("ShareCenter", { }else{ this.currentNode.getMetadata().set("ajxp_shared", "true"); ajaxplorer.fireNodeRefresh(this.currentNode); - ajaxplorer.displayMessage('SUCCESS', 'Created a new public folder at ' + response); + ajaxplorer.displayMessage('SUCCESS', MessageHash["share_center.156"].replace("%s", response)); oForm.down("#share_container").setValue(response); this._currentRepositoryLink = response; this._currentRepositoryLabel = oForm.down("#repo_label").getValue(); @@ -393,7 +393,7 @@ Class.create("ShareCenter", { } if(this.shareFolderMode != "workspace"){ - this.updateDialogButtons(oForm.down('#share_result').down("div.SF_horizontal_fieldsRow"), oForm, "folder", json); + this.updateDialogButtons(oForm.down('#target_repository_toggle'), oForm, "folder", json); }else{ var El = new Element('div', {className:"SF_horizontal_fieldsRow"}).update('
'); oForm.down("#shareDialogButtons").insert({top:El}); @@ -920,7 +920,7 @@ Class.create("ShareCenter", { // WATCH BUTTON if(ajaxplorer.hasPluginOfType("meta", "watch")){ var st = (shareType == "folder" ? MessageHash["share_center.38"] : MessageHash["share_center.39"]); - if(!dialogButtonsOrRow.down('#watch_folder')) { + if(!dialogButtonsOrRow.down('#watch_folder_eye')) { dialogButtonsOrRow.down('.SF_horizontal_actions').insert({top:" "+MessageHash["share_center.82"]+""}); } var folderEye = dialogButtonsOrRow.down('#watch_folder_eye'); @@ -995,17 +995,25 @@ Class.create("ShareCenter", { link = dialogButtonsOrRow.down('[name="link_url"]').getValue(); message = s + "\n\n " + ""+link+""; }else{ - s = MessageHash["share_center.43"]; + if(this.currentNode.isLeaf()){ + s = MessageHash["share_center.42"] + }else{ + s = MessageHash["share_center.43"]; + } if(s) s = s.replace("%s", ajaxplorer.appTitle); link = this._currentRepositoryLink; - message = s + "\n\n " + "" + MessageHash["share_center.46"].replace("%s1", this._currentRepositoryLabel).replace("%s2", ajaxplorer.appTitle) + ""; + if(this.shareFolderMode == 'workspace'){ + message = s + "\n\n " + "" + MessageHash["share_center.46"].replace("%s1", this._currentRepositoryLabel).replace("%s2", ajaxplorer.appTitle) + ""; + }else{ + message = s + "\n\n " + "" + MessageHash["share_center.46" + (this.currentNode.isLeaf()?'_file':'_mini')].replace("%s1", this._currentRepositoryLabel) + ""; + } } if(dialogButtonsOrRow.down('.share_qrcode') && dialogButtonsOrRow.down('.share_qrcode').visible() && dialogButtonsOrRow.down('.share_qrcode > img')){ message += "\n\n "+ MessageHash["share_center.108"] + "\n\n" + dialogButtonsOrRow.down('.share_qrcode').innerHTML; } var mailer = new AjxpMailer(); var usersList = null; - if(shareType == 'folder' && oForm) { + if(this.shareFolderMode == 'workspace' && oForm) { usersList = oForm.down(".editable_users_list"); } console.log(mailerShower); diff --git a/core/src/plugins/action.share/manifest.xml b/core/src/plugins/action.share/manifest.xml index 7b62d7551b..932713acbb 100644 --- a/core/src/plugins/action.share/manifest.xml +++ b/core/src/plugins/action.share/manifest.xml @@ -7,7 +7,7 @@ - + @@ -167,13 +167,13 @@ AJXP_MESSAGE[share_center.139] AJXP_MESSAGE[share_center.140] AJXP_MESSAGE[share_center.141]AJXP_MESSAGE[share_center.142] +
-