showandtell 0.0.7 → 0.0.8

data/README.md

@@ -1,7 +1,7 @@
 # Showandtell
 ## Simple, nicer Rails notifications
 
-Showandtell provides an incredibly easy way to integrate [fancy-rails-notifications](https://github.com/mluckeneder/fancy-rails-notifications) into your Rails 3.1+ app.
+Showandtell provides an incredibly easy way to integrate [Twitter bootstrap](http://github.com/twitter/bootstrap) notifications into your Rails 3.1+ app.
 
 1. Add `gem 'showandtell'` to your Gemfile
 2. Add `//=require showandtell` to your app/assets/javascripts/application.js
@@ -10,10 +10,23 @@ Showandtell provides an incredibly easy way to integrate [fancy-rails-notificati
 
 Note that your notifications must have a class of `flash` and an id of `flash_severity` where severity is the type of notification - notice, alert, etc. The appropriate code for this is:
 
-	<% flash.each do |name, msg| %>
-	  <%= content_tag :div, msg, :id => "flash_#{name}", :class=>"flash" %>
+	<% if flash %>
+	<div id="flash_messages">
+		<% flash.each do |name, msg| %>
+			<% if name == :notice %>
+			<div class="alert alert-success">
+			<% elsif name == :alert %>
+			<div class="alert alert-error">
+			<% else %>
+			<div class="alert alert-info">
+			<% end %>
+			<a class="close" data-dismiss="alert">×</a>
+				<%= msg %>
+			</div>
+		<% end %>
+	</div>
 	<% end %>
-
+	
 ### Bug Reports
 
 If you run into a bug, please start by searching the [GitHub issue tracker page](https://github.com/roboteti/showandtell/issues). If you find one matching your problem, please feel free to add to the discussion. If you can't find one, please [create a new issue](https://github.com/roboteti/showandtell/issues/new).
@@ -25,7 +38,6 @@ If you run into a bug, please start by searching the [GitHub issue tracker page]
 
 ### Credits
 - Gem created by [J-P Teti](http://jpteti.com)
-- [fancy-rails-notifications](https://github.com/mluckeneder/fancy-rails-notifications) by [mluckeneder](https://github.com/mluckeneder).
 
 ### License
 Licensed under the [MIT license](https://github.com/roboteti/showandtell/blob/master/LICENSE.txt).

data/lib/assets/javascripts/showandtell/bootstrap.min.js

@@ -0,0 +1,7 @@
+/**
+* Bootstrap.js by @fat & @mdo
+* plugins: bootstrap-transition.js, bootstrap-alert.js
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(a){a(function(){a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger("close").removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery)

data/lib/assets/javascripts/showandtell/index.js

@@ -1,5 +1 @@
-//= require ./jquery.fancy-notifications
-
-$(function(){
-    $.FancyNotifications();
-});
+//= require ./bootstrap.min

data/lib/assets/stylesheets/showandtell/bootstrap.min.css

@@ -0,0 +1,26 @@
+/*!
+ * Bootstrap v2.0.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
+.clearfix:after{clear:both;}
+.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.alert,.alert-heading{color:#c09853;}
+.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;}
+.alert-success{background-color:#dff0d8;border-color:#d6e9c6;}
+.alert-success,.alert-success .alert-heading{color:#468847;}
+.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;}
+.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#b94a48;}
+.alert-info{background-color:#d9edf7;border-color:#bce8f1;}
+.alert-info,.alert-info .alert-heading{color:#3a87ad;}
+.alert-block{padding-top:14px;padding-bottom:14px;}
+.alert-block>p,.alert-block>ul{margin-bottom:0;}
+.alert-block p+p{margin-top:5px;}
+.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;}
+.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
+.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}

data/lib/assets/stylesheets/showandtell/index.css

@@ -1,3 +1,3 @@
 /*
- *= require ./jquery.fancy-notifications
+ *= require ./bootstrap.min
 */

data/showandtell.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name      = 'showandtell'
-  s.version   = '0.0.7'
+  s.version   = '0.0.8'
   s.author    = 'J-P Teti (fancy-rails-notifications by mluckender)'
   s.email     = 'roboteti@gmail.com'
   s.homepage  = "http://github.com/roboteti/showandtell"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showandtell
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &4752450 !ruby/object:Gem::Requirement
+  requirement: &10143560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4752450
+  version_requirements: *10143560
 description: 
 email: roboteti@gmail.com
 executables: []
@@ -29,16 +29,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ./Gemfile
-- ./lib/assets/javascripts/showandtell/activate.js
+- ./lib/assets/images/showandtell/glyphicons-halflings-white.png
+- ./lib/assets/images/showandtell/glyphicons-halflings.png
+- ./lib/assets/javascripts/showandtell/bootstrap.min.js
 - ./lib/assets/javascripts/showandtell/index.js
-- ./lib/assets/javascripts/showandtell/jquery.fancy-notifications.js
+- ./lib/assets/stylesheets/showandtell/bootstrap.min.css
 - ./lib/assets/stylesheets/showandtell/index.css
-- ./lib/assets/stylesheets/showandtell/jquery.fancy-notifications.css
 - ./lib/showandtell.rb
 - ./LICENSE.txt
 - ./Rakefile
 - ./README.md
 - ./showandtell-0.0.6.gem
+- ./showandtell-0.0.7.gem
 - ./showandtell.gemspec
 homepage: http://github.com/roboteti/showandtell
 licenses: []

data/lib/assets/javascripts/showandtell/activate.js

@@ -1,3 +0,0 @@
-$(function(){
-    $.FancyNotifications();
-});

data/lib/assets/javascripts/showandtell/jquery.fancy-notifications.js

@@ -1,69 +0,0 @@
-// =======================================================================
-// Fancy jQuery Notifications
-//
-// Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
-//
-//
-// Requires: jquery
-//
-// Author: Michael Luckeneder (https://github.com/mluckeneder)
-//
-//
-// =======================================================================
-
-(function( $ ){
-  var $closeTimeout;
-
-  
-
-  var setupNotificationBehavior = function(){
-	$(".flash").click(function(){
-		$.FancyNotifications.close();
-		$(this).slideUp('slow');
-	});
-	$('.flash').slideDown('slow');
-	$closeTimeout = setTimeout("$('.flash').slideUp('slow',function(){ $(this).remove();});","3000");
-  };
-
-  
-  $.FancyNotifications = function() {
-	setupNotificationBehavior();
-  };
-
-  $.FancyNotifications.error = function(message){
-	$.FancyNotifications.close();
-	this.showMessage("error", message);
-  };
-
-  $.FancyNotifications.alert = function(message){
-	$.FancyNotifications.close();
-	this.showMessage("alert", message);
-  };
-
-  $.FancyNotifications.notice = function(message){
-	$.FancyNotifications.close();
-	this.showMessage("notice", message);
-  };
-
-  $.FancyNotifications.showMessage = function(type,message){
-    var $div = $("<div></div>");
-	$div.attr("class","flash");
-	$div.attr("id", "flash_"+type);
-	$div.hide();
-	$div.html(message);
-
-	$('body').prepend($div);
-
-	setupNotificationBehavior();
-  };
-  
-  $.FancyNotifications.close = function(){
-	clearTimeout($closeTimeout);
-	$('.flash').slideUp('slow',function(){ $(this).remove();});
-  };
- 
-
-  
-
-  
-})( jQuery );

data/lib/assets/stylesheets/showandtell/jquery.fancy-notifications.css

@@ -1,29 +0,0 @@
-#flash_error {
-	background-color:#FCC;
-}
-#flash_alert{
-	background-color:#FFE5CC;
-}
-
-
-#flash_notice {
-	background-color:#CFC;
-}
-
-
-
-.flash {
-	font-family: 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
-	cursor:pointer;
-	display:none;
-	width:100%;
-	text-align:center;
-	padding-top:0.5em;
-	padding-bottom:0.5em;
-	font-size:1.3em;
-	position:fixed;
-	top:0;
-	height:1.3em;
-	left:0;
-	z-index:10000;
-}