contour 0.1.1 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+== 0.2.1
+
+* Bug Fix
+  * Apparently add_dependency doesn't work with (= ) signs either
+
+== 0.2.0
+
+* Enhancements
+  * Stock assets added
+  * Sign in, password reset, and registration pages redesigned
+
 == 0.1.1
 
 * Bug Fix

data/README.rdoc

@@ -38,7 +38,7 @@ In order to get registration working, you can use the modified Contour Authentic
 
   resources :authentications, :controller => 'contour/authentications'
 
-  devise_for :users, :controllers => {:registrations => 'contour/registrations'}, :path_names => { :sign_up => 'register', :sign_in => 'login' }
+  devise_for :users, :controllers => {:registrations => 'contour/registrations', :sessions => 'contour/sessions', :passwords => 'contour/passwords'}, :path_names => { :sign_up => 'register', :sign_in => 'login' }
 
 == Contributing to contour
  

data/app/controllers/contour/passwords_controller.rb

@@ -0,0 +1,3 @@
+class Contour::PasswordsController < Devise::SessionsController
+  
+end

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

@@ -0,0 +1,19 @@
+<% @title = 'Forgot your password?' %>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+  <fieldset style="width:235px">
+    <legend><%= @title %></legend>
+    
+    <div class="field">
+      <%= f.label :email %><br />
+      <%= f.text_field :email %>
+    </div>
+  </fieldset>
+  <div class="actions">
+    <% form_name = 'user_new' %>
+    <%= link_to_function image_tag('stock/tick.png', :alt => '') + "Send me reset password instructions", "$('##{form_name}').submit();", :class => "button positive" %>
+    <div style="clear:both"></div><br />
+    <%= link_to "Login here!", new_session_path(resource_name) %> or <%= link_to "Register here!", new_registration_path(resource_name) %>
+  </div>
+<% end %>

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

@@ -1,37 +1,41 @@
-<% @title = 'Sign Up' %>
-<h2><%= @title %></h2>
+<% @title = 'Register' %>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
-
-  <p><%= f.label :first_name %><br />
-  <%= f.text_field :first_name  %>
-  </p>
+  <fieldset style="width:235px">
+    <legend><%= @title %></legend>
+    
+    <div class="field">
+      <%= f.label :first_name %><br />
+      <%= f.text_field :first_name  %>
+    </div>
   
-  <p><%= f.label :last_name %><br />
-  <%= f.text_field :last_name  %></p>
-
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
-
-<% if @user.password_required? %>
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
-<% end %>
-
-  <p><%= f.submit "Sign up" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
-
-<% if false %>
-<% if @user.password_required? %>
-  <% unless PROVIDERS.blank? %>
-    <h3>Don't want to remember a new login and password? Sign up using one of your existing accounts!</h3>
-    <%= render :partial => 'contour/authentications/index' %>
-  <% end %>
-<% end %>
+    <div class="field">
+      <%= f.label :last_name %><br />
+      <%= f.text_field :last_name  %>
+    </div>
+
+    <div class="field">
+      <%= f.label :email %><br />
+      <%= f.text_field :email %>
+    </div>
+
+    <% if @user.password_required? %>
+      <div class="field">
+        <%= f.label :password %><br />
+        <%= f.password_field :password %>
+      </div>
+
+      <div class="field">
+        <%= f.label :password_confirmation %><br />
+        <%= f.password_field :password_confirmation %>
+      </div>
+    <% end %>
+  </fieldset>
+  <div class="actions">
+    <% form_name = 'user_new' %>
+    <%= link_to_function image_tag('stock/tick.png', :alt => '') + "Sign up", "$('##{form_name}').submit();", :class => "button positive" %>
+    <div style="clear:both"></div><br />
+    <%= link_to "Already signed up? Login here!", new_session_path(resource_name) %>
+  </div>
 <% end %>

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

@@ -1,25 +1,27 @@
 <% @title = 'Login' %>
-<h2><%= @title %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
-
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
-
-  <% if devise_mapping.rememberable? -%>
-    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
-  <% end -%>
-
-  <p><%= f.submit "Sign in" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
-
-<% if false %>
-<% unless PROVIDERS.blank? %>
-  <h3>Don't want to remember a new login and password? Sign in using one of your existing accounts!</h3>
-  <%= render :partial => 'contour/authentications/index' %>
-<% end %>
+  <fieldset style="width:235px">
+    <legend><%= @title %></legend>
+    
+    <div class="field">
+      <%= f.label :email %><br />
+      <%= f.text_field :email %>
+    </div>
+    <div class="field">
+      <%= f.label :password %><br />
+      <%= f.password_field :password %>
+    </div>
+  </fieldset>
+  <div class="actions">
+    <% form_name = 'user_new' %>
+    <%= link_to_function image_tag('stock/tick.png', :alt => '') + "Login", "$('##{form_name}').submit();", :class => "button positive" %>
+    <% if devise_mapping.rememberable? -%>
+      <div style="padding-top:5px;padding-bottom:4px;"><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+    <% end -%>
+    <% if devise_mapping.recoverable? && controller_name != 'passwords' %>
+      <div style="clear:both"></div><br />
+      <%= link_to "Forgot your password?", new_password_path(resource_name) %> or <%= link_to "Register here!", new_registration_path(resource_name) %>
+    <% end %>
+  </div>
 <% end %>

