diff --git a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx index 876624892d..babe1c15cb 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx @@ -31,10 +31,10 @@ masterPageDropDown: $("#<%= MasterTemplate.ClientID %>"), treeSyncPath: '<%=TemplateTreeSyncPath%>', text: { - templateErrorHeader: "<%= umbraco.ui.Text("speechBubbles", "templateErrorHeader") %>", - templateSavedHeader: "<%= umbraco.ui.Text("speechBubbles", "templateSavedHeader") %>", - templateErrorText: "<%= umbraco.ui.Text("speechBubbles", "templateErrorText") %>", - templateSavedText: "<%= umbraco.ui.Text("speechBubbles", "templateSavedText") %>" + templateErrorHeader: "<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "templateErrorHeader")) %>", + templateSavedHeader: "<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "templateSavedHeader")) %>", + templateErrorText: "<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "templateErrorText")) %>", + templateSavedText: "<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "templateSavedText")) %>" } }); diff --git a/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx b/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx index 4fce8917f4..489470895e 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/scripts/editScript.aspx @@ -23,10 +23,10 @@ saveButton: $("#<%= ((Control)SaveButton).ClientID %>"), editorSourceElement: $('#<%= editorSource.ClientID %>'), text: { - fileErrorHeader: '<%= umbraco.ui.Text("speechBubbles", "fileErrorHeader") %>', - fileSavedHeader: '<%= umbraco.ui.Text("speechBubbles", "fileSavedHeader") %>', + fileErrorHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "fileErrorHeader")) %>', + fileSavedHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "fileSavedHeader")) %>', fileSavedText: '', - fileErrorText: '<%= umbraco.ui.Text("speechBubbles", "fileErrorText") %>', + fileErrorText: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "fileErrorText")) %>', } }); editor.init(); diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx index 90fdc33385..4e79f8b3fe 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx @@ -18,9 +18,9 @@ saveButton: $("#<%= ((Control)SaveButton).ClientID %>"), editorSourceElement: $('#<%= editorSource.ClientID %>'), text: { - cssErrorHeader: '<%= umbraco.ui.Text("speechBubbles", "cssErrorHeader") %>', - cssSavedHeader: '<%= umbraco.ui.Text("speechBubbles", "cssSavedHeader") %>', - cssSavedText: '<%= umbraco.ui.Text("speechBubbles", "cssSavedText") %>', + cssErrorHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "cssErrorHeader")) %>', + cssSavedHeader: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "cssSavedHeader")) %>', + cssSavedText: '<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "cssSavedText")) %>', cssErrorText: 'Please make sure that you have permissions set correctly', } }); diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx index 1d0166285d..c554ab88b9 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx @@ -10,25 +10,25 @@
- <%=umbraco.ui.Text("name", base.getUser())%>: + <%=umbraco.ui.Text("name", UmbracoUser)%>:
- <%=umbraco.ui.Text("stylesheet", "nameHelp", base.getUser())%> + <%=umbraco.ui.Text("stylesheet", "nameHelp", UmbracoUser)%>
- <%=umbraco.ui.Text("alias", base.getUser())%>: + <%=umbraco.ui.Text("alias", UmbracoUser)%>:
- <%=umbraco.ui.Text("stylesheet", "aliasHelp", base.getUser())%> + <%=umbraco.ui.Text("stylesheet", "aliasHelp", UmbracoUser)%>
- <%=umbraco.ui.Text("styles", base.getUser())%>: + <%=umbraco.ui.Text("styles", UmbracoUser)%>: @@ -38,7 +38,7 @@
- <%=umbraco.ui.Text("preview", base.getUser())%>: + <%=umbraco.ui.Text("preview", UmbracoUser)%>:
diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js index fd7541cf78..43a8d1b349 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js +++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js @@ -46,7 +46,7 @@ submitSucces: function(t) { if (t != 'true') { - top.UmbSpeechBubble.ShowMessage('error', this._opts.text.fileErrorHeader, this._opts.text.fileErrorText); + top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.fileErrorHeader), unescape(this._opts.text.fileErrorText)); } var newFilePath = this._opts.nameTxtBox.val(); @@ -58,11 +58,11 @@ UmbClientMgr.contentFrame(newLocation); //we need to do this after we navigate otherwise the navigation will wait unti lthe message timeout is done! - top.UmbSpeechBubble.ShowMessage('save', this._opts.text.fileSavedHeader, this._opts.text.fileSavedText); + top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.fileSavedHeader), unescape(this._opts.text.fileSavedText)); } else { - top.UmbSpeechBubble.ShowMessage('save', this._opts.text.fileSavedHeader, this._opts.text.fileSavedText); + top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.fileSavedHeader), unescape(this._opts.text.fileSavedText)); UmbClientMgr.mainTree().setActiveTreeType('scripts'); //we need to pass in the newId parameter so it knows which node to resync after retreival from the server UmbClientMgr.mainTree().syncTree("-1,init," + this._opts.originalFileName, true, null, newFilePath); @@ -73,7 +73,7 @@ }, submitFailure: function(t) { - top.UmbSpeechBubble.ShowMessage('error', this._opts.text.fileErrorHeader, this._opts.text.fileErrorText); + top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.fileErrorHeader), unescape(this._opts.text.fileErrorText)); } }); })(jQuery); \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js index 5311d91ff1..b67e224d7b 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js +++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditStyleSheet.js @@ -46,10 +46,10 @@ submitSucces: function(t) { if (t != 'true') { - top.UmbSpeechBubble.ShowMessage('error', this._opts.text.cssErrorHeader, this._opts.text.cssErrorText); + top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.cssErrorHeader), unescape(this._opts.text.cssErrorText)); } else { - top.UmbSpeechBubble.ShowMessage('save', this._opts.text.cssSavedHeader, this._opts.text.cssSavedText); + top.UmbSpeechBubble.ShowMessage('save', unescape(this._opts.text.cssSavedHeader), unescape(this._opts.text.cssSavedText)); } UmbClientMgr.mainTree().setActiveTreeType('stylesheets'); @@ -60,7 +60,7 @@ }, submitFailure: function(t) { - top.UmbSpeechBubble.ShowMessage('error', this._opts.text.cssErrorHeader, this._opts.text.cssErrorText); + top.UmbSpeechBubble.ShowMessage('error', unescape(this._opts.text.cssErrorHeader), unescape(this._opts.text.cssErrorText)); } }); })(jQuery); \ No newline at end of file