summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-31 15:12:59 -0700
committerelijah <elijah@riseup.net>2013-07-31 15:12:59 -0700
commit1a3fdad01d9cb2e2596281d38ce0c0f1ad4da04a (patch)
tree265a2c3393c4e6f8e2958f8739f50150e89c3d92 /app/views
parent21f39bf368ea1e0deb70eb918f0947fb6fbd900d (diff)
added empty 'home' layout and removed debugger from homecontroller
Diffstat (limited to 'app/views')
-rw-r--r--app/views/home/index.html.haml21
-rw-r--r--app/views/layouts/_content.html.haml2
-rw-r--r--app/views/layouts/application.html.haml3
-rw-r--r--app/views/layouts/home.html.haml12
4 files changed, 26 insertions, 12 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 8c90436..0d1ac73 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,12 +1,15 @@
-%h1= t(:welcome, :provider => APP_CONFIG[:domain])
+#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).
+ %p
+ We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later).
-= home_page_buttons
+ = home_page_buttons
-- if Rails.env == 'development'
- .row-fluid
- %hr
- %p
- = link_to "fetch a cert", cert_path
+ - if Rails.env == 'development'
+ .row-fluid
+ %hr
+ %p
+ = link_to "fetch a cert", cert_path
diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
index 19af627..d5c2fa3 100644
--- a/app/views/layouts/_content.html.haml
+++ b/app/views/layouts/_content.html.haml
@@ -1,5 +1,5 @@
-#
--# Partial for displaying the page content. This is the only place that content should be displayed.
+-# Partial for displaying the page content. This is the only place that content should be displayed (except for home layout)
-#
- if content_for?(:content)
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 380f92d..816b558 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,8 +11,7 @@
= yield(:head)
%body
#masthead
- - if params[:controller] != 'home'
- = render 'layouts/masthead'
+ = render 'layouts/masthead'
#main
.container-fluid
- if logged_in?
diff --git a/app/views/layouts/home.html.haml b/app/views/layouts/home.html.haml
new file mode 100644
index 0000000..e6fa15d
--- /dev/null
+++ b/app/views/layouts/home.html.haml
@@ -0,0 +1,12 @@
+!!!
+%html
+ %head
+ %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}
+ %title= html_title
+ %meta{:content => content_for?(:description) ? yield(:description) : "LEAP Web", :name => "description"}
+ = stylesheet_link_tag "application", :media => "all"
+ = javascript_include_tag "application"
+ = csrf_meta_tags
+ = yield(:head)
+ %body
+ = yield \ No newline at end of file