Fix planning tooltip view (glpi-project#1098)

* Add planning tooltip view * Add style for begin & end planning
orthagh · Oct 3, 2016 · fe7b441 · fe7b441
1 parent 3a2dee7
commit fe7b441
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/css/styles.css b/css/styles.css
@@ -1817,6 +1817,10 @@ a.icon_nav_move:hover img {
    height: 10px;
 }
 
+#planning .fc-divider {
+   border:1px dashed #cccccc;
+}
+
 /* for checkavailable */
 
 .planning {

diff --git a/inc/planning.class.php b/inc/planning.class.php
@@ -607,6 +607,7 @@ static function showPlanning($fullview = true) {
                element.find('.fc-list-item-title > a').prepend(eventtype_marker);
 
                var content = event.content;
+               var tooltip = event.tooltip;
                if(view.name !== 'month' && view.name !== 'listYear' && !event.allDay){
                   element
                      .append('<div class=\"content\">'+content+'</div>');
@@ -639,7 +640,7 @@ static function showPlanning($fullview = true) {
                   }
                   element.qtip({
                      position: qtip_position,
-                     content: content,
+                     content: tooltip,
                      style: {
                         classes: 'qtip-shadow qtip-bootstrap'
                      },
@@ -1748,7 +1749,8 @@ static function constructEventsArray($options = array()) {
          $users_id = (isset($event['users_id_tech']) && !empty($event['users_id_tech'])?
                         $event['users_id_tech']:
                         $event['users_id']);
-         $content = Planning::displayPlanningItem($event, $users_id, 'in', true);
+         $content = Planning::displayPlanningItem($event, $users_id, 'in', false);
+         $tooltip = Planning::displayPlanningItem($event, $users_id, 'in', true);
 
          $begin = date('c', strtotime($event['begin']));
          $end = date('c', strtotime($event['end']));
@@ -1763,6 +1765,7 @@ static function constructEventsArray($options = array()) {
          $index_color = array_search("user_$users_id", array_keys($_SESSION['glpi_plannings']));
          $events[] = array('title'       => $event['name'],
                            'content'     => $content,
+                           'tooltip'     => $tooltip,
                            'start'       => $begin,
                            'end'         => $end,
                            'editable'    => isset($event['editable'])?$event['editable']:false,