diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 11:52:07 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 11:52:07 +0100 |
| commit | 508b6a9fc79326bcf6d060f1daf42f5b67bfaeec (patch) | |
| tree | de95217962ceffcb249d65deda0f825a87e2144d | |
| parent | 364b1cd3915ab8d33f1a63f598be3acb4bfcf86a (diff) | |
| download | nextcloud-server-508b6a9fc79326bcf6d060f1daf42f5b67bfaeec.tar.gz nextcloud-server-508b6a9fc79326bcf6d060f1daf42f5b67bfaeec.zip | |
displaying notification now centered
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
| -rw-r--r-- | apps/files/templates/index.php | 1 | ||||
| -rw-r--r-- | core/css/styles.css | 3 | ||||
| -rw-r--r-- | core/js/js.js | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 5 | ||||
| -rw-r--r-- | settings/templates/users.php | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 77c06007da4..b66b523ae38 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -50,7 +50,6 @@ <?php endif;?> <input type="hidden" name="permissions" value="<?php echo $_['permissions']; ?>" id="permissions"> </div> -<div id='notification'></div> <?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?> <div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div> diff --git a/core/css/styles.css b/core/css/styles.css index 496320561f8..e7ad777f719 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -190,7 +190,8 @@ fieldset.warning legend { color:#b94a48 !important; } .bold { font-weight:bold; } .center { text-align:center; } -#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; 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-container { position: absolute; 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; } tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; } diff --git a/core/js/js.js b/core/js/js.js index 10758a90722..e724be9c2d5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -311,13 +311,13 @@ OC.Notification={ var notification = $('#notification'); notification.hide(); notification.html(html); - notification.fadeIn(); + notification.fadeIn().css("display","inline"); }, show: function(text) { var notification = $('#notification'); notification.hide(); notification.text(text); - notification.fadeIn(); + notification.fadeIn().css("display","inline"); } }; diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index ba5053edecf..be9eff80553 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -40,7 +40,10 @@ </head> <body id="<?php echo $_['bodyid'];?>"> - <header><div id="header"> + <div id="notification-container"> + <div id="notification"/> + </div> + <header><div id="header"> <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> <a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out'); echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> <form class="searchbox header-right" action="#" method="post"> diff --git a/settings/templates/users.php b/settings/templates/users.php index e8bf9edf604..80d8dc9cc86 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -73,8 +73,6 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>; </div> </div> -<div id='notification'></div> - <table data-groups="<?php echo implode(', ', $allGroups);?>"> <thead> <tr> |