From 3e6503928ffe22f4c4f575396a0ec599fdc1e17e Mon Sep 17 00:00:00 2001
From: Emrys <emrys@openenergymonitor.org>
Date: Fri, 5 Apr 2019 18:36:20 +0100
Subject: [PATCH 1/5] backward compatible emoncms 8

---
 graph_controller.php | 2 +-
 graph_menu.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/graph_controller.php b/graph_controller.php
index 2f45989..a7ee8da 100644
--- a/graph_controller.php
+++ b/graph_controller.php
@@ -72,7 +72,7 @@ function graph_controller()
     }
 
     else {
-        $route->sidebar = view("Modules/graph/Views/sidebar.php");
+        $route->sidebar = view("Modules/graph/Views/sidebar.php",array());
         $result = view("Modules/graph/view.php", array("session" => $session["write"]));
     }
 
diff --git a/graph_menu.php b/graph_menu.php
index b52c575..1dcc247 100644
--- a/graph_menu.php
+++ b/graph_menu.php
@@ -10,4 +10,4 @@
         'data'=> array('sidebar' => '#sidebar_graph')
     );
 
-    $menu['sidebar']['includes']['setup']['graph'] = view('Modules/graph/Views/sidebar.php');
\ No newline at end of file
+    $menu['sidebar']['includes']['setup']['graph'] = view('Modules/graph/Views/sidebar.php',array());
\ No newline at end of file

From ce8ede75a437748ff218229480db2501716760e2 Mon Sep 17 00:00:00 2001
From: Emrys <emrys@openenergymonitor.org>
Date: Tue, 23 Apr 2019 17:10:30 +0100
Subject: [PATCH 2/5] moved graph module to new emoncms menu

---
 graph.css      | 2 +-
 graph_menu.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/graph.css b/graph.css
index 24118e0..25a42f7 100644
--- a/graph.css
+++ b/graph.css
@@ -28,7 +28,7 @@
     width: 14rem;
     overflow: hidden;
     position: relative;
-    margin-bottom: 3rem;
+    /* margin-bottom: 3rem; */
 }
 #graph-list input{
     width:12rem;
diff --git a/graph_menu.php b/graph_menu.php
index 1dcc247..39f60c5 100644
--- a/graph_menu.php
+++ b/graph_menu.php
@@ -1,6 +1,6 @@
 <?php
 
-    $menu['sidebar']['setup'][] = array(
+    $menu['sidebar']['emoncms'][] = array(
         'text' => _("Graphs"),
         'path' => 'graph',
         'active'=>'graph',
@@ -10,4 +10,4 @@
         'data'=> array('sidebar' => '#sidebar_graph')
     );
 
-    $menu['sidebar']['includes']['setup']['graph'] = view('Modules/graph/Views/sidebar.php',array());
\ No newline at end of file
+    $menu['sidebar']['includes']['emoncms']['graph'] = view('Modules/graph/Views/sidebar.php',array());
\ No newline at end of file

From ee9df7ebda22cd2669bcbcfd975e8c5ce47bcb84 Mon Sep 17 00:00:00 2001
From: Emrys <emrys@openenergymonitor.org>
Date: Wed, 24 Apr 2019 14:33:49 +0100
Subject: [PATCH 3/5] merged with master

---
 graph.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/graph.css b/graph.css
index a868b62..911bd04 100644
--- a/graph.css
+++ b/graph.css
@@ -188,7 +188,6 @@ input.feed-tag-checkbox-left, input.feed-tag-checkbox-right{
     outline: none;
 }
 
-<<<<<<< HEAD
 table#feeds.table thead th{
     border-top: 4px solid #333;
     font-weight: normal !important;
@@ -240,7 +239,6 @@ table#feeds.table .caret {
     opacity: .3;
     transform: scale(.99);
 }
-=======
 #download-buttons form{
     margin: 0;
     padding: 0;
@@ -253,7 +251,6 @@ table#feeds.table .caret {
     width: auto;
 }
 
->>>>>>> ce6dd74d1cfcd9fd48c1ef97d88385bf1629d5e2
 @media(max-width: 512px) {
     #legend .col {
         position: relative; left: 0;

From f8e1c119a9cb7aa1b1578d7d0139213698728e40 Mon Sep 17 00:00:00 2001
From: Emrys <emrys@openenergymonitor.org>
Date: Mon, 29 Apr 2019 15:06:11 +0100
Subject: [PATCH 4/5] set max width for feed name in graph sidebar

---
 graph.css | 4 ++++
 graph.js  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/graph.css b/graph.css
index 911bd04..32382de 100644
--- a/graph.css
+++ b/graph.css
@@ -212,6 +212,10 @@ table#feeds.table tbody tr th{
 table#feeds.table tbody tr th:hover{
     text-decoration: underline;
 }
+table#feeds.table tbody tr th.feed-title span{
+    max-width:9em;
+}
+
 table#feeds.table .caret {
     border-top-color: currentColor !important;
     display: inline-block;
diff --git a/graph.js b/graph.js
index c2c509a..f37b292 100644
--- a/graph.js
+++ b/graph.js
@@ -257,7 +257,7 @@ function graph_init_editor()
            if (name.length>20) {
                name = name.substr(0,20)+"..";
            }
-           out += "<th class='feed-title' data-feedid='"+feedsbytag[tag][z].id+"'>"+name+"</th>";
+           out += "<th class='feed-title' title='"+name+"' data-feedid='"+feedsbytag[tag][z].id+"'><span class='text-truncate d-inline-block'>"+name+"</span></th>";
            out += "<td><input class='feed-select-left' data-feedid='"+feedsbytag[tag][z].id+"' type='checkbox'></td>";
            out += "<td><input class='feed-select-right' data-feedid='"+feedsbytag[tag][z].id+"' type='checkbox'></td>";
            out += "</tr>";

From 7b57cf40a3536324249b275170a98905a3bca503 Mon Sep 17 00:00:00 2001
From: Emrys <emrys@openenergymonitor.org>
Date: Tue, 30 Apr 2019 16:13:48 +0100
Subject: [PATCH 5/5] bumped js/css version

---
 view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view.php b/view.php
index 0de9c16..b5f5720 100644
--- a/view.php
+++ b/view.php
@@ -14,7 +14,7 @@
     $menucollapses = true;
     
     $userid = 0;
-    $v = 2;
+    $v = 3;
     
     if (isset($_GET['userid'])) $userid = (int) $_GET['userid'];