summaryrefslogtreecommitdiffstats
path: root/templates/content/js/com.cnprog.utils.js
diff options
context:
space:
mode:
Diffstat (limited to 'templates/content/js/com.cnprog.utils.js')
-rw-r--r--templates/content/js/com.cnprog.utils.js15
1 files changed, 12 insertions, 3 deletions
diff --git a/templates/content/js/com.cnprog.utils.js b/templates/content/js/com.cnprog.utils.js
index e271ed78..5c0c4a27 100644
--- a/templates/content/js/com.cnprog.utils.js
+++ b/templates/content/js/com.cnprog.utils.js
@@ -23,7 +23,12 @@ var notify = function() {
},
close: function(doPostback) {
if (doPostback) {
- $.post("/messages/markread/", { formdata: "required" });
+<<<<<<< HEAD:templates/content/js/com.cnprog.utils.js
+ $.post($.i18n._("/") + $.i18n._("messages/") +
+=======
+ $.post(scriptUrl + $.i18n._("messages/") +
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.utils.js
+ $.i18n._("markread/"), { formdata: "required" });
}
$(".notify").fadeOut("fast");
$("body").css("margin-top", "0");
@@ -35,7 +40,11 @@ var notify = function() {
function appendLoader(containerSelector) {
$(containerSelector).append('<img class="ajax-loader" '
- +'src="/content/images/indicator.gif" title="'
+<<<<<<< HEAD:templates/content/js/com.cnprog.utils.js
+ +'src="' + $.i18n._('/') + 'content/images/indicator.gif" title="'
+=======
+ +'src="' + scriptUrl + 'content/images/indicator.gif" title="'
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/content/js/com.cnprog.utils.js
+$.i18n._('loading...')
+'" alt="'
+$.i18n._('loading...')
@@ -103,7 +112,7 @@ var CPValidator = function(){
return {
tags: {
required: " " + $.i18n._('tags cannot be empty'),
- maxlength: " " + $.i18n._('tablimits info'),
+ maxlength: " " + $.i18n._('tablimits info')
},
text: {
required: " " + $.i18n._('content cannot be empty'),