From 559c11e80916aed51b0f6f10b1345822a6e76570 Mon Sep 17 00:00:00 2001
From: Kenji Okimoto <okimoto@clear-code.com>
Date: Wed, 16 May 2018 14:19:48 +0900
Subject: [PATCH] Apply bootstrap4 style

Signed-off-by: Kenji Okimoto <okimoto@clear-code.com>
---
 app/views/fluentd/errors.html.haml        | 10 +++++-----
 app/views/fluentd/log.html.haml           |  2 +-
 app/views/fluentd/show.html.haml          | 20 ++++++++++----------
 app/views/plugins/installed.html.haml     | 14 +++++++-------
 app/views/plugins/recommended.html.haml   |  8 ++++----
 app/views/plugins/updated.html.haml       | 10 +++++-----
 app/views/shared/_initial_setup.html.haml |  6 +++---
 app/views/users/show.html.haml            |  2 +-
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/views/fluentd/errors.html.haml b/app/views/fluentd/errors.html.haml
index 425d30a..3acfd37 100644
--- a/app/views/fluentd/errors.html.haml
+++ b/app/views/fluentd/errors.html.haml
@@ -1,16 +1,16 @@
 - page_title t('fluentd.common.recent_errors', days: @error_duration_days) do
-  - link_to raw_log_daemon_path(@fluentd), class: "btn btn-primary pull-right" do
+  - link_to raw_log_daemon_path(@fluentd), class: "btn btn-primary float-right" do
     = icon('fa-download')
     = t('fluentd.common.raw_log_link')
 
 .row
-  .col-xs-12
+  .col-xl-12.col-sm-12
     - @errors.each do |error|
-      .panel.panel-default
-        .panel-heading
+      .card.card-primary
+        .card-heading
           %h4= error[:subject]
         - if error[:notes].present?
-          .panel-body
+          .card-body
             %ul
               - error[:notes].each do |stack|
                 %li= stack
diff --git a/app/views/fluentd/log.html.haml b/app/views/fluentd/log.html.haml
index ba655d4..822523b 100644
--- a/app/views/fluentd/log.html.haml
+++ b/app/views/fluentd/log.html.haml
@@ -4,6 +4,6 @@
     = t('fluentd.common.raw_log_link')
 
 .row
-  .col-xs-12
+  .col-xl-12.col-sm-12
     = preserve do # partial containing <pre>, so shouldn't break indent
       = render partial: "shared/vue/fluent_log", locals: { fluentd: @fluentd }
diff --git a/app/views/fluentd/show.html.haml b/app/views/fluentd/show.html.haml
index 10b8fb7..090f3cd 100644
--- a/app/views/fluentd/show.html.haml
+++ b/app/views/fluentd/show.html.haml
@@ -1,9 +1,9 @@
 - if @fluentd.present?
   - page_title t('.page_title')
   .row
-    .col-xs-6
-      %div{class: "panel panel-#{@fluentd.agent.running? ? "success":"default"}"}
-        .panel-heading
+    .col-xl-6.col-sm-6
+      %div{class: "card card-#{@fluentd.agent.running? ? "primary":"secondary"}"}
+        .card-header
           %h4
             - if @fluentd.agent.running?
               = icon("fa-play")
@@ -11,16 +11,16 @@
             - else
               = icon("fa-pause")
               = t("fluentd.common.stopped")
-        .panel-body
+        .card-body
           - if flash[:error]
             .alert.alert-danger= flash[:error]
           = link_to icon("fa-play") << t("fluentd.common.start"), start_daemon_agent_path(@fluentd),     method: :put, class: "btn #{@fluentd.agent.running? ? "disabled btn-default" : "btn-primary"}"
           = link_to icon("fa-pause") << t("fluentd.common.stop"), stop_daemon_agent_path(@fluentd),       method: :put, class: "btn #{@fluentd.agent.running? ? "btn-danger" : "disabled btn-default"}"
           = link_to icon("fa-refresh") << t("fluentd.common.restart"), restart_daemon_agent_path(@fluentd), method: :put, class: "btn #{@fluentd.agent.running? ? "btn-warning" : "disabled btn-default"}"
-    .col-xs-6
-      .panel.panel-default
-        .panel-heading
-          .pull-right
+    .col-xl-6.col-sm-6
+      .card.card-default
+        .card-header
+          .float-right
             = link_to t('terms.edit'), edit_daemon_path, class: "btn btn-default"
             = link_to t('terms.destroy'), "#", class: "btn btn-danger", data: { toggle: "modal", target: "#setting-destroy-modal" }
           %h4= t('fluentd.common.fluentd_info')
@@ -40,7 +40,7 @@
                       Close
                     = submit_tag t('terms.destroy'), class: "btn btn-danger"
 
-        %table.table.table-hover
+        %table.table.table-hover.mb-0
           %tbody
             %tr
               %th= @fluentd.class.human_attribute_name(:pid_file)
