Merge pull request #20 from Skud/fixfooters

Fixfooters
This commit is contained in:
Skud
2012-09-24 13:25:33 -07:00
5 changed files with 55 additions and 57 deletions

View File

@@ -1,30 +0,0 @@
<% content_for :title, "Growstuff dev site" %>
<div class="row">
<div class="five columns">
<ul class="link-list">
<% if user_signed_in? %>
<li>You are signed in as <%= current_user.email %>. </li>
<li><%= link_to("Log out", destroy_user_session_path) %></li>
<% else %>
<li><%= link_to('Sign up', new_user_registration_path) %></li>
<li><%= link_to('Log in', new_user_session_path) %></li>
<% end %>
</ul>
</div>
</div>
<div class="row">
<div class="five columns">
<h1><a href="/">Growstuff</a> <small>dev site</small></h1>
<p>We're a community of gardeners</p>
</div>
</div>
<div class="row">
<div class="five columns">
<ul class="link-list">
<li><a href="">footer link</li>
</ul>
</div>
</div>

View File

@@ -1,11 +1,13 @@
%ul
%li
= link_to "About", "https://github.com/Growstuff/project/wiki/About%20Growstuff"
%li
= link_to "License", "https://github.com/Growstuff/growstuff/blob/dev/LICENSE.txt"
%li
= link_to "Github", "https://github.com/Growstuff/"
%li
= link_to "Mailing list", "http://lists.growstuff.org/mailman/listinfo/discuss"
%li
= link_to "Community Guidelines", "https://github.com/Growstuff/policy/blob/master/community-guidelines.md"
.row
.ten.columns
%ul.link-list
%li
= link_to "About", "https://github.com/Growstuff/project/wiki/About%20Growstuff"
%li
= link_to "License", "https://github.com/Growstuff/growstuff/blob/dev/LICENSE.txt"
%li
= link_to "Github", "https://github.com/Growstuff/"
%li
= link_to "Mailing list", "http://lists.growstuff.org/mailman/listinfo/discuss"
%li
= link_to "Community Guidelines", "https://github.com/Growstuff/policy/blob/master/community-guidelines.md"

View File

@@ -0,0 +1,21 @@
.row
.ten.columns
- if user_signed_in?
%ul.link-list
%li
You are signed in as
= current_user.email + "."
%li
= link_to("Log out", destroy_user_session_path)
- else
%ul.link-list
%li
= link_to('Sign up', new_user_registration_path)
%li
= link_to('Log in', new_user_session_path)
.row
.ten.columns
%h1
= link_to('Growstuff', root_path)

View File

@@ -0,0 +1,10 @@
%head
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href='http://fonts.googleapis.com/css?family=Sevillana' rel='stylesheet' type='text/css'>
%title
= content_for?(:title) ? yield(:title) : "Growstuff"
= stylesheet_link_tag "application", :media => "all"
= javascript_include_tag "application"
= csrf_meta_tags

View File

@@ -1,19 +1,14 @@
%html
%head
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href='http://fonts.googleapis.com/css?family=Sevillana' rel='stylesheet' type='text/css'>
%title
= content_for?(:title) ? yield(:title) : "Growstuff"
= stylesheet_link_tag "application", :media => "all"
= javascript_include_tag "application"
= csrf_meta_tags
= render :partial => "layouts/meta"
%body
- if notice
%p.notice
= notice
- if alert
%p.alert
= alert
= yield
= render :partial => "layouts/header"
.row
.ten.columns
- if notice
%p.notice
= notice
- if alert
%p.alert
= alert
= yield
= render :partial => "layouts/footer"