summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-01-23 12:05:58 -0800
committerjessib <jessib@riseup.net>2014-01-23 12:05:58 -0800
commitd578c07e196cd9758fbf1752a9bb8477c260bb30 (patch)
tree4dcbef4b1b2ea9dcd52cf98f1bb98b371a93c631 /app/views/layouts
parent01941b7d930c581a6684f6b939b3ae2f62bd832e (diff)
parentce412a9a0ccce22b5b9d90f70369b91d5fc46e4f (diff)
Merge pull request #135 from elijh/feature/pages
add some static pages
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_footer.html.haml10
-rw-r--r--app/views/layouts/_masthead.html.haml10
-rw-r--r--app/views/layouts/application.html.haml18
-rw-r--r--app/views/layouts/home.html.haml2
4 files changed, 27 insertions, 13 deletions
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index e69de29..5909bdd 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -0,0 +1,10 @@
+.full-height
+ = link_to icon('home') + t(:home), home_path
+ = link_to icon('eye-close') + t(:privacy_policy), privacy_policy_path
+ = link_to icon('file') + t(:terms_of_service), terms_of_service_path
+ - if lookup_context.exists?('pages/about')
+ = link_to icon('info-sign') + t(:about), about_path
+ - if lookup_context.exists?('pages/contact')
+ = link_to icon('comment') + t(:contact), contact_path
+ - if APP_CONFIG[:service_levels]
+ = link_to icon('shopping-cart') + t(:pricing), pricing_path \ No newline at end of file
diff --git a/app/views/layouts/_masthead.html.haml b/app/views/layouts/_masthead.html.haml
index 280f2c2..35225a1 100644
--- a/app/views/layouts/_masthead.html.haml
+++ b/app/views/layouts/_masthead.html.haml
@@ -1,4 +1,6 @@
-.title
- %span.sitename
- = APP_CONFIG[:domain]
- = t(:user_control_panel) \ No newline at end of file
+#masthead
+ .title
+ %span.sitename
+ %a{:href => home_path}= APP_CONFIG[:domain]
+ - if @show_navigation
+ = t(:user_control_panel) \ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 816b558..1cd4ec3 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -10,15 +10,17 @@
= csrf_meta_tags
= yield(:head)
%body
- #masthead
+ #wrap
= render 'layouts/masthead'
- #main
- .container-fluid
- - if logged_in?
+ #main
+ .container-fluid
+ - if logged_in?
+ .row-fluid
+ .span12
+ = render 'layouts/header'
.row-fluid
- .span12
- = render 'layouts/header'
- .row-fluid
- = render 'layouts/content'
+ = render 'layouts/content'
+ #push
+ -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
#footer
= render 'layouts/footer'
diff --git a/app/views/layouts/home.html.haml b/app/views/layouts/home.html.haml
index e6fa15d..8451de5 100644
--- a/app/views/layouts/home.html.haml
+++ b/app/views/layouts/home.html.haml
@@ -8,5 +8,5 @@
= javascript_include_tag "application"
= csrf_meta_tags
= yield(:head)
- %body
+ %body.home
= yield \ No newline at end of file