Merge branch 'feature/design_layouts' into develop

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
-  revision: 79e7f27bcd70aa56682a8460c0bd6871bb6da172
+  revision: 0e88056ac5d58fb0bbd23d3fe929eac01712d964
   branch: 3
   specs:
     bootstrap-sass (3.0.0.0)

config.rb

@@ -37,9 +37,10 @@
 # page "/path/to/file.html", :layout => :otherlayout
 # 
 # A path which all have the same  layout
-# with_layout :admin do
-#   page "/admin/*"
-# end
+with_layout :login do
+   page '/index.html'
+   page '/forgot_password.html'
+end
 
 # Proxy (fake) files
 # page "/this-page-has-no-template.html", :proxy => "/template-file.html" do
@@ -63,6 +64,9 @@
 #   end
 # end
 
+# i18n
+activate :i18n
+
 set :fonts_dir, 'assets/fonts'
 set :css_dir, 'assets/stylesheets'
 set :js_dir, 'assets/javascripts'

helpers/view_helpers.rb

@@ -0,0 +1,12 @@
+module ViewHelpers
+  def page(title, id)
+    @page_id = id
+    content_for :title do
+      title
+    end
+  end
+
+  def launcher_active(page)
+    @page_id == page ? {class:'active'} : {}
+  end
+end

locales/en.yml

@@ -0,0 +1,13 @@
+en:
+  login_heading: "Login to your account"
+  login_remember_me: "Remember me on this computer"
+  login_email: "Email address"
+  login_email_hint: "Enter your email address"
+  login_password: "Password"
+  forgot_password: "Forgot password?"
+  forgot_password_heading: "Reset your password"
+
+  sign_in: "Sign in"
+  sign_out: "Sign out"
+  send: "Send"
+  go_back: "Go back"

source/assets/javascripts/application.js.coffee

@@ -1,3 +1,31 @@
+#= require bootstrap
 #= require_tree
 
-$(document).ready ->
+$(document).ready ->
+
+  # Enable Tips & Popovers
+  $('[data-toggle=tooltip]').tooltip()
+  $('[data-toggle=popover]').popover()
+
+  # Eable Dropdowns
+  $('.dropdown-toggle').dropdown()
+  $('.dropdown.hover').hover (->
+    $(this).find('.dropdown-menu').stop(true, true).fadeIn()
+  ), ->
+    $(this).find('.dropdown-menu').stop(true, true).delay(100).fadeOut()
+
+  # Dock dropdown fix
+  $('#dock li.launcher').each ->
+    $(this).find('.dropdown-menu').css 'top', $(this).position().top + 33
+
+  $('#toggle').click ->
+    $('#dock .launcher a').toggle()
+    $('#dock li.launcher').each ->
+      $(this).find('.dropdown-menu').css 'top', $(this).position().top + 33
+
+  # Enable toolbar tooltips
+  $('[data-toggle=toolbar-tooltip]').tooltip
+    placement: 'bottom'
+
+  # Enable knob inputs
+  $('.knob').knob()