contour 2.1.0.beta10 → 2.1.0.beta11

data/app/assets/stylesheets/contour.css

@@ -3,7 +3,7 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require bootstrap/v3.0.0-rc1/bootstrap
+ *= require bootstrap/v3.0.0-rc2/bootstrap
  *= require bootstrap/bs-callout
  *= require glyphicons
  *= require bootstrap-overrides

data/app/assets/stylesheets/typeahead.js-bootstrap.css

@@ -1,8 +1,8 @@
 .twitter-typeahead {
-  display: inline-block;
+  display: block;
   width: 100%;
-  height: 38px;
-  /*padding: 8px 12px;*/
+  height: 34px;
+  /*padding: 6px 12px;*/
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
@@ -10,17 +10,22 @@
   background-color: #ffffff;
   /*border: 1px solid #cccccc;*/
   border-radius: 4px;
-  /*-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);*/
-  /*box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);*/
-  /*-webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;*/
-  /*transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;*/
-}
+/*  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+*/}
 
 .twitter-typeahead .tt-query,
 .twitter-typeahead .tt-hint {
   margin-bottom: 0;
 }
 
+.twitter-typeahead .tt-query {
+  border-top-left-radius: 4px !important;
+  border-bottom-left-radius: 4px !important;
+}
+
 .tt-dropdown-menu {
   min-width: 160px;
   margin-top: 2px;

data/app/helpers/contour_helper.rb

@@ -1,7 +1,7 @@
 module ContourHelper
 
   def cancel
-    link_to 'Cancel', URI.parse(request.referer.to_s).path.blank? ? root_path : (URI.parse(request.referer.to_s).path), class: 'btn btn-cancel-inverse'
+    link_to 'Cancel', URI.parse(request.referer.to_s).path.blank? ? root_path : (URI.parse(request.referer.to_s).path), class: 'btn btn-default'
   end
 
   def sort_field_helper(order, sort_field, display_name, search_form_id  = 'search_form')

data/app/views/contour/_links.html.erb

@@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Sign in", new_session_path(resource_name), class: 'btn btn-mini' %>
+  <%= link_to "Sign in", new_session_path(resource_name), class: 'btn btn-xs' %>
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name), class: 'btn btn-mini' %>
+  <%= link_to "Sign up", new_registration_path(resource_name), class: 'btn btn-xs' %>
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name), class: 'btn btn-mini' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name), class: 'btn btn-xs' %>
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: 'btn btn-mini' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: 'btn btn-xs' %>
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: 'btn btn-mini' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: 'btn btn-xs' %>
 <% end -%>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: 'btn btn-mini' %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: 'btn btn-xs' %>
   <% end -%>
 <% end -%>

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

@@ -2,7 +2,7 @@
   <div class="page-header">
     <h1>
       Latest News
-      <%#= link_to @news_feed.channel.title, @news_feed.channel.link, target: '_blank', class: 'btn btn-mini' %>
+      <%#= link_to @news_feed.channel.title, @news_feed.channel.link, target: '_blank', class: 'btn btn-xs' %>
     </h1>
   </div>
 

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

@@ -1,16 +1,19 @@
 <div class="container">
-  <%= link_to Contour.application_name.html_safe, root_path, class: 'navbar-brand' %>
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
 
-  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-    <span class="icon-bar"></span>
-    <span class="icon-bar"></span>
-    <span class="icon-bar"></span>
-  </button>
+    <%= link_to Contour.application_name.html_safe, root_path, class: 'navbar-brand' %>
+  </div>
 
-  <div class="nav-collapse collapse navbar-responsive-collapse">
+  <div class="collapse navbar-collapse navbar-ex1-collapse">
     <% display = signed_in? ? ['signed_in', 'always'] : ['not_signed_in', 'always'] %>
     <% Contour.menu_items.group_by{|i| i[:position]}.each do |position, items| %>
-      <ul class="nav navbar-nav <%= 'pull-right' if position == 'right' %>">
+      <ul class="nav navbar-nav <%= 'navbar-right' if position == 'right' %>">
         <% items.each_with_index do |menu_item, index| %>
           <% if display.include?(menu_item[:display]) and (menu_item[:condition].blank? or eval(menu_item[:condition])) %>
             <% has_submenu = (menu_item[:links] || []).collect{|link| link[:condition].blank? or eval(link[:condition])}.include?(true) %>
@@ -21,7 +24,6 @@
                   target: menu_item[:target], style: "#{ 'display:inline-block;padding-right:0px' if has_submenu }")
                    %>
               <%= link_to "<b class='caret'></b>".html_safe, '#', class: 'dropdown-toggle', 'data-toggle' => 'dropdown', style: 'display:inline-block;padding-left:4px;margin-left:-4px;' if has_submenu %>
-              <%# , 'data-target' => "#menu#{position}#{index}" %>
               <% if has_submenu %>
                 <ul class="dropdown-menu">
                 <% menu_item[:links].each do |link| %>
@@ -45,7 +47,7 @@
       </ul>
     <% end %>
     <% if Contour.search_bar and display.include?(Contour.search_bar[:display]) %>
