Permalink
Browse files

updated bootstrap alert usage and js for bootstrap 2

  • Loading branch information...
1 parent af376d4 commit 8594aa2c777644d512f139b16b33e02ed2e93cb1 @hashbangperl committed Apr 23, 2012
Showing with 11 additions and 8 deletions.
  1. +8 −5 root/static/javascript/bootstrap-alert.js
  2. +1 −1 root/templates/include/header.tt
  3. +2 −2 root/templates/login.tt
@@ -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 );
@@ -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) %]
View
@@ -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>

0 comments on commit 8594aa2

Please sign in to comment.