Commit 61e8e6be by tady

flow view large-view

parent fc172c54
...@@ -40,7 +40,7 @@ GEM ...@@ -40,7 +40,7 @@ GEM
arel (4.0.2) arel (4.0.2)
ast (1.1.0) ast (1.1.0)
atomic (1.1.15) atomic (1.1.15)
aws-sdk (1.36.0) aws-sdk (1.36.1)
json (~> 1.4) json (~> 1.4)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
uuidtools (~> 2.1) uuidtools (~> 2.1)
...@@ -195,7 +195,7 @@ GEM ...@@ -195,7 +195,7 @@ GEM
net-scp (1.1.2) net-scp (1.1.2)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.8.0) net-ssh (2.8.0)
newrelic_rpm (3.7.3.199) newrelic_rpm (3.7.3.204)
nio4r (1.0.0) nio4r (1.0.0)
nokogiri (1.6.1) nokogiri (1.6.1)
mini_portile (~> 0.5.0) mini_portile (~> 0.5.0)
...@@ -289,7 +289,7 @@ GEM ...@@ -289,7 +289,7 @@ GEM
parser (~> 2.1.3) parser (~> 2.1.3)
powerpack (~> 0.0.6) powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
sass (3.3.1) sass (3.3.2)
sass-rails (4.0.1) sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10) sass (>= 3.1.10)
......
...@@ -7,25 +7,16 @@ ...@@ -7,25 +7,16 @@
.col-xs-8 role="navigation" .col-xs-8 role="navigation"
.list-group .list-group
- @posts.each_with_index do |post, i| - @posts.each do |_post|
a.list-group-item.post-list data-post-id=post.id href="#" = render partial: 'posts/large_item', locals: { post: _post }
.text-primary #{post.title}
small
| #{post.author.name} posted&nbsp;
abbr.js-time-ago data-time-ago-at=post.updated_at
|.&nbsp;&nbsp;
- post.tags.each do |tag|
span.label.label-success ##{tag.name}
| &nbsp;
.col-xs-4 .col-xs-4
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
h2.panel-title この1週間で閲覧の多かった投稿(調整中) h2.panel-title この1週間で閲覧の多かった投稿(調整中)
.panel-body.list-group .panel-body.list-group
- Post.limit(5).each_with_index do |post, i| - Post.limit(5).each do |_post|
a.list-group-item.post-list data-post-id=post.id href="#" = post.title = render partial: 'posts/small_item', locals: { post: _post }
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
......
...@@ -15,7 +15,7 @@ html lang="ja" ...@@ -15,7 +15,7 @@ html lang="ja"
= render partial: 'partials/app_header' = render partial: 'partials/app_header'
.container.container-main .container.container-main
= yield = yield
/! /.container
script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.6.0/underscore-min.js" script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.6.0/underscore-min.js"
script src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js" script src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js"
script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js" script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"
......
...@@ -11,10 +11,12 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation" ...@@ -11,10 +11,12 @@ nav.navbar.navbar-default.navbar-fixed-top role="navigation"
button.btn.btn-default data-disable-with="Searching..." type="submit" button.btn.btn-default data-disable-with="Searching..." type="submit"
span.glyphicon.glyphicon-search span.glyphicon.glyphicon-search
ul.nav.navbar-nav ul.nav.navbar-nav
li li class=('active' if current_page?(stock_path))
a Stock a href=stock_path title="Stock"
li.active | Stock
a Flow li class=('active' if current_page?(flow_path))
a href=flow_path title="Frow"
| Flow
= form_tag(destroy_user_session_path, :method => :delete, class: 'navbar-form navbar-right') do = form_tag(destroy_user_session_path, :method => :delete, class: 'navbar-form navbar-right') do
= submit_tag 'SignOut', class: 'btn btn-default' = submit_tag 'SignOut', class: 'btn btn-default'
......
/ locals:
/ post {Post}
a.list-group-item.post-list data-post-id=post.id href=post_path(post)
.container-fluid
.row
.col-xs-10
.text-primary #{post.title}
.col-xs-2
small.pull-right
= post.id
.row
.col-xs-10
small
| #{post.author.name} posted&nbsp;
abbr.js-time-ago data-time-ago-at=post.updated_at
|.&nbsp;&nbsp;
- post.tags.each do |tag|
span.label.label-success ##{tag.name}
| &nbsp;
.col-xs-2
small.pull-right
span.glyphicon.glyphicon-paperclip 1
| &nbsp;
span.glyphicon.glyphicon-eye-open 2
| &nbsp;
span.glyphicon.glyphicon-edit 3
| &nbsp;
/ locals:
/ post {Post}
a.list-group-item.post-list data-post-id=post.id href="#" = post.title
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment