RubyGems - fluentd-ui - Versions diffs - 0.4.5 → 1.0.0.alpha.1 - Mend

fluentd-ui 0.4.5 → 1.0.0.alpha.1

Potentially problematic release.

This version of fluentd-ui might be problematic. Click here for more details.

Files changed (243) hide show

data/app/views/layouts/application.html.erb CHANGED Viewed

@@ -10,71 +10,56 @@
       <% end %>
       <%= fluentd_ui_title %>
     </title>
-    <%= stylesheet_link_tag    'application', media: 'all'%>
-    <%= javascript_include_tag 'application' %>
+    <%= stylesheet_link_tag 'application', media: 'all'%>
+    <%= stylesheet_pack_tag 'application', media: 'all'%>
+    <%= javascript_pack_tag 'application' %>
+    <%= javascript_pack_tag 'notification' %>
+    <%= content_for(:additional_javascript_pack_tag) %>
     <%= csrf_meta_tags %>
   </head>
-  <body>
-    <div id="wrapper">
-      <nav class="navbar navbar-default navbar-fixed-top" role="navigation" style="margin-bottom: 0">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <%= link_to fluentd_ui_logo, root_path, class: "navbar-brand fluentd-ui-logo" %>
-        </div>
-        <!-- /.navbar-header -->
+  <body class="fixed-nav bg-light">
+    <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top" id="mainNav">
+      <%= link_to fluentd_ui_logo, root_path, class: "navbar-brand fluentd-ui-logo" %>
+      <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+      <div class="collapse navbar-collapse" id="navbarResponsive">
+        <%= render partial: "shared/global_nav" %>
+        <ul class="navbar-nav ml-auto">
+          <%- if @fluentd %>
+            <li class="nav-item fluentd-status">
+              <a class="nav-link" href="<%= daemon_path %>" data-toggle="tooltip" data-placement="bottom" title="fluentd <%= fluentd_status_message %>">
+                <%= fluentd_status_icon %>
+              </a>
+            </li>
+          <%- end %>
-        <ul class="nav navbar-top-links navbar-right">
-          <% if @fluentd %>
-          <li class="fluentd-status">
-            <a href="<%= daemon_path %>" data-toggle="tooltip" data-placement="bottom" title="fluentd <%= fluentd_status_message %>">
-              <%= fluentd_status_icon %>
-            </a>
-          </li>
-          <% end %>
           <%= render partial: "shared/vue/notification" %>
-          <li class="dropdown">
-            <%= link_to(t("terms.sign_out"), sessions_path, method: :delete) %>
+          <li class="nav-item">
+            <%= link_to(icon("fa-fw fa-sign-out") + t("terms.sign_out"), sessions_path, method: :delete, class: "nav-link") %>
           </li>
         </ul>
-        <!-- /.navbar-top-links -->
-        <div class="navbar-default navbar-static-side" role="navigation">
-          <div class="sidebar-collapse">
-            <%= render partial: "shared/global_nav" %>
-            <!-- /#side-menu -->
-          </div>
-          <!-- /.sidebar-collapse -->
-        </div>
-        <!-- /.navbar-static-side -->
-      </nav>
+      </div>
+    </nav>
-      <div id="page-wrapper">
+    <div class="content-wrapper">
+      <div class="container-fluid">
         <%= render partial: "shared/flash" %>
         <% if content_for?(:page_head) %>
           <div class="row">
-            <div class="col-xs-12">
-              <h1 class="page-header"><%= content_for(:page_head) %></h1>
+            <div class="col-xl-12 col-sm-12">
+              <h1 class="display-4 border-bottom mb-3"><%= content_for(:page_head) %></h1>
             </div>
-            <!-- /.col-xs-12 -->
           </div>
-          <!-- /.row -->
         <% end %>
         <div class="row">
-          <div class="col-xs-12">
+          <div class="col-xl-12 col-sm-12">
             <%= yield %>
           </div>
         </div>
-        <!-- /.row -->
       </div>
-      <!-- /#page-wrapper -->
     </div>
-    <!-- /#wrapper -->
   </body>
 </html>

data/app/views/layouts/sign_in.html.erb CHANGED Viewed

@@ -3,26 +3,19 @@
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Fluentd-UI</title>
-  <%= stylesheet_link_tag    'application', media: 'all'%>
-  <%= javascript_include_tag 'application' %>
+  <title>Fluentd-UI</title>
+  <%= stylesheet_link_tag 'application', media: 'all'%>
+  <%= javascript_pack_tag 'application' %>
   <%= csrf_meta_tags %>
 </head>
