@@ -1,6 +1,6 @@

 source 'https://rubygems.org'

-gem 'rails', '3.2.11'

+gem 'rails', '~> 3.2.11'

 # Bundle edge Rails instead:

 # gem 'rails', :git => 'git://github.com/rails/rails.git'

@@ -12,13 +12,13 @@ gem "mongoid", "~> 3.0.20"

 group :assets do

   gem 'sass-rails',   '~> 3.2.3'

   gem 'coffee-rails', '~> 3.2.1'

+  gem 'normalize-rails'

+  gem 'compass-rails'

   # See https://github.com/sstephenson/execjs#readme for more supported runtimes

   # gem 'therubyracer', :platforms => :ruby

   gem 'uglifier', '>= 1.0.3'

-  gem "compass", "~> 0.12.2"

-

 end

 group :development, :test do

@@ -1,38 +1,38 @@

 GEM

   remote: https://rubygems.org/

   specs:

-    actionmailer (3.2.11)

-      actionpack (= 3.2.11)

+    actionmailer (3.2.12)

+      actionpack (= 3.2.12)

       mail (~> 2.4.4)

-    actionpack (3.2.11)

-      activemodel (= 3.2.11)

-      activesupport (= 3.2.11)

+    actionpack (3.2.12)

+      activemodel (= 3.2.12)

+      activesupport (= 3.2.12)

       builder (~> 3.0.0)

       erubis (~> 2.7.0)

       journey (~> 1.0.4)

-      rack (~> 1.4.0)

+      rack (~> 1.4.5)

       rack-cache (~> 1.2)

       rack-test (~> 0.6.1)

       sprockets (~> 2.2.1)

-    activemodel (3.2.11)

-      activesupport (= 3.2.11)

+    activemodel (3.2.12)

+      activesupport (= 3.2.12)

       builder (~> 3.0.0)

-    activerecord (3.2.11)

-      activemodel (= 3.2.11)

-      activesupport (= 3.2.11)

+    activerecord (3.2.12)

+      activemodel (= 3.2.12)

+      activesupport (= 3.2.12)

       arel (~> 3.0.2)

       tzinfo (~> 0.3.29)

-    activeresource (3.2.11)

-      activemodel (= 3.2.11)

-      activesupport (= 3.2.11)

-    activesupport (3.2.11)

+    activeresource (3.2.12)

+      activemodel (= 3.2.12)

+      activesupport (= 3.2.12)

+    activesupport (3.2.12)

       i18n (~> 0.6)

       multi_json (~> 1.0)

     addressable (2.3.2)

     ansi (1.4.3)

     arel (3.0.2)

     builder (3.0.4)

-    capistrano (2.14.1)

+    capistrano (2.14.2)

       highline

       net-scp (>= 1.0.0)

       net-sftp (>= 2.0.0)

@@ -45,8 +45,8 @@ GEM

       rack-test (>= 0.5.4)

       selenium-webdriver (~> 2.0)

       xpath (~> 1.0.0)

-    childprocess (0.3.7)

-      ffi (~> 1.0, >= 1.0.6)

+    childprocess (0.3.8)

+      ffi (~> 1.0, >= 1.0.11)

     chunky_png (1.2.7)

     coffee-rails (3.2.2)

       coffee-script (>= 2.2.0)

@@ -59,13 +59,15 @@ GEM

       chunky_png (~> 1.2)

       fssm (>= 0.2.7)

       sass (~> 3.1)

+    compass-rails (1.0.3)

+      compass (>= 0.12.2, < 0.14)

     diff-lcs (1.1.3)

     erubis (2.7.0)

     execjs (1.4.0)

       multi_json (~> 1.0)

     factory_girl (4.2.0)

       activesupport (>= 3.0.0)

-    factory_girl_rails (4.2.0)

+    factory_girl_rails (4.2.1)

       factory_girl (~> 4.2.0)

       railties (>= 3.0.0)

     ffi (1.3.1)

@@ -81,67 +83,68 @@ GEM

     hike (1.2.1)

     i18n (0.6.1)

     journey (1.0.4)

-    jquery-rails (2.2.0)

+    jquery-rails (2.2.1)

       railties (>= 3.0, < 5.0)

       thor (>= 0.14, < 2.0)

