From 3f51128e24e1ca3247169066aa6a03090df98dd6 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 17 Jun 2013 01:26:35 -0700
Subject: start of new ui - css changes, layout changes, navigation changes.

---
 app/views/layouts/_footer.html.haml         |  0
 app/views/layouts/_header.html.haml         |  3 +++
 app/views/layouts/_masthead.html.haml       |  4 ++++
 app/views/layouts/_masthead_large.html.haml |  3 +++
 app/views/layouts/_navigation.html.haml     | 17 +++++++++++-----
 app/views/layouts/application.html.haml     | 30 ++++++++++++++++++++---------
 6 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 app/views/layouts/_footer.html.haml
 create mode 100644 app/views/layouts/_header.html.haml
 create mode 100644 app/views/layouts/_masthead.html.haml
 create mode 100644 app/views/layouts/_masthead_large.html.haml

(limited to 'app/views/layouts')

diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
new file mode 100644
index 0000000..e69de29
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'
-- 
cgit v1.2.3