-<body>
-     <div class="container">
-        <div class="row">
-            <div class="col-md-4 col-md-offset-4">
-              <%= yield %>
-            </div>
-        </div>
-    </div>
+<body class="bg-light">
+  <div class="container">
+    <%= yield %>
+  </div>
 </body>
 </html>

data/app/views/misc/information.html.haml CHANGED Viewed

@@ -1,23 +1,23 @@
 - page_title t('.page_title') do
-  - link_to misc_download_info_path, class: "btn btn-primary pull-right" do
+  - link_to misc_download_info_path, class: "btn btn-primary float-right" do
     = icon('fa-download')
     = t('.download_system_information')
 - if FluentdUI.update_available? && !FluentdUI.td_agent_ui?
   - # NOTE: td-agent-ui shouldn't have auto update feature
   .row
-    .col-xs-12
+    .col-xl-12
       %p
         = link_to misc_update_fluentd_ui_path, class: "btn btn-primary btn-lg", method: :post do
           = t('.update_fluentd_ui', version: FluentdUI.latest_version, title: fluentd_ui_title)
         = t('.update_fluentd_ui_caution', brand: fluentd_ui_brand)
 .row
-  .col-xs-6
-    .panel.panel-default
-      .panel-heading
+  .col-xl-6.col-sm-6.mb-3
+    .card.card-default
+      .card-header
         %h4= t("terms.version")
-      .panel-body
+      .card-body
         %dl{class: "dl-horizontal"}
           %dt ruby
           %dd= RUBY_DESCRIPTION
@@ -27,11 +27,11 @@
           %dt fluentd-ui
           %dd= FluentdUI::VERSION
-  .col-xs-6
-    .panel.panel-default
-      .panel-heading
+  .col-xl-6.col-sm-6.mb-3
+    .card.card-default
+      .card-header
         %h4= t('terms.installed_plugins')
-      .panel-body
+      .card-body
         - if @plugins.present?
           %table{class: "table table-hover", id: "plugins-table"}
             %thead
@@ -47,9 +47,9 @@
           = t "plugins.common.no_installed"
 .row
-  .col-xs-12
-    .panel.panel-default
-      .panel-heading
+  .col-xl-12.col-sm-12
+    .card.card-default
+      .card-header
         %h4{"data-toggle" => "collapse", "href" => "#env-table"}
           = icon('fa-caret-down')
           = t('.env')

data/app/views/misc/update_fluentd_ui.html.haml CHANGED Viewed

@@ -1,7 +1,7 @@
-.panel.panel-default
-  .panel-heading
+.card
+  .card-header
     = t('.update_title', title: fluentd_ui_title)
-  .panel-body
+  .card-body
     #processing
       = icon('fa-lg fa-gear fa-spin')
       = t('.updating')

data/app/views/plugins/installed.html.haml CHANGED Viewed

@@ -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
@@ -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"

data/app/views/plugins/recommended.html.haml CHANGED Viewed

@@ -3,11 +3,11 @@
 %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
+      %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{scope: "col"}
   %tbody
     - @plugins.each do |plugin|
       %tr

data/app/views/plugins/updated.html.haml CHANGED Viewed

@@ -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

data/app/views/sessions/new.html.haml CHANGED Viewed

@@ -1,8 +1,7 @@
-.login-panel.panel.panel-default
-  .panel-heading
-    %h3.panel-title
-      = t('messages.please_sign_in')
-  .panel-body
+.card.card-login.mx-auto.mt-5
+  .card-header
+    = t('messages.please_sign_in')
+  .card-body
     = render partial: "shared/error"
     = form_for(:session, url: sessions_path) do |f|
       .form-group
@@ -10,4 +9,4 @@
       .form-group
         = f.password_field :password, placeholder: t('terms.password'), class: "form-control"
-      = submit_tag t("terms.sign_in"), class: "btn btn-success"
+      = submit_tag t("terms.sign_in"), class: "btn btn-primary btn-block"

data/app/views/shared/_global_nav.html.erb CHANGED Viewed

@@ -1,9 +1,9 @@
-<ul class="nav" id="side-menu">
-  <li>
+<ul class="navbar-nav navbar-sidenav" id="side-menu">
+  <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Fluentd">
     <a class="section">
       <%= icon("fa-puzzle-piece fa-fw") << "fluentd" %>
     </a>
