Merge branch 'full-screen'

app/assets/javascripts/disks.js

@@ -27,4 +27,8 @@ $(document).ready(function () {
         $("#partition").attr("value", path);
 
     });
+    $(function () {
+        //TODO: Tempory fix for bootstrap theme styles conflict
+        $('#preferences').removeClass()
+    });
 });

app/assets/stylesheets/basic.css

@@ -85,4 +85,28 @@ body {
     -webkit-border-radius: 6px 0 6px 6px;
     -moz-border-radius: 6px 0 6px 6px;
     border-radius: 6px 0 6px 6px;
+}
+
+hr {
+    -moz-border-bottom-colors: none;
+    -moz-border-image: none;
+    -moz-border-left-colors: none;
+    -moz-border-right-colors: none;
+    -moz-border-top-colors: none;
+    border-color: #dfdfdf;
+    -moz-use-text-color: #dfdfdf;
+    border-style: solid none;
+    border-width: 1px 0;
+    margin: 0;
+    padding: 0;
+}
+
+#content {
+  min-height: 100%;
+}
+
+#footer {
+  height: auto;
+  margin: auto;
+  bottom: 0px;
 }

app/controllers/disk_wizards_controller.rb

@@ -1,6 +1,8 @@
 class DiskWizardsController < ApplicationController
   before_filter :disk_wizard
 
+  layout 'wizard'
+
   def disk_wizard
     defined?(disk_wizards_engine) ? admin_required : false
   end

app/views/disk_wizards/confirmation.html.erb

@@ -3,7 +3,6 @@
         $('#debug').tooltip();
     });
 </script>
-<%= render 'shared/header' %>
 <div class="panel-body">
   <%= form_tag(defined?(disk_wizards_engine) ? disk_wizards_engine.process_path : process_path, {method: "POST", id: "confirmation"}) %>
   <%= hidden_field_tag 'device', user_selections['path'] %>
@@ -70,4 +69,4 @@
     </div>
   </div>
 </div>
-<%= render 'shared/footer' %>
+

app/views/disk_wizards/done.html.erb

@@ -1,4 +1,3 @@
-<%= render 'shared/header' %>
 <script>
 
     function getDebugURL() {
@@ -161,4 +160,3 @@
   </div>
   </div>
 </div>
-<%= render 'shared/footer' %>

app/views/disk_wizards/manage_disk.html.erb

@@ -1,4 +1,3 @@
-<%= render 'shared/header' %>
 <script>
     $(function () {
         $('.mount_check').change(function () {
@@ -48,4 +47,3 @@
     <% end %>
   </div>
 </div>
-<%= render 'shared/footer' %>

app/views/disk_wizards/progress.html.erb

@@ -33,7 +33,6 @@
     }
 
 </script>
-<%= render 'shared/header' %>
 <div class="panel-body">
   <% "***************#{user_selections}" %>
   <div class="row">
@@ -54,4 +53,3 @@
     </div>
   </div>
 </div>
-<%= render 'shared/footer' %>

app/views/disk_wizards/select_device.html.erb

@@ -26,7 +26,6 @@
             getDevices();
         }
 </script>
-<%= render 'shared/header' %>
 
 <div class="panel-body">
   <% "*****************#{@new_disks}" %>
@@ -109,4 +108,3 @@
     </div>
   </div>
 </div>
-<%= render 'shared/footer' %>

app/views/disk_wizards/select_fs.html.erb

@@ -61,7 +61,6 @@
         chart.draw(data, options);
     }
 </script>
-<%= render 'shared/header' %>
 <div class="panel-body">
   <!-- div class="row">
   <div class="well" id="disk_stats">
@@ -254,4 +253,3 @@
   </div>
   </form>
 </div>
-<%= render 'shared/footer' %>

app/views/layouts/wizard.html.slim

@@ -0,0 +1,91 @@
+doctype 5
+html[dir="#{@locale_direction}" lang="#{I18n.locale}" xml:lang="#{I18n.locale}"]
+  head
+    meta charset="utf-8"
+    title = full_page_title
+
+    = stylesheet_link_tag 'application'
+
+    - if theme.name != "default" and theme.disable_inheritance == false
+      = stylesheet_link_tag(theme_stylesheet_path('style', theme.default))
+      = stylesheet_link_tag(theme_stylesheet_path('rtl', theme.default)) if rtl?
+    = stylesheet_link_tag "basic"
+    = stylesheet_link_tag "bootstrap"
+    = stylesheet_link_tag "bootstrap-theme"
+
+    = theme_stylesheet_link_tag 'style'
+    = theme_stylesheet_link_tag('rtl') if rtl?
+
+    /[ if lt IE 9 ]
+      = javascript_include_tag 'http://html5shim.googlecode.com/svn/trunk/html5.js'
+
+    = javascript_tag {render 'shared/js_vars'}
+    = javascript_include_tag 'application'
+    = javascript_tag {'$.fx.off = true;' if Rails.env.test?}
+    - for header in theme.headers do
+      = header =~ /\.js$/ ? javascript_include_tag(header) : header
+
+    link rel="search" type="application/opensearchdescription+xml" title="HDA Search" href="/search.xml"
+    link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"
+
+    = javascript_include_tag "jsapi", "chartkick"
+    = javascript_include_tag "bootstrap"
+    = javascript_include_tag "bootstrap-contextmenu"
+    = javascript_include_tag "disks"
+
+    = csrf_meta_tags
+
+  body.basic
+
+    = render 'layouts/header'
+
+    #content
+      = 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/
+              - if flash[:error]
+                .aleart_box style=("position: absolute;z-index: 9999;left: 12.5%;width: 75%")
+                  .alert.alert-danger.alert-dismissable
+                    button.close aria-hidden="true" data-dismiss="alert" type="button"
+                      | \×
+                    strong Warning!
+                    = flash[:error]
+                - flash[:error] = nil
+              - if flash[:success]
+                .aleart_box style=("position: absolute;z-index: 9999;left: 12.5%;width: 75%")
+                  .alert.alert-success.alert-dismissable
+                    button.close aria-hidden="true" data-dismiss="alert" type="button"
+                      | \×
+                    = flash[:success]
+                - flash[:success] = nil
+
+              = yield
+      .push
+    = render 'layouts/footer'
+
+    #js-templates[style="display:none"]
+      = yield :js_templates