From ba57834f688646b0490a5043628185a86fd0af51 Mon Sep 17 00:00:00 2001 From: Dzmitry Plashchynski Date: Sun, 8 Mar 2015 21:21:06 +0200 Subject: [PATCH] Add layout for the web dashboard --- web/views/dashboard.haml | 43 +++++++++++++--------------------------- web/views/job.haml | 31 +++++++---------------------- web/views/layout.haml | 18 +++++++++++++++++ 3 files changed, 39 insertions(+), 53 deletions(-) create mode 100644 web/views/layout.haml diff --git a/web/views/dashboard.haml b/web/views/dashboard.haml index 5e98776..4540d6f 100644 --- a/web/views/dashboard.haml +++ b/web/views/dashboard.haml @@ -1,29 +1,14 @@ -!!! 5 -%html{lang: "en"} - %head - %meta{charset: "utf-8"} - %meta{"http-equiv" => "X-UA-Compatible", content: "IE=edge"} - %meta{name: "viewport", content: "width=device-width, initial-scale=1"} - - %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"}/ - - %body - .container - %h2 Crono Jobs - %table.table - %tr - %th Job - %th Last performed at - %th - - for job in @jobs - %tr - %td= job.job_id - %td= job.last_performed_at - %td - %a{href: url("/jobs/#{job.id}")} Log - - %script{src: "https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"} - %script{src: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"} +.page-header + %h1 Crono Dashboard +%h3 Running Jobs +%table.table + %tr + %th Job + %th Last performed at + %th + - for job in @jobs + %tr + %td= job.job_id + %td= job.last_performed_at + %td + %a{href: url("/jobs/#{job.id}")} Log diff --git a/web/views/job.haml b/web/views/job.haml index 3309a14..ec4f987 100644 --- a/web/views/job.haml +++ b/web/views/job.haml @@ -1,24 +1,7 @@ -!!! 5 -%html{lang: "en"} - %head - %meta{charset: "utf-8"} - %meta{"http-equiv" => "X-UA-Compatible", content: "IE=edge"} - %meta{name: "viewport", content: "width=device-width, initial-scale=1"} - - %title Crono Job #{@job.job_id} - - %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"}/ - - %body - .container - %ol.breadcrumb - %li - %a{href: url("/")} Home - %li.active= @job.job_id - %h2 - "#{@job.job_id}" Log: - %pre= @job.log - - %script{src: "https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"} - %script{src: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"} +%ol.breadcrumb + %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 new file mode 100644 index 0000000..7c55481 --- /dev/null +++ b/web/views/layout.haml @@ -0,0 +1,18 @@ +!!! 5 +%html{lang: "en"} + %head + %meta{charset: "utf-8"} + %meta{"http-equiv" => "X-UA-Compatible", content: "IE=edge"} + %meta{name: "viewport", content: "width=device-width, initial-scale=1"} + + %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"}/ + + %body + .container + = yield + + %script{src: "https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"} + %script{src: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"}