Skip to content

Commit

Permalink
cleaning up views
Browse files Browse the repository at this point in the history
  • Loading branch information
alexhanh committed Sep 21, 2011
1 parent 5399a58 commit f8a1f9d
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 85 deletions.
3 changes: 0 additions & 3 deletions app/controllers/static_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ def faq
def news
end

def donate
end

def tutorial
end

Expand Down
15 changes: 1 addition & 14 deletions app/views/home/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,4 @@
- for event in @events
= link_to event.name, event
%br
= link_to t("see_more"), events_path
- unless !Rails.env.production? || (user_signed_in? && current_user.pro?)
.box
<script type="text/javascript"><!--
google_ad_client = "ca-pub-1956707559301300";
/* dropsc_right */
google_ad_slot = "6965777277";
google_ad_width = 200;
google_ad_height = 200;
//-->
</script>
<script type="text/javascript"
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
= link_to t("see_more"), events_path
45 changes: 2 additions & 43 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,6 @@

.span-17
#top-add
- unless !Rails.env.production? || (user_signed_in? && current_user.pro?)
<script type="text/javascript"><!--
google_ad_client = "ca-pub-1956707559301300";
/* drop.sc top */
google_ad_slot = "5102432878";
google_ad_width = 468;
google_ad_height = 60;
//-->
</script>
<script type="text/javascript"
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>

#upload-button-container.span-3.last
#upload-button= t("upload")
Expand Down Expand Up @@ -97,28 +85,9 @@
#key-highlight
%li= link_to t("sign_up"), new_user_registration_path
%li= link_to t("login"), new_user_session_path
%li#fb
%a#fb-link{:href => "http://www.facebook.com/pages/dropsc/200146390025931", :title => t("dropsc_on_facebook"), :target => "_blank"}= image_tag("facebook_l.png", :size => "16x16")
%li#twitter
%a#twitter-link{:href => "http://twitter.com/drop_sc", :title => t("dropsc_on_twitter"), :target => "_blank"}= image_tag("twitter.png", :size => "16x16")

.span-24.last
= yield

- unless !Rails.env.production? || (user_signed_in? && current_user.pro?)
.span-24.last
.box{:style => "padding-left: 111px;"}
<script type="text/javascript"><!--
google_ad_client = "ca-pub-1956707559301300";
/* dropsc_bottom */
google_ad_slot = "3068460667";
google_ad_width = 728;
google_ad_height = 90;
//-->
</script>
<script type="text/javascript"
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>

.span-24.last.append-bottom.prepend-top
#footer-container
Expand All @@ -128,15 +97,5 @@
= link_to(t("about"), "/about") + " | "
= link_to(t("faq"), "/faq") + " | "
- unless user_signed_in? && current_user.pro?
= link_to(t("go_pro"), "/pro") + " | "
= link_to(t("donate"), "/donate")
%ul
%li
= mail_to "support@drop.sc"
%li
&copy; 2011 drop.sc
.additional-notices= t("blizzard_copyright")

- if Rails.env.production?
= render 'shared/ga.html'
= render 'shared/gauges.html'
= link_to(t("go_pro"), "/pro")
.additional-notices= t("blizzard_copyright")
24 changes: 0 additions & 24 deletions app/views/static/donate.html.haml

This file was deleted.

1 change: 0 additions & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
match '/faq/' => "static#faq"
match '/twitter/' => "static#twitter"

match '/donate/' => "static#donate"
match '/tutorial/' => "static#tutorial"
match '/pro/' => "static#pro"

Expand Down

0 comments on commit f8a1f9d

Please sign in to comment.