contour 1.0.0.beta3 → 1.0.0.beta4

data/CHANGELOG.rdoc

@@ -4,6 +4,7 @@
   * Twitter-Bootstrap CSS layout is now default!
   * Authentications can now be placed as a submenu using { authentications: true } anywhere in the contour links configuration
   * Rails updated to minimum 3.2.3
+  * Redirects to the user's alternate login page if a user fails to login on the default devise sign in page
 
 * Breaking Changes
   * CSS updated to use Twitter-Bootstrap

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

@@ -5,6 +5,3 @@
     element.html('<br /><center><img width=\"13\" height=\"13\" src=\"' + root_url + 'assets/ajax-loader.gif\" align=\"absmiddle\" alt=\"...\" />' + text + '</center><br />')
   else if element
     element.html('<img width=\"13\" height=\"13\" src=\"' + root_url + 'assets/ajax-loader.gif\" align=\"absmiddle\" alt=\"...\" />' + text)
-
-jQuery ->
-  $(".collapse").collapse()

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

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

data/app/controllers/contour/sessions_controller.rb

@@ -19,4 +19,26 @@ class Contour::SessionsController < Devise::SessionsController
     super
   end
 
-end
+  # Overwrite Devise authentication to check if the user is typing another credential into the default box
+  # if so, find alternative login methods for that user and forward the user to those login screens
+  def create
+    # resource = warden.authenticate!(auth_options)
+    resource = warden.authenticate(auth_options)
+
+    if resource
+      set_flash_message(:notice, :signed_in) if is_navigational_format?
+      sign_in(resource_name, resource)
+      respond_with resource, location: after_sign_in_path_for(resource)
+    else
+      resource = resource_name.to_s.titleize.constantize.find_by_email(params[resource_name][:email])
+      if resource and resource.respond_to?('authentications') and providers = resource.authentications.pluck(:provider).uniq and providers.size > 0
+        redirect_to request.script_name + '/auth/' + providers.first
+      elsif providers = Authentication.where(uid: params[resource_name][:email]).pluck(:provider).uniq and providers.size > 0
+        redirect_to request.script_name + '/auth/' + providers.first
+      else
+        resource = warden.authenticate!(auth_options)
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Sign in", new_session_path(resource_name), class: 'btn btn-mini' %>
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name), class: 'btn btn-mini' %>
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name), class: 'btn btn-mini' %>
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: 'btn btn-mini' %>
+<% 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' %>
+<% 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' %>
+  <% end -%>
+<% end -%>

data/app/views/contour/confirmations/new.html.erb

@@ -1,12 +1,20 @@
-<h2>Resend confirmation instructions</h2>
+<% @title = 'Resend confirmation instructions' %>
+<div class="page-header">
+  <h1><%= @title %></h1>
+</div>
 
-<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post, class: 'form-horizontal' }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <div class="control-group">
+    <%= f.label :email, class: 'control-label' %>
+    <div class="controls">
+      <%= f.email_field :email %>
+    </div>
+  </div>
 
-  <div><%= f.submit "Resend confirmation instructions" %></div>
+  <div class="form-actions">
+    <%= f.submit "Resend confirmation instructions", class: 'btn btn-primary' %>
+    <%= render partial: 'contour/links' %>
+  </div>
 <% end %>
-
-<%= render "links" %>

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

@@ -1,16 +1,17 @@
 <% unless @news_feed.blank? %>
-  <fieldset>
-    <legend>Latest News</legend>
+  <div class="page-header">
+    <h1>
+      Latest News
+      <%#= link_to @news_feed.channel.title, @news_feed.channel.link, target: '_blank', class: 'btn btn-mini' %>
+    </h1>
+  </div>
 
-    <h4><%= link_to @news_feed.channel.title, @news_feed.channel.link, target: '_blank' %></h4>
-    <br />
-    <% @news_feed.items.each_with_index do |item, i| %>
-      <% if i < Contour.news_feed_items.to_i %>
-        <div class="field">
-          <label><%= link_to item.title, item.link, target: '_blank' %></label><br />
-          <ul style="list-style: none"><li><%= item.description.gsub("[...]", link_to('[read more]', item.link, target: '_blank')).html_safe %></li></ul>
-        </div>
-      <% end %>
+  <% @news_feed.items.each_with_index do |item, i| %>
+    <% if i < Contour.news_feed_items.to_i %>
+      <div class="well">
+        <label><%= link_to item.title, item.link, target: '_blank' %></label><br />
+        <ul style="list-style: none"><li><%= item.description.gsub("[...]", link_to('[read more]', item.link, target: '_blank')).html_safe %></li></ul>
+      </div>
     <% end %>
