From 08277cdbdacdff5431decfc18b20b84beecaaf2d Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Fri, 18 May 2018 17:16:52 +0900 Subject: [PATCH] Use bootstrap4 style Signed-off-by: Kenji Okimoto --- app/views/fluentd/settings/edit.html.haml | 2 +- app/views/fluentd/settings/histories/_list.html.haml | 2 +- .../fluentd/settings/in_tail/after_format.html.haml | 4 ++-- app/views/fluentd/settings/in_tail/confirm.html.haml | 4 ++-- app/views/fluentd/settings/source_and_output.html.haml | 4 ++-- app/views/fluentd/show.html.haml | 10 +++++----- app/views/plugins/installed.html.haml | 2 +- app/views/shared/_modal.html.erb | 2 +- app/views/tutorials/chapter1.html.erb | 3 +-- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/views/fluentd/settings/edit.html.haml b/app/views/fluentd/settings/edit.html.haml index 8794443..e24ff7a 100644 --- a/app/views/fluentd/settings/edit.html.haml +++ b/app/views/fluentd/settings/edit.html.haml @@ -6,4 +6,4 @@ = text_area_tag "config", @config, class: "form-control js-fluentd-config-editor", rows: 40 %p.text.text-danger= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand) = submit_tag t("terms.update"), class: "btn btn-primary" - = submit_tag t("terms.configtest"), class: "btn btn-default", name: "dryrun" + = submit_tag t("terms.configtest"), class: "btn btn-secondary", name: "dryrun" diff --git a/app/views/fluentd/settings/histories/_list.html.haml b/app/views/fluentd/settings/histories/_list.html.haml index 0b23e6e..77e87a4 100644 --- a/app/views/fluentd/settings/histories/_list.html.haml +++ b/app/views/fluentd/settings/histories/_list.html.haml @@ -14,4 +14,4 @@ .form-group.input-group = f.text_field :content, value: file.note.content, class: "note-content form-control", id: nil %span.input-group-btn - = submit_tag t('terms.save'), class: 'btn btn-default' + = submit_tag t('terms.save'), class: 'btn btn-info' diff --git a/app/views/fluentd/settings/in_tail/after_format.html.haml b/app/views/fluentd/settings/in_tail/after_format.html.haml index 6d518ad..4c521ff 100644 --- a/app/views/fluentd/settings/in_tail/after_format.html.haml +++ b/app/views/fluentd/settings/in_tail/after_format.html.haml @@ -6,5 +6,5 @@ = render partial: "form", locals: { f: f } %p - = f.submit t('terms.next'), class: "btn btn-lg btn-primary pull-right" - = f.submit t('terms.prev'), class: "btn btn-lg btn-default", name: "back" + = f.submit t('terms.next'), class: "btn btn-lg btn-primary float-right" + = f.submit t('terms.prev'), class: "btn btn-lg btn-secondary", name: "back" diff --git a/app/views/fluentd/settings/in_tail/confirm.html.haml b/app/views/fluentd/settings/in_tail/confirm.html.haml index 785958c..0cdaa00 100644 --- a/app/views/fluentd/settings/in_tail/confirm.html.haml +++ b/app/views/fluentd/settings/in_tail/confirm.html.haml @@ -8,6 +8,6 @@ %pre= @setting.to_conf %p - = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary pull-right" - = f.submit t('terms.prev'), class: "btn btn-lg btn-default", name: "back" + = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary float-right" + = f.submit t('terms.prev'), class: "btn btn-lg btn-secondary", name: "back" .clearfix.pull-right= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand) diff --git a/app/views/fluentd/settings/source_and_output.html.haml b/app/views/fluentd/settings/source_and_output.html.haml index 8655ff5..b7b9135 100644 --- a/app/views/fluentd/settings/source_and_output.html.haml +++ b/app/views/fluentd/settings/source_and_output.html.haml @@ -35,8 +35,8 @@ %h2 = t('.current') .float-right - %button.btn.btn-default.btn-sm{"v-on:click" => "update", "v-if" => "!loading"}= icon('fa-refresh') - %button.btn.btn-default.btn-sm{"v-if" => "loading"}= icon('fa-spin fa-refresh') + %button.btn.btn-outline-dark.btn-sm{"v-on:click" => "update", "v-if" => "!loading"}= icon('fa-refresh') + %button.btn.btn-outline-dark.btn-sm{"v-if" => "loading"}= icon('fa-spin fa-refresh') .row .col-xl-6.input %h3= t('.in') diff --git a/app/views/fluentd/show.html.haml b/app/views/fluentd/show.html.haml index 090f3cd..f9cd02a 100644 --- a/app/views/fluentd/show.html.haml +++ b/app/views/fluentd/show.html.haml @@ -14,14 +14,14 @@ .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"}" + = link_to icon("fa-play") << t("fluentd.common.start"), start_daemon_agent_path(@fluentd), method: :put, class: "btn #{@fluentd.agent.running? ? "disabled btn-outline-dark" : "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-outline-dark"}" + = 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-outline-dark"}" .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.edit'), edit_daemon_path, class: "btn btn-info" = link_to t('terms.destroy'), "#", class: "btn btn-danger", data: { toggle: "modal", target: "#setting-destroy-modal" } %h4= t('fluentd.common.fluentd_info') .modal.fade{id: "setting-destroy-modal"} @@ -36,7 +36,7 @@ = raw t('fluentd.common.destroy_fluentd_setting_warning', brand: fluentd_ui_brand) .modal-footer = form_tag(daemon_path(@fluentd), method: :delete) do - %button.btn.btn-default{"data-dismiss" => "modal"} + %button.btn.btn-secondary{"data-dismiss" => "modal"} Close = submit_tag t('terms.destroy'), class: "btn btn-danger" diff --git a/app/views/plugins/installed.html.haml b/app/views/plugins/installed.html.haml index 9097625..9fb1fe0 100644 --- a/app/views/plugins/installed.html.haml +++ b/app/views/plugins/installed.html.haml @@ -28,7 +28,7 @@ = t('terms.confirm_body', action: t('terms.uninstall')) .modal-footer = form_tag(uninstall_plugins_path, method: :patch) do - %button.btn.btn-default{"data-dismiss" => "modal"} + %button.btn.btn-secondary{"data-dismiss" => "modal"} Close = hidden_field_tag("plugins[]", plugin.gem_name) = submit_tag t('terms.uninstall'), class: "btn btn-danger" diff --git a/app/views/shared/_modal.html.erb b/app/views/shared/_modal.html.erb index d14cf93..1842857 100644 --- a/app/views/shared/_modal.html.erb +++ b/app/views/shared/_modal.html.erb @@ -14,7 +14,7 @@
- + <%= primary_button %>
diff --git a/app/views/tutorials/chapter1.html.erb b/app/views/tutorials/chapter1.html.erb index 9aa0d40..72a2fff 100644 --- a/app/views/tutorials/chapter1.html.erb +++ b/app/views/tutorials/chapter1.html.erb @@ -14,7 +14,7 @@

- " /> + " /> $ curl -X POST http://localhost:<%= @in_http["port"] %>{{ path }} -F 'json={{ data | to_json }}' @@ -28,4 +28,3 @@

<%= link_to t('tutorials.chapter2.page_title') << " >>", tutorials_chapter2_path, class: "pull-right" %>

-