fixed some part of layout

amahi · Jun 28, 2018 · dba613a · dba613a
1 parent ef99b9a
commit dba613a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 29 deletions.
diff --git a/app/controllers/disk_wizard_controller.rb b/app/controllers/disk_wizard_controller.rb
@@ -8,6 +8,7 @@ class DiskWizardController < ApplicationController
   # @return [Device Array] : Return array of Device objects, which are mounted(permanent or temporary) in the HDA.
   # Render the first step of the Disk-Wizard(DW)
   def select_device
+    @page_title = t('disk_wizard')
     DebugLogger.info "--disk_wizard_start--"
     @mounted_disks = Device.mounts
   end

diff --git a/app/views/layouts/wizard.html.slim b/app/views/layouts/wizard.html.slim
@@ -31,40 +31,49 @@ html[dir="#{@locale_direction}" lang="#{I18n.locale}" xml:lang="#{I18n.locale}"]
 
     = csrf_meta_tags
 
-  body.basic
-
+  body
+    
     = render 'layouts/header'
 
     #content
+      = render 'layouts/subheader'
       = render 'shared/flash_messages'
-      #app.inner
-        .row.text-center
-          .col-md-12
-            .panel.panel-default
-              ul.nav.nav-pills.nav-justified.alert-warning
-                li class=(params[:action] == "select_device" ? "active" : "disabled")
-                  a href="#"
-                    |Select new drive
-                    span.glyphicon.glyphicon-chevron-right
-                li class=(params[:action] == "select_fs" ? "active" : "disabled")
-                  a href="#"
-                    |Choose file system
-                    span.glyphicon.glyphicon-chevron-right
-                li class=(params[:action] == "manage_disk" ? "active" : "disabled")
-                  a href="#"
-                    | Options
-                    span.glyphicon.glyphicon-chevron-right
-                li class=(params[:action] == "confirmation" ? "active" : "disabled")
-                  a href="#"
-                    | Confirmation
-                    span.glyphicon.glyphicon-chevron-right
-                li class=(params[:action] == "done" ? "active" : "disabled")
-                  a href="#"
-                    | Done
-                    span.glyphicon.glyphicon-ok
-              hr/
-              = yield
+      #app.inner.container
+        - unless @no_tabs
+          /= render 'shared/tabs'
+
+          #preferences
+            .preftab
+              .row.text-center
+                .col-md-12
+                  .panel.panel-default
+                    ul.nav.nav-pills.nav-justified.alert-warning
+                      li class=(params[:action] == "select_device" ? "active" : "disabled")
+                        a href="#"
+                          |Select new drive
+                          span.glyphicon.glyphicon-chevron-right
+                      li class=(params[:action] == "select_fs" ? "active" : "disabled")
+                        a href="#"
+                          |Choose file system
+                          span.glyphicon.glyphicon-chevron-right
+                      li class=(params[:action] == "manage_disk" ? "active" : "disabled")
+                        a href="#"
+                          | Options
+                          span.glyphicon.glyphicon-chevron-right
+                      li class=(params[:action] == "confirmation" ? "active" : "disabled")
+                        a href="#"
+                          | Confirmation
+                          span.glyphicon.glyphicon-chevron-right
+                      li class=(params[:action] == "done" ? "active" : "disabled")
+                        a href="#"
+                          | Done
+                          span.glyphicon.glyphicon-ok
+                      hr/
+                      = yield
+        - else
+          = yield
       .push
+
     = render 'layouts/footer'
 
     #js-templates[style="display:none"]

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -21,3 +21,4 @@
 
 en:
   hello: "Hello world"
+  disk_wizard: "Disk Wizard"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,4 @@

		en:
		hello: "Hello world"
		disk_wizard: "Disk Wizard"