From 6deceb741280f27f1b48c83d7e238fa69469410e Mon Sep 17 00:00:00 2001 From: YOSHIDA Hiroki Date: Sat, 22 Feb 2014 02:48:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E3=82=BF=E3=82=B0=E4=B8=80?= =?UTF-8?q?=E8=A6=A7:=20Google=20Adsense=E3=82=92=E8=BF=BD=E5=8A=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3dba9dd6344ca3bd1f4543719f4b39d3aac212f3. --- app/views/base/_adsense.html.slim | 6 ------ app/views/base/_clip_wall.html.slim | 7 ++++++- app/views/base/_wall.html.slim | 2 -- 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 app/views/base/_adsense.html.slim diff --git a/app/views/base/_adsense.html.slim b/app/views/base/_adsense.html.slim deleted file mode 100644 index db2f68e..0000000 --- a/app/views/base/_adsense.html.slim +++ /dev/null @@ -1,6 +0,0 @@ -li.box.adsense - p スポンサードリンク - = javascript_include_tag src='//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js', async: true - ins class="adsbygoogle" style="display:inline-block;width:160px;height:600px" data-ad-client="ca-pub-4041207602643401" data-ad-slot="8343200370" - javascript: - (adsbygoogle = window.adsbygoogle || []).push({}); diff --git a/app/views/base/_clip_wall.html.slim b/app/views/base/_clip_wall.html.slim index 97ce0a6..1ebb8a7 100644 --- a/app/views/base/_clip_wall.html.slim +++ b/app/views/base/_clip_wall.html.slim @@ -7,7 +7,12 @@ #container.hidden ul - if @clips.respond_to?(:current_page) && @clips.current_page == 1 - == render partial: 'base/adsense' + li.box.adsense + p スポンサードリンク + = javascript_include_tag src='//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js', async: true + ins class="adsbygoogle" style="display:inline-block;width:160px;height:600px" data-ad-client="ca-pub-4041207602643401" data-ad-slot="8343200370" + javascript: + (adsbygoogle = window.adsbygoogle || []).push({}); - @clips.each do |clip| == render partial: 'base/clip', locals: { clip: clip } diff --git a/app/views/base/_wall.html.slim b/app/views/base/_wall.html.slim index 0ffcddc..1894cf2 100644 --- a/app/views/base/_wall.html.slim +++ b/app/views/base/_wall.html.slim @@ -3,8 +3,6 @@ #container.hidden ul - - if records.respond_to?(:current_page) && records.current_page == 1 - == render partial: 'base/adsense' - records.each do |record| - case record - when Clip From 1f99f32e0a096a2cfa9f2c1161a58aa2c3374bd4 Mon Sep 17 00:00:00 2001 From: YOSHIDA Hiroki Date: Sat, 22 Feb 2014 02:49:12 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"Google=20Adsense=E3=82=92?= =?UTF-8?q?=E8=A9=A6=E9=A8=93=E7=9A=84=E3=81=AB=E5=B0=8E=E5=85=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 22565915cc42ddb297d5f3c920c0a1609d910c33. --- app/assets/stylesheets/wall.css.scss.erb | 11 ----------- app/views/base/_clip_wall.html.slim | 7 ------- 2 files changed, 18 deletions(-) diff --git a/app/assets/stylesheets/wall.css.scss.erb b/app/assets/stylesheets/wall.css.scss.erb index ac5725b..993eb1e 100644 --- a/app/assets/stylesheets/wall.css.scss.erb +++ b/app/assets/stylesheets/wall.css.scss.erb @@ -392,14 +392,3 @@ $group_box_height: <%= Settings.thumb_width %>px; @include opacity(0.75); } } - -/* adsense */ -.adsense { - padding: 20px 0 !important; - text-align: center; - - & > p { - margin-bottom: 0.5em; - color: #aaa; - } -} diff --git a/app/views/base/_clip_wall.html.slim b/app/views/base/_clip_wall.html.slim index 1ebb8a7..ca4f473 100644 --- a/app/views/base/_clip_wall.html.slim +++ b/app/views/base/_clip_wall.html.slim @@ -6,13 +6,6 @@ #container.hidden ul - - if @clips.respond_to?(:current_page) && @clips.current_page == 1 - li.box.adsense - p スポンサードリンク - = javascript_include_tag src='//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js', async: true - ins class="adsbygoogle" style="display:inline-block;width:160px;height:600px" data-ad-client="ca-pub-4041207602643401" data-ad-slot="8343200370" - javascript: - (adsbygoogle = window.adsbygoogle || []).push({}); - @clips.each do |clip| == render partial: 'base/clip', locals: { clip: clip }