updated bootstrap alert usage and js for bootstrap 2

hashbangperl · Apr 23, 2012 · 8594aa2 · 8594aa2
1 parent af376d4
commit 8594aa2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/root/static/javascript/bootstrap-alert.js b/root/static/javascript/bootstrap-alert.js
@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.0
+ * bootstrap-alert.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -51,11 +51,14 @@
 
       $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
 
-      $parent.removeClass('in')
+      $parent
+        .trigger('close')
+        .removeClass('in')
 
       function removeElement() {
-        $parent.remove()
-        $parent.trigger('closed')
+        $parent
+          .trigger('closed')
+          .remove()
       }
 
       $.support.transition && $parent.hasClass('fade') ?
@@ -88,4 +91,4 @@
     $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
   })
 
-}( window.jQuery )
+}( window.jQuery );
diff --git a/root/templates/include/header.tt b/root/templates/include/header.tt
@@ -9,7 +9,7 @@
 [% SET page_assets = get_fresh_file_assets() %]
 
 [% CALL page_assets.include("/javascript/jquery-1.7.1.min.js", -1) %]
-[% CALL page_assets.include("/javascript/bootstrap-alerts.js", 20) %]
+[% CALL page_assets.include("/javascript/bootstrap-alert.js", 20) %]
 [% CALL page_assets.include("/javascript/bootstrap-dropdown.js", 21) %]
 
 

diff --git a/root/templates/login.tt b/root/templates/login.tt
@@ -6,8 +6,8 @@
           <div class="span14">
 
    [% IF errors %]
-   <div class="alert warning" data-alert="alert">
-    <a class="close" href="#" onClick>×</a>
+    <div class="alert warning">
+     <a class="close" data-dismiss="alert">×</a>
     <p>
       <strong>Unable to login</strong> please check the following errors and correct them or contact support :
       <ul>