wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-04-24 13:31:18 -04:00
commit 5e7664e25f
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/util.js
View File

@ -166,23 +166,14 @@ $(document).ready(function(){
$("#notice_action-submit").addClass("disabled"); $("#notice_action-submit").addClass("disabled");
return true; return true;
}, },
timeout: 7000,
error: function (xhr, textStatus, errorThrown) { $("#form_notice").removeClass("processing"); error: function (xhr, textStatus, errorThrown) { $("#form_notice").removeClass("processing");
$("#notice_action-submit").removeAttr("disabled"); $("#notice_action-submit").removeAttr("disabled");
$("#notice_action-submit").removeClass("disabled"); $("#notice_action-submit").removeClass("disabled");
if ($(".error", xhr.responseXML).length > 0) {
if (textStatus == "timeout") { $('#form_notice').append(document._importNode($(".error", xhr.responseXML).get(0), true));
alert ("Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists");
} }
else { else {
switch(xhr.status) { alert("Sorry! We had trouble sending your notice ("+xhr.status+" "+xhr.statusText+"). Please report the problem to the site administrator if this happens again.");
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;
}
} }
}, },
success: function(xml) { if ($("#error", xml).length > 0) { success: function(xml) { if ($("#error", xml).length > 0) {

11
theme/base/css/display.css
View File

@ -86,7 +86,7 @@ border:0;
.error, .error,
.success { .success {
padding:4px 7px; padding:4px 1.55%;
border-radius:4px; border-radius:4px;
-moz-border-radius:4px; -moz-border-radius:4px;
-webkit-border-radius:4px; -webkit-border-radius:4px;
@ -426,6 +426,7 @@ line-height:1;
#form_notice fieldset { #form_notice fieldset {
border:0; border:0;
padding:0; padding:0;
position:relative;
} }
#form_notice legend { #form_notice legend {
display:none; display:none;
@ -480,7 +481,13 @@ margin-bottom:7px;
margin-left:18px; margin-left:18px;
float:left; float:left;
} }
#form_notice .error {
float:left;
clear:both;
width:96.9%;
margin-bottom:0;
line-height:1.618;
}
/* entity_profile */ /* entity_profile */
.entity_profile { .entity_profile {