From bda31d7152e78b8e484c7b16accdbf7edeaaf96f Mon Sep 17 00:00:00 2001
From: Florian Beer <fb@42dev.eu>
Date: Thu, 4 Aug 2016 14:19:02 +0200
Subject: [PATCH 1/4] Update Apps overview page

---
 html/pages/apps/default.inc.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/html/pages/apps/default.inc.php b/html/pages/apps/default.inc.php
index 41380c9b1e..4118d21ae0 100644
--- a/html/pages/apps/default.inc.php
+++ b/html/pages/apps/default.inc.php
@@ -9,19 +9,18 @@ $graph_array_zoom['height'] = '150';
 $graph_array_zoom['width']  = '400';
 $graph_array['legend']      = 'no';
 
-echo '<h2>'.nicecase($vars['app']).'</h2>';
-echo '<table cellpadding=5 cellspacing=0 class=devicetable width=100%>';
 $app_devices = dbFetchRows('SELECT * FROM `devices` AS D, `applications` AS A WHERE D.device_id = A.device_id AND A.app_type = ?', array($vars['app']));
 
 foreach ($app_devices as $app_device) {
-    echo '<tr class="list-device">';
-    echo '<td class="device-head" width=300px>'.generate_device_link($app_device, shorthost($app_device['hostname']), array('tab' => 'apps', 'app' => $vars['app'])).'</td>';
-    echo '<td class="device-head" width=100px>'.$app_device['app_instance'].'</td>';
-    echo '<td class="device-head" width=100px>'.$app_device['app_status'].'</td>';
-    echo '<td></td>';
-    echo '</tr>';
-    echo '<tr class="list-device">';
-    echo '<td colspan=4>';
+    echo '<div class="panel panel-default">
+        <div class="panel-heading">
+        <h3 class="panel-title">
+        '.generate_device_link($app_device, shorthost($app_device['hostname']), array('tab' => 'apps', 'app' => $vars['app'])).'
+        <div class="pull-right"><small class="muted">'.$app_device['app_instance'].' '.$app_device['app_status'].'</small></div>
+        </h3>
+        </div>
+        <div class="panel-body">
+        <div class="row">';
 
     foreach ($graphs[$vars['app']] as $graph_type) {
     $graph_array['type']          = 'application_'.$vars['app'].'_'.$graph_type;
@@ -31,11 +30,14 @@ foreach ($app_devices as $app_device) {
 
         $link = generate_url(array('page' => 'device', 'device' => $app_device['device_id'], 'tab' => 'apps', 'app' => $vars['app']));
 
+        echo '<div class="pull-left">';
         echo overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL);
+        echo '</div>';
     }
 
-    echo '</td>';
-    echo '</tr>';
+    echo '</div>';
+    echo '</div>';
+    echo '</div>';
 }//end foreach
 
 echo '</table>';

From 362f40e988af219f6a68f84b99aa9ac5695fe215 Mon Sep 17 00:00:00 2001
From: Florian Beer <fb@42dev.eu>
Date: Thu, 4 Aug 2016 15:58:58 +0200
Subject: [PATCH 2/4] Update header link color

---
 html/css/styles.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/html/css/styles.css b/html/css/styles.css
index 5f9aaa5587..e30ff97963 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -43,8 +43,8 @@ ul ul ul { list-style: square outside; }
 }
 
 .pagemenu-selected {
-  font-weight: bold; 
-  background-color: #dfdfdf; 
+  font-weight: bold;
+  background-color: #dfdfdf;
 
   border: 1px solid #c0c0c0;
 
@@ -436,7 +436,7 @@ tr.list-device-ignored-up {
 }
 
 .device-head, a.list-device {
-  color: #1111aa;
+  color: #23527c;
 }
 
 a.list-device-down, a.list-device-down, a.list-device-down:visited {
@@ -1251,7 +1251,7 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover {
   padding:1px;
   margin:0;
 }
-  
+
 
 /* Header
 -----------------------------------------------------------------------------*/
@@ -1332,15 +1332,15 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover {
 }
 
 .div-normal {
-  
+
 }
 .div-alert {
-  border: 2px solid; 
+  border: 2px solid;
   #border-radius: 10px;
   border-color: #cc0000;
 }
 .div-ignore {
-  
+
 }
 .div-ignore-alert {
 
@@ -1749,7 +1749,7 @@ tr.search:nth-child(odd) {
     -o-user-select: none;
     user-select: none; // Default
 }
-		
+
 .zoomOut {
     top:30px;
 }

From 559658323003a84442553683030d537c05744ff8 Mon Sep 17 00:00:00 2001
From: Florian Beer <fb@42dev.eu>
Date: Thu, 4 Aug 2016 16:40:13 +0200
Subject: [PATCH 3/4] Show graphs for apps that do not set graph type

---
 html/pages/apps/default.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/pages/apps/default.inc.php b/html/pages/apps/default.inc.php
index 4118d21ae0..84f583f80a 100644
--- a/html/pages/apps/default.inc.php
+++ b/html/pages/apps/default.inc.php
@@ -23,7 +23,7 @@ foreach ($app_devices as $app_device) {
         <div class="row">';
 
     foreach ($graphs[$vars['app']] as $graph_type) {
-    $graph_array['type']          = 'application_'.$vars['app'].'_'.$graph_type;
+        $graph_array['type']      = empty($graph_type) ? 'application_'.$vars['app'] : 'application_'.$vars['app'].'_'.$graph_type;
         $graph_array['id']        = $app_device['app_id'];
         $graph_array_zoom['type'] = 'application_'.$vars['app'].'_'.$graph_type;
         $graph_array_zoom['id']   = $app_device['app_id'];

From f88d6171d27e762bc2d657c663143734e428f022 Mon Sep 17 00:00:00 2001
From: Florian Beer <fb@42dev.eu>
Date: Thu, 4 Aug 2016 16:43:01 +0200
Subject: [PATCH 4/4] Show os-updates graph on app overview page

---
 html/pages/apps.inc.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/pages/apps.inc.php b/html/pages/apps.inc.php
index 855de431c7..fb767fe76b 100644
--- a/html/pages/apps.inc.php
+++ b/html/pages/apps.inc.php
@@ -56,6 +56,8 @@ $graphs['tinydns']   = array(
     'other',
 );
 
+$graphs['os-updates'] = array('');
+
 print_optionbar_start();
 
 echo "<span style='font-weight: bold;'>Apps</span> &#187; ";