-    json (1.7.6)

+    json (1.7.7)

     launchy (2.2.0)

       addressable (~> 2.3)

     mail (2.4.4)

       i18n (>= 0.4.0)

       mime-types (~> 1.16)

       treetop (~> 1.4.8)

-    mime-types (1.20.1)

-    minitest (4.5.0)

+    mime-types (1.21)

+    minitest (4.6.0)

     minitest-reporters (0.14.7)

       ansi

       builder

       minitest (>= 2.12, < 5.0)

       powerbar

-    mongoid (3.0.21)

+    mongoid (3.0.22)

       activemodel (~> 3.1)

       moped (~> 1.2)

       origin (~> 1.0)

       tzinfo (~> 0.3.22)

-    moped (1.3.2)

-    multi_json (1.5.0)

-    net-scp (1.0.4)

-      net-ssh (>= 1.99.1)

-    net-sftp (2.0.5)

-      net-ssh (>= 2.0.9)

-    net-ssh (2.6.3)

-    net-ssh-gateway (1.1.0)

-      net-ssh (>= 1.99.1)

+    moped (1.4.2)

+    multi_json (1.6.0)

+    net-scp (1.1.0)

+      net-ssh (>= 2.6.5)

+    net-sftp (2.1.1)

+      net-ssh (>= 2.6.5)

+    net-ssh (2.6.5)

+    net-ssh-gateway (1.2.0)

+      net-ssh (>= 2.6.5)

     nokogiri (1.5.6)

+    normalize-rails (2.0.1)

     origin (1.0.11)

     polyglot (0.3.3)

     powerbar (1.0.11)

       ansi (~> 1.4.0)

       hashie (>= 1.1.0)

-    rack (1.4.4)

+    rack (1.4.5)

     rack-cache (1.2)

       rack (>= 0.4)

     rack-ssl (1.3.3)

       rack

     rack-test (0.6.2)

       rack (>= 1.0)

-    rails (3.2.11)

-      actionmailer (= 3.2.11)

-      actionpack (= 3.2.11)

-      activerecord (= 3.2.11)

-      activeresource (= 3.2.11)

-      activesupport (= 3.2.11)

+    rails (3.2.12)

+      actionmailer (= 3.2.12)

+      actionpack (= 3.2.12)

+      activerecord (= 3.2.12)

+      activeresource (= 3.2.12)

+      activesupport (= 3.2.12)

       bundler (~> 1.0)

-      railties (= 3.2.11)

-    railties (3.2.11)

-      actionpack (= 3.2.11)

-      activesupport (= 3.2.11)

+      railties (= 3.2.12)

+    railties (3.2.12)

+      actionpack (= 3.2.12)

+      activesupport (= 3.2.12)

       rack-ssl (~> 1.3.2)

       rake (>= 0.8.7)

       rdoc (~> 3.4)

       thor (>= 0.14.6, < 2.0)

     rake (10.0.3)

-    rdoc (3.12)

+    rdoc (3.12.1)

       json (~> 1.4)

     rspec-core (2.12.2)

     rspec-expectations (2.12.1)

@@ -173,7 +176,7 @@ GEM

     test-unit (2.5.4)

     thor (0.17.0)

     tilt (1.3.3)

-    timecop (0.5.9.1)

+    timecop (0.5.9.2)

     treetop (1.4.12)

       polyglot

       polyglot (>= 0.3.1)

@@ -193,7 +196,7 @@ DEPENDENCIES

   capistrano

   capybara

   coffee-rails (~> 3.2.1)

-  compass (~> 0.12.2)

+  compass-rails

   factory_girl_rails

   haml (~> 3.1.7)

   haml-rails (~> 0.3.5)

@@ -202,7 +205,8 @@ DEPENDENCIES

   minitest

   minitest-reporters (>= 0.5.0)

   mongoid (~> 3.0.20)

-  rails (= 3.2.11)

+  normalize-rails

+  rails (~> 3.2.11)

   rspec-rails

   sass-rails (~> 3.2.3)

   test-unit

deleted file mode 100755

@@ -1,3 +0,0 @@

-# Place all the behaviors and hooks related to the matching controller here.

-# All this logic will automatically be available in application.js.

-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

new file mode 100644

