contour 1.0.0.beta7 → 1.0.0.beta8

data/README.rdoc

@@ -14,29 +14,7 @@ Or update your Gemfile to include:
 
 == Getting started
 
-Contour depends on a config initializer. The config initializer is used to set various default settings in the layout, and also allows the menu to be created using a ruby hash.  To install a template you can run:
-
-  rails generate contour:install
-
-Contour uses a template to generate your application layout. You can add the following in your application_controller.rb:
-
-  layout "contour/layouts/application"
-
-Contour also provides a custom jquery-ui and BlueTrip CSS Framework.  To include these, add the following to your application.css manifest (after "*= require_self" and before "*= require_tree ."):
-
-  *= require contour
-
-Contour provides custom JavaScript.  In order to make the application layout function properly include the following at the beginning of your application.js (before "//= require_tree ." replacing "//= require jquery" and "//= require jquery_ujs"):
-
-  //= require contour
-
-In order to get registration working, you can use the modified Contour Authentications controller which overrides the default devise controller of the same name:
-
-  devise_for :users, controllers: { registrations: 'contour/registrations', sessions: 'contour/sessions', passwords: 'contour/passwords' }, path_names: { sign_up: 'register', sign_in: 'login' }
-
-== Setting up a new project with quick authentication
-
-Make sure you have Rails 3.2.1
+Make sure you have Rails 3.2.3
 
   rails -v
 
@@ -46,7 +24,7 @@ Make sure you have Rails 3.2.1
 
 Modify Gemfile and add
 
-  gem 'contour', '~> 1.0.0'          # Basic Layout and Assets
+  gem 'contour', '~> 1.0.0'
 
 Run Bundle install
 
