From 6f52367f1d0687812b39c5d794417421bf549680 Mon Sep 17 00:00:00 2001
From: YOSHIDA Hiroki <hyoshida@appirits.com>
Date: Sun, 15 Dec 2013 17:02:45 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E8=A9=B3=E7=B4=B0:=20mixi=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?=E6=8C=99=E5=8B=95=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/base/_mixi_button.html.erb | 2 +-
 app/views/clips/show.html.slim       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/base/_mixi_button.html.erb b/app/views/base/_mixi_button.html.erb
index 63702fb..bbc71ee 100644
--- a/app/views/base/_mixi_button.html.erb
+++ b/app/views/base/_mixi_button.html.erb
@@ -1,2 +1,2 @@
-<div data-plugins-type="mixi-favorite" data-service-key="<%= Settings.mixi_key %>" data-size="medium" data-href="" data-show-faces="false" data-show-count="true" data-show-comment="true" data-width=""></div>
+<div data-plugins-type="mixi-favorite" data-service-key="<%= Settings.mixi_key %>" data-size="medium" data-href="<%= url_for id: target ||= nil, only_path: false %>" data-show-faces="false" data-show-count="true" data-show-comment="true" data-width=""></div>
 <script type="text/javascript">$(document).ajaxComplete(function() { try{ $('[data-plugins-type="mixi-favorite"]:empty').each(function(i, element) { new __MIXI_PLUGINS__.FavoriteFrame(element); }); } catch(e) {} });</script>
diff --git a/app/views/clips/show.html.slim b/app/views/clips/show.html.slim
index bf24624..b424219 100644
--- a/app/views/clips/show.html.slim
+++ b/app/views/clips/show.html.slim
@@ -66,7 +66,7 @@
         li.facebook
           == render partial: '/base/facebook_button', locals: { target: @clip }
         li.mixi
-          == render partial: '/base/mixi_button'
+          == render partial: '/base/mixi_button', locals: { target: @clip }
 
   .other_info
     - if user_signed_in? && @clip.user_id == current_user.id

From 07d368123a749544563d9396dd3bab2d593e98a8 Mon Sep 17 00:00:00 2001
From: YOSHIDA Hiroki <hyoshida@appirits.com>
Date: Sun, 15 Dec 2013 17:37:51 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=81=BE=E3=81=A8=E3=82=81=E8=A9=B3?=
 =?UTF-8?q?=E7=B4=B0:=20=E3=82=BD=E3=83=BC=E3=82=B7=E3=83=A3=E3=83=AB?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/matomes.css.scss | 34 ++++++++++++++++++++-----
 app/views/matomes/show.html.slim        | 20 +++++++++++----
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/matomes.css.scss b/app/assets/stylesheets/matomes.css.scss
index 808076a..d185537 100644
--- a/app/assets/stylesheets/matomes.css.scss
+++ b/app/assets/stylesheets/matomes.css.scss
@@ -11,8 +11,8 @@
 @import "common";
 
 $header_width: 960px;
-$infomation_width: 600px;
-$contribute_width: 300px;
+$infomation_width: 760px;
+$contribute_width: 200px;
 $cover_size: 100px;
 
 // header
@@ -69,6 +69,8 @@ $cover_size: 100px;
   }
 
   .meta {
+    vertical-align: middle;
+
     .description {
       margin-right: 0.5em;
     }
@@ -79,7 +81,8 @@ $cover_size: 100px;
   }
 
   .user {
-    margin-top: 0.5em;
+    display: inline-block;
+    margin-top: 10px;
 
     img {
       vertical-align: middle;
@@ -93,9 +96,6 @@ $cover_size: 100px;
     .name {
       font-weight: bold;
     }
-
-    .title {
-    }
   }
 
   #edit {
@@ -231,6 +231,28 @@ $cover_size: 100px;
   }
 }
 
+// social button
+#matome .social {
+  display: inline-block;
+  margin-top: 3px;
+  margin-left: 10px;
+  height: 26px;
+  max-width: 330px;
+  vertical-align: middle;
+  white-space: nowrap;
+  overflow: hidden;
+
+  li {
+    display: inline-block;
+    margin-right: 5px;
+    margin-bottom: 5px;
+
+    &.twitter {
+      width: 90px;
+    }
+  }
+}
+
 // dialog
 #matome_dialog {
   img {
diff --git a/app/views/matomes/show.html.slim b/app/views/matomes/show.html.slim
index f6db654..d0029b0 100644
--- a/app/views/matomes/show.html.slim
+++ b/app/views/matomes/show.html.slim
@@ -12,16 +12,26 @@
               = link_to 'まとめを編集', edit_matome_path(@matome)
         .text
           h1 = @matome.title
-          p.meta
+          .meta
             - if @matome.description.present?
               span.description = @matome.description
             span.updated_at
               | 更新日:
               = I18n.l @matome.updated_at.to_date, format: :long
-          p.user
-            span.avatar = link_to_user_by_avatar(@matome.user)
-            span.name = "#{@matome.user.nick_name}"
-            span.title さん
+          .meta
+            .user
+              span.avatar = link_to_user_by_avatar(@matome.user)
+              span.name =  link_to @matome.user.nick_name, user_path(@matome.user)
+              span.title さん
+            .social
+              ul
+                li.twitter
+                  == render partial: '/base/twitter_button', locals: { target: @matome }
+                li.facebook
+                  == render partial: '/base/facebook_button', locals: { target: @matome }
+                li.mixi
+                  == render partial: '/base/mixi_button', locals: { target: @matome }
+
       .contribute
         p.meta
           .like