Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jodyalbritton/eyeonthecounty
base: cf68ac007d
...
head fork: jodyalbritton/eyeonthecounty
compare: 46e2f82395
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
1  Gemfile
@@ -27,6 +27,7 @@ gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc
#gems for user accounts and objects
+gem 'ads-rails'
gem 'devise'
gem 'omniauth-facebook'
gem 'omniauth-twitter'
View
3  Gemfile.lock
@@ -45,6 +45,8 @@ GEM
activerecord (>= 3, < 5)
acts_as_list (0.4.0)
activerecord (>= 3.0)
+ ads-rails (0.1.1)
+ rails (>= 3.1.0, < 4.2.0)
ancestry (2.1.0)
activerecord (>= 3.0.0)
arel (5.0.1.20140414130214)
@@ -304,6 +306,7 @@ DEPENDENCIES
aasm
acts-as-taggable-on (~> 3.2.5)
acts_as_list
+ ads-rails
ancestry
authority
autonumeric-rails
View
11 app/views/layouts/application.html.erb
@@ -119,9 +119,8 @@
<!-- top_banner -->
<ins class="adsbygoogle"
- style="display:inline-block;width:728px;height:90px"
- data-ad-client="ca-pub-1330310830055293"
- data-ad-slot="1848089765"></ins>
+ <%= google_adsense_include_tag client: 'ca-pub-1330310830055293', slot: '1848089765'%>
+
</figure>
</div>
@@ -375,12 +374,6 @@
</div>
-
-<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-
- <script>
- (adsbygoogle = window.adsbygoogle || []).push({});
- </script>
<script>
$(function() {
$( "#query" ).autocomplete({
View
7 config/application.rb 100644 → 100755
@@ -19,5 +19,12 @@ class Application < Rails::Application
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
+
+ config.ads.renderer = lambda { |options|
+ tag(
+ :img,
+ src: "http://placehold.it/#{options[:width]}x#{options[:height]}&text=Adsense"
+ )
+ }
end
end

No commit comments for this range

Something went wrong with that request. Please try again.