@@ -0,0 +1,8 @@

+$bg-color: #DEDBDB;

+$app-color: #24a396;

+

+$white: #fff;

+$gray: #b0b7b9;

+$gray-light: #dde0e3;

+

+$error: #AD3A3A;

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,65 @@

+/*

+ *= require normalize-rails

+ *= require_self

+ *= require_tree .

+*/

+

+@import "config";

+@import "compass/css3/box-sizing";

+

+h1 {

+  color: $app-color;

+  background: #f4f4f4;

+  font-size: 17px;

+  padding: 7px 14px;

+}

+

+body {

+  background: $bg-color;

+}

+

+label {

+  display: block;

+  color: $gray;

+  font-size: 12px;

+  margin: 11px 0 2px;

+}

+

+input {

+  border: 1px $gray-light solid;

+  border-radius: 4px;

+  width: 100%;

+  margin-bottom: 10px;

+  height: 30px;

+  @include box-sizing(border-box);

+

+  &[type=submit] {

+    text-transform:lowercase;

+    font-variant: small-caps;

+    font-weight: bold;

+    font-size: 18px;

+    background: $app-color;

+    color: #f9f9f9;

+    border: none 0px #000000;

+    margin-top: 16px;

+  }

+

+  &:focus {

+    outline: 5px auto $app-color;

+  }

+}

+

+.top-border {

+  border-top: 7px solid $app-color;

+}

+

+.alert {

+  font-size: 12px;

+  &.alert-notice {

+

+  }

+

+  &.alert-error {

+    color: $error;

+  }

+}

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,18 @@

+@import "config";

+

+body {

+  border-top: #658489 7px solid;

+}

+

+$form-wrapper-padding: 14px;

+

+.form-wrapper {

+  width: 250px;

+  background: $white;

+  padding: 0 $form-wrapper-padding;

+  margin: 100px auto;

+}

+

+.login-form-header {

+  margin: 0 -1*$form-wrapper-padding;

+}

\ No newline at end of file

@@ -2,7 +2,7 @@

 %html{:lang => :en}

   %head

     %title= yield(:title) + " | App"

-    %meta{:charset => "utf-8"}/

-    -#%link{ :href => "/css/screen.css", :media => "screen", :rel => "stylesheet" }

+    %meta{ :charset => "utf-8" }/

+    = stylesheet_link_tag "application"

   %body

     = yield

\ No newline at end of file

@@ -1,20 +1,23 @@

-- content_for(:title, 'Login')

-%h1 Login

-- if flash[:error]

-  %div.alert.alert-error

-    = flash[:error]

+- content_for(:title, t("sessions.title"))

+.form-wrapper

+  %h1{ class: "top-border login-form-header" }

+    = t(".form-header")

-- if flash[:notice]

-  %div.alert.alert-notice

-    = flash[:notice]

+  %form{ action: sessions_path, method: "post"}

+    %label{for: "jid"}

+      %strong Jabber ID

+    %input{type: "text", name: "jid", class: "text", id: "jid", placeholder: "nick@example.com"}

-%form{ action: sessions_path, method: "post"}

-  %fieldset

-    %ol

-      %li

-        %label{for: "jid"} Jabber ID:

-        %input{type: "text", name: "jid", class: "text", id: "jid"}

-      %li

-        %label{for: "password"} Password:

-        %input{type: "password", name: "password", class: "text", id: "password"}

-    %input{type: "submit", value: "Send", class: "button"}

\ No newline at end of file

+    %label{for: "pass"}

+      %strong Password

+    %input{type: "password", name: "password", class: "text", id: "pass"}

+

+    - if flash[:error]

+      %div.alert.alert-error

+        = flash[:error]

+

+    - if flash[:notice]

+      %div.alert.alert-notice

+        = flash[:notice]

+

+    %input{type: "submit", value: t(".form-send"), class: "button"}

\ No newline at end of file

@@ -4,4 +4,11 @@

 en:

   login:

     error: 'Invalid email/password combination'

-    success: 'Successfully logged in'

\ No newline at end of file

+    success: 'Successfully logged in'

+

+  sessions:

+    title: "Login"

+

+    new:

+      form-header: "Login form"

+      form-send: "Login"

\ No newline at end of file