diff --git a/Gemfile b/Gemfile
index 763b431e..97f8de9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
source "http://gemcutter.org"
source "http://gems.github.com"
-gem "rails", "3.0.0.beta2"
+gem "rails", "3.0.0.beta3"
gem "liquid"
gem "bson_ext"
@@ -10,6 +10,8 @@ gem "mongo_ext"
gem "mongoid", ">= 2.0.0.beta2"
gem "warden"
gem "devise", ">= 1.1.rc0"
+gem "haml", '>= 3.0.0.beta.2', :git => 'git://github.com/nex3/haml.git'
+gem "formtastic", :git => 'git://github.com/justinfrench/formtastic.git', :branch => 'rails3'
# Development environment
diff --git a/app/controllers/admin/passwords_controller.rb b/app/controllers/admin/passwords_controller.rb
new file mode 100644
index 00000000..5eed6cb0
--- /dev/null
+++ b/app/controllers/admin/passwords_controller.rb
@@ -0,0 +1,9 @@
+class Admin::PasswordsController < Devise::PasswordsController
+
+ include Locomotive::Routing::SiteDispatcher
+
+ layout 'login'
+
+ before_filter :require_site
+
+end
\ No newline at end of file
diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb
new file mode 100644
index 00000000..25754beb
--- /dev/null
+++ b/app/controllers/admin/sessions_controller.rb
@@ -0,0 +1,9 @@
+class Admin::SessionsController < Devise::SessionsController
+
+ include Locomotive::Routing::SiteDispatcher
+
+ layout 'login'
+
+ before_filter :require_site
+
+end
\ No newline at end of file
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e8065d95..1c588fe1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,11 @@
class ApplicationController < ActionController::Base
protect_from_forgery
+
+ before_filter :set_locale
+
+ protected
+
+ def set_locale
+ I18n.locale = 'fr'
+ end
end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 6d87a41c..ce5967fa 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,4 +1,4 @@
-class HomeController < ActionController::Base
+class HomeController < ApplicationController
def show; end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de6be794..e70987f8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,26 @@
module ApplicationHelper
+
+ def title(title = nil)
+ if title.nil?
+ @content_for_title
+ else
+ @content_for_title = title
+ ''
+ end
+ end
+
+ def flash_message
+ if not flash.empty?
+ content_tag :div, flash.values.first,
+ :id => "flash-#{flash.keys.first}",
+ :class => 'application-message'
+ else
+ ''
+ end
+ end
+
+ def submit_button_tag(label)
+ content_tag(:button, content_tag(:span, label), :type => 'submit', :class => 'button')
+ end
+
end
diff --git a/app/views/admin/passwords/edit.html.haml b/app/views/admin/passwords/edit.html.haml
new file mode 100644
index 00000000..89703706
--- /dev/null
+++ b/app/views/admin/passwords/edit.html.haml
@@ -0,0 +1,18 @@
+- title t('.title')
+
+= semantic_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
+
+ = f.hidden_field :reset_password_token
+
+ .inner
+ = flash_message
+
+ = f.inputs do
+ = f.input :password, :label => t('.password'), :required => false
+ = f.input :password_confirmation, :label => t('.password_confirmation'), :required => false
+
+ %p.link
+ = link_to t('.link'), new_account_session_path(resource_name)
+
+ .footer
+ = submit_button_tag t('buttons.change_password')
diff --git a/app/views/admin/passwords/new.html.haml b/app/views/admin/passwords/new.html.haml
new file mode 100644
index 00000000..ff47ad39
--- /dev/null
+++ b/app/views/admin/passwords/new.html.haml
@@ -0,0 +1,17 @@
+- title t('.title')
+
+= semantic_form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
+
+ = f.hidden_field :reset_password_token
+
+ .inner
+ = flash_message
+
+ = f.inputs do
+ = f.input :email, :label => t('.email'), :required => false
+
+ %p.link
+ = link_to t('.link'), new_account_session_path(resource_name)
+
+ .footer
+ = submit_button_tag t('buttons.send_password')
\ No newline at end of file
diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml
new file mode 100644
index 00000000..27714786
--- /dev/null
+++ b/app/views/admin/sessions/new.html.haml
@@ -0,0 +1,15 @@
+- title t('.title')
+
+= semantic_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+ .inner
+ = flash_message
+
+ = f.inputs do
+ = f.input :email, :label => t('.email'), :required => false
+ = f.input :password, :label => t('.password'), :required => false
+
+ %p.link
+ = link_to t('.link'), new_password_path(resource_name)
+
+ .footer
+ = submit_button_tag t('buttons.login')
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
deleted file mode 100644
index 8ce5cc0f..00000000
--- a/app/views/devise/confirmations/new.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Resend confirmation instructions
-
-<%= form_for(resource_name, resource, :url => confirmation_path(resource_name)) do |f| %>
- <%= f.error_messages %>
-
- <%= f.label :email %>
- <%= f.text_field :email %>
-
- <%= f.submit "Resend confirmation instructions" %>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml
new file mode 100644
index 00000000..baac47f6
--- /dev/null
+++ b/app/views/devise/confirmations/new.html.haml
@@ -0,0 +1,12 @@
+%h2
+ Resend confirmation instructions
+= form_for(resource_name, resource, :url => confirmation_path(resource_name)) do |f|
+= f.error_messages
+%p
+ = f.label :email
+%p
+ = f.text_field :email
+%p
+ = f.submit "Resend confirmation instructions"
+- end
+= render :partial => "devise/shared/links"
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
deleted file mode 100644
index a6ea8ca1..00000000
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-Welcome <%= @resource.email %>!
-
-You can confirm your account through the link below:
-
-<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
diff --git a/app/views/devise/mailer/confirmation_instructions.html.haml b/app/views/devise/mailer/confirmation_instructions.html.haml
new file mode 100644
index 00000000..d7ffefb5
--- /dev/null
+++ b/app/views/devise/mailer/confirmation_instructions.html.haml
@@ -0,0 +1,8 @@
+%p
+ Welcome
+ = @resource.email
+ \!
+%p
+ You can confirm your account through the link below:
+%p
+ = link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
deleted file mode 100644
index ae9e888a..00000000
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password, and you can do this through the link below.
-
-<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
-
-If you didn't request this, please ignore this email.
-Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/reset_password_instructions.html.haml b/app/views/devise/mailer/reset_password_instructions.html.haml
new file mode 100644
index 00000000..24d2eea1
--- /dev/null
+++ b/app/views/devise/mailer/reset_password_instructions.html.haml
@@ -0,0 +1,12 @@
+%p
+ Hello
+ = @resource.email
+ \!
+%p
+ Someone has requested a link to change your password, and you can do this through the link below.
+%p
+ = link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
+%p
+ If you didn't request this, please ignore this email.
+%p
+ Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
deleted file mode 100644
index 2263c219..00000000
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-Hello <%= @resource.email %>!
-
-Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
-
-Click the link below to unlock your account:
-
-<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %>
diff --git a/app/views/devise/mailer/unlock_instructions.html.haml b/app/views/devise/mailer/unlock_instructions.html.haml
new file mode 100644
index 00000000..59c6979f
--- /dev/null
+++ b/app/views/devise/mailer/unlock_instructions.html.haml
@@ -0,0 +1,10 @@
+%p
+ Hello
+ = @resource.email
+ \!
+%p
+ Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
+%p
+ Click the link below to unlock your account:
+%p
+ = link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token)
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
deleted file mode 100644
index 82858b4c..00000000
--- a/app/views/devise/passwords/edit.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-Change your password
-
-<%= form_for(resource_name, resource, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
- <%= f.error_messages %>
- <%= f.hidden_field :reset_password_token %>
-
- <%= f.label :password %>
- <%= f.password_field :password %>
-
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
-
- <%= f.submit "Change my password" %>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
deleted file mode 100644
index f055608a..00000000
--- a/app/views/devise/passwords/new.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Forgot your password?
-
-<%= form_for(resource_name, resource, :url => password_path(resource_name)) do |f| %>
- <%= f.error_messages %>
-
- <%= f.label :email %>
- <%= f.text_field :email %>
-
- <%= f.submit "Send me reset password instructions" %>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
deleted file mode 100644
index 6de7b26a..00000000
--- a/app/views/devise/registrations/edit.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-Edit <%= resource_name.to_s.humanize %>
-
-<%= form_for(resource_name, resource, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
- <%= f.error_messages %>
-
- <%= f.label :email %>
- <%= f.text_field :email %>
-
- <%= f.label :password %> (leave blank if you don't want to change it)
- <%= f.password_field :password %>
-
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
-
- <%= f.label :current_password %> (we need your current password to confirm your changes)
- <%= f.password_field :current_password %>
-
- <%= f.submit "Update" %>
-<% end %>
-
-Cancel my account
-
-Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.
-
-<%= link_to "Back", :back %>
diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml
new file mode 100644
index 00000000..cb69d96b
--- /dev/null
+++ b/app/views/devise/registrations/edit.html.haml
@@ -0,0 +1,35 @@
+%h2
+ Edit
+ = resource_name.to_s.humanize
+= form_for(resource_name, resource, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
+= f.error_messages
+%p
+ = f.label :email
+%p
+ = f.text_field :email
+%p
+ = f.label :password
+ %i
+ (leave blank if you don't want to change it)
+%p
+ = f.password_field :password
+%p
+ = f.label :password_confirmation
+%p
+ = f.password_field :password_confirmation
+%p
+ = f.label :current_password
+ %i
+ (we need your current password to confirm your changes)
+%p
+ = f.password_field :current_password
+%p
+ = f.submit "Update"
+- end
+%h3
+ Cancel my account
+%p
+ Unhappy?
+ = link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete
+ \.
+= link_to "Back", :back
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
deleted file mode 100644
index 3c2b1a8b..00000000
--- a/app/views/devise/registrations/new.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-Sign up
-
-<%= form_for(resource_name, resource, :url => registration_path(resource_name)) do |f| %>
- <%= f.error_messages %>
- <%= f.label :email %>
- <%= f.text_field :email %>
-
- <%= f.label :password %>
- <%= f.password_field :password %>
-
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
-
- <%= f.submit "Sign up" %>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
new file mode 100644
index 00000000..70740a1d
--- /dev/null
+++ b/app/views/devise/registrations/new.html.haml
@@ -0,0 +1,20 @@
+%h2
+ Sign up
+= form_for(resource_name, resource, :url => registration_path(resource_name)) do |f|
+= f.error_messages
+%p
+ = f.label :email
+%p
+ = f.text_field :email
+%p
+ = f.label :password
+%p
+ = f.password_field :password
+%p
+ = f.label :password_confirmation
+%p
+ = f.password_field :password_confirmation
+%p
+ = f.submit "Sign up"
+- end
+= render :partial => "devise/shared/links"
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
deleted file mode 100644
index 3762d08e..00000000
--- a/app/views/devise/sessions/new.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-Sign in
-
-<%= form_for(resource_name, resource, :url => session_path(resource_name)) do |f| %>
- <%= f.label :email %>
- <%= f.text_field :email %>
-
- <%= f.label :password %>
- <%= f.password_field :password %>
-
- <% if devise_mapping.rememberable? -%>
- <%= f.check_box :remember_me %> <%= f.label :remember_me %>
- <% end -%>
-
- <%= f.submit "Sign in" %>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
new file mode 100644
index 00000000..f6114871
--- /dev/null
+++ b/app/views/devise/sessions/new.html.haml
@@ -0,0 +1,22 @@
+
+
+/ = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+/ %p
+/ = f.label :email
+/ %p
+/ = f.text_field :email
+/
+/ %p
+/ = f.label :password
+/ %p
+/ = f.password_field :password
+/
+/ - if devise_mapping.rememberable?
+/ %p
+/ = f.check_box :remember_me
+/ = f.label :remember_me
+/
+/ %p
+/ = f.submit "Sign in"
+/
+/ = link_to "Forgot your password?", new_password_path(resource_name)
\ No newline at end of file
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
deleted file mode 100644
index 56b9cc73..00000000
--- a/app/views/devise/shared/_links.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name) %>Resend unlock instructions
-
-<%= form_for(resource_name, resource, :url => unlock_path(resource_name)) do |f| %>
- <%= f.error_messages %>
-
- <%= f.label :email %>
- <%= f.text_field :email %>
-
- <%= f.submit "Resend unlock instructions" %>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
diff --git a/app/views/devise/unlocks/new.html.haml b/app/views/devise/unlocks/new.html.haml
new file mode 100644
index 00000000..16d1f505
--- /dev/null
+++ b/app/views/devise/unlocks/new.html.haml
@@ -0,0 +1,12 @@
+%h2
+ Resend unlock instructions
+= form_for(resource_name, resource, :url => unlock_path(resource_name)) do |f|
+= f.error_messages
+%p
+ = f.label :email
+%p
+ = f.text_field :email
+%p
+ = f.submit "Resend unlock instructions"
+- end
+= render :partial => "devise/shared/links"
diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb
deleted file mode 100644
index 3261094a..00000000
--- a/app/views/home/show.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Locomotive rocks !!!
-
-<%= flash[:error] %>
\ No newline at end of file
diff --git a/app/views/home/show.html.haml b/app/views/home/show.html.haml
new file mode 100644
index 00000000..30c50859
--- /dev/null
+++ b/app/views/home/show.html.haml
@@ -0,0 +1,4 @@
+%h2 Locomotive rocks !!!
+
+%p
+ = flash[:error]
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
new file mode 100644
index 00000000..1fcad643
--- /dev/null
+++ b/app/views/layouts/application.html.haml
@@ -0,0 +1,7 @@
+!!! XML
+!!!
+%html{ :xmlns => 'http://www.w3.org/1999/xhtml' }
+ %head
+ %body
+ %h1 Welcome to Locomotive
+ = yield
\ No newline at end of file
diff --git a/app/views/layouts/login.html.haml b/app/views/layouts/login.html.haml
new file mode 100644
index 00000000..d7f0c936
--- /dev/null
+++ b/app/views/layouts/login.html.haml
@@ -0,0 +1,15 @@
+!!! XML
+!!!
+%html{ :xmlns => 'http://www.w3.org/1999/xhtml' }
+ %head
+ %title= escape_once("#{Locomotive.config.name} — #{current_site.name}")
+ = stylesheet_link_tag 'blueprint/screen', 'admin/login', :media => 'screen'
+ / [if IE]
+ = stylesheet_link_tag('blueprint/ie', :media => 'screen')
+ %body
+ #wrapper
+ #light.container
+ #panel.container
+ %h1= title
+
+ = yield
\ No newline at end of file
diff --git a/config/application.rb b/config/application.rb
index 5222a57b..264cba3c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,6 +43,6 @@ module Locomotive
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters << :password
- config.cookie_secret = '968a457262807c64e3ed5609882e17a774b917f5bcf2d308bd37eac4ba4d416d5692e6b13d77523fddb94c1dd603f160db8492b86b5e0203240bf339fe2aeae4'
+ config.secret_token = '968a457262807c64e3ed5609882e17a774b917f5bcf2d308bd37eac4ba4d416d5692e6b13d77523fddb94c1dd603f160db8492b86b5e0203240bf339fe2aeae4'
end
end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 489b2903..0fce7883 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -18,4 +18,12 @@ Locomotive::Application.configure do
config.action_mailer.raise_delivery_errors = false
# config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+
+ # MockSmtp settings
+ config.action_mailer.delivery_method = :smtp
+ config.action_mailer.smtp_settings = {
+ :address => "localhost",
+ :port => 1025,
+ :domain => "example.com"
+ }
end
diff --git a/config/initializers/cookie_verification_secret.rb b/config/initializers/cookie_verification_secret.rb
deleted file mode 100644
index f710de0f..00000000
--- a/config/initializers/cookie_verification_secret.rb
+++ /dev/null
@@ -1 +0,0 @@
-# Rails.application.config.cookie_secret = '968a457262807c64e3ed5609882e17a774b917f5bcf2d308bd37eac4ba4d416d5692e6b13d77523fddb94c1dd603f160db8492b86b5e0203240bf339fe2aeae4'
\ No newline at end of file
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 28d475fd..280637f5 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -84,6 +84,7 @@ Devise.setup do |config|
# ==> General configuration
# Load and configure the ORM. Supports :active_record (default), :mongoid
# (requires mongo_ext installed) and :data_mapper (experimental).
+ require 'active_support/core_ext/class/attribute'
require 'devise/orm/mongoid'
# Turn scoped views on. Before rendering "sessions/new", it will first check for
@@ -113,4 +114,4 @@ Devise.setup do |config|
# end
# manager.default_strategies(:scope => :user).unshift :twitter_oauth
# end
-end
+end
\ No newline at end of file
diff --git a/config/initializers/formtastic.rb b/config/initializers/formtastic.rb
new file mode 100644
index 00000000..7c1fa651
--- /dev/null
+++ b/config/initializers/formtastic.rb
@@ -0,0 +1 @@
+Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
\ No newline at end of file
diff --git a/config/initializers/locomotive.rb b/config/initializers/locomotive.rb
index c7765e7e..ff12be7b 100644
--- a/config/initializers/locomotive.rb
+++ b/config/initializers/locomotive.rb
@@ -4,5 +4,5 @@ Locomotive.configure do |config|
config.default_domain = 'example.com'
end
-# TODO: embed it in Locomotive
-ActionMailer::Base.default_url_options[:host] = Locomotive.config.default_domain + (Rails.env.development? ? ':3000' : '')
\ No newline at end of file
+# TODO: embed it in Locomotive right after configure
+ActionMailer::Base.default_url_options[:host] = Locomotive.config.default_domain + (Rails.env.development? ? ':3000' : '')
diff --git a/config/locales/admin_ui_en.yml b/config/locales/admin_ui_en.yml
index a9f72ecc..2690b192 100644
--- a/config/locales/admin_ui_en.yml
+++ b/config/locales/admin_ui_en.yml
@@ -1,2 +1,25 @@
en:
- hello: "Hello world"
+ admin:
+ sessions:
+ new:
+ title: Login to
+ link: "I forgot my password"
+ email: "Email"
+ password: "Password"
+
+ passwords:
+ new:
+ title: Forgot password
+ link: "→ Back to login page"
+ email: "Your email"
+ edit:
+ title: Update my password
+ link: "→ Back to login page"
+ password: "Your new password"
+ password_confirmation: "Confirmation of your new password"
+
+ buttons:
+ login: Log in
+ send_password: Send
+ change_password: Update
+
\ No newline at end of file
diff --git a/config/locales/admin_ui_fr.yml b/config/locales/admin_ui_fr.yml
index 8627442c..10f75b58 100644
--- a/config/locales/admin_ui_fr.yml
+++ b/config/locales/admin_ui_fr.yml
@@ -1,2 +1,21 @@
fr:
- hello: 'Bonjour le monde'
\ No newline at end of file
+ admin:
+ sessions:
+ new:
+ title: Connexion à
+ link: "J'ai oublié mon mot de passe"
+ email: "Email"
+ password: "Mot de passe"
+ passwords:
+ new:
+ title: Mot de passe oublié
+ link: "→ Retour page de connexion"
+ email: "Votre email"
+ edit:
+ title: Changer mon mot de passe
+ link: "→ Retour page de connexion"
+
+ buttons:
+ login: Se connecter
+ send_password: Envoyer
+ change_password: Changer
diff --git a/config/routes.rb b/config/routes.rb
index e4698ab9..223aa648 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,17 +5,20 @@ Locomotive::Application.routes.draw do |map|
end
# admin authentication
- Devise.register(:accounts, {}) # bypass the devise_for :accounts
+ Devise.register(:accounts, :controllers => { :sessions => 'admin/sessions', :passwords => 'admin/passwords' }) # bypass the devise_for :accounts
scope '/admin' do
- get 'login' => 'devise/sessions#new', :as => :new_account_session
- post 'login' => 'devise/sessions#create', :as => :account_session
- get 'logout' => 'devise/sessions#destroy', :as => :destroy_account_session
- resource :password, :only => [:new, :create, :edit, :update], :controller => 'devise/passwords'
+ get 'login' => 'admin/sessions#new', :as => :new_account_session
+ post 'login' => 'admin/sessions#create', :as => :account_session
+ get 'logout' => 'admin/sessions#destroy', :as => :destroy_account_session
+ resource :password, :only => [:new, :create, :edit, :update], :controller => 'admin/passwords'
end
# admin interface for each website
namespace 'admin' do
- # TODO
+ # get 'login' => 'sessions#new', :as => :new_account_session
+ # post 'login' => 'sessions#create', :as => :account_session
+ # get 'logout' => 'sessions#destroy', :as => :destroy_account_session
+ # resource :password, :only => [:new, :create, :edit, :update], :controller => 'devise/passwords'
end
match '/' => 'pages#show'
diff --git a/lib/devise/orm/mongo_mapper.rb b/lib/devise/orm/mongo_mapper.rb
deleted file mode 100644
index a1420a71..00000000
--- a/lib/devise/orm/mongo_mapper.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-module Devise
- module Orm
- module MongoMapper
- module Hook
- def devise_modules_hook!
- extend Schema
- include Compatibility
- yield
- return unless Devise.apply_schema
- devise_modules.each { |m| send(m) if respond_to?(m, true) }
- end
- end
-
- module Schema
- include Devise::Schema
-
- # Tell how to apply schema methods. This automatically converts DateTime
- # to Time, since MongoMapper does not recognize the former.
- def apply_schema(name, type, options={})
- type = Time if type == DateTime
- key name, type, options
- end
- end
-
- module Compatibility
- extend ActiveSupport::Concern
-
- module ClassMethods
- def find(*args)
- case args.first
- when :first, :all
- send(args.shift, *args)
- else
- super
- end
- end
- end
- end
-
- end
- end
-end
-
-[MongoMapper::Document, MongoMapper::EmbeddedDocument].each do |mod|
- mod::ClassMethods.class_eval do
- include Devise::Models
- include Devise::Orm::MongoMapper::Hook
- end
-end
\ No newline at end of file
diff --git a/lib/locomotive.rb b/lib/locomotive.rb
index 22b6a6ea..4c9eacc0 100644
--- a/lib/locomotive.rb
+++ b/lib/locomotive.rb
@@ -1,3 +1,6 @@
+# require 'locomotive/patches'
+require 'locomotive/configuration'
+
module Locomotive
class << self
@@ -14,66 +17,67 @@ module Locomotive
yield(self.config)
end
- class Configuration
-
- @@defaults = {
- :default_domain => 'rails.local.fr',
- :reserved_subdomains => %w{www admin email blog webmail mail support help site sites}
- }
-
- cattr_accessor :settings
-
- def initialize
- @@settings = self.class.get_from_hash(@@defaults)
- end
-
- def self.settings
- @@settings
- end
-
- def method_missing(name, *args, &block)
- self.settings.send(name, *args, &block)
- end
-
- protected
-
- # converts a hash map into a ConfigurationHash
- def self.get_from_hash(hash)
- config = ConfigurationHash.new
-
- hash.each_pair do |key, value|
- config[key] = value.is_a?(Hash) ? self.get_from_hash(value) : value
- end
-
- config
- end
- end
-
- # specialized hash for storing configuration settings
- class ConfigurationHash < Hash
- # ensure that default entries always produce
- # instances of the ConfigurationHash class
- def default(key=nil)
- include?(key) ? self[key] : self[key] = self.class.new
- end
-
- # retrieves the specified key and yields it
- # if a block is provided
- def [](key, &block)
- block_given? ? yield(super(key)) : super(key)
- end
-
- # provides member-based access to keys
- # i.e. params.id === params[:id]
- # note: all keys are converted to symbols
- def method_missing(name, *args, &block)
- if name.to_s.ends_with? '='
- send :[]=, name.to_s.chomp('=').to_sym, *args
- else
- send(:[], name.to_sym, &block)
- end
- end
- end
-
+ # class Configuration
+ #
+ # @@defaults = {
+ # :name => 'LocomotiveApp'
+ # :default_domain => 'rails.local.fr',
+ # :reserved_subdomains => %w{www admin email blog webmail mail support help site sites}
+ # }
+ #
+ # cattr_accessor :settings
+ #
+ # def initialize
+ # @@settings = self.class.get_from_hash(@@defaults)
+ # end
+ #
+ # def self.settings
+ # @@settings
+ # end
+ #
+ # def method_missing(name, *args, &block)
+ # self.settings.send(name, *args, &block)
+ # end
+ #
+ # protected
+ #
+ # # converts a hash map into a ConfigurationHash
+ # def self.get_from_hash(hash)
+ # config = ConfigurationHash.new
+ #
+ # hash.each_pair do |key, value|
+ # config[key] = value.is_a?(Hash) ? self.get_from_hash(value) : value
+ # end
+ #
+ # config
+ # end
+ # end
+ #
+ # # specialized hash for storing configuration settings
+ # class ConfigurationHash < Hash
+ # # ensure that default entries always produce
+ # # instances of the ConfigurationHash class
+ # def default(key=nil)
+ # include?(key) ? self[key] : self[key] = self.class.new
+ # end
+ #
+ # # retrieves the specified key and yields it
+ # # if a block is provided
+ # def [](key, &block)
+ # block_given? ? yield(super(key)) : super(key)
+ # end
+ #
+ # # provides member-based access to keys
+ # # i.e. params.id === params[:id]
+ # # note: all keys are converted to symbols
+ # def method_missing(name, *args, &block)
+ # if name.to_s.ends_with? '='
+ # send :[]=, name.to_s.chomp('=').to_sym, *args
+ # else
+ # send(:[], name.to_sym, &block)
+ # end
+ # end
+ # end
+ #
end
\ No newline at end of file
diff --git a/lib/locomotive/configuration.rb b/lib/locomotive/configuration.rb
new file mode 100644
index 00000000..e95a4fe9
--- /dev/null
+++ b/lib/locomotive/configuration.rb
@@ -0,0 +1,66 @@
+module Locomotive
+
+ class Configuration
+
+ @@defaults = {
+ :name => 'LocomotiveApp',
+ :default_domain => 'rails.local.fr',
+ :reserved_subdomains => %w{www admin email blog webmail mail support help site sites}
+ }
+
+ cattr_accessor :settings
+
+ def initialize
+ @@settings = self.class.get_from_hash(@@defaults)
+ end
+
+ def self.settings
+ @@settings
+ end
+
+ def method_missing(name, *args, &block)
+ self.settings.send(name, *args, &block)
+ end
+
+ protected
+
+ # converts a hash map into a ConfigurationHash
+ def self.get_from_hash(hash)
+ config = ConfigurationHash.new
+
+ hash.each_pair do |key, value|
+ config[key] = value.is_a?(Hash) ? self.get_from_hash(value) : value
+ end
+
+ config
+ end
+ end
+
+ # specialized hash for storing configuration settings
+ class ConfigurationHash < Hash
+ # ensure that default entries always produce
+ # instances of the ConfigurationHash class
+ def default(key=nil)
+ include?(key) ? self[key] : self[key] = self.class.new
+ end
+
+ # retrieves the specified key and yields it
+ # if a block is provided
+ def [](key, &block)
+ block_given? ? yield(super(key)) : super(key)
+ end
+
+ # provides member-based access to keys
+ # i.e. params.id === params[:id]
+ # note: all keys are converted to symbols
+ def method_missing(name, *args, &block)
+ if name.to_s.ends_with? '='
+ send :[]=, name.to_s.chomp('=').to_sym, *args
+ else
+ send(:[], name.to_sym, &block)
+ end
+ end
+ end
+
+
+end
\ No newline at end of file
diff --git a/lib/locomotive/devise/sessions_controller.rb b/lib/locomotive/devise/sessions_controller.rb
new file mode 100644
index 00000000..72dd0507
--- /dev/null
+++ b/lib/locomotive/devise/sessions_controller.rb
@@ -0,0 +1,5 @@
+Devise::SessionsController.class_eval do
+
+
+
+end
\ No newline at end of file
diff --git a/lib/locomotive/patches.rb b/lib/locomotive/patches.rb
new file mode 100644
index 00000000..44b1e1e0
--- /dev/null
+++ b/lib/locomotive/patches.rb
@@ -0,0 +1,2 @@
+# load patches for devise, ...etc
+require 'locomotive/devise/sessions_controller'
\ No newline at end of file
diff --git a/public/images/admin/login/bg.png b/public/images/admin/login/bg.png
new file mode 100644
index 00000000..867c8a7e
Binary files /dev/null and b/public/images/admin/login/bg.png differ
diff --git a/public/images/admin/login/bottom_panel_bg.png b/public/images/admin/login/bottom_panel_bg.png
new file mode 100644
index 00000000..dcb348f8
Binary files /dev/null and b/public/images/admin/login/bottom_panel_bg.png differ
diff --git a/public/images/admin/login/buttons/left_bg.png b/public/images/admin/login/buttons/left_bg.png
new file mode 100644
index 00000000..adc9f543
Binary files /dev/null and b/public/images/admin/login/buttons/left_bg.png differ
diff --git a/public/images/admin/login/buttons/right_bg.png b/public/images/admin/login/buttons/right_bg.png
new file mode 100644
index 00000000..5c521e78
Binary files /dev/null and b/public/images/admin/login/buttons/right_bg.png differ
diff --git a/public/images/admin/login/content_panel_bg.png b/public/images/admin/login/content_panel_bg.png
new file mode 100644
index 00000000..413d9371
Binary files /dev/null and b/public/images/admin/login/content_panel_bg.png differ
diff --git a/public/images/admin/login/input_bg.png b/public/images/admin/login/input_bg.png
new file mode 100644
index 00000000..31df486f
Binary files /dev/null and b/public/images/admin/login/input_bg.png differ
diff --git a/public/images/admin/login/light_bg.png b/public/images/admin/login/light_bg.png
new file mode 100644
index 00000000..b642a18e
Binary files /dev/null and b/public/images/admin/login/light_bg.png differ
diff --git a/public/images/admin/login/top_panel_bg.png b/public/images/admin/login/top_panel_bg.png
new file mode 100644
index 00000000..afe91e5f
Binary files /dev/null and b/public/images/admin/login/top_panel_bg.png differ
diff --git a/public/images/admin/login/wrapper_bg.png b/public/images/admin/login/wrapper_bg.png
new file mode 100644
index 00000000..21e81ea2
Binary files /dev/null and b/public/images/admin/login/wrapper_bg.png differ
diff --git a/public/stylesheets/admin/login.css b/public/stylesheets/admin/login.css
new file mode 100644
index 00000000..db288911
--- /dev/null
+++ b/public/stylesheets/admin/login.css
@@ -0,0 +1,141 @@
+body { background: #000 url(/images/admin/login/bg.png) repeat 0 0; }
+
+#wrapper {
+ background: transparent url(/images/admin/login/wrapper_bg.png) repeat-x 0 0;
+ min-height: 400px;
+}
+
+#light {
+ background: transparent url(/images/admin/login/light_bg.png) no-repeat center 0;
+ min-height: 400px;
+ padding-top: 100px;
+}
+
+#panel {
+ background: transparent url(/images/admin/login/top_panel_bg.png) no-repeat center 0;
+ width: 340px;
+ height: 344px;
+ padding: 8px 9px 0 7px;
+}
+
+#panel h1 {
+ height: 36px;
+ margin: 0px;
+ padding: 25px 0px 0 0;
+ font-size: 1.2em;
+ color: white;
+ text-align: center;
+ text-shadow: 1px 1px 1px #000;
+}
+
+#panel .inner {
+ background: transparent url(/images/admin/login/content_panel_bg.png) repeat-y center 0;
+ padding: 5px 0px 20px 0;
+}
+
+#panel fieldset {
+ border: 0px;
+ padding: 0px;
+ margin: 0px;
+}
+
+#panel fieldset ol {
+ width: 260px;
+ list-style: none;
+ padding: 0px;
+ margin: 0px auto 0 auto;
+}
+
+#panel fieldset ol li {
+ margin-top: 20px;
+}
+
+#panel fieldset ol li label {
+ display: block;
+ font-size: 1.2em;
+ color: #222;
+}
+
+#panel fieldset ol li input {
+ background: white url(/images/admin/login/input_bg.png) no-repeat 0 0;
+ width: 246px;
+ padding: 7px;
+ border: 0px;
+ font-size: 1.2em;
+ color: #222;
+}
+
+#panel fieldset ol li p.inline-errors {
+ padding: 3px 5px;
+ margin: 5px 0px;
+ background: #FFE5E5;
+ color: #CE2525;
+}
+
+#panel p.link {
+ margin: 15px 0 0 40px;
+}
+
+#panel p.link a {
+ color: #1f82bc;
+ text-decoration: none;
+}
+
+#panel p.link a:hover {
+ text-decoration: underline;
+}
+
+#panel div.footer {
+ background: transparent url(/images/admin/login/bottom_panel_bg.png) no-repeat center 0;
+ text-align: right;
+ margin: 0px 0px 0 0px;
+ padding: 22px 0;
+}
+
+#panel div.footer .button {
+ display: inline-block;
+ background: transparent url(/images/admin/login/buttons/left_bg.png) no-repeat 0 0;
+ margin: 0 38px 0 0;
+ padding: 0px 0px 0px 2px;
+ font-size: 1.1em;
+ color: white;
+ cursor: pointer;
+ border: none;
+ height: 31px;
+}
+
+#panel div.footer .button span {
+ display: inline-block;
+ background: transparent url(/images/admin/login/buttons/right_bg.png) no-repeat right top;
+ position: relative;
+ top: -1px;
+ padding: 3px 9px 9px 4px;
+ line-height: 21px;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+ #panel div.footer .button { padding-left: 5px; }
+ #panel div.footer .button span { top: 0px; padding-right: 10px; }
+}
+
+/* ___ Messages ___ */
+
+div.application-message {
+ font-size: 1.2em;
+ font-weight: bold;
+ padding: 8px;
+ margin: 10px 20px 0 20px;
+ text-align: justify;
+}
+
+div#flash-alert {
+ background: #FFE5E5;
+ color: #CE2525;
+}
+
+div#flash-notice {
+ background: #c7ff99;
+ color: #58852b;
+}
+
+
diff --git a/public/stylesheets/blueprint/ie.css b/public/stylesheets/blueprint/ie.css
new file mode 100755
index 00000000..eee142f2
--- /dev/null
+++ b/public/stylesheets/blueprint/ie.css
@@ -0,0 +1,26 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.8
+ http://blueprintcss.org
+
+ * Copyright (c) 2007-Present. See LICENSE for more info.
+ * See README for instructions on how to use Blueprint.
+ * For credits and origins, see AUTHORS.
+ * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {overflow-x:hidden;}
+* html legend {margin:0px -8px 16px 0;padding:0;}
+ol {margin-left:2em;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+fieldset {padding-top:0;}
\ No newline at end of file
diff --git a/public/stylesheets/blueprint/plugins/buttons/icons/cross.png b/public/stylesheets/blueprint/plugins/buttons/icons/cross.png
new file mode 100755
index 00000000..1514d51a
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/buttons/icons/cross.png differ
diff --git a/public/stylesheets/blueprint/plugins/buttons/icons/key.png b/public/stylesheets/blueprint/plugins/buttons/icons/key.png
new file mode 100755
index 00000000..a9d5e4f8
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/buttons/icons/key.png differ
diff --git a/public/stylesheets/blueprint/plugins/buttons/icons/tick.png b/public/stylesheets/blueprint/plugins/buttons/icons/tick.png
new file mode 100755
index 00000000..a9925a06
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/buttons/icons/tick.png differ
diff --git a/public/stylesheets/blueprint/plugins/buttons/readme.txt b/public/stylesheets/blueprint/plugins/buttons/readme.txt
new file mode 100755
index 00000000..a8c2b570
--- /dev/null
+++ b/public/stylesheets/blueprint/plugins/buttons/readme.txt
@@ -0,0 +1,32 @@
+Buttons
+
+* Gives you great looking CSS buttons, for both and .
+* Demo: particletree.com/features/rediscovering-the-button-element
+
+
+Credits
+----------------------------------------------------------------
+
+* Created by Kevin Hale [particletree.com]
+* Adapted for Blueprint by Olav Bjorkoy [bjorkoy.com]
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this plugin to lib/settings.yml.
+ See compress.rb for instructions.
+
+2) Use the following HTML code to place the buttons on your site:
+
+
+
+
+
+
+
+
+
diff --git a/public/stylesheets/blueprint/plugins/buttons/screen.css b/public/stylesheets/blueprint/plugins/buttons/screen.css
new file mode 100755
index 00000000..bb66b215
--- /dev/null
+++ b/public/stylesheets/blueprint/plugins/buttons/screen.css
@@ -0,0 +1,97 @@
+/* --------------------------------------------------------------
+
+ buttons.css
+ * Gives you some great CSS-only buttons.
+
+ Created by Kevin Hale [particletree.com]
+ * particletree.com/features/rediscovering-the-button-element
+
+ See Readme.txt in this folder for instructions.
+
+-------------------------------------------------------------- */
+
+a.button, button {
+ display:block;
+ float:left;
+ margin: 0.7em 0.5em 0.7em 0;
+ padding:5px 10px 5px 7px; /* Links */
+
+ border:1px solid #dedede;
+ border-top:1px solid #eee;
+ border-left:1px solid #eee;
+
+ background-color:#f5f5f5;
+ font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+ font-size:100%;
+ line-height:130%;
+ text-decoration:none;
+ font-weight:bold;
+ color:#565656;
+ cursor:pointer;
+}
+button {
+ width:auto;
+ overflow:visible;
+ padding:4px 10px 3px 7px; /* IE6 */
+}
+button[type] {
+ padding:4px 10px 4px 7px; /* Firefox */
+ line-height:17px; /* Safari */
+}
+*:first-child+html button[type] {
+ padding:4px 10px 3px 7px; /* IE7 */
+}
+button img, a.button img{
+ margin:0 3px -3px 0 !important;
+ padding:0;
+ border:none;
+ width:16px;
+ height:16px;
+ float:none;
+}
+
+
+/* Button colors
+-------------------------------------------------------------- */
+
+/* Standard */
+button:hover, a.button:hover{
+ background-color:#dff4ff;
+ border:1px solid #c2e1ef;
+ color:#336699;
+}
+a.button:active{
+ background-color:#6299c5;
+ border:1px solid #6299c5;
+ color:#fff;
+}
+
+/* Positive */
+body .positive {
+ color:#529214;
+}
+a.positive:hover, button.positive:hover {
+ background-color:#E6EFC2;
+ border:1px solid #C6D880;
+ color:#529214;
+}
+a.positive:active {
+ background-color:#529214;
+ border:1px solid #529214;
+ color:#fff;
+}
+
+/* Negative */
+body .negative {
+ color:#d12f19;
+}
+a.negative:hover, button.negative:hover {
+ background-color:#fbe3e4;
+ border:1px solid #fbc2c4;
+ color:#d12f19;
+}
+a.negative:active {
+ background-color:#d12f19;
+ border:1px solid #d12f19;
+ color:#fff;
+}
diff --git a/public/stylesheets/blueprint/plugins/fancy-type/readme.txt b/public/stylesheets/blueprint/plugins/fancy-type/readme.txt
new file mode 100755
index 00000000..85f24915
--- /dev/null
+++ b/public/stylesheets/blueprint/plugins/fancy-type/readme.txt
@@ -0,0 +1,14 @@
+Fancy Type
+
+* Gives you classes to use if you'd like some
+ extra fancy typography.
+
+Credits and instructions are specified above each class
+in the fancy-type.css file in this directory.
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this plugin to lib/settings.yml.
+ See compress.rb for instructions.
diff --git a/public/stylesheets/blueprint/plugins/fancy-type/screen.css b/public/stylesheets/blueprint/plugins/fancy-type/screen.css
new file mode 100755
index 00000000..028e05bb
--- /dev/null
+++ b/public/stylesheets/blueprint/plugins/fancy-type/screen.css
@@ -0,0 +1,71 @@
+/* --------------------------------------------------------------
+
+ fancy-type.css
+ * Lots of pretty advanced classes for manipulating text.
+
+ See the Readme file in this folder for additional instructions.
+
+-------------------------------------------------------------- */
+
+/* Indentation instead of line shifts for sibling paragraphs. */
+ p + p { text-indent:2em; margin-top:-1.5em; }
+ form p + p { text-indent: 0; } /* Don't want this in forms. */
+
+
+/* For great looking type, use this code instead of asdf:
+ asdf
+ Best used on prepositions and ampersands. */
+
+.alt {
+ color: #666;
+ font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif;
+ font-style: italic;
+ font-weight: normal;
+}
+
+
+/* For great looking quote marks in titles, replace "asdf" with:
+ “ asdf”
+ (That is, when the title starts with a quote mark).
+ (You may have to change this value depending on your font size). */
+
+.dquo { margin-left: -.5em; }
+
+
+/* Reduced size type with incremental leading
+ (http://www.markboulton.co.uk/journal/comments/incremental_leading/)
+
+ This could be used for side notes. For smaller type, you don't necessarily want to
+ follow the 1.5x vertical rhythm -- the line-height is too much.
+
+ Using this class, it reduces your font size and line-height so that for
+ every four lines of normal sized type, there is five lines of the sidenote. eg:
+
+ New type size in em's:
+ 10px (wanted side note size) / 12px (existing base size) = 0.8333 (new type size in ems)
+
+ New line-height value:
+ 12px x 1.5 = 18px (old line-height)
+ 18px x 4 = 72px
+ 72px / 5 = 14.4px (new line height)
+ 14.4px / 10px = 1.44 (new line height in em's) */
+
+p.incr, .incr p {
+ font-size: 10px;
+ line-height: 1.44em;
+ margin-bottom: 1.5em;
+}
+
+
+/* Surround uppercase words and abbreviations with this class.
+ Based on work by Jørgen Arnor Gårdsø Lom [http://twistedintellect.com/] */
+
+.caps {
+ font-variant: small-caps;
+ letter-spacing: 1px;
+ text-transform: lowercase;
+ font-size:1.2em;
+ line-height:1%;
+ font-weight:bold;
+ padding:0 2px;
+}
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/doc.png b/public/stylesheets/blueprint/plugins/link-icons/icons/doc.png
new file mode 100755
index 00000000..834cdfaf
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/link-icons/icons/doc.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/email.png b/public/stylesheets/blueprint/plugins/link-icons/icons/email.png
new file mode 100755
index 00000000..7348aed7
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/link-icons/icons/email.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/external.png b/public/stylesheets/blueprint/plugins/link-icons/icons/external.png
new file mode 100755
index 00000000..cf1cfb42
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/link-icons/icons/external.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/feed.png b/public/stylesheets/blueprint/plugins/link-icons/icons/feed.png
new file mode 100755
index 00000000..315c4f4f
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/link-icons/icons/feed.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/im.png b/public/stylesheets/blueprint/plugins/link-icons/icons/im.png
new file mode 100755
index 00000000..79f35ccb
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/link-icons/icons/im.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/pdf.png b/public/stylesheets/blueprint/plugins/link-icons/icons/pdf.png
new file mode 100755
index 00000000..8f8095e4
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/link-icons/icons/pdf.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png b/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png
new file mode 100755
index 00000000..ebf206de
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/xls.png b/public/stylesheets/blueprint/plugins/link-icons/icons/xls.png
new file mode 100755
index 00000000..b977d7e5
Binary files /dev/null and b/public/stylesheets/blueprint/plugins/link-icons/icons/xls.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/readme.txt b/public/stylesheets/blueprint/plugins/link-icons/readme.txt
new file mode 100755
index 00000000..3cb1b2ce
--- /dev/null
+++ b/public/stylesheets/blueprint/plugins/link-icons/readme.txt
@@ -0,0 +1,18 @@
+Link Icons
+* Icons for links based on protocol or file type.
+
+This is not supported in IE versions < 7.
+
+
+Credits
+----------------------------------------------------------------
+
+* Marc Morgan
+* Olav Bjorkoy [bjorkoy.com]
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this line to your HTML:
+ , . */
+blockquote:before, blockquote:after, q:before, q:after { content: ""; }
+blockquote, q { quotes: "" ""; }
+
+/* Remove annoying border on linked images. */
+a img { border: none; }
diff --git a/public/stylesheets/blueprint/src/typography.css b/public/stylesheets/blueprint/src/typography.css
new file mode 100755
index 00000000..5dfa2081
--- /dev/null
+++ b/public/stylesheets/blueprint/src/typography.css
@@ -0,0 +1,105 @@
+/* --------------------------------------------------------------
+
+ typography.css
+ * Sets up some sensible default typography.
+
+-------------------------------------------------------------- */
+
+/* Default font settings.
+ The font-size percentage is of 16px. (0.75 * 16px = 12px) */
+body {
+ font-size: 75%;
+ color: #222;
+ background: #fff;
+ font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+}
+
+
+/* Headings
+-------------------------------------------------------------- */
+
+h1,h2,h3,h4,h5,h6 { font-weight: normal; color: #111; }
+
+h1 { font-size: 3em; line-height: 1; margin-bottom: 0.5em; }
+h2 { font-size: 2em; margin-bottom: 0.75em; }
+h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1em; }
+h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; }
+h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; }
+h6 { font-size: 1em; font-weight: bold; }
+
+h1 img, h2 img, h3 img,
+h4 img, h5 img, h6 img {
+ margin: 0;
+}
+
+
+/* Text elements
+-------------------------------------------------------------- */
+
+p { margin: 0 0 1.5em; }
+p img.left { float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; }
+p img.right { float: right; margin: 1.5em 0 1.5em 1.5em; }
+
+a:focus,
+a:hover { color: #000; }
+a { color: #009; text-decoration: underline; }
+
+blockquote { margin: 1.5em; color: #666; font-style: italic; }
+strong { font-weight: bold; }
+em,dfn { font-style: italic; }
+dfn { font-weight: bold; }
+sup, sub { line-height: 0; }
+
+abbr,
+acronym { border-bottom: 1px dotted #666; }
+address { margin: 0 0 1.5em; font-style: italic; }
+del { color:#666; }
+
+pre { margin: 1.5em 0; white-space: pre; }
+pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; }
+
+
+/* Lists
+-------------------------------------------------------------- */
+
+li ul,
+li ol { margin:0 1.5em; }
+ul, ol { margin: 0 1.5em 1.5em 1.5em; }
+
+ul { list-style-type: disc; }
+ol { list-style-type: decimal; }
+
+dl { margin: 0 0 1.5em 0; }
+dl dt { font-weight: bold; }
+dd { margin-left: 1.5em;}
+
+
+/* Tables
+-------------------------------------------------------------- */
+
+table { margin-bottom: 1.4em; width:100%; }
+th { font-weight: bold; }
+thead th { background: #c3d9ff; }
+th,td,caption { padding: 4px 10px 4px 5px; }
+tr.even td { background: #e5ecf9; }
+tfoot { font-style: italic; }
+caption { background: #eee; }
+
+
+/* Misc classes
+-------------------------------------------------------------- */
+
+.small { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; }
+.large { font-size: 1.2em; line-height: 2.5em; margin-bottom: 1.25em; }
+.hide { display: none; }
+
+.quiet { color: #666; }
+.loud { color: #000; }
+.highlight { background:#ff0; }
+.added { background:#060; color: #fff; }
+.removed { background:#900; color: #fff; }
+
+.first { margin-left:0; padding-left:0; }
+.last { margin-right:0; padding-right:0; }
+.top { margin-top:0; padding-top:0; }
+.bottom { margin-bottom:0; padding-bottom:0; }