more flexible notifications

2012-09-12 22:53:59 -05:00
parent 7898055f0c
commit 54e67932a0
5 changed files with 44 additions and 14 deletions
@@ -1 +1 @@
-Version 2.0.8 (2012-09-12 11:26:18) stable
+Version 2.0.8 (2012-09-12 22:53:52) stable
@@ -95,16 +95,23 @@ div.flash {
    top:48px;
    right:50px;
    min-width:280px;
-    opacity:0.85;
+    opacity:0.95;
    margin:0px 0px 10px 10px;
-    color:#fff;
    vertical-align:middle;
    cursor:pointer;
-    background:#000;
+    color:#fff;
+    background-color:#000;
    border:2px solid #fff;
-    border-radius:5px;
-    -moz-border-radius:5px;
-    -webkit-border-radius:5px;
+    border-radius:8px;
+    -o-border-radius: 8px;
+    -moz-border-radius:8px;
+    -webkit-border-radius:8px;
+    background-image: -webkit-linear-gradient(top,#222,#000);
+    background-image: -o-linear-gradient(top,#222,#000);
+    background-image: linear-gradient(top,#222,#000);
+    background-repeat: repeat-x;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
    z-index:2000;
 }
 div.flash:hover { opacity:0.25; }
@@ -1,8 +1,27 @@
-body {
-  padding-top: 60px;
+#navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;}
+
+div.flash.fcenter {
+   left: 25%;
+   right: 25%;
 }

-#navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;}
+div.flash.ftop, div.flash.ftop:hover {
+   position: relative;
+   margin:0;
+   padding:1em;
+   top:0;
+   left:0;
+   width:100%;
+   text-align:center;
+   color:#3A87AD;
+   background:#D9EDF7;
+   border:1px solid #BCE8F1;
+   border-top:0px;
+   border-left:0px;
+   border-right:0px;
+   border-radius:0;
+   opacity:1;
+}

 /* bootstrap dropdown */

@@ -18,6 +37,10 @@ body {
    visibility: visible;
 }

+#header {
+  margin-top: 60px;
+}
+
 .mastheader h1 {
  margin-bottom: 9px;
  font-size: 81px;
@@ -39,7 +39,7 @@ function web2py_ajax_init(target) {

 function web2py_event_handlers() {
  var doc = jQuery(document)
-  doc.on('click', '.flash', function(e){jQuery(this).fadeOut('slow'); e.preventDefault();});
+      doc.on('click', '.flash', function(e){var t=jQuery(this); if(t.css('top')=='0px') t.slideUp('slow'); else t.fadeOut(); e.preventDefault();});
  doc.on('keyup', 'input.integer', function(){this.value=this.value.reverse().replace(/[^0-9\-]|\-(?=.)/g,'').reverse();});
  doc.on('keyup', 'input.double, input.decimal', function(){this.value=this.value.reverse().replace(/[^0-9\-\.,]|[\-](?=.)|[\.,](?=[0-9]*[\.,])/g,'').reverse();});
  var confirm_message = (typeof w2p_ajax_confirm_message != 'undefined') ? w2p_ajax_confirm_message : "Are you sure you want to delete this object?";
@@ -55,7 +55,7 @@ function web2py_event_handlers() {
 jQuery(function() {
   var flash = jQuery('.flash');
   flash.hide();
-   if(flash.html()) flash.slideDown();
+   if(flash.html()) flash.append('<span style="float:right;">&times;<span>').slideDown();
   web2py_ajax_init(document);
   web2py_event_handlers();
 });
@@ -65,6 +65,8 @@
 </head>

 <body>
+  <div class="flash">{{=response.flash or ''}}</div>
+
  <!-- Navbar ================================================== -->
  <div class="navbar navbar-fixed-top">
    <div class="navbar-inner">
@@ -88,8 +90,6 @@
  </div><!--/top navbar -->

  <div class="container">
-    <div class="flash">{{=response.flash or ''}}</div>
-
    <!-- Masthead ================================================== -->
    <header class="mastheader" id="header">
      <div class="row">