Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update html classes #234

Merged
merged 5 commits into from
May 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/javascript/packs/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ import jQuery from 'jquery/dist/jquery'
window.$ = jQuery
window.jQuery = jQuery

import Rails from 'rails-ujs/lib/assets/compiled/rails-ujs.js'

window.Rails = Rails
Rails.start()

import 'popper.js/dist/popper'
import 'bootstrap/dist/js/bootstrap'
import 'datatables.net/js/jquery.dataTables'
Expand Down
2 changes: 1 addition & 1 deletion app/views/fluentd/errors.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.col-xl-12.col-sm-12
- @errors.each do |error|
.card.card-primary
.card-heading
.card-header
%h4= error[:subject]
- if error[:notes].present?
.card-body
Expand Down
2 changes: 1 addition & 1 deletion app/views/fluentd/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
= 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"}"
= link_to icon("fa-refresh") << t("fluentd.common.reload"), reload_daemon_agent_path(@fluentd), method: :put, class: "btn #{@fluentd.agent.running? ? "btn-info" : "disabled btn-default"}"
= link_to icon("fa-refresh") << t("fluentd.common.reload"), reload_daemon_agent_path(@fluentd), method: :put, class: "btn #{@fluentd.agent.running? ? "btn-info" : "disabled btn-outline-dark"}"
.col-xl-6.col-sm-6
.card.card-default
.card-header
Expand Down
2 changes: 1 addition & 1 deletion app/views/misc/information.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- page_title t('.page_title') do
- link_to misc_download_info_path, class: "btn btn-primary float-right" do
- link_to misc_download_info_path, class: "btn btn-primary float-right mt-3" do
= icon('fa-download')
= t('.download_system_information')

Expand Down
1 change: 1 addition & 0 deletions config/locales/translation_en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ en:
start: Start
stop: Stop
restart: Restart
reload: Reload
log: Log
stopped: Stopped
running: Running
Expand Down
1 change: 1 addition & 0 deletions config/locales/translation_ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ ja:
start: 開始
stop: 停止
restart: 再起動
reload: リロード
log: ログ
stopped: 停止中
running: 稼働中
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"jquery": "^3.3.1",
"lodash": "^4.17.10",
"popper.js": "^1.14.3",
"rails-ujs": "^5.2.0",
"startbootstrap-sb-admin": "^4.0.0",
"vue": "^2.5.16",
"vue-loader": "14.2.2",
Expand Down
4 changes: 4 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4741,6 +4741,10 @@ querystringify@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"

rails-ujs@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/rails-ujs/-/rails-ujs-5.2.0.tgz#d93f7a969a226c0ae67044172955be8c1cdf49fc"

randomatic@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
Expand Down