summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-04-24 13:31:18 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-04-24 13:31:18 -0400
commit5e7664e25f6c4b93d32bc1ef33463c09205ff679 (patch)
tree07d119e4d77fc866c011bc1701ef7d54db481ee4
parentecb09fb8646def7f6a7c5fc0fc2d4df6676edd06 (diff)
parent12867d114d8d40bf9a45b3e1eb9b0e50d736d333 (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
-rw-r--r--js/util.js15
-rw-r--r--theme/base/css/display.css11
2 files changed, 12 insertions, 14 deletions
diff --git a/js/util.js b/js/util.js
index 16422df57..15a14625c 100644
--- a/js/util.js
+++ b/js/util.js
@@ -166,23 +166,14 @@ $(document).ready(function(){
$("#notice_action-submit").addClass("disabled");
return true;
},
- timeout: 7000,
error: function (xhr, textStatus, errorThrown) { $("#form_notice").removeClass("processing");
$("#notice_action-submit").removeAttr("disabled");
$("#notice_action-submit").removeClass("disabled");
-
- if (textStatus == "timeout") {
- alert ("Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists");
+ if ($(".error", xhr.responseXML).length > 0) {
+ $('#form_notice').append(document._importNode($(".error", xhr.responseXML).get(0), true));
}
else {
- switch(xhr.status) {
- default: case 404:
- alert("Sorry! We had trouble sending your notice. Please report the problem to the site administrator if this happens again.");
- break;
- case 502: case 503: case 504:
- alert("Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.");
- break;
- }
+ alert("Sorry! We had trouble sending your notice ("+xhr.status+" "+xhr.statusText+"). Please report the problem to the site administrator if this happens again.");
}
},
success: function(xml) { if ($("#error", xml).length > 0) {
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 2fb1c007f..0bc2e68b6 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -86,7 +86,7 @@ border:0;
.error,
.success {
-padding:4px 7px;
+padding:4px 1.55%;
border-radius:4px;
-moz-border-radius:4px;
-webkit-border-radius:4px;
@@ -426,6 +426,7 @@ line-height:1;
#form_notice fieldset {
border:0;
padding:0;
+position:relative;
}
#form_notice legend {
display:none;
@@ -480,7 +481,13 @@ margin-bottom:7px;
margin-left:18px;
float:left;
}
-
+#form_notice .error {
+float:left;
+clear:both;
+width:96.9%;
+margin-bottom:0;
+line-height:1.618;
+}
/* entity_profile */
.entity_profile {