aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRaghu Nayyar <me@iraghu.com>2013-04-26 21:12:38 -0700
committerRaghu Nayyar <me@iraghu.com>2013-04-26 21:12:38 -0700
commit2bcb64e7813e5118676958a79910cdb604f9439b (patch)
tree0e892caa817759417df4f37f2e7bae9eea521a27 /core
parent7b2c64236ce3ddd6cf1a09c67745a8f7ab9c356b (diff)
parentb6fee2d25794ff3214e1bbf857861f6d681c4cf2 (diff)
downloadnextcloud-server-2bcb64e7813e5118676958a79910cdb604f9439b.tar.gz
nextcloud-server-2bcb64e7813e5118676958a79910cdb604f9439b.zip
Merge pull request #3114 from owncloud/update-notification
Add an update notification
Diffstat (limited to 'core')
-rw-r--r--core/css/styles.css4
-rw-r--r--core/templates/layout.user.php3
2 files changed, 5 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index 6eea2be433d..93f2cecbfe9 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -344,8 +344,8 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
.center { text-align:center; }
#notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
-#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
-#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
+#notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification span, #update-notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index cfe0a551943..9a1b202226b 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -32,6 +32,9 @@
<body id="<?php p($_['bodyid']);?>">
<div id="notification-container">
<div id="notification"></div>
+ <?php if ($_['updateAvailable']): ?>
+ <div id="update-notification" style="display: inline;"><?php print_unescaped($l->t('%s is available. <a href="%s">Click here to get more information.', array($_['updateVersion'], $_['updateLink']))); ?></a></div>
+ <?php endif; ?>
</div>
<header><div id="header">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"