contour 1.0.0.beta2 → 1.0.0.beta3

data/app/assets/javascripts/contour/global.js.coffee

@@ -6,11 +6,5 @@
   else if element
     element.html('<img width=\"13\" height=\"13\" src=\"' + root_url + 'assets/ajax-loader.gif\" align=\"absmiddle\" alt=\"...\" />' + text)
 
-@showMessage = (elements) ->
-  $.each(elements, (index, value) ->
-    element = $(value)
-    element.fadeIn(2000)
-  )
-
 jQuery ->
   $(".collapse").collapse()

data/app/helpers/contour_helper.rb

@@ -3,16 +3,17 @@ module ContourHelper
   def flash_block
     output = ''
     flash.each do |type, message|
-      output += flash_container(type, message)
+      output += flash_container(type, message) if ['alert', 'notice', 'error', 'warning', 'success', 'info'].include?(type.to_s)
     end
 
     raw(output)
   end
 
   def flash_container(type, message)
-    raw(content_tag(:div, :class => "alert alert-#{type}") do
-      content_tag(:a, raw("×"),:class => 'close', :data => {:dismiss => 'alert'}) +
-      message
-    end)
+    type = 'success' if type.to_s == 'notice'
+    type = 'error' if type.to_s == 'alert'
+    content_tag(:div, class: "alert alert-#{type}") do
+      content_tag(:a, raw("×"), href: '#', class: 'close', data: { dismiss: 'alert' }) + message
+    end.html_safe
   end
 end

data/app/views/contour/layouts/application.html.erb

@@ -6,7 +6,7 @@
   <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
   <![endif]-->
-  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= stylesheet_link_tag    "application", media: "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -30,22 +30,16 @@
     <%= link_to (Contour.application_name_html.blank? ? Contour.application_name : Contour.application_name_html.html_safe), root_path, style: 'text-decoration:none;', onmouseover: "$('#version').show();", onmouseout: "$('#version').hide();" %>
       <span id="version" style="display:none;font-size:0.5em;font-variant:normal" class="quiet"><%= Contour.application_version %></span>
   </div>
+<% end %>
 
-  <div class="container" style="position:relative">
-    <div id="message">
-      <%= render partial: 'contour/layouts/message' %>
-    </div>
+  <div class="navbar navbar-fixed-top">
+    <%= render partial: 'contour/layouts/menu' %>
   </div>
-<% end %>
 
   <div class="container">
     <%= flash_block %>
   </div>
 
-  <div class="navbar navbar-fixed-top">
-    <%= render partial: 'contour/layouts/menu' %>
-  </div>
-
   <div class="container">
     <%= yield %>
   </div>

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 1
     MINOR = 0
     TINY = 0
-    BUILD = "beta2" # nil, "pre", "rc", "rc2"
+    BUILD = "beta3" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70203892515100 !ruby/object:Gem::Requirement
+  requirement: &70342550843280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70203892515100
+  version_requirements: *70342550843280
 - !ruby/object:Gem::Dependency
   name: twitter-bootstrap-rails
-  requirement: &70203892514600 !ruby/object:Gem::Requirement
+  requirement: &70342550842480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70203892514600
+  version_requirements: *70342550842480
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70203892514140 !ruby/object:Gem::Requirement
+  requirement: &70342550841180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70203892514140
+  version_requirements: *70342550841180
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70203892513680 !ruby/object:Gem::Requirement
+  requirement: &70342550839260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70203892513680
+  version_requirements: *70342550839260
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70203892513220 !ruby/object:Gem::Requirement
+  requirement: &70342550838600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70203892513220
+  version_requirements: *70342550838600
 - !ruby/object:Gem::Dependency
   name: omniauth-openid
-  requirement: &70203892512760 !ruby/object:Gem::Requirement
+  requirement: &70342550837880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70203892512760
+  version_requirements: *70342550837880
 - !ruby/object:Gem::Dependency
   name: omniauth-ldap
-  requirement: &70203892512300 !ruby/object:Gem::Requirement
+  requirement: &70342550837120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70203892512300
+  version_requirements: *70342550837120
 - !ruby/object:Gem::Dependency
   name: omniauth-twitter
-  requirement: &70203892511840 !ruby/object:Gem::Requirement
+  requirement: &70342550836140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70203892511840
+  version_requirements: *70342550836140
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &70203892511380 !ruby/object:Gem::Requirement
+  requirement: &70342550835260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70203892511380
+  version_requirements: *70342550835260
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &70203892510920 !ruby/object:Gem::Requirement
+  requirement: &70342550834020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70203892510920
+  version_requirements: *70342550834020
 - !ruby/object:Gem::Dependency
   name: omniauth-cas
-  requirement: &70203892510460 !ruby/object:Gem::Requirement
+  requirement: &70342550832240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70203892510460
+  version_requirements: *70342550832240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70203892510080 !ruby/object:Gem::Requirement
+  requirement: &70342550831420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203892510080
+  version_requirements: *70342550831420
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -454,7 +454,6 @@ files:
 - app/views/contour/confirmations/new.html.erb
 - app/views/contour/layouts/_latest_news.html.erb
 - app/views/contour/layouts/_menu.html.erb
-- app/views/contour/layouts/_message.html.erb
 - app/views/contour/layouts/application.html.erb
 - app/views/contour/passwords/edit.html.erb
 - app/views/contour/passwords/new.html.erb

data/app/views/contour/layouts/_message.html.erb

@@ -1,8 +0,0 @@
-<% unless notice.blank? %>
-  <div id="msg_notice" class="notice" style="display:none"><%= notice %></div>
-  <%= javascript_tag "showMessage(['#msg_notice']);" %>
-<% end %>
-<% unless alert.blank? %>
-  <div id="msg_alert" class="error" style="display:none"><%= alert %></div>
-  <%= javascript_tag "showMessage(['#msg_alert']);" %>
-<% end %>