Move .errormsg from settings-css to .warning in core. Reusable!
This commit is contained in:
parent
db424cc86b
commit
7c296a6cf9
|
@ -389,7 +389,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
|
|||
|
||||
|
||||
/* Warnings and errors are the same */
|
||||
.warning, .update, .error {
|
||||
#body-login .warning, #body-login .update, #body-login .error {
|
||||
display: block;
|
||||
padding: 10px;
|
||||
color: #dd3b3b;
|
||||
|
@ -401,6 +401,16 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
|
|||
border-radius: 5px;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
#body-user .warning, #body-settings .warning {
|
||||
margin-top: 8px;
|
||||
padding: 5px;
|
||||
background: #fdd;
|
||||
-webkit-border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.warning legend,
|
||||
.warning a,
|
||||
.error a {
|
||||
|
|
|
@ -92,14 +92,6 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
|
|||
|
||||
.appslink { text-decoration: underline; }
|
||||
.score { color:#666; font-weight:bold; font-size:0.8em; }
|
||||
.errormsg {
|
||||
margin: 20px;
|
||||
padding: 5px;
|
||||
background: #fdd;
|
||||
-webkit-border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
/* LOG */
|
||||
#log { white-space:normal; }
|
||||
|
|
|
@ -51,10 +51,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
|
|||
page.find('span.score').hide();
|
||||
}
|
||||
if (typeof($('#leftcontent li[data-id="'+app.id+'"]').data('errormsg')) !== "undefined") {
|
||||
page.find(".errormsg").show();
|
||||
page.find(".errormsg").text($('#leftcontent li[data-id="'+app.id+'"]').data('errormsg'));
|
||||
page.find(".warning").show();
|
||||
page.find(".warning").text($('#leftcontent li[data-id="'+app.id+'"]').data('errormsg'));
|
||||
} else {
|
||||
page.find(".errormsg").hide();
|
||||
page.find(".warning").hide();
|
||||
}
|
||||
},
|
||||
enableApp:function(appid, active, element) {
|
||||
|
@ -190,8 +190,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
|
|||
});
|
||||
},
|
||||
showErrorMessage: function(message) {
|
||||
$('#rightcontent .errormsg').show();
|
||||
$('#rightcontent .errormsg').text(message);
|
||||
$('.appinfo .warning').show();
|
||||
$('.appinfo .warning').text(message);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -41,6 +41,6 @@
|
|||
print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
|
||||
<input class="enable hidden" type="submit" />
|
||||
<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
|
||||
<div class="errormsg hidden"></div>
|
||||
<div class="warning hidden"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue