Merge branch 'master' into not_deploy_on_pull_req

Author: ssig33

Gemfile

@@ -48,7 +48,7 @@ gem 'faker'
 gem "cancan", :git => "git://github.com/ryanb/cancan.git", :branch => "2.0"
 gem 'therubyracer'
 gem "less-rails"
-gem "twitter-bootstrap-rails"
+gem "twitter-bootstrap-rails", github: 'seyhunak/twitter-bootstrap-rails'
 gem "jquery-ui-rails"
 gem "ransack", github: 'ernie/ransack', branch: "rails-4"
 gem "dalli"

Gemfile.lock

@@ -30,6 +30,16 @@ GIT
   specs:
     cancan (2.0.0.alpha)
 
+GIT
+  remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
+  revision: 3ac1736365a14253b34b4798ee2dc0215896be9a
+  specs:
+    twitter-bootstrap-rails (2.2.6)
+      actionpack (>= 3.1)
+      execjs
+      rails (>= 3.1)
+      railties (>= 3.1)
+
 GIT
   remote: git://github.com/smartinez87/exception_notification.git
   revision: 11d61df3cb435381929757b8d7e47209b5ab2b14
@@ -259,10 +269,6 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (1.1.1)
       coffee-rails
-    twitter-bootstrap-rails (2.2.6)
-      actionpack (>= 3.1)
-      execjs
-      railties (>= 3.1)
     tzinfo (0.3.37)
     uglifier (2.0.1)
       execjs (>= 0.3.0)
@@ -314,6 +320,6 @@ DEPENDENCIES
   test_after_commit
   therubyracer
   turbolinks
-  twitter-bootstrap-rails
+  twitter-bootstrap-rails!
   uglifier (>= 1.0.3)
   webrat

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -29,3 +29,13 @@
 //
 // Example:
 // @linkColor: #ff0000;
+
+.error_notification {
+  .alert();
+  .alert-error();
+  .alert-block();
+}
+
+.field_with_errors {
+  .control-group.error();
+}

app/views/layouts/application.html.haml

@@ -15,7 +15,7 @@
     %link(href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72")
     %link(href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed")
     %link(href="/favicon.ico" rel="shortcut icon")
-
+    = javascript_include_tag "application"
 
   %body
     .navbar.navbar-fluid-top
@@ -53,8 +53,3 @@
 
       %footer
         %p © Company 2013
-    /
-      Javascripts
-      \==================================================
-    / Placed at the end of the document so the pages load faster
-    = javascript_include_tag "application"

app/views/posts/_post.html.haml

@@ -0,0 +1,10 @@
+%tr
+  - if local_assigns.fetch(:with_user, true)
+    %td= link_to_user(post.user)
+  %td= link_to l(post.created_at), post
+  %td= post.text
+  %td= link_to post.url,post.url
+  %td= post.comments_count
+  %td
+    = link_to t('.edit', :default => t("helpers.links.edit")), edit_post_path(post), :class => 'btn btn-mini' if can? :edit, post
+    = link_to t('.destroy', :default => t("helpers.links.destroy")), post_path(post), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-mini btn-danger' if can? :destroy, post

app/views/posts/index.html.haml

@@ -7,21 +7,12 @@
 = paginate posts
 %table.table
   %tr
-    %th= User
+    %th= User.human_attribute_name(:username)
     %th= sort_link @q, :created_at, "投稿日時"
-    %th 本文
-    %th Url
+    %th= Post.human_attribute_name(:text)
+    %th= Post.human_attribute_name(:url)
     %th= sort_link @q, :comments_count, 'コメント数'
     %th=t '.actions', :default => t("helpers.actions")
 
-  - posts.each do |post|
-    %tr
-      %td= link_to_user(post.user)
-      %td= link_to l(post.created_at), post
-      %td= post.text
-      %td= link_to post.url,post.url
-      %td= post.comments_count
-      %td
-        = link_to t('.edit', :default => t("helpers.links.edit")), edit_post_path(post), :class => 'btn btn-mini' if can? :edit, post
-        = link_to t('.destroy', :default => t("helpers.links.destroy")), post_path(post), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-mini btn-danger' if can? :destroy, post
-= paginate posts
+  = render posts
+= paginate posts

app/views/posts/show.html.haml

@@ -3,12 +3,12 @@
   %h1=t '.title', :default => model_class.model_name.human
 
 %dl
-  %dt User
-  %dd= @post.user.username
-  %dt Text
+  %dt= User.human_attribute_name(:username)
+  %dd= link_to_user @post.user
+  %dt= model_class.human_attribute_name(:text)
   %dd= @post.text
-  %dt Url
-  %dd= @post.url
+  %dt= model_class.human_attribute_name(:url)
+  %dd= link_to @post.url, @post.url
 
 .form-actions
   = link_to t('.back', :default => t("helpers.links.back")), :back, :class => 'btn'

app/views/users/show.html.haml

@@ -1,12 +1,19 @@
 - model_class = User
 .page-header
-  %h1=t '.title', :default => model_class.model_name.human
-
-%dl
-  %dt Username
-  %dd= @user.username
+  %h1= @user.username
 
 .form-actions
   = link_to t('.back', :default => t("helpers.links.back")), :back, :class => 'btn'
   = link_to t('.edit', :default => t("helpers.links.edit")), edit_user_path(@user), :class => 'btn' if can? :update, @user
   = link_to t('.destroy', :default => t("helpers.links.destroy")), user_path(@user), :method => "delete", :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-danger' if can? :destroy, @user
+
+%h2 最近の投稿
+%table.table
+  %tr
+    %th= Post.human_attribute_name(:created_at)
+    %th= Post.human_attribute_name(:text)
+    %th= Post.human_attribute_name(:url)
+    %th= Post.human_attribute_name(:comments_count)
+    %th=t '.actions', :default => t("helpers.actions")
+
+  = render @user.posts.order("created_at DESC").first(10), with_user: false

config/locales/ja.bootstrap.yml

@@ -0,0 +1,35 @@
+ja:
+  helpers:
+    actions: "アクション"
+    links:
+      back: "戻る"
+      cancel: "キャンセル"
+      confirm: "よろしいですか？"
+      edit: 編集
+      destroy: "削除"
+      new: "新規"
+    titles:
+      edit: "%{model}の編集"
+      index: "%{model}の一覧"
+      save: "保存"
+      new: "新規%{model}"
+      delete: "削除"
+    notices:
+      created: "%{model}を作成しました。"
+      updated: "%{model}を更新しました。"
+      destroyed: "%{model}を削除しました。"
+
+  views:
+    pagination:
+      first: "<<"
+      last: ">>"
+      previous: "<"
+      next: ">"
+      truncate: "..."
+
+  simple_form:
+    error_notification:
+      default_message: 修正が必要な項目があります。
+
+  ransack:
+    search: 検索する

config/locales/ja.yml

@@ -100,7 +100,7 @@ ja:
     messages:
       accepted: を受諾してください。
       blank: を入力してください。
-      confirmation: と確認の入力が一致しません。
+      confirmation: が一致しません。
       empty: を入力してください。
       equal_to: は%{count}にしてください。
       even: は偶数にしてください。

config/locales/translation_ja.yml

@@ -12,26 +12,14 @@ ja:
         user: :activerecord.models.user  #g
 
       post:
+        created_at: 投稿日
         comments: コメント  #g
+        comments_count: コメント数
         text: 本文  #g
         url: URL  #g
         user: :activerecord.models.user  #g
 
       user:
-        password_digest:
-        salt:
+        password: パスワード
+        password_confirmation: パスワード (確認)
         username: ユーザー名  #g
-
-  helpers:
-    notices:
-      created: "%{model}を作成しました。"
-      updated: "%{model}を更新しました。"
-      destroyed: "%{model}を削除しました。"
-
-  views:
-    pagination:
-      first: "<<"
-      last: ">>"
-      previous: "<"
-      next: ">"
-      truncate: "..."

lib/templates/haml/scaffold/index.html.haml

@@ -5,7 +5,7 @@
 %table.table
   %tr
 <% for attribute in attributes -%>
-    %th <%= attribute.human_name %>
+    %th= model_class.human_attribute_name(:<%= attribute.name %>)
 <% end -%>
     %th=t '.actions', :default => t("helpers.actions")
 

lib/templates/haml/scaffold/show.html.haml

@@ -4,7 +4,7 @@
 
 %dl
 <% for attribute in attributes -%>
-  %dt <%= attribute.human_name %>
+  %dt= model_class.human_attribute_name(:<%= attribute.name %>)
   %dd= @<%= singular_table_name %>.<%= attribute.name %>
 <% end -%>