Merge commit 'a68ba40f' into wip/130410_flow_view

app/views/flow/show.html.slim

@@ -11,8 +11,18 @@
         a.list-group-item.post-list data-post-id=post.id href="#" = post.title
 
   .col-xs-4
-    h2
-      small 最近投稿したユーザー
-    .list-group
+    .panel.panel-default
+      .panel-heading
+        h2.panel-title この1週間で閲覧の多かった投稿
+      .panel-body.list-group
+        - Post.limit(5).each_with_index do |post, i|
+          a.list-group-item.post-list data-post-id=post.id href="#" = post.title
+
+    .panel.panel-default
+      .panel-heading
+        h2.panel-title 最近投稿したユーザー
+      .panel-body.list-group
         - User.post_recently.limit(10).each_with_index do |author, i|
           a.list-group-item.post-list data-author-id=author.id href="#" = author.name
+
+

app/views/partials/_app_header.html.slim

 nav.navbar.navbar-default.navbar-fixed-top role="navigation"
   .container
     .navbar-header
-      button.navbar-toggle data-target="#bs-example-navbar-collapse-1" data-toggle="collapse" type="button"
-        span.sr-only Toggle navigation
-        span.icon-bar
-        span.icon-bar
-        span.icon-bar
       a.navbar-brand href=root_path Rendezvous
 
-    #bs-example-navbar-collapse-1.collapse.navbar-collapse
+    .collapse.navbar-collapse
       form#app-search-form.navbar-form.navbar-left action=posts_path role="search"
         .input-group
           input.form-control name="q" placeholder="Search" type="text" value=params[:q] /