-      <form id="<%= Contour.search_bar[:id] || 'global-search' %>-form" class="navbar-form pull-<%= Contour.search_bar[:position] || 'left' %>" action="<%= Contour.search_bar[:path].blank? ? '#' : eval(Contour.search_bar[:path].to_s) %>">
+      <form id="<%= Contour.search_bar[:id] || 'global-search' %>-form" class="navbar-form navbar-<%= Contour.search_bar[:position] || 'left' %>" action="<%= Contour.search_bar[:path].blank? ? '#' : eval(Contour.search_bar[:path].to_s) %>">
         <input id="<%= Contour.search_bar[:id] || 'global-search' %>" name="q" type="text" autocomplete="off" class="form-control" value="<%= params[:q] %>" placeholder="<%= Contour.search_bar[:placeholder] || 'Search' %>">
       </form>
     <% end %>

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

@@ -15,9 +15,9 @@
     <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
   </head>
   <body data-spy="scroll" data-target=".bs-sidebar">
-    <div class="navbar navbar-inverse navbar-fixed-top">
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <%= render partial: 'contour/layouts/menu' %>
-    </div>
+    </nav>
 
     <div class="container" style="position:relative">
       <div class="flash-block" data-object="flash-container">

data/contour.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails',                   '~> 4.0.0'
   s.add_dependency 'jquery-rails',            '>= 3.0.4'
   s.add_dependency 'coffee-rails',            '~> 4.0.0'
-  s.add_dependency 'devise',                  '~> 3.0.0'
+  s.add_dependency 'devise',                  '~> 3.0.2'
   s.add_dependency 'omniauth',                '~> 1.1.4'
   s.add_dependency 'omniauth-cas',            '~> 1.0.4'
   s.add_dependency 'omniauth-facebook',       '~> 1.4.1'

data/lib/contour/version.rb

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

data/lib/generators/contour/scaffold/templates/_paginate.html.erb

@@ -20,8 +20,8 @@
       <%- end -%>
       <%- end -%>
       <td>
-        <%%= link_to 'Edit', edit_<%= resource_name %>_path(<%= resource_name %>), class: 'btn btn-mini' %>
-        <%%= link_to 'Delete', <%= resource_name %>, method: :delete, class: 'btn btn-mini btn-danger-inverse', data: { confirm: "Are you sure you want to delete <%= resource_title %> #{<%= resource_name %>.name}?" } %>
+        <%%= link_to 'Edit', edit_<%= resource_name %>_path(<%= resource_name %>), class: 'btn btn-xs' %>
+        <%%= link_to 'Delete', <%= resource_name %>, method: :delete, class: 'btn btn-xs btn-danger-inverse', data: { confirm: "Are you sure you want to delete <%= resource_title %> #{<%= resource_name %>.name}?" } %>
       </td>
     </tr>
   <%% end %>

data/lib/generators/contour/scaffold/templates/index.html.erb

@@ -2,7 +2,7 @@
 <div class="page-header">
   <h1>
     <%%= @title %>
-    <%%= link_to "Create <%= resource_title %>", new_<%= resource_name %>_path, class: 'btn btn-mini btn-primary' %>
+    <%%= link_to "Create <%= resource_title %>", new_<%= resource_name %>_path, class: 'btn btn-xs btn-primary' %>
   </h1>
 </div>
 

data/lib/generators/contour/scaffold/templates/show.html.erb

@@ -2,8 +2,8 @@
 <div class="page-header">
   <h1>
     <%%= link_to "<%= resource_title_plural %>", <%= resource_name_plural %>_path %> &middot; <%%= @title %>
-    <%%= link_to "Edit <%= resource_title %>", edit_<%= resource_name %>_path(@<%= resource_name %>), class: 'btn btn-mini' %>
-    <%%= link_to "Delete <%= resource_title %>", @<%= resource_name %>, method: :delete, class: 'btn btn-mini btn-danger-inverse', data: { confirm: "Are you sure you want to delete <%= resource_title %> #{@<%= resource_name %>.name}?" } %>
+    <%%= link_to "Edit <%= resource_title %>", edit_<%= resource_name %>_path(@<%= resource_name %>), class: 'btn btn-xs' %>
+    <%%= link_to "Delete <%= resource_title %>", @<%= resource_name %>, method: :delete, class: 'btn btn-xs btn-danger-inverse', data: { confirm: "Are you sure you want to delete <%= resource_title %> #{@<%= resource_name %>.name}?" } %>
   </h1>
 </div>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta10
+  version: 2.1.0.beta11
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +219,7 @@ files:
 - app/assets/images/contour/ui-icons_cd0a0a_256x240.png
 - app/assets/images/contour/ui-icons_d8e7f3_256x240.png
 - app/assets/images/contour/ui-icons_f9bd01_256x240.png
-- app/assets/javascripts/bootstrap/v3.0.0-rc1/bootstrap.js
+- app/assets/javascripts/bootstrap/v3.0.0-rc2/bootstrap.js
 - app/assets/javascripts/contour/global.js.coffee
 - app/assets/javascripts/contour.js
 - app/assets/javascripts/external/bootstrap-datepicker.js
@@ -229,7 +229,7 @@ files:
 - app/assets/javascripts/external/typeahead.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
 - app/assets/stylesheets/bootstrap/bs-callout.css
-- app/assets/stylesheets/bootstrap/v3.0.0-rc1/bootstrap.css
+- app/assets/stylesheets/bootstrap/v3.0.0-rc2/bootstrap.css
 - app/assets/stylesheets/bootstrap-overrides.css
 - app/assets/stylesheets/contour/about.css
 - app/assets/stylesheets/contour/authentication.css