Corrections esthétiques

BrunoSpy · Aug 30, 2016 · a2cb39d · a2cb39d
1 parent 810cdec
commit a2cb39d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/module/Application/public/assets/css/timeline.css b/module/Application/public/assets/css/timeline.css
@@ -18,7 +18,6 @@
 .Base {
 	position:fixed;
 	background-color: white;
-	z-index: 2;
 }
 
 .Time_obj {
@@ -102,7 +101,6 @@
 
 .elmt.notpunctual .rect_elmt {
 	top: 0px;
-	z-index: 2;
 	border-width: 1px;
 	border-radius: 5px;
 	border-color: transparent;

diff --git a/module/Application/public/assets/js/jquery.timepicker.js b/module/Application/public/assets/js/jquery.timepicker.js
@@ -171,7 +171,7 @@
                     weekStart : 1,
                     switchOnClick: true,
                     nowButton: true,
-                    nowText: "Jour"
+                    nowText: "Ce jour"
                 });
 
                 div.on('click', 'span.glyphicon-calendar', function(e){

diff --git a/module/Core/src/Core/View/Helper/NavBar.php b/module/Core/src/Core/View/Helper/NavBar.php
@@ -116,13 +116,13 @@ public function __invoke($color = 'epeires')
         $html .= '</form>';
         $html .= '<div id="changeview" class="navbar-right" style="margin-top: 5px">Vue : <div class="btn-group" data-toggle="buttons">';
         $html .= '<label class="btn btn-xs btn-info active">';
-        $html .= '<input name="viewOptions" id="viewsix" type="radio" autocomplete="off" value="six" checked><strong>6h</strong>';
+        $html .= '<input name="viewOptions" id="viewsix" type="radio" autocomplete="off" value="six" checked><strong>6 h</strong>';
         $html .= '</label>';
         $html .= '<label class="btn btn-xs btn-info ">';
-        $html .= '<input name="viewOptions" id="viewday" type="radio" autocomplete="off" value="day"><strong>24h</strong>';
+        $html .= '<input name="viewOptions" id="viewday" type="radio" autocomplete="off" value="day"><strong>24 h</strong>';
         $html .= '</label>';
         $html .= '<label class="btn btn-xs btn-info ">';
-        $html .= '<input name="viewOptions" id="viewmonth" type="radio" autocomplete="off" value="month"><strong>Mois</strong>';
+        $html .= '<input name="viewOptions" id="viewmonth" type="radio" autocomplete="off" value="month"><strong>7 j/+</strong>';
         $html .= '</label>';
         $html .= '</div></div>';
         $html .= '</div></div></nav>';