-  </fieldset>
-<% end %>
+  <% end %>
+<% end %>

data/app/views/contour/passwords/edit.html.erb

@@ -1,16 +1,28 @@
-<h2>Change your password</h2>
+<% @title = 'Change your password' %>
+<div class="page-header">
+  <h1><%= @title %></h1>
+</div>
 
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, class: 'form-horizontal' }) do |f| %>
   <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
 
-  <div><%= f.label :password, "New password" %><br />
-  <%= f.password_field :password %></div>
+  <div class="control-group">
+    <%= f.label :password, "New password", class: 'control-label' %>
+    <div class="controls">
+      <%= f.password_field :password %>
+    </div>
+  </div>
 
-  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <div class="control-group">
+    <%= f.label :password_confirmation, "Confirm new password", class: 'control-label' %>
+    <div class="controls">
+      <%= f.password_field :password_confirmation %>
+    </div>
+  </div>
 
-  <div><%= f.submit "Change my password" %></div>
+  <div class="form-actions">
+    <%= f.submit "Change my password", class: 'btn btn-primary' %>
+    <%= render partial: 'contour/links' %>
+  </div>
 <% end %>
-
-<%= render "links" %>

data/app/views/contour/passwords/new.html.erb

@@ -1,12 +1,20 @@
-<h2>Forgot your password?</h2>
+<% @title = 'Forgot your password?' %>
+<div class="page-header">
+  <h1><%= @title %></h1>
+</div>
 
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, class: 'form-horizontal' }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <div class="control-group">
+    <%= f.label :email, class: 'control-label' %>
+    <div class="controls">
+      <%= f.email_field :email %>
+    </div>
+  </div>
 
-  <div><%= f.submit "Send me reset password instructions" %></div>
+  <div class="form-actions">
+    <%= f.submit "Send me reset password instructions", class: 'btn btn-primary' %>
+    <%= render partial: 'contour/links' %>
+  </div>
 <% end %>
-
-<%= render "links" %>

data/app/views/contour/registrations/edit.html.erb

