diff --git a/Dockerfile b/Dockerfile index 833943b..9898f94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM ubuntu:trusty MAINTAINER Philippe Pepos Petitclerc # Set the locale -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 RUN apt-get update && apt-get install -yq git apache2 npm nodejs-legacy ruby diff --git a/app/assets/js/scripts.js b/app/assets/js/scripts.js index b88172a..63216c3 100644 --- a/app/assets/js/scripts.js +++ b/app/assets/js/scripts.js @@ -28,11 +28,11 @@ var AdagiosUI = (function() { $activeHostCell .prev('th') - .css('background-color', activeHostCell_bkgColor); + .css('background-color', activeHostCell_bkgColor); }; var closeSidebar = function() { - $('.sidebar__close').on('click', function() { + $('.sidebar__close').on('click', function() { $('.topbar__toggle-sidebar').find('.topbar__button').trigger('click'); }); }; @@ -44,5 +44,5 @@ var AdagiosUI = (function() { syncBkgCheckbox : syncBkgCheckbox, closeSidebar : closeSidebar }; - + })(); diff --git a/app/assets/sass/global/_color-schemes.scss b/app/assets/sass/global/_color-schemes.scss index 21a2f86..d0a5a4c 100644 --- a/app/assets/sass/global/_color-schemes.scss +++ b/app/assets/sass/global/_color-schemes.scss @@ -10,7 +10,7 @@ // Dark Scheme //----------------------------------*/ -.color-scheme--dark { +.color-scheme--dark { %colorTxtCurrent { color:$_color_dark_delta; } @@ -41,12 +41,12 @@ %colorBkgTopbar { background:$_color_dark_beta; } - + %colorBkgTopbarPanel { background:$_color_dark_alpha; } %colorBkgTopbarButton { - background:$_color_dark_beta; + background:$_color_dark_beta; } } diff --git a/app/assets/sass/global/_default.scss b/app/assets/sass/global/_default.scss index 88a119f..5f69a1a 100644 --- a/app/assets/sass/global/_default.scss +++ b/app/assets/sass/global/_default.scss @@ -208,7 +208,7 @@ table { //@include medium-and-up-screen { // display:table; - // overflow-x:visible; + // overflow-x:visible; //} } diff --git a/app/assets/sass/global/_helpers.scss b/app/assets/sass/global/_helpers.scss index 8b4e935..0646be6 100644 --- a/app/assets/sass/global/_helpers.scss +++ b/app/assets/sass/global/_helpers.scss @@ -8,7 +8,7 @@ border: 0; overflow: hidden; text-indent: -9999px; - + &:before { content: ""; display: block; diff --git a/app/assets/sass/global/_iconography.scss b/app/assets/sass/global/_iconography.scss index f90377d..bee50ae 100644 --- a/app/assets/sass/global/_iconography.scss +++ b/app/assets/sass/global/_iconography.scss @@ -24,34 +24,34 @@ } } */ - + [class^="ico-"]:before, [class*=" ico-"]:before { font-family: "adagios-fontawesome"; font-style: normal; font-weight: normal; speak: none; - + display: inline-block; text-decoration: inherit; width: 1em; margin-right: .2em; text-align: center; /* opacity: .8; */ - + /* For safety - reset parent styles, that can break glyph codes*/ font-variant: normal; text-transform: none; - + /* fix buttons height, for twitter bootstrap */ line-height: 1em; - + /* Animation center compensation - margins should be symmetric */ /* remove if not needed */ margin-left: .2em; - + /* you can be more comfortable with increased icons size */ /* font-size: 120%; */ - + /* Uncomment for 3D effect */ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ } diff --git a/app/assets/sass/global/_layout.scss b/app/assets/sass/global/_layout.scss index b907ecf..401db93 100644 --- a/app/assets/sass/global/_layout.scss +++ b/app/assets/sass/global/_layout.scss @@ -19,7 +19,7 @@ .layout__main { width:100%; - + @include medium-and-up-screen { display:table-cell; vertical-align:top; diff --git a/app/assets/sass/modules-interface/_main.scss b/app/assets/sass/modules-interface/_main.scss index f293c58..c474beb 100644 --- a/app/assets/sass/modules-interface/_main.scss +++ b/app/assets/sass/modules-interface/_main.scss @@ -119,7 +119,7 @@ .main__content__header { .main__content__title, - .main__content__alert { + .main__content__alert { @include large-xlarge-screen { float:left; diff --git a/app/assets/sass/modules-objects/_panes.scss b/app/assets/sass/modules-objects/_panes.scss index d426c9b..ab9a824 100644 --- a/app/assets/sass/modules-objects/_panes.scss +++ b/app/assets/sass/modules-objects/_panes.scss @@ -3,7 +3,7 @@ //----------------------------------*/ .panes { //background:aquamarine; - //border:5px solid red; + //border:5px solid red; display:block; overflow-x:auto; width:auto; @@ -26,15 +26,15 @@ } .panes__container { - //background:indigo; - display:table; + //background:indigo; + display:table; width:auto; width:840px; @include medium-and-up-screen { display:table-row; min-width:0; - position:static; + position:static; } } diff --git a/app/assets/sass/modules-objects/_problems.scss b/app/assets/sass/modules-objects/_problems.scss index a5112eb..0cbc83a 100644 --- a/app/assets/sass/modules-objects/_problems.scss +++ b/app/assets/sass/modules-objects/_problems.scss @@ -108,7 +108,7 @@ .problems__name { &:after { background:transparent; - border:1px solid; + border:1px solid; border-radius:0 0 0 5px; content:""; display:block; @@ -174,6 +174,6 @@ .color-scheme--light & { background:$_color_light_gamma; - color:$_color_alpha; + color:$_color_alpha; } } \ No newline at end of file diff --git a/app/assets/sass/modules-objects/_togglable-tabs.scss b/app/assets/sass/modules-objects/_togglable-tabs.scss index daa5bb0..af07254 100644 --- a/app/assets/sass/modules-objects/_togglable-tabs.scss +++ b/app/assets/sass/modules-objects/_togglable-tabs.scss @@ -12,7 +12,7 @@ .tabpanel__tab { border-style:solid; border-width:0 0 1px; - display:block; + display:block; line-height:1; margin:0 0 0 ($_space / 3); padding:0 $_space .5em 0; diff --git a/app/assets/sass/modules-simples/_buttons.scss b/app/assets/sass/modules-simples/_buttons.scss index 3574016..314f6d5 100644 --- a/app/assets/sass/modules-simples/_buttons.scss +++ b/app/assets/sass/modules-simples/_buttons.scss @@ -2,7 +2,7 @@ // BUTTON MODULE //----------------------------------*/ %button-reset { - background:transparent; + background:transparent; border:0; display:inline-block; padding:0; diff --git a/app/components/sidebar/_sidebar.scss b/app/components/sidebar/_sidebar.scss index de47d54..45a2787 100644 --- a/app/components/sidebar/_sidebar.scss +++ b/app/components/sidebar/_sidebar.scss @@ -3,7 +3,7 @@ //----------------------------------*/ .sidebar-wrapper { @extend %colorBkgPanel; - padding-bottom:em(72+$_space, $_base_font_size); + padding-bottom:em(72+$_space, $_base_font_size); } //.sidebar {} diff --git a/app/components/table/cell_last_check/cell_last_check.css b/app/components/table/cell_last_check/cell_last_check.css index 0b10c82..4f74ddf 100644 --- a/app/components/table/cell_last_check/cell_last_check.css +++ b/app/components/table/cell_last_check/cell_last_check.css @@ -27,7 +27,7 @@ margin: 0px; line-height: 35px; cursor: pointer; - /* + /* .collapsed{ .arrow:before{ font-family: FontAwesome; diff --git a/app/components/tactical/current_health/current_health.html b/app/components/tactical/current_health/current_health.html index 6fb5267..deb3f0d 100644 --- a/app/components/tactical/current_health/current_health.html +++ b/app/components/tactical/current_health/current_health.html @@ -17,4 +17,4 @@ - + diff --git a/app/components/tactical/status_overview/status_overview.html b/app/components/tactical/status_overview/status_overview.html index 28191af..d8ed60f 100644 --- a/app/components/tactical/status_overview/status_overview.html +++ b/app/components/tactical/status_overview/status_overview.html @@ -16,7 +16,7 @@ Hosts {{totalHosts}} {{hostProblems}} - + Services {{totalServices}} diff --git a/app/components/tactical/tactical.html b/app/components/tactical/tactical.html index 38f6bad..2ccf5e4 100644 --- a/app/components/tactical/tactical.html +++ b/app/components/tactical/tactical.html @@ -3,11 +3,11 @@
- +
- +
diff --git a/app/components/tactical/top_alert_producers/top_alert_producers.html b/app/components/tactical/top_alert_producers/top_alert_producers.html index efa23cb..8861372 100644 --- a/app/components/tactical/top_alert_producers/top_alert_producers.html +++ b/app/components/tactical/top_alert_producers/top_alert_producers.html @@ -9,6 +9,6 @@ {{ host.host_name }} {{ host.problems }} - + diff --git a/app/components/topbar/_topbar.scss b/app/components/topbar/_topbar.scss index 3dcfa3e..3a2f94e 100644 --- a/app/components/topbar/_topbar.scss +++ b/app/components/topbar/_topbar.scss @@ -87,7 +87,7 @@ &.topbar__button--hover { transition-duration: 0.5s; transition-property: color, background-color; - + &[aria-expanded="true"], &:hover { .color-scheme--dark & { @@ -128,9 +128,9 @@ } .topbar__notifications { - + .ico-bell-alt { - + &:after { background:$_color_error; border-radius:100%; @@ -169,7 +169,7 @@ } } -.topbar__settings { +.topbar__settings { .ico-sliders:before { @include vendor(transform, rotate(90deg)); diff --git a/app/components/topbar/topbar.html b/app/components/topbar/topbar.html index 948cbb8..2bce49c 100644 --- a/app/components/topbar/topbar.html +++ b/app/components/topbar/topbar.html @@ -22,7 +22,7 @@ Voir les notifications - +
    @@ -47,13 +47,13 @@
- +
  1. localhost - +
    Root partition @@ -64,7 +64,7 @@
  2. www.theatlantic.com - +
    HTTP www.theatlantic.com @@ -75,20 +75,20 @@
  3. www.savoirfairelinux.com - +
    Verbis se superiores opere enim 8 days, 5 hours
    Check_http: invalid onedirection option - $
    - +
    CPU utilization 1 days, 3 hours
    NRPE: Command checkCPU not defined
    - +
    Runnning services 1 days, 12 hours @@ -97,10 +97,10 @@
- +
- +
ALL PROBLEMS
@@ -108,7 +108,7 @@
- +
  • - +