Move .errormsg from settings-css to .warning in core. Reusable!

diff --git a/core/css/styles.css b/core/css/styles.css
index becf0af90563612b9c93edc71485ca98bba543f2..39121fccb235e370ff3c3988db80930e8f9f925e 100644 (file)
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -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 {

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 38c28dd33b977324fd0e89f900da41e48a3e5b58..d5ffe44848266db87d8333ee8a894b857319119d 100644 (file)
--- 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 0ca1b5f77190a33bb7ea7906719ce38bcb0db858..d9817aff6b6791e3376a91d642c6508d749b5907 100644 (file)
--- 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 b6b731ac9c5ceec1aa7285c962e982ec1659629e..0b76f775fea4802ec635b42e69a27d9438fbc73d 100644 (file)
--- 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>