Update settings to re-use admin layout, one big navigation tree, improve settings forms

2017-01-28 03:56:10 +01:00
parent 04bce0cdf2
commit f4bc9620a9
22 changed files with 169 additions and 82 deletions
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@ -1,14 +1,17 @@
 - content_for :header_tags do
  = javascript_include_tag 'application_public'
-  
+
 - content_for :content do
  .admin-wrapper
-    .sidebar
-      = link_to root_path do
-        = image_tag 'logo.png', class: 'logo'
+    .sidebar-wrapper
+      .sidebar
+        = link_to root_path do
+          = image_tag 'logo.png', class: 'logo'

-      = render_navigation
-    .content
-      = yield
+        = render_navigation
+    .content-wrapper
+      .content
+        %h2= yield :page_title
+        = yield

-= render template: "layouts/application"
+= render template: "layouts/application", locals: { body_classes: 'admin' }
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -20,5 +20,7 @@

    = yield :header_tags

-  %body{ class: @body_classes }
+  - body_classes ||= @body_classes
+
+  %body{ class: body_classes }
    = content_for?(:content) ? yield(:content) : yield