summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-06-17 01:26:35 -0700
committerelijah <elijah@riseup.net>2013-06-17 01:26:35 -0700
commit8b7621793fe5f8fa55c955045a71821c53d4759f (patch)
tree872071d4fd3510d319288b32aeb8cdcdcf741a22 /app/views/layouts
parent15d48c24e529e2f944b026749c5eb35eb4c5cfa7 (diff)
start of new ui - css changes, layout changes, navigation changes.
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_footer.html.haml0
-rw-r--r--app/views/layouts/_header.html.haml3
-rw-r--r--app/views/layouts/_masthead.html.haml4
-rw-r--r--app/views/layouts/_masthead_large.html.haml3
-rw-r--r--app/views/layouts/_navigation.html.haml17
-rw-r--r--app/views/layouts/application.html.haml30
6 files changed, 43 insertions, 14 deletions
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/views/layouts/_footer.html.haml
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
new file mode 100644
index 0000000..aa4054b
--- /dev/null
+++ b/app/views/layouts/_header.html.haml
@@ -0,0 +1,3 @@
+- if user
+ %strong.user_address
+ = user.email_address
diff --git a/app/views/layouts/_masthead.html.haml b/app/views/layouts/_masthead.html.haml
new file mode 100644
index 0000000..280f2c2
--- /dev/null
+++ b/app/views/layouts/_masthead.html.haml
@@ -0,0 +1,4 @@
+.title
+ %span.sitename
+ = APP_CONFIG[:domain]
+ = t(:user_control_panel) \ No newline at end of file
diff --git a/app/views/layouts/_masthead_large.html.haml b/app/views/layouts/_masthead_large.html.haml
new file mode 100644
index 0000000..6bb1943
--- /dev/null
+++ b/app/views/layouts/_masthead_large.html.haml
@@ -0,0 +1,3 @@
+.title
+ %span.sitename
+ = APP_CONFIG[:domain] \ No newline at end of file
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index b75eed7..7cd0f38 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,6 +1,13 @@
-= link_to "Leap Web", root_path, :class => 'brand'
-%ul.nav
- // = render '/tickets/nav'
+//= link_to "Leap Web", root_path, :class => 'brand'
+//%ul.nav
+// // = render '/tickets/nav'
+//
+//%ul.nav.pull-right
+// = render '/sessions/nav'
-%ul.nav.pull-right
- = render '/sessions/nav'
+%ul.nav.sidenav
+ = link_to_navigation t(:overview), user_overview_path(user), :active => controller?(:overviews)
+ = link_to_navigation t(:account_settings), edit_user_path(user), :active => controller?(:users)
+ =# link_to_navigation t(:email_settings), edit_email_path(user), :active => controller?(:emails)
+ = link_to_navigation t(:support_tickets), tickets_path, :active => controller?(:tickets)
+ = link_to_navigation t(:logout), logout_path, :method => :delete
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e6d22f0..719d699 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -9,15 +9,27 @@
= csrf_meta_tags
= yield(:head)
%body
- %header.navbar.navbar-fixed-top
- %nav.navbar-inner
- .container
- = render 'layouts/navigation'
- #main{:role => "main"}
- .container
- .content
- .row
+ #masthead
+ - if logged_in?
+ = render 'layouts/masthead'
+ - else
+ = render 'layouts/masthead_large'
+ #main
+ .container-fluid
+ - if logged_in?
+ .row-fluid
.span12
+ = render 'layouts/header'
+ .row-fluid
+ .span2
+ = render 'layouts/navigation'
+ .span10
= render 'layouts/messages'
= yield
- %footer
+ - else
+ .row-fluid
+ .span12
+ = render 'layouts/messages'
+ = yield
+ #footer
+ = render 'layouts/footer'