@@ -1,25 +1,50 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
+<% @title = "Edit #{resource_name.to_s.humanize}" %>
+<div class="page-header">
+  <h1><%= @title %></h1>
+</div>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: { method: :put, class: 'form-horizontal' }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
-
-  <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-  <%= f.password_field :password, :autocomplete => "off" %></div>
-
-  <div><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></div>
-
-  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-  <%= f.password_field :current_password %></div>
-
-  <div><%= f.submit "Update" %></div>
+  <div class="control-group">
+    <%= f.label :email, class: 'control-label' %>
+    <div class="controls">
+      <%= f.email_field :email %>
+    </div>
+  </div>
+
+  <div class="control-group">
+    <%= f.label :password, class: 'control-label' %>
+    <div class="controls">
+      <%= f.password_field :password, :autocomplete => "off" %>
+      <i class="help-block">(leave blank if you don't want to change it)</i>
+    </div>
+  </div>
+
+  <div class="control-group">
+    <%= f.label :password_confirmation, class: 'control-label' %>
+    <div class="controls">
+      <%= f.password_field :password_confirmation %>
+    </div>
+  </div>
+
+  <div class="control-group">
+    <%= f.label :current_password, class: 'control-label' %>
+    <div class="controls">
+      <%= f.password_field :current_password %>
+      <i class="help-block">(we need your current password to confirm your changes)</i>
+    </div>
+  </div>
+
+  <div class="form-actions">
+    <%= f.submit "Update", class: 'btn btn-primary' %>
+  </div>
 <% end %>
 
-<h3>Cancel my account</h3>
+<div class="page-header">
+  <h3>Cancel my account</h3>
+</div>
 
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, class: 'btn btn-danger' %>.</p>
 
 <%= link_to "Back", :back %>

data/app/views/contour/registrations/new.html.erb

@@ -1,18 +1,34 @@
-<h2>Sign up</h2>
+<% @title = 'Sign up' %>
+<div class="page-header">
+  <h1><%= @title %></h1>
+</div>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: { class: 'form-horizontal' }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %>
-  <%= f.email_field :email %></div>
+  <div class="control-group">
+    <%= f.label :email, class: 'control-label' %>
+    <div class="controls">
+      <%= f.email_field :email %>
+    </div>
+  </div>
 
-  <div><%= f.label :password %>
-  <%= f.password_field :password %></div>
+  <div class="control-group">
+    <%= f.label :password, class: 'control-label' %>
+    <div class="controls">
+      <%= f.password_field :password %>
+    </div>
+  </div>
 
-  <div><%= f.label :password_confirmation %>
-  <%= f.password_field :password_confirmation %></div>
+  <div class="control-group">
+    <%= f.label :password_confirmation, class: 'control-label' %>
+    <div class="controls">
+      <%= f.password_field :password_confirmation %>
+    </div>
+  </div>
 
-  <div><%= f.submit "Sign up", class: 'btn btn-primary' %></div>
+  <div class="form-actions">
+    <%= f.submit "Sign up", class: 'btn btn-primary' %>
+    <%= render partial: 'contour/links' %>
+  </div>
 <% end %>
-
-<%= render "links" %>

data/app/views/contour/samples/index.html.erb

@@ -1,9 +1,13 @@
-<h1>Contour Details</h1>
+<% @title = 'Contour Details' %>
+<div class="page-header">
+  <h1><%= @title %></h1>
+</div>
+
+<dl class="dl-horizontal">
+  <dt>Contour Version</dt>
+  <dd><%= Contour::VERSION::STRING %></dd>
+</dl>
 
-<p>
-  <b>Contour Version:</b>
-  <%= Contour::VERSION::STRING %>
-</p>
 
 <h2>Application Details</h2>
 
@@ -15,18 +19,18 @@ If the file does not exist run:<br />
 <br />
 <code style="margin-left:10px">rails generate contour:install</code><br />
 <br />
-<% unless request.script_name.blank? %>
-  <p><b>Subdomain:</b>
-    <%= request.script_name %>
-  </p>
-<% end %>
-<% (Contour.class_variables.collect{|v| v.to_s.gsub('@@','')} - ['menu_items']).each do |attribute| %>
-  <p>
-    <b><%= attribute.titleize %>:</b>
+
+<dl class="dl-horizontal">
+  <% unless request.script_name.blank? %>
+    <dt>Subdomain</dt>
+    <dd><%= request.script_name %></dd>
+  <% end %>
+  <% (Contour.class_variables.collect{|v| v.to_s.gsub('@@','')} - ['menu_items']).each do |attribute| %>
+    <dt><%= attribute.titleize %></dt>
     <% if Contour.send(attribute).blank? %>
-      <span class="quiet">NULL</span>
+      <dd class="muted">NULL</dd>
     <% else %>
-      <%= Contour.send(attribute) %>
+      <dd><%= Contour.send(attribute) %></dd>
     <% end %>
-  </p>
-<% end %>
+  <% end %>
+</dl>

data/app/views/contour/sessions/new.html.erb

@@ -1,17 +1,42 @@
-<h2>Sign in</h2>
+<% @title = 'Sign in' %>
 
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :email %>
-  <%= f.email_field :email %></div>
+<div class="row">
+  <div class="span8">
+    <div class="page-header">
+      <h1><%= @title %></h1>
+    </div>
 
-  <div><%= f.label :password %>
-  <%= f.password_field :password %></div>
+    <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), html: { class: 'form-horizontal' }) do |f| %>
+      <div class="control-group">
+        <%= f.label :email, class: 'control-label' %>
+        <div class="controls">
+          <%= f.email_field :email %>
+        </div>
+      </div>
 
-  <% if devise_mapping.rememberable? -%>
-    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
-  <% end -%>
+      <div class="control-group">
+        <%= f.label :password, class: 'control-label' %>
+        <div class="controls">
+          <%= f.password_field :password %>
+        </div>
+      </div>
 
-  <div><%= f.submit "Sign in", class: 'btn btn-primary' %></div>
-<% end %>
+      <% if devise_mapping.rememberable? -%>
+        <div class="control-group">
+          <div class="controls checkbox">
+            <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+          </div>
+        </div>
+      <% end -%>
 
-<%= render "links" %>
+      <div class="form-actions">
+        <%= f.submit "Sign in", class: 'btn btn-primary' %>
+        <%= render partial: 'contour/links' %>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="span4">
+    <%= render partial: 'contour/layouts/latest_news' %>
+  </div>
+</div>

data/app/views/contour/unlocks/new.html.erb

@@ -1,12 +1,20 @@
-<h2>Resend unlock instructions</h2>
+<% @title = 'Resend unlock instructions' %>
+<div class="page-header">
+  <h1><%= @title %></h1>
+</div>
 
-<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post, class: 'form-horizontal' }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <div class="control-group">
+    <%= f.label :email, class: 'control-label' %>
+    <div class="controls">
+      <%= f.email_field :email %>
+    </div>
+  </div>
 
-  <div><%= f.submit "Resend unlock instructions" %></div>
+  <div class="form-actions">
+    <%= f.submit "Resend unlock instructions", class: 'btn btn-primary' %>
+    <%= render partial: 'contour/links' %>
+  </div>
 <% end %>
-
-<%= render "links" %>