diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 6fa06c7..45c6f8e 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -69,3 +69,8 @@ div.span2{ font-color:#5A5A5A; text-align: center; } + +.rent-record{ + margin-top:1em; + margin-bottom: 1em; +} diff --git a/app/assets/stylesheets/login.css b/app/assets/stylesheets/login.css new file mode 100644 index 0000000..c010638 --- /dev/null +++ b/app/assets/stylesheets/login.css @@ -0,0 +1,30 @@ +body { + padding-top: 40px; + padding-bottom: 40px; + background-color: #f5f5f5; +} + +.form-signin { + max-width: 300px; + padding: 19px 29px 29px; + margin: 0 auto 20px; + background-color: #fff; + border: 1px solid #e5e5e5; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05); + box-shadow: 0 1px 2px rgba(0,0,0,.05); +} +.form-signin .form-signin-heading, +.form-signin .checkbox { + margin-bottom: 10px; +} +.form-signin input[type="text"], +.form-signin input[type="password"] { + font-size: 16px; + height: auto; + margin-bottom: 15px; + padding: 7px 9px; +} \ No newline at end of file diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 11046fd..a3b65ea 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,2 +1,6 @@ class UserController < ApplicationController + + def login + render :layout => false + end end diff --git a/app/views/book/view.html.slim b/app/views/book/view.html.slim index 8757471..b6b4d59 100644 --- a/app/views/book/view.html.slim +++ b/app/views/book/view.html.slim @@ -10,3 +10,18 @@ div.detail.row-fluid div.span4 ul.unstyled div.well.summary + div.span4 + div.action style="text-align:center" + button.btn.btn-success.btn-large 借阅 + div.rent-record + table.table.table-bordered + caption 当前借阅情况 + thead + tr + th width="100" 日期 + th width="100" 借阅人 + tbody + div.reader-wall + p 读者墙: + div.well + diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 5fba14c..a7a29e7 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -18,10 +18,10 @@ html div.nav ul.nav li - a href="" books + a href="" 书架 ul.nav.pull-right li - a href="" logout + a href="/login" login div.container.main = yield diff --git a/app/views/user/login.html.slim b/app/views/user/login.html.slim new file mode 100644 index 0000000..659b73f --- /dev/null +++ b/app/views/user/login.html.slim @@ -0,0 +1,19 @@ +DOCTYPE html +html lang="en" + head + meta charset="utf-8" + title Sign in + meta name="viewport" content="width=device-width, initial-scale=1.0" + = stylesheet_link_tag '/bootstrap/css/bootstrap.min.css' + = stylesheet_link_tag '/bootstrap/css/bootstrap-responsive.min.css' + = stylesheet_link_tag 'login' + + body + div.container + form.form-signin + h2.form-signin-heading Please sign in + input.input-block-level type="text" placeholder="Email address" + input.input-block-level type="password" placeholder="Password" + label.checkbox + input type="checkbox" value="remember-me" Remember me + button.btn.btn-large.btn-primary type="submit" Sign in diff --git a/config/routes.rb b/config/routes.rb index 11ed0a4..c6c9e7b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ Libr::Application.routes.draw do root to:'home#index' match 'books/:id' => 'book#view' get '/search/book/:arg' =>'book#search' + get '/login' => 'user#login' # The priority is based upon order of creation: # first created -> highest priority.