From 935e746815a4f88b8ca71fc7b90a048c356040cf Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Wed, 9 Nov 2011 18:33:13 -0500
Subject: [PATCH] more work on mobile view

---
 app/assets/stylesheets/mobile/posts.css.scss  | 31 ++++++++++-------
 .../stylesheets/mobile/sesssions.css.scss     | 10 ++++++
 app/controllers/m/sessions_controller.rb      | 26 +++++++++++++++
 app/views/m/posts/_header.html.erb            | 11 ++++---
 app/views/m/sessions/new.html.erb             | 33 +++++++++++++++++++
 5 files changed, 96 insertions(+), 15 deletions(-)
 create mode 100644 app/assets/stylesheets/mobile/sesssions.css.scss
 create mode 100644 app/controllers/m/sessions_controller.rb
 create mode 100644 app/views/m/sessions/new.html.erb

diff --git a/app/assets/stylesheets/mobile/posts.css.scss b/app/assets/stylesheets/mobile/posts.css.scss
index 369122338..f19ddecc8 100644
--- a/app/assets/stylesheets/mobile/posts.css.scss
+++ b/app/assets/stylesheets/mobile/posts.css.scss
@@ -1,34 +1,43 @@
 @import "../common/000_vars.css.scss";
 
+$default_font_size: 30pt;
+
 div#main {
   max-width: 960px;
 }
 
 header {
-  margin: 10px;
-  padding: 0;
-  overflow: visible;
+  background: #eee;
+  height: 50px;
+  padding: 0 10px;
+  overflow: hidden;
   
+  div {
+    height: 50px;
+    vertical-align: middle;
+  }
+
   div#search-item {
     float: right;
     
     input {
-      font-size: 2em;
+      margin-top: 10%;
+      font-size: $default_font_size;
     }
   }
   
   div#sign-in-item {
     float: left;
-    font-size: 3em;
+    font-size: $default_font_size;
     font-weight: bold;
-    margin-top: 0.3em;
+    margin-top: 15px;
   }
 }
 
 footer {
   div.paginator {
     overflow: visible;
-    font-size: 3em;
+    font-size: $default_font_size;
     
     li {
       a {
@@ -102,13 +111,13 @@ div#tag-list {
 
     a {
       background: #eee;
-      font-size: 3em;
+      font-size: $default_font_size;
       font-weight: bold;
       padding: 0.2em 0.5em;
       border: 1px solid #666;
-      -moz-border-radius: 3px;
-      -webkit-border-radius: 3px;
-      border-radius: 3px;
+      -moz-border-radius: 0.5em;
+      -webkit-border-radius: 0.5em;
+      border-radius: 0.5em;
     }
   }
 }
diff --git a/app/assets/stylesheets/mobile/sesssions.css.scss b/app/assets/stylesheets/mobile/sesssions.css.scss
new file mode 100644
index 000000000..84cc7aee7
--- /dev/null
+++ b/app/assets/stylesheets/mobile/sesssions.css.scss
@@ -0,0 +1,10 @@
+@import "../common/000_vars.css.scss";
+@import "../common/simple_form.css.scss";
+
+div#main {
+  max-width: 960px;
+}
+
+div#c-m-sessions {
+  margin: 10px;
+}
\ No newline at end of file
diff --git a/app/controllers/m/sessions_controller.rb b/app/controllers/m/sessions_controller.rb
new file mode 100644
index 000000000..7792577ed
--- /dev/null
+++ b/app/controllers/m/sessions_controller.rb
@@ -0,0 +1,26 @@
+module M
+  class SessionsController < ApplicationController
+    layout "mobile"
+
+    def new
+      @user = User.new
+    end
+  
+    def create
+      session_creator = SessionCreator.new(session, cookies, params[:name], params[:password], params[:remember])
+    
+      if session_creator.authenticate
+        redirect_to(params[:url] || session[:previous_uri] || m_posts_path)
+      else
+        redirect_to(new_m_session_path, :notice => "Password was incorrect.")
+      end
+    end
+  
+    def destroy
+      session.delete(:user_id)
+      cookies.delete(:cookie_password_hash)
+      cookies.delete(:user_name)
+      redirect_to(m_posts_path, :notice => "You are now logged out.")
+    end
+  end
+end
diff --git a/app/views/m/posts/_header.html.erb b/app/views/m/posts/_header.html.erb
index 3fa02983a..5a7724257 100644
--- a/app/views/m/posts/_header.html.erb
+++ b/app/views/m/posts/_header.html.erb
@@ -1,13 +1,16 @@
 <header>
   <div id="sign-in-item">
-    <%= Danbooru.config.app_name %>
-    <% if true || CurrentUser.is_anonymous? %>
-      - <%= link_to "Sign in", new_m_session_path %>
+    <%= link_to Danbooru.config.app_name, posts_path %>
+    
+    <% if CurrentUser.is_anonymous? %>
+      &ndash; <%= link_to "Sign in", new_m_session_path(:url => request.fullpath) %>
+    <% else %>
+      &ndash; <%= link_to "Sign out", m_session_path, :remote => true, :method => :delete %>
     <% end %>
   </div>
   <div id="search-item">
     <%= form_tag(m_posts_path, :method => :get) do %>
-      <%= search_field_tag :tags, params[:tags] %>
+      <%= search_field_tag :tags, params[:tags], :placeholder => "Search" %>
     <% end %>
   </div>
 </header>
diff --git a/app/views/m/sessions/new.html.erb b/app/views/m/sessions/new.html.erb
new file mode 100644
index 000000000..64ecf4ecf
--- /dev/null
+++ b/app/views/m/sessions/new.html.erb
@@ -0,0 +1,33 @@
+<div id="c-m-sessions">
+  <div id="a-new">
+    <section>
+      <h1>Sign in</h1>
+      <%= form_tag(session_path, :class => "simple_form") do %>
+        <%= hidden_field_tag "url", params[:url] %>
+
+        <div class="input">
+          <label for="name">Name</label>
+          <%= text_field_tag :name %>
+        </div>
+        
+        <div class="input">
+          <label for="password">Password</label>
+          <%= password_field_tag :password %>
+        </div>
+
+        <div class="input">
+          <label for="remember" id="remember-label">Remember</label>
+          <%= check_box_tag :remember %>
+        </div>
+        
+        <div class="input">
+          <%= submit_tag "Submit" %>
+        </div>
+      <% end %>
+    </section>   
+  </div>
+</div>
+
+<% content_for(:page_title) do %>
+ Sign in - <%= Danbooru.config.app_name %>
+<% end %>