-    <ul class="nav nav-second-level">
+    <ul class="sidenav-second-level">
       <% if fluentd_exists? %>
         <li>
           <%= link_to_other t('fluentd.show.page_title'), daemon_path %>
@@ -29,11 +29,11 @@
   </li>
   <% if fluentd_exists? %>
-  <li>
+  <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Plugins">
     <a class="section">
       <%= icon("fa-cogs fa-fw") << t('terms.plugins') %>
     </a>
-    <ul class="nav nav-second-level">
+    <ul class="sidenav-second-level">
       <li>
         <%= link_to_other t("plugins.installed.page_title"), installed_plugins_path %>
       </li>
@@ -47,11 +47,11 @@
   </li>
   <% end %>
-  <li>
+  <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Misc">
     <a class="section">
       <%= icon('fa-coffee fa-fw') << t('terms.misc') %>
     </a>
-    <ul class="nav nav-second-level">
+    <ul class="sidenav-second-level">
       <li>
         <%= link_to_other t("misc.information.page_title"), misc_information_path %>
       </li>
@@ -67,11 +67,11 @@
     </ul>
   </li>
-  <li>
+  <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Language">
     <a class="section">
       <%= icon('fa-font') << t('terms.languages') %>
     </a>
-    <ul class="nav nav-second-level">
+    <ul class="sidenav-second-level">
       <li>
         <%= language_menu %>
       </li>

data/app/views/shared/_initial_setup.html.haml CHANGED Viewed

@@ -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"

data/app/views/shared/_modal.html.erb CHANGED Viewed

@@ -14,7 +14,7 @@
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
           <%= primary_button %>
         </div>
       </div>

data/app/views/shared/settings/_form.html.haml CHANGED Viewed

@@ -6,12 +6,13 @@
     = field(f, key)
   - if @setting.advanced_options.present?
-    .well.well-sm
-      %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"}
-        = icon('fa-caret-down')
-        = t('terms.advanced_setting')
-      #advanced-setting.collapse
-        - @setting.advanced_options.each do |key|
-          = field(f, key)
-  = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right"
+    .card.bg-light
+      .card-body
+        %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"}
+          = icon('fa-caret-down')
+          = t('terms.advanced_setting')
+        #advanced-setting.collapse
+          - @setting.advanced_options.each do |key|
+            = field(f, key)
+  = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary float-right"

data/app/views/shared/settings/show.html.haml CHANGED Viewed

@@ -1,6 +1,8 @@
 - page_title t("fluentd.settings.#{target_plugin_name}.show.page_title")
+- add_javascript_pack_tag("nested_settings")
-.well
-  = raw t("fluentd.settings.#{target_plugin_name}.option_guide")
+.card.mb-3
+  .card-body.bg-light
+    = raw t("fluentd.settings.#{target_plugin_name}.option_guide")
 = render "shared/settings/form"

data/app/views/shared/vue/_fluent_log.html.erb CHANGED Viewed

@@ -1,20 +1,21 @@
+<%- add_javascript_pack_tag("fluent_log") %>
 <!-- vue.js -->
 <% auto_reload ||= true %>
 <div id="fluent-log" logUrl="<%= log_tail_daemon_agent_path(fluentd) %>" initialAutoReload="<%= auto_reload ? "true" : "" %>">
   <div class="bottom-margin form-inline">
-    <button class="btn btn-primary" v-on="click: fetchLogs">
+    <button class="btn btn-primary mr-3" v-on:click="fetchLogs">
       <%= t "terms.reload_log" %>
     </button>
-    <input type="text" v-model="limit" size="4" v-on="keyup: fetchLogs | key enter" class="form-control"/>
+    <input type="text" v-model="limit" size="4" v-on:keyup.enter="fetchLogs" class="form-control"/>
     <%= t('terms.lines') %>
-    <label>
+    <label class="ml-3">
       <input type="checkbox" v-model="autoFetch" /> <%= t "terms.auto_reload", seconds: 1 %>
     </label>
     <span v-if="processing"><%= icon('fa-spin fa-refresh') %></span>
   </div>
-<pre v-if="isPresentedLogs"><!-- be careful indent -->
-<div class="log"><span v-repeat="logs">{{ $value }}
+<pre v-if="isPresentedLogs" class="card bg-light"><!-- be careful indent -->
+<div class="log card-body"><span v-for="log in logs">{{ log }}
 </span></div></pre>
   <div v-if="!isPresentedLogs && !processing">
@@ -22,4 +23,3 @@
   </div>
 </div>
 <!-- /vue.js -->