diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-18 17:37:22 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-18 17:37:22 +0200 |
| commit | 7c296a6cf915da6630422ceb8e253ebf9f004964 (patch) | |
| tree | 0b250c2556045574d645235dead6ee89cb44f815 /settings | |
| parent | db424cc86b005d2edfcfcf55ee7f5294dfffc8b6 (diff) | |
| download | nextcloud-server-7c296a6cf915da6630422ceb8e253ebf9f004964.tar.gz nextcloud-server-7c296a6cf915da6630422ceb8e253ebf9f004964.zip | |
Move .errormsg from settings-css to .warning in core. Reusable!
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 8 | ||||
| -rw-r--r-- | settings/js/apps.js | 10 | ||||
| -rw-r--r-- | settings/templates/apps.php | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 38c28dd33b9..d5ffe448482 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -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; } diff --git a/settings/js/apps.js b/settings/js/apps.js index 0ca1b5f7719..d9817aff6b6 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -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); } }; diff --git a/settings/templates/apps.php b/settings/templates/apps.php index b6b731ac9c5..0b76f775fea 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -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> |