data/contour.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.authors = ["Remo Mueller"]
   s.description = "Basic Rails Framework files and assets for layout and authentication"
 
-  # s.add_development_dependency "rails",   "~> 3.0"
   s.add_dependency("devise", "~> 1.3.4")
   s.add_dependency("omniauth", "~> 0.2.6")
   

data/lib/contour/version.rb

@@ -1,3 +1,3 @@
 module Contour
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/vendor/assets/stylesheets/bluetrip-screen.css

@@ -250,20 +250,20 @@ a[href$=".rdf"],
 a[href^="aim:"] { padding:2px 22px 2px 0; margin:-2px 0; background-repeat: no-repeat; background-position: right center; }
 
 /*** EXTERNAL LINK ICONS ***/
-a[href^="http:"]          { background-image: url(../assets/icons/external.png); padding-right: 14px; }
-a[href^="mailto:"]        { background-image: url(../assets/icons/email.png); }
-a[href^="http:"]:visited  { background-image: url(../assets/icons/visited.png); }
+a[href^="http:"]          { background-image: url(../assets/stock/external.png); padding-right: 14px; }
+a[href^="mailto:"]        { background-image: url(../assets/stock/email.png); }
+a[href^="http:"]:visited  { background-image: url(../assets/stock/visited.png); }
 
 /*** FILE LINK ICONS ***/
-a[href$=".pdf"]   { background-image: url(../assets/icons/pdf.png); }
+a[href$=".pdf"]   { background-image: url(../assets/stock/pdf.png); }
 a[href$=".doc"],
-a[href$=".docx"]  { background-image: url(../assets/icons/doc.png); }
-a[href$=".xls"]   { background-image: url(../assets/icons/xls.png); }
+a[href$=".docx"]  { background-image: url(../assets/stock/doc.png); }
+a[href$=".xls"]   { background-image: url(../assets/stock/xls.png); }
 
 /*** MISCELLANEOUS LINK ICONS ***/
 a[href$=".rss"],
-a[href$=".rdf"]   { background-image: url(../assets/icons/feed.png); }
-a[href^="aim:"]   { background-image: url(../assets/icons/im.png); }
+a[href$=".rdf"]   { background-image: url(../assets/stock/feed.png); }
+a[href^="aim:"]   { background-image: url(../assets/stock/im.png); }
 a[href^="http://yourwebsite.com"] { background:none; padding:0; margin:0; }
 
 /*** TEXT CLASSES ***/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70141803093320 !ruby/object:Gem::Requirement
+  requirement: &70197105513840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70141803093320
+  version_requirements: *70197105513840
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70141803091520 !ruby/object:Gem::Requirement
+  requirement: &70197105513340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70141803091520
+  version_requirements: *70197105513340
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -44,6 +44,7 @@ files:
 - LICENSE
 - README.rdoc
 - app/controllers/contour/authentications_controller.rb
+- app/controllers/contour/passwords_controller.rb
 - app/controllers/contour/registrations_controller.rb
 - app/controllers/contour/samples_controller.rb
 - app/controllers/contour/sessions_controller.rb
@@ -53,12 +54,12 @@ files:
 - 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
 - app/views/contour/registrations/edit.html.erb
 - app/views/contour/registrations/new.html.erb
 - app/views/contour/samples/index.html.erb
 - app/views/contour/sessions/new.html.erb
-- app/views/devise/passwords/edit.html.erb
-- app/views/devise/passwords/new.html.erb
 - contour.gemspec
 - lib/contour.rb
 - lib/contour/engine.rb
@@ -98,6 +99,32 @@ files:
 - vendor/assets/images/redmond/ui-icons_cd0a0a_256x240.png
 - vendor/assets/images/redmond/ui-icons_d8e7f3_256x240.png
 - vendor/assets/images/redmond/ui-icons_f9bd01_256x240.png
+- vendor/assets/images/stock/addfile.png
+- vendor/assets/images/stock/blank.png
+- vendor/assets/images/stock/cross.png
+- vendor/assets/images/stock/delete.png
+- vendor/assets/images/stock/doc.png
+- vendor/assets/images/stock/download.png
+- vendor/assets/images/stock/edit.png
+- vendor/assets/images/stock/email.png
+- vendor/assets/images/stock/external.png
+- vendor/assets/images/stock/favorite_no.png
+- vendor/assets/images/stock/favorite_yes.png
+- vendor/assets/images/stock/feed.png
+- vendor/assets/images/stock/im.png
+- vendor/assets/images/stock/information.png
+- vendor/assets/images/stock/key.png
+- vendor/assets/images/stock/mydocuments.png
+- vendor/assets/images/stock/open.png
+- vendor/assets/images/stock/pdf.png
+- vendor/assets/images/stock/save.png
+- vendor/assets/images/stock/tag_blue.png
+- vendor/assets/images/stock/tag_green.png
+- vendor/assets/images/stock/tag_neutral.png
+- vendor/assets/images/stock/tag_red.png
+- vendor/assets/images/stock/tick.png
+- vendor/assets/images/stock/visited.png
+- vendor/assets/images/stock/xls.png
 - vendor/assets/javascripts/contour.js
 - vendor/assets/javascripts/errors.js.coffee
 - vendor/assets/javascripts/external/exporting-2.1.4.src.js

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

@@ -1,12 +0,0 @@
-<h2>Forgot your password?</h2>
-
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
-
-  <p><%= f.submit "Send me reset password instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>