@@ -52,7 +52,7 @@
               %th= @fluentd.class.human_attribute_name(:config_file)
               %td= @fluentd.agent.config_file
   .row
-    .col-xs-12
+    .col-xl-12
       = preserve do # partial containing <pre>, so shouldn't break indent
         = render partial: "shared/vue/fluent_log", locals: { fluentd: @fluentd }
 
diff --git a/app/views/plugins/installed.html.haml b/app/views/plugins/installed.html.haml
index cc836a5..9097625 100644
--- a/app/views/plugins/installed.html.haml
+++ b/app/views/plugins/installed.html.haml
@@ -3,13 +3,13 @@
 %table{class: "table table-striped table-hover", id: "plugins-table"}
   %thead
     %tr
-      %th.col-xs-1
-      %th.col-xs-1= t('plugins.common.name')
-      %th{width: 160}= t('plugins.common.authors')
-      %th{width: 320}= t('plugins.common.summary')
-      %th.col-xs-1= t('plugins.common.installed_version')
-      %th.col-xs-1= t('plugins.common.latest_version')
-      %th.col-xs-1
+      %th{scope: "col"}
+      %th{scope: "col"}= t('plugins.common.name')
+      %th{scope: "col"}= t('plugins.common.authors')
+      %th{scope: "col"}= t('plugins.common.summary')
+      %th{scope: "col"}= t('plugins.common.installed_version')
+      %th{scope: "col"}= t('plugins.common.latest_version')
+      %th{scope: "col"}
   %tbody
     - @plugins.each do |plugin|
       %tr
diff --git a/app/views/plugins/recommended.html.haml b/app/views/plugins/recommended.html.haml
index 400ff9a..f2bdc78 100644
--- a/app/views/plugins/recommended.html.haml
+++ b/app/views/plugins/recommended.html.haml
@@ -3,10 +3,10 @@
 %table{class: "table table-striped table-hover", id: "plugins-table"}
   %thead
     %tr
-      %th{width: "24"}
-      %th= t('plugins.common.name')
-      %th= t('plugins.common.category')
-      %th= t('plugins.common.status')
+      %th{scope: "col", width: "24"}
+      %th{scope: "col"}= t('plugins.common.name')
+      %th{scope: "col"}= t('plugins.common.category')
+      %th{scope: "col"}= t('plugins.common.status')
       %th
   %tbody
     - @plugins.each do |plugin|
diff --git a/app/views/plugins/updated.html.haml b/app/views/plugins/updated.html.haml
index 392e9c2..46d671a 100644
--- a/app/views/plugins/updated.html.haml
+++ b/app/views/plugins/updated.html.haml
@@ -7,11 +7,11 @@
     %table{class: "table table-striped table-hover"}
       %thead
         %tr
-          %th.col-xs-2= t('plugins.common.name')
-          %th.col-xs-2= t('plugins.common.authors')
-          %th.col-xs-6= t('plugins.common.summary')
-          %th.col-xs-1= t('plugins.common.installed_version')
-          %th.col-xs-1= t('plugins.common.latest_version')
+          %th.col-xl-2= t('plugins.common.name')
+          %th.col-xl-2= t('plugins.common.authors')
+          %th.col-xl-6= t('plugins.common.summary')
+          %th.col-xl-1= t('plugins.common.installed_version')
+          %th.col-xl-1= t('plugins.common.latest_version')
       %tbody
         - @plugins.each do |plugin|
           %tr
diff --git a/app/views/shared/_initial_setup.html.haml b/app/views/shared/_initial_setup.html.haml
index c4a0c69..9fbb5d3 100644
--- a/app/views/shared/_initial_setup.html.haml
+++ b/app/views/shared/_initial_setup.html.haml
@@ -1,13 +1,13 @@
 - page_title "fluentd"
 
 .row
-  .col-xs-6
+  .col-xl-6.col-sm-6
     .well
       %span= link_to icon("fa-cog") << t("terms.setup", target: "fluentd"), new_daemon_path(variant: "fluentd_gem"), class: "btn btn-primary btn-lg"
-  .col-xs-6
+  .col-xl-6.col-sm-6
     .well
       %span
-        = link_to icon("fa-cog") << t("terms.setup", target: "td-agent"), new_daemon_path(variant: "td-agent"), class: "btn btn-lg #{has_td_agent_system? ? "btn-primary" : "btn-default disabled"}"
+        = link_to icon("fa-cog") << t("terms.setup", target: "td-agent"), new_daemon_path(variant: "td-agent"), class: "btn btn-lg #{has_td_agent_system? ? "btn-primary" : "btn-secondary disabled"}"
         - unless has_td_agent_system?
           = link_to t('terms.install_it', target: "td-agent"), "http://docs.treasuredata.com/articles/td-agent"
 
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index ddb0ae0..f622418 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -2,7 +2,7 @@
 
 
 
-.col-xs-6
+.col-xl-6.col-sm-6
   - if notice
     .alert.alert-success= notice
   - else