style for reg/login; minor UI fixes;

Gemfile.lock

@@ -44,7 +44,7 @@ GEM
       rack (>= 1.0.0)
     cocaine (0.1.0)
     daemons (1.0.10)
-    devise (1.4.0)
+    devise (1.4.1)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
@@ -53,7 +53,7 @@ GEM
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     gem_plugin (0.2.3)
     haml (3.1.2)
     haml-rails (0.3.4)

app/views/devise/registrations/_new.html.erb

@@ -1,18 +1,25 @@
-<h2>Sign up</h2>
-
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Sign up" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
+<div class="tabs tabs_js w03">
+  <ul class="nav">
+    <li>signup</li>
+  </ul>
+  <div class="content">
+    <div class="signuptab">
+      <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+        <%= devise_error_messages! %>
+  
+        <p><%= f.label :email %><br />
+        <%= f.email_field :email %></p>
+  
+        <p><%= f.label :password %><br />
+        <%= f.password_field :password %></p>
+  
+        <p><%= f.label :password_confirmation %><br />
+        <%= f.password_field :password_confirmation %></p>
+  
+        <p><%= f.submit "Sign up" %></p>
+      <% end %>
+  
+      <%= render :partial => "devise/shared/links" %>
+    </div>
+  </div>
+</div>

app/views/devise/sessions/_new.html.erb

@@ -1,17 +1,24 @@
-<h2>Sign in</h2>
+<div class="tabs tabs_js w03">
+  <ul class="nav">
+    <li>signup</li>
+  </ul>
+  <div class="content">
+    <div class="signuptab">
+      <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+        <p><%= f.label :email %><br />
+        <%= f.email_field :email %></p>
 
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <p><%= f.label :email %><br />
-  <%= f.email_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.label :password %><br />
-  <%= f.password_field :password %></p>
+        <p><%= f.submit "Sign in" %></p>
+      <% end %>
 
-  <% if devise_mapping.rememberable? -%>
-    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
-  <% end -%>
-
-  <p><%= f.submit "Login" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
+      <%= render :partial => "devise/shared/links" %>
+    </div>
+  </div>
+</div>

app/views/layouts/application.html.haml

@@ -34,6 +34,8 @@
           = form_tag '/search', :method => 'get', :id => "search_form", :remote=>true do
             = text_field_tag 'q', params[:q], :class => "text", :placeholder => "Search here ..."
             = link_to image_tag("icons/search-navi.png", :class=>"button"), "/#!/search"
+        - if !signed_in?
+          %li.login= async_link_to image_tag("icons/login.png"), new_user_session_path
       %br.clean
       #content
       %br.clean

config/initializers/app_config.rb

@@ -1,4 +1 @@
-APP_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.open(File.join(Rails.root, 'config', 'config.yml'))))
-
-require "sevendigital"
-$sevendigital_client = Sevendigital::Client.new("config/sevendigital.yml", :country => "US")
+APP_CONFIG = HashWithIndifferentAccess.new(YAML.load(File.open(File.join(Rails.root, 'config', 'config.yml'))))

config/initializers/sevendigital.rb

@@ -1 +0,0 @@
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 

public/javascripts/ajax/favourites.js

@@ -1,7 +1,6 @@
 $(document).ready(function(){
   $('.heart').live("click", function(){
     var params = "id="+$('#content .tabs .content').attr('q');
-    alert(params);
     favourite_request(favourite_path, params);
   });
   

public/javascripts/layout.js

@@ -116,7 +116,6 @@ function album_add_show_songs_button(){
 
 function init_site(link){
   Path.listen();
-  //onYouTubePlayerReady();
   
   switch(link) {
     case artist_path:
@@ -136,7 +135,13 @@ function init_site(link){
       set_active_navigation(charts_path);
       break;
     case user_path:
+    case register_path:
       init_tabs();
+      set_active_navigation(register_path);
+      break;
+    case login_path:
+      init_tabs();
+      set_active_navigation(home_path);
   }
 }
 

public/stylesheets/9minutes.css

@@ -128,7 +128,7 @@ body {
     #navigation li.active {
       background: url("/images/backgrounds/fuse.png") 0 -127px; }
     #navigation li.search {
-      width: 200px;
+      width: 260px;
       font-size: 16px;
       color: #ffffff;
       line-height: 58px;
@@ -136,13 +136,12 @@ body {
       background: transparent url("/images/backgrounds/dark.png") repeat;
       margin-top: 21px;
       height: 58px;
-      padding-left: 20px;
-      margin-left: 20px; }
+      padding-left: 20px; }
       #navigation li.search img {
         vertical-align: middle;
         margin-left: 10px; }
       #navigation li.search .text {
-        width: 150px;
+        width: 210px;
         height: 45px;
         border: 0;
         background: 0;
@@ -159,6 +158,11 @@ body {
       display: inline-block;
       text-decoration: none;
       text-align: center; }
+    #navigation li.login a {
+      width: auto;
+      margin: 0 15px 0 10px;
+      margin-top: 7px;
+      height: 72px; }
 
 /* FOOT */
 #foot {
@@ -490,6 +494,19 @@ body {
       #user_left .con li:last-child {
         margin-bottom: 0; }
 
+.signuptab input[type=text], .signuptab input[type=email], .signuptab input[type=password] {
+  width: 300px;
+  height: 28px;
+  margin-bottom: 10px;
+  padding-left: 10px; }
+.signuptab input[type=submit] {
+  width: 70px;
+  height: 25px;
+  margin-bottom: 20px; }
+.signuptab a {
+  color: #0086cc !important;
+  margin-right: 20px; }
+
 /*********************************/
 /************ LAYOUT *************/
 /*********************************/

public/stylesheets/sass/_layout.scss

@@ -105,7 +105,7 @@ body {
     &.active { background: url('#{$bg-url}/fuse.png') 0 -127px }
     &.search {
       $top: 21px;
-      width: 200px;
+      width: 260px;
       font-size: 16px;
       color: #ffffff;
       line-height: $height - $top;
@@ -114,13 +114,12 @@ body {
       margin-top: $top;
       height: $height - $top;
       padding-left: 20px;
-      margin-left: 20px;
       img {
         vertical-align: middle;
         margin-left: 10px;
       }
       .text {
-        width: 150px;
+        width: 210px;
         height: 45px;
         border: 0; 
         background: 0;
@@ -139,6 +138,14 @@ body {
       text-decoration: none;
       text-align: center;
     }
+    &.login {
+      a {
+        width: auto;
+        margin: 0 15px 0 10px;
+        margin-top: 7px;
+        height: $height - 7;
+      }
+    }
   }
 }
 

public/stylesheets/sass/_user.scss

@@ -40,4 +40,24 @@
       &:last-child { margin-bottom: 0 }
     }
   }
+}
+
+
+
+.signuptab {
+  input[type=text], input[type=email], input[type=password] {
+    width: 300px;
+    height: 28px;
+    margin-bottom: 10px;
+    padding-left: 10px;
+  }
+  input[type=submit] {
+    width: 70px;
+    height: 25px;
+    margin-bottom: 20px;
+  }
+  a {
+    color: $blue!important;
+    margin-right: 20px;
+  }
 }