summaryrefslogtreecommitdiff
path: root/app/views/home
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/home
parent01941b7d930c581a6684f6b939b3ae2f62bd832e (diff)
parentce412a9a0ccce22b5b9d90f70369b91d5fc46e4f (diff)
Merge pull request #135 from elijh/feature/pages
add some static pages
Diffstat (limited to 'app/views/home')
-rw-r--r--app/views/home/_content.html.haml14
-rw-r--r--app/views/home/_masthead.html.haml4
-rw-r--r--app/views/home/index.html.haml30
3 files changed, 27 insertions, 21 deletions
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
new file mode 100644
index 0000000..3d351e9
--- /dev/null
+++ b/app/views/home/_content.html.haml
@@ -0,0 +1,14 @@
+.row-fluid
+ %h1= t(:welcome, :provider => APP_CONFIG[:domain])
+ %p We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later).
+
+.row-fluid
+ = home_page_buttons
+
+ - if Rails.env == 'development'
+ .row-fluid
+ %hr
+ %p
+ = link_to "fetch a cert", cert_path
+ %p
+ = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
diff --git a/app/views/home/_masthead.html.haml b/app/views/home/_masthead.html.haml
new file mode 100644
index 0000000..6759339
--- /dev/null
+++ b/app/views/home/_masthead.html.haml
@@ -0,0 +1,4 @@
+-# An example masthead:
+-#
+-# #masthead
+-# %h1 Example \ No newline at end of file
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 67b2c06..147cacd 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,21 +1,9 @@
-#main
- .container-fluid
- .row-fluid
- %h1= t(:welcome, :provider => APP_CONFIG[:domain])
-
- %p
- We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later).
-
- .row-fluid
- .span6.offset3
- = render 'layouts/messages'
- .row-fluid
- = home_page_buttons
-
- - if Rails.env == 'development'
- .row-fluid
- %hr
- %p
- = link_to "fetch a cert", cert_path
- %p
- = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
+#wrap
+ = render 'home/masthead'
+ #main
+ .container-fluid
+ = render 'home/content'
+ #push
+ -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
+#footer
+ = render 'layouts/footer' \ No newline at end of file