@@ -88,7 +66,7 @@ Edit your app/assets/stylesheets/application.css manifest to use Contour CSS (af
 
 Make sure the devise line in config/routes.rb looks as follows
 
-  devise_for :users, controllers: { registrations: 'contour/registrations', sessions: 'contour/sessions', passwords: 'contour/passwords' }, path_names: { sign_up: 'register', sign_in: 'login' }
+  devise_for :users, controllers: { registrations: 'contour/registrations', sessions: 'contour/sessions', passwords: 'contour/passwords', confirmations: 'contour/confirmations', unlocks: 'contour/unlocks' }, path_names: { sign_up: 'register', sign_in: 'login' }
 
 <b>If there is a line that just says 'devise_for :users' or a duplicate, <i>REMOVE IT!</i></b>
 

data/app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee

@@ -3,4 +3,3 @@ jQuery ->
   $(".tooltip").tooltip()
   $("a[rel=tooltip]").tooltip()
   $('.dropdown-toggle').dropdown()
-#   $(".collapse").collapse()

data/app/assets/stylesheets/bootstrap-base-overrides.css

@@ -0,0 +1,17 @@
+/* bootstrap-base-overrides.css */
+/* These overrides come after bootstrap.css but before bootstrap-responsive.css */
+
+/* Line 1752 */
+[class^="icon-"],
+[class*=" icon-"] {
+  background-image: url(twitter-bootstrap/v2.0.3/glyphicons-halflings.png);
+}
+
+/* Line 1770 */
+.icon-white {
+  background-image: url(twitter-bootstrap/v2.0.3/glyphicons-halflings-white.png);
+}
+
+
+
+body { padding-top: 60px; }

data/app/assets/stylesheets/bootstrap-responsive-overrides.css

@@ -0,0 +1,22 @@
+/* bootstrap-base-overrides.css */
+/* These overrides come after bootstrap.css and bootstrap-responsive.css */
+
+dt, dd {
+  line-height: 18px;
+  min-height: 40px;
+}
+
+/*
+dt, dd {
+  display: block;
+  float: left;
+  margin-top: 20px;
+}
+
+dt { clear: both; }
+dl { overflow: hidden; }
+
+.dl-horizontal dd {
+  margin-left: 30px;
+}
+*/

data/app/assets/stylesheets/contour.css

@@ -4,8 +4,9 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require twitter-bootstrap/v2.0.3/bootstrap
+ *= require bootstrap-base-overrides
  *= require twitter-bootstrap/v2.0.3/bootstrap-responsive
- *= require bootstrap_and_overrides
+ *= require bootstrap-responsive-overrides
  *= require jquery-ui-1.8.10.custom
  *= require jquery.qtip
  *= require contour/authentication

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

@@ -6,7 +6,7 @@
       <span class="icon-bar"></span>
     </a>
     <%= link_to Contour.application_name.html_safe, root_path, class: 'brand' %>
-    <div class="nav-collapse">
+    <div class="nav-collapse 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 <%= 'pull-right' if position == 'right' %>">

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 1
     MINOR = 0
     TINY = 0
-    BUILD = "beta7" # nil, "pre", "rc", "rc2"
+    BUILD = "beta8" # 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.beta7
+  version: 1.0.0.beta8
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70239203187000 !ruby/object:Gem::Requirement
+  requirement: &70353680606440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70239203187000
+  version_requirements: *70353680606440
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70239203186500 !ruby/object:Gem::Requirement
+  requirement: &70353680605940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70239203186500
+  version_requirements: *70353680605940
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70239203186040 !ruby/object:Gem::Requirement
+  requirement: &70353680605480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70239203186040
+  version_requirements: *70353680605480
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70239203185580 !ruby/object:Gem::Requirement
+  requirement: &70353680605020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70239203185580
+  version_requirements: *70353680605020
 - !ruby/object:Gem::Dependency
   name: omniauth-openid
-  requirement: &70239203185120 !ruby/object:Gem::Requirement
+  requirement: &70353680604560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70239203185120
+  version_requirements: *70353680604560
 - !ruby/object:Gem::Dependency
   name: omniauth-ldap
-  requirement: &70239203184660 !ruby/object:Gem::Requirement
+  requirement: &70353680604100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70239203184660
+  version_requirements: *70353680604100
 - !ruby/object:Gem::Dependency
   name: omniauth-twitter
-  requirement: &70239203184200 !ruby/object:Gem::Requirement
+  requirement: &70353680603640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70239203184200
+  version_requirements: *70353680603640
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &70239203183740 !ruby/object:Gem::Requirement
+  requirement: &70353680603180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70239203183740
+  version_requirements: *70353680603180
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &70239203183280 !ruby/object:Gem::Requirement
+  requirement: &70353680622940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70239203183280
+  version_requirements: *70353680622940
 - !ruby/object:Gem::Dependency
   name: omniauth-cas
-  requirement: &70239203182820 !ruby/object:Gem::Requirement
+  requirement: &70353680622480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70239203182820
+  version_requirements: *70353680622480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70239203182440 !ruby/object:Gem::Requirement
+  requirement: &70353680622100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239203182440
+  version_requirements: *70353680622100
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -426,7 +426,8 @@ files:
 - app/assets/javascripts/twitter-bootstrap/bootstrap-tab.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
 - app/assets/javascripts/twitter-bootstrap/v2.0.3/bootstrap.js
-- app/assets/stylesheets/bootstrap_and_overrides.css
+- app/assets/stylesheets/bootstrap-base-overrides.css
+- app/assets/stylesheets/bootstrap-responsive-overrides.css
 - app/assets/stylesheets/contour/authentication.css
 - app/assets/stylesheets/contour.css
 - app/assets/stylesheets/jquery-ui-1.8.10.custom.css

data/app/assets/stylesheets/bootstrap_and_overrides.css

@@ -1,14 +0,0 @@
-body { padding-top: 60px; }
-
-dt, dd {
-  display: block;
-  float: left;
-  margin-top: 20px;
-}
-
-dt { clear: both; }
-dl { overflow: hidden; }
-
-.dl-horizontal dd {
-  margin-left: 30px;
-}