diff --git a/app/views/home/_keep_in_touch.html.haml b/app/views/home/_keep_in_touch.html.haml deleted file mode 100644 index 66360e2df..000000000 --- a/app/views/home/_keep_in_touch.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -%h2= t('.keep_in_touch') - -%p - = link_to(image_tag("twitter_32.png", :alt => ''), 'http://twitter.com/growstufforg', :target => "_blank") - = t('.twitter_html', link: link_to(t('.twitter_linktext'), 'http://twitter.com/growstufforg', :target => "_blank")) - -%p - = link_to(image_tag("facebook_32.png", :alt => ''), 'https://www.facebook.com/Growstufforg', :target => "_blank") - = t('.facebook_html', link: link_to(t('.facebook_linktext'), 'https://www.facebook.com/Growstufforg', :target => "_blank")) - -%p - = link_to(image_tag("blog_32.png", :alt => ''), 'http://blog.growstuff.org/', :target => "_blank") - = t('.blog_html', link: link_to(t('.blog_linktext'), 'http://blog.growstuff.org/', :target => "_blank")) - -%p - = link_to(image_tag("email_32.png", :alt => ''), 'http://blog.growstuff.org/newsletter', :target => "_blank") - = t('.newsletter_html', link: link_to(t('.newsletter_linktext'), 'http://blog.growstuff.org/newsletter', :target => "_blank")) diff --git a/app/views/home/_open.html.haml b/app/views/home/_open.html.haml deleted file mode 100644 index fa7c00f57..000000000 --- a/app/views/home/_open.html.haml +++ /dev/null @@ -1,29 +0,0 @@ -%h2= t('.open_source_title') - -%p - = t('.open_source_body_html', why: link_to(t('.why_linktext'), 'http://blog.growstuff.org/2013/02/20/why-growstuff-is-open-source/'), - github: link_to(t('.github_linktext'), 'http://github.com/Growstuff/growstuff'), - site_name: ENV['GROWSTUFF_SITE_NAME'] ) - - -%h2= t('.open_data_title') - -%p - = t('.open_data_body_html', creative_commons_link: link_to(t('.creative_commons_linktext'), 'http://creativecommons.org/licenses/by-sa/3.0/'), - wiki_link: link_to(t('.wiki_linktext'), 'http://wiki.growstuff.org/index.php/Open_data'), - api_docs_link: link_to(t('.api_docs_linktext'), 'http://wiki.growstuff.org/index.php/API')) - - - -%h2= t('.get_involved_title') - -%p - = t('.get_involved_body_html', talk_link: link_to(t('.talk_linktext'), 'http://talk.growstuff.org/'), - wiki_link: link_to(t('.wiki_linktext'), 'http://wiki.growstuff.org/')) - - -%h2= t('.support_title') - -%p - = t('.support_body_html', ad_free: link_to(t('.ad_free_linktext'), 'http://wiki.growstuff.org/index.php/Why_no_ads%3F'), - buy_account: link_to(t('.buy_account_linktext'), shop_path)) diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 2c7bac88a..931dcec5c 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -17,13 +17,9 @@ = render :partial => 'blurb' .visible-xs = render :partial => 'blurb' -.row - .col-md-8.main + = render :partial => 'crops' = render :partial => 'seeds' = render :partial => 'members' = render :partial => 'discuss' - .col-md-4.sidebar - = render :partial => 'keep_in_touch' - = render :partial => 'open' diff --git a/spec/views/home/_keep_in_touch.html.haml_spec.rb b/spec/views/home/_keep_in_touch.html.haml_spec.rb deleted file mode 100644 index 3438cab80..000000000 --- a/spec/views/home/_keep_in_touch.html.haml_spec.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'rails_helper' - -describe 'home/_keep_in_touch.html.haml', :type => "view" do - before :each do - render - end - - it 'has a heading' do - assert_select 'h2', 'Keep in touch' - end - - it 'links to twitter' do - assert_select 'a', :href => 'http://twitter.com/growstufforg' - end - - it 'links to facebook' do - assert_select 'a', :href =>'https://www.facebook.com/Growstufforg' - end - - it 'links to the blog' do - assert_select 'a', :href => 'http://blog.growstuff.org' - end - - it 'links to the newsletter' do - assert_select 'a', :href => 'http://blog.growstuff.org/newsletter' - end - -end diff --git a/spec/views/home/_open.html.haml_spec.rb b/spec/views/home/_open.html.haml_spec.rb deleted file mode 100644 index 49e541c3b..000000000 --- a/spec/views/home/_open.html.haml_spec.rb +++ /dev/null @@ -1,31 +0,0 @@ -require 'rails_helper' - -describe 'home/_open.html.haml', :type => "view" do - before(:each) do - render - end - - it 'has an open source section' do - assert_select 'h2', 'Open Source' - end - - it 'links to github' do - assert_select 'a', :href => 'http://github.com/Growstuff/growstuff' - end - - it 'has an open data section' do - assert_select 'h2', 'Open Data and APIs' - end - - it 'links to API docs' do - assert_select 'a', :href => 'http://wiki.growstuff.org/index.php/API' - end - - it 'has a get involved section' do - assert_select 'h2', 'Get Involved' - end - - it 'links to the mailing list' do - assert_select 'a', :href => 'http://lists.growstuff.org/mailman/listinfo/discuss' - end -end diff --git a/spec/views/layouts/_footer_spec.rb b/spec/views/layouts/_footer_spec.rb deleted file mode 100644 index 00b1f1b07..000000000 --- a/spec/views/layouts/_footer_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'rails_helper' - -describe 'layouts/_footer.html.haml', :type => "view" do - - before(:each) do - render - end - - it 'should have links in footer' do - rendered.should have_content 'About' - rendered.should have_content 'Contact' - assert_select("a[href=/policy/tos]", 'Terms of Service') - assert_select("a[href=/policy/privacy]", 'Privacy Policy') - assert_select("a[href=/policy/community]", 'Community Guidelines') - rendered.should have_content 'Open Source' - assert_select("a[href=/support]", 'Support/FAQ') - end - - it 'should not have an explicit wiki link' do - rendered.should_not have_content 'Wiki' - end -end