more work on mobile view

This commit is contained in:
albert
2011-11-09 18:33:13 -05:00
parent 3b961481f3
commit 935e746815
5 changed files with 96 additions and 15 deletions

View File

@@ -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;
}
}
}

View File

@@ -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;
}

View File

@@ -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

View File

@@ -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>

View File

@@ -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 %>