From b95c480a8feb2ce30f4367435a70ad7b00c43a56 Mon Sep 17 00:00:00 2001
From: Dzmitry Plashchynski <plashchynski@gmail.com>
Date: Sun, 8 Mar 2015 22:25:55 +0200
Subject: [PATCH] Add background for web

---
 lib/crono/web.rb         |  3 ---
 web/assets/custom.css    | 20 ++++++++++++++++++++
 web/views/dashboard.haml | 13 ++++++++-----
 web/views/job.haml       |  1 +
 web/views/layout.haml    | 11 +++++++++--
 5 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 web/assets/custom.css

diff --git a/lib/crono/web.rb b/lib/crono/web.rb
index fd542fb..35a58b3 100644
--- a/lib/crono/web.rb
+++ b/lib/crono/web.rb
@@ -3,9 +3,6 @@ require 'sinatra/base'
 
 module Crono
   class Web < Sinatra::Base
-    def app
-      Sinatra::Application
-      end
     set :root, File.expand_path(File.dirname(__FILE__) + "/../../web")
     set :public_folder, Proc.new { "#{root}/assets" }
     set :views, Proc.new { "#{root}/views" }
diff --git a/web/assets/custom.css b/web/assets/custom.css
new file mode 100644
index 0000000..c9994c1
--- /dev/null
+++ b/web/assets/custom.css
@@ -0,0 +1,20 @@
+.container {
+  background-color: #CFD8DC;
+}
+
+body {
+  background-color: #455A64;
+}
+
+.page-header {
+  border-bottom: 1px solid #B6B6B6;
+}
+
+#job_list td,#job_list th {
+  border-top: 1px solid #B6B6B6;
+  color: #212121;
+}
+
+.breadcrumb {
+  background-color: #FFFFFF;
+}
diff --git a/web/views/dashboard.haml b/web/views/dashboard.haml
index 4540d6f..3b4279c 100644
--- a/web/views/dashboard.haml
+++ b/web/views/dashboard.haml
@@ -1,7 +1,8 @@
-.page-header
-  %h1 Crono Dashboard
+%ol.breadcrumb
+  %li.active Home
+
 %h3 Running Jobs
-%table.table
+%table.table#job_list
   %tr
     %th Job
     %th Last performed at
@@ -9,6 +10,8 @@
   - for job in @jobs
     %tr
       %td= job.job_id
-      %td= job.last_performed_at
+      %td= job.last_performed_at || "—"
       %td
-        %a{href: url("/jobs/#{job.id}")} Log
+        %a{href: url("/jobs/#{job.id}")}
+          Log
+          %span.glyphicon.glyphicon-menu-right
diff --git a/web/views/job.haml b/web/views/job.haml
index ec4f987..831c7a1 100644
--- a/web/views/job.haml
+++ b/web/views/job.haml
@@ -2,6 +2,7 @@
   %li
     %a{href: url("/")} Home
   %li.active= @job.job_id
+
 %h2
   "#{@job.job_id}" Log:
 %pre= @job.log
diff --git a/web/views/layout.haml b/web/views/layout.haml
index 7c55481..e262f3e 100644
--- a/web/views/layout.haml
+++ b/web/views/layout.haml
@@ -7,11 +7,18 @@
 
     %title Crono Dashboard
 
-    %link{href: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css", rel: "stylesheet"}/
-    %link{href: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css", rel: "stylesheet"}/
+    %link{href: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css", rel: "stylesheet"}
+    %link{href: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css", rel: "stylesheet"}
+    %link{href: "#{env['SCRIPT_NAME']}/custom.css", rel: "stylesheet"}
 
   %body
+    %br
+    %br
     .container
+      .page-header
+        %h1
+          Crono #{Crono::VERSION}
+          %small Dashboard
       = yield
 
     %script{src: "https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"}