Skip to content

Commit

Permalink
apply mobile layout to top page
Browse files Browse the repository at this point in the history
  • Loading branch information
@otiai10
otiai10 committed Feb 17, 2013
1 parent c2b2ed2 commit c0912a1
Show file tree
Hide file tree
Showing 14 changed files with 9,697 additions and 95 deletions.
34 changes: 34 additions & 0 deletions app/assets/stylesheets/application.css
View file
Expand Up @@ -11,3 +11,37 @@
*= require_self
*= require_tree .
*/

html, body {
overflow-x : hidden;
overflow-y : auto;
}

body {
background-image: url('http://pds.exblog.jp/pds/1/200911/09/31/a0095531_22452614.jpg');
background-size: cover;
}

div {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-o-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
}

div.login-info > p {
text-align: right;
/* color: red; */
font-size: 1em;
margin: 0;
}

div.contents {
height: 100%;
background-color: rgba(255,255,255,0.8);
padding: 7px;
width: 100%;
max-width: 320px;
margin: 0 auto;
}
69 changes: 0 additions & 69 deletions app/assets/stylesheets/scaffolds.css.scss
View file

This file was deleted.

31 changes: 31 additions & 0 deletions app/assets/stylesheets/top.css.scss
View file
@@ -1,3 +1,34 @@
// Place all the styles related to the top controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

// '.contents' is a mear container
div.contents {
div.row {
div.span9 {
p.lead {
font-size: 3em;
line-height: 1.4em;
text-shadow: 0 1px 0px #ddd;
}
}
div.span9.game-title {
width: 100%;
text-align: center;
font-size: 1.2em;
}
form#ini-form {
text-align: right;
small {
font-size: 0.8em;
}
}
h3 {
text-align: right;
}
h4 {
text-align: right;
}
}

}
30 changes: 18 additions & 12 deletions app/controllers/players_controller.rb
View file
Expand Up @@ -2,9 +2,11 @@ class PlayersController < ApplicationController
# GET /players
# GET /players.json
def index
#@mess = 'indexを通ってきました'
@mess = cookies[:mess]
@user_name = cookies[:user_name]
@vote_left = cookies[:vote_left]
cookies[:mess] = { :value => '' }

@players = Player.find(:all, :order => "points DESC")

respond_to do |format|
Expand Down Expand Up @@ -86,27 +88,31 @@ def destroy

# POST /players/1/vote
def vote
@player = Player.find(params[:id])
@user_name = cookies[:user_name]
@vote_left = cookies[:vote_left]
logger.debug @vote_left
unless @user_name.nil?
unless @vote_left.to_i < 1
_vote
@mess = '投票しました'
#@mess = '投票しました'
cookies[:mess] = { :value => @player.number.to_s + 'に★しました' }
else
@mess = '投票回数が0回です'
#@mess = '投票回数が0回です'
cookies[:mess] = { :value => '投票回数が０回です' }
end
else
@mess = 'まずユーザ登録してください'
#@mess = 'まずユーザ登録してください'
cookies[:mess] = { :value => 'まずはユーザ名を決めて参加してください' }
end
#respond_to do |format|
# format.html { redirect_to players_url }
# format.json { head :no_content }
#end
# messをcookie使ってやり取りするならこの処理はいらん
@players = Player.find(:all, :order => "points DESC")
@vote_left = cookies[:vote_left]
render 'players/index'
respond_to do |format|
format.html { redirect_to players_url }
format.json { head :no_content }
end
## messをcookie使ってやり取りするならこの処理はいらん
#@players = Player.find(:all, :order => "points DESC")
#@vote_left = cookies[:vote_left]
#render 'players/index'
end
end

Expand Down
28 changes: 25 additions & 3 deletions app/views/layouts/application.html.erb
View file
@@ -1,14 +1,36 @@
<!DOCTYPE html>
<html>
<head>
<title>Gangvote</title>
<title>Stars★</title>
<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
<link rel="stylesheet" href="bootstrap/css/bootstrap.css" />
<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
</head>
<body>
<hr>
<!-- twitterbootstrap navbar -->
<div class="navbar navbar-inverse">
<div class="navbar-inner">
<%= link_to('theMAN', {:controller => 'top'}, {:class => 'brand'}) %>
<ul class="nav pull-right">
<!-- li class="active"><a href="#">Home</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li -->
<li>
<div class="login-info">
<p>3月31日 京都大学vs関西学院大学</p>
<% unless @user_name.nil? %>
<p><%= @user_name %>として参加中</p>
<% end %>
</div>
</li>
</ul>
</div>
</div>
<!-- /twitterbootstrap navbar -->
<div class="contents">
<%= yield %>
<hr>
</div>
</body>
</html>
38 changes: 27 additions & 11 deletions app/views/top/index.html.erb
View file
@@ -1,11 +1,27 @@
<a href="/players"><%= image_tag 'logos/shiraishi.jpg', :class => 'prof-img' %></a>
<% if @user_name.nil? %>
<%= form_tag({ :controller => 'account', :action => 'login' }, { :id => 'ini-form', :class => 'form' }) do %>
<%= text_field_tag 'user_name', '', { :size => 50, :placeholder => 'ユーザ名を登録' } %>
<%= submit_tag '登録' %>
<% end %>
<small>このユーザ名は24時間だけ有効です。</small>
<% else %>
<h3><%= @user_name %>として参加中</h3>
<h4><%= link_to('Players', {:controller => 'players'}) %></h4>
<% end %>
<div class="row">
<div class="span9">
<p>あなたの投票がMVPを決める</p>
<p class="lead">
You<br>Decide<br>the MAN
</p>
</div>
</div>
<div class="row">
<div class="span9 game-title">
<p>3月31日:京都大学vs関西学院大学</p>
</div>
</div>
<div class="row">
<!-- a href="/players"><%= image_tag 'logos/shiraishi.jpg', :class => 'prof-img' %></a -->
<% if @user_name.nil? %>
<%= form_tag({ :controller => 'account', :action => 'login' }, { :id => 'ini-form' }) do %>
<%= text_field_tag 'user_name', '', { :size => 50, :placeholder => 'ユーザ名を登録' } %><br>
<%= submit_tag '参加', { :class => 'btn'} %><br>
<small>※ MVP投票集計以外の目的には使用されません</small><br>
<small>※ このユーザ名情報は24時間後に破棄されます</small>
<% end %>
<% else %>
<h3><%= @user_name %>として参加中</h3>
<h4><%= link_to('Players', {:controller => 'players'}) %></h4>
<% end %>
</div>

0 comments on commit c0912a1

Please sign in to comment.