From ed18dd904b11f2454abc11119c95c19e86d43259 Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Thu, 19 Oct 2017 15:40:53 +0200
Subject: [PATCH 01/11] WIP: button for exporting tables as csv

Changes are made in layout.html and button libraries were added:

<link rel="stylesheet"String type="text/css"String href="https://cdn.datatables.net/v/dt/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-html5-1.4.2/b-print-1.4.2/datatables.min.css"String/>

<script type="text/javascript"String src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"String></script>
<script type="text/javascript"String src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"String></script>
<script type="text/javascript"String src="https://cdn.datatables.net/v/dt/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-html5-1.4.2/b-print-1.4.2/datatables.min.js"String></script>
---
 puppetboard/templates/layout.html | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index 5c740a2b..fd51ddfa 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{config.PAGE_TITLE}}</title>
+    <title>Puppetboard</title>
     {% if config.OFFLINE_MODE %}
     <style>
       @font-face {
@@ -18,14 +18,18 @@
     <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css' />
     <link href="{{ url_for('static', filename='Semantic-UI-2.1.8/semantic.min.css') }}" rel="stylesheet" />
     <link href='//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.13/css/dataTables.semanticui.min.css' rel='stylesheet' type='text/css'>
+    
     {% endif %}
-    <link href="{{ url_for('static', filename='css/c3.min.css') }}" rel="stylesheet" />
     <link href="{{ url_for('static', filename='css/puppetboard.css') }}" rel="stylesheet" />
 
     {% if config.OFFLINE_MODE %}
       <script src="{{ url_for('static', filename='jquery-2.1.1/jquery.min.js') }}"></script>
       <script src="{{ url_for('static', filename='jquery-datatables-1.10.13/jquery.dataTables.min.js') }}"></script>
       <script src="{{ url_for('static', filename='jquery-datatables-1.10.13/dataTables.semanticui.min.js') }}"></script>
+      <script src="{{ url_for('static', filename='DataTables/Buttons-1.4.2/js/dataTables.buttons.min.js') }}"></script>
+      <script src="{{ url_for('static', filename='DataTables/Buttons-1.4.2/js/dataTables.semanticui.min.js') }}"></script>
+      <script src="{{ url_for('static', filename='DataTables/Buttons-1.4.2/js/js/buttons.html5.min.js') }}"></script>
+      
       {% if config.LOCALISE_TIMESTAMP %}
       <script src="{{ url_for('static', filename='moment.js-2.7.0/moment.min.js') }}"></script>
       {% endif %}
@@ -46,7 +50,8 @@
     <script src="{{url_for('static', filename='js/d3.min.js')}}"></script>
     <script src="{{url_for('static', filename='js/c3.min.js')}}"></script>
     <script src="{{url_for('static',
-                  filename='jquery-tablesort-v.0.0.11/jquery.tablesort.min.js')}}"></script>
+    filename='jquery-tablesorter-v.2.0.5/jquery.tablesorter.min.js')}}"></script>
+
     {% block script %} {% endblock script %}
     <script type="text/javascript">
     {% block javascript %} {% endblock javascript %}
@@ -56,8 +61,28 @@
           $.getScript('{{url_for('static', filename='js/tables.js')}}')
           {% block onload_script %} {% endblock onload_script %}
         })
+
+    
+      $("table:visible").DataTable( {
+          dom: 'Bfrtip',
+                buttons: [
+      
+                  'copy',
+      
+                  'csv',
+      
+                  'excel',
+
+	          'pdf',
+
+                  'print',
+      
+              ]
+      
+      } );
     </script>
     {% block head %} {% endblock head %}
+
   </head>
 
   <body>

From d6ca8e1f3785b3d20f0561fb05181c66b8884017 Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Wed, 25 Oct 2017 15:17:27 +0200
Subject: [PATCH 02/11] Add files via upload

---
 puppetboard/templates/layout.html | 108 +++++++++++++++++++++++++++---
 1 file changed, 100 insertions(+), 8 deletions(-)

diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index fd51ddfa..926098e7 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -3,6 +3,7 @@
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Puppetboard</title>
+    <button id="export" style='margin-left: 50 px;'>export csv</button>
     {% if config.OFFLINE_MODE %}
     <style>
       @font-face {
@@ -18,13 +19,16 @@
     <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css' />
     <link href="{{ url_for('static', filename='Semantic-UI-2.1.8/semantic.min.css') }}" rel="stylesheet" />
     <link href='//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.13/css/dataTables.semanticui.min.css' rel='stylesheet' type='text/css'>
-    
     {% endif %}
     <link href="{{ url_for('static', filename='css/puppetboard.css') }}" rel="stylesheet" />
 
     {% if config.OFFLINE_MODE %}
       <script src="{{ url_for('static', filename='jquery-2.1.1/jquery.min.js') }}"></script>
       <script src="{{ url_for('static', filename='jquery-datatables-1.10.13/jquery.dataTables.min.js') }}"></script>
+      <script src="{{ url_for('static', filename='jquery-plugin/dataTables.filesizeTypeDetect.js') }}"></script>
+      <script src="{{ url_for('static', filename='jquery-plugin/dataTables.filesizeSort.js') }}"></script>
+      <script src="{{ url_for('static', filename='jquery-plugin/ip-adress_Det.js') }}"></script>
+      <script src="{{ url_for('static', filename='jquery-plugin/ip-adress_SORT.js') }}"></script>
       <script src="{{ url_for('static', filename='jquery-datatables-1.10.13/dataTables.semanticui.min.js') }}"></script>
       <script src="{{ url_for('static', filename='DataTables/Buttons-1.4.2/js/dataTables.buttons.min.js') }}"></script>
       <script src="{{ url_for('static', filename='DataTables/Buttons-1.4.2/js/dataTables.semanticui.min.js') }}"></script>
@@ -36,6 +40,7 @@
     {% else %}
       <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
       <script src="//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.13/js/jquery.dataTables.min.js"></script>
+      <script src="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css"></script>
       <script src="//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.13/js/dataTables.semanticui.min.js"></script>
       {% if config.LOCALISE_TIMESTAMP %}
         <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.7.0/moment.min.js"></script>
@@ -67,19 +72,106 @@
           dom: 'Bfrtip',
                 buttons: [
       
-                  'copy',
+                  'copyHtml5',
       
-                  'csv',
+                  'excelHtml5',
       
-                  'excel',
-
-	          'pdf',
-
-                  'print',
+                  'csvHtml5',
       
               ]
       
       } );
+
+      $('#export').click(function() {
+      var titles = [];
+      var data = [];
+
+  /*
+   * Get the table headers, this will be CSV headers
+   * The count of headers will be CSV string separator
+   */
+  $('.dataTable th').each(function() {
+    titles.push($(this).text());
+  });
+
+  /*
+   * Get the actual data, this will contain all the data, in 1 array
+   */
+  $('.dataTable td').each(function() {
+    data.push($(this).text());
+  });
+  
+  /*
+   * Convert our data to CSV string
+   */
+  var CSVString = prepCSVRow(titles, titles.length);
+  CSVString += prepCSVRow(data, titles.length);
+
+  /*
+   * Make CSV downloadable
+   */
+  var downloadLink = document.createElement("a");
+  blob = new Blob([CSVString]);
+  downloadLink.href = URL.createObjectURL(blob);
+  downloadLink.download = "data.csv";
+
+  /*
+   * Actually download CSV
+   */
+  document.body.appendChild(downloadLink);
+  downloadLink.click();
+  document.body.removeChild(downloadLink);
+});
+
+   /*
+* Convert data array to CSV string
+* @param arr {Array} - the actual data
+* @param columnCount {Number} - the amount to split the data into columns
+* @param initial {String} - initial string to append to CSV string
+* return {String} - ready CSV string
+*/
+function prepCSVRow(arr, columnCount, initial) {
+  var row = ''; // this will hold data
+  var delimeter = ','; // data slice separator, in excel it's `;`, in usual CSv it's `,`
+  var newLine = '\r\n'; // newline separator for CSV row
+
+  /*
+   * Convert [1,2,3,4] into [[1,2], [3,4]] while count is 2
+   * @param _arr {Array} - the actual array to split
+   * @param _count {Number} - the amount to split
+   * return {Array} - splitted array
+   */
+  function splitArray(_arr, _count) {
+    var splitted = [];
+    var result = [];
+    _arr.forEach(function(item, idx) {
+      if ((idx + 1) % _count === 0) {
+        splitted.push(item);
+        result.push(splitted);
+        splitted = [];
+      } else {
+        splitted.push(item);
+      }
+    });
+    return result;
+  }
+  var plainArr = splitArray(arr, columnCount);
+  // don't know how to explain this
+  // you just have to like follow the code
+  // and you understand, it's pretty simple
+  // it converts `['a', 'b', 'c']` to `a,b,c` string
+  plainArr.forEach(function(arrItem) {
+    arrItem.forEach(function(item, idx) {
+      row += item + ((idx + 1) === arrItem.length ? '' : delimeter);
+    });
+    row += newLine;
+  });
+  return initial + row;
+}
+
+document.write('<button type="button" onclick="#export()">Test :)</button>');
+
+</script>
     </script>
     {% block head %} {% endblock head %}
 

From 63816af6e42143ecfdaff53755fbde277130adf8 Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Fri, 27 Oct 2017 08:46:50 +0200
Subject: [PATCH 03/11] Button for export finally works

Button for export finally works
---
 puppetboard/templates/layout.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index 926098e7..3f6d4b1b 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -3,7 +3,7 @@
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Puppetboard</title>
-    <button id="export" style='margin-left: 50 px;'>export csv</button>
+    <button id="export" style="color:#b53f3f;box-shadow: 4px 4px #0a214a;margin-top: 5 px; margin-left: 5 px">Export data as csv</button>
     {% if config.OFFLINE_MODE %}
     <style>
       @font-face {
@@ -104,15 +104,16 @@
   /*
    * Convert our data to CSV string
    */
-  var CSVString = prepCSVRow(titles, titles.length);
-  CSVString += prepCSVRow(data, titles.length);
+  var CSVString = prepCSVRow(titles, titles.length, '');
+  CSVString = prepCSVRow(data, titles.length, CSVString);
 
   /*
    * Make CSV downloadable
    */
   var downloadLink = document.createElement("a");
-  blob = new Blob([CSVString]);
-  downloadLink.href = URL.createObjectURL(blob);
+  var blob = new Blob(["\ufeff", CSVString]);
+  var url = URL.createObjectURL(blob);
+  downloadLink.href = url;
   downloadLink.download = "data.csv";
 
   /*
@@ -169,7 +170,7 @@
   return initial + row;
 }
 
-document.write('<button type="button" onclick="#export()">Test :)</button>');
+//document.write('<button type="button" onclick="#export()">Export will be here :)</button>');
 
 </script>
     </script>

From a68c8550571c933f0f321281cd4fbac8f497d49b Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Tue, 7 Nov 2017 08:50:33 +0100
Subject: [PATCH 04/11] Add files via upload

---
 puppetboard/templates/layout.html | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index 3f6d4b1b..fbab9759 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -25,14 +25,8 @@
     {% if config.OFFLINE_MODE %}
       <script src="{{ url_for('static', filename='jquery-2.1.1/jquery.min.js') }}"></script>
       <script src="{{ url_for('static', filename='jquery-datatables-1.10.13/jquery.dataTables.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='jquery-plugin/dataTables.filesizeTypeDetect.js') }}"></script>
-      <script src="{{ url_for('static', filename='jquery-plugin/dataTables.filesizeSort.js') }}"></script>
-      <script src="{{ url_for('static', filename='jquery-plugin/ip-adress_Det.js') }}"></script>
-      <script src="{{ url_for('static', filename='jquery-plugin/ip-adress_SORT.js') }}"></script>
       <script src="{{ url_for('static', filename='jquery-datatables-1.10.13/dataTables.semanticui.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='DataTables/Buttons-1.4.2/js/dataTables.buttons.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='DataTables/Buttons-1.4.2/js/dataTables.semanticui.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='DataTables/Buttons-1.4.2/js/js/buttons.html5.min.js') }}"></script>
+
       
       {% if config.LOCALISE_TIMESTAMP %}
       <script src="{{ url_for('static', filename='moment.js-2.7.0/moment.min.js') }}"></script>
@@ -40,7 +34,6 @@
     {% else %}
       <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
       <script src="//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.13/js/jquery.dataTables.min.js"></script>
-      <script src="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css"></script>
       <script src="//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.13/js/dataTables.semanticui.min.js"></script>
       {% if config.LOCALISE_TIMESTAMP %}
         <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.7.0/moment.min.js"></script>
@@ -54,8 +47,8 @@
     <script src="{{ url_for('static', filename='js/scroll.top.js') }}"></script>
     <script src="{{url_for('static', filename='js/d3.min.js')}}"></script>
     <script src="{{url_for('static', filename='js/c3.min.js')}}"></script>
-    <script src="{{url_for('static',
-    filename='jquery-tablesorter-v.2.0.5/jquery.tablesorter.min.js')}}"></script>
+    <script src="{{url_for('static', filename='jquery-tablesort-v.0.0.11/jquery.tablesort.min.js')}}"></script> 
+
 
     {% block script %} {% endblock script %}
     <script type="text/javascript">
@@ -68,20 +61,6 @@
         })
 
     
-      $("table:visible").DataTable( {
-          dom: 'Bfrtip',
-                buttons: [
-      
-                  'copyHtml5',
-      
-                  'excelHtml5',
-      
-                  'csvHtml5',
-      
-              ]
-      
-      } );
-
       $('#export').click(function() {
       var titles = [];
       var data = [];
@@ -170,7 +149,6 @@
   return initial + row;
 }
 
-//document.write('<button type="button" onclick="#export()">Export will be here :)</button>');
 
 </script>
     </script>

From c34a85840cb72f6b5a84e04613e8821136ff1a92 Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Tue, 28 Nov 2017 12:47:43 +0100
Subject: [PATCH 05/11] Update layout.html

---
 puppetboard/templates/layout.html | 36 ++-----------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index fbab9759..13af2a75 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -3,7 +3,8 @@
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Puppetboard</title>
-    <button id="export" style="color:#b53f3f;box-shadow: 4px 4px #0a214a;margin-top: 5 px; margin-left: 5 px">Export data as csv</button>
+    <button id="export" style="clear: right;width:127px;height:50px;color:#0a214a;box-shadow: 4px 4px #0a214a;margin-top: 5 px; margin-left: 5 px">Export data as csv</button>
+
     {% if config.OFFLINE_MODE %}
     <style>
       @font-face {
@@ -65,62 +66,33 @@
       var titles = [];
       var data = [];
 
-  /*
-   * Get the table headers, this will be CSV headers
-   * The count of headers will be CSV string separator
-   */
   $('.dataTable th').each(function() {
     titles.push($(this).text());
   });
 
-  /*
-   * Get the actual data, this will contain all the data, in 1 array
-   */
   $('.dataTable td').each(function() {
     data.push($(this).text());
   });
   
-  /*
-   * Convert our data to CSV string
-   */
   var CSVString = prepCSVRow(titles, titles.length, '');
   CSVString = prepCSVRow(data, titles.length, CSVString);
 
-  /*
-   * Make CSV downloadable
-   */
   var downloadLink = document.createElement("a");
   var blob = new Blob(["\ufeff", CSVString]);
   var url = URL.createObjectURL(blob);
   downloadLink.href = url;
   downloadLink.download = "data.csv";
 
-  /*
-   * Actually download CSV
-   */
   document.body.appendChild(downloadLink);
   downloadLink.click();
   document.body.removeChild(downloadLink);
 });
 
-   /*
-* Convert data array to CSV string
-* @param arr {Array} - the actual data
-* @param columnCount {Number} - the amount to split the data into columns
-* @param initial {String} - initial string to append to CSV string
-* return {String} - ready CSV string
-*/
 function prepCSVRow(arr, columnCount, initial) {
   var row = ''; // this will hold data
   var delimeter = ','; // data slice separator, in excel it's `;`, in usual CSv it's `,`
   var newLine = '\r\n'; // newline separator for CSV row
 
-  /*
-   * Convert [1,2,3,4] into [[1,2], [3,4]] while count is 2
-   * @param _arr {Array} - the actual array to split
-   * @param _count {Number} - the amount to split
-   * return {Array} - splitted array
-   */
   function splitArray(_arr, _count) {
     var splitted = [];
     var result = [];
@@ -136,10 +108,6 @@
     return result;
   }
   var plainArr = splitArray(arr, columnCount);
-  // don't know how to explain this
-  // you just have to like follow the code
-  // and you understand, it's pretty simple
-  // it converts `['a', 'b', 'c']` to `a,b,c` string
   plainArr.forEach(function(arrItem) {
     arrItem.forEach(function(item, idx) {
       row += item + ((idx + 1) === arrItem.length ? '' : delimeter);

From fc0c9a0fead5f2f18908394069ecf6cbeba44453 Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Thu, 30 Nov 2017 11:01:27 +0100
Subject: [PATCH 06/11] Update layout.html

---
 puppetboard/templates/layout.html | 126 ++++++++++++++----------------
 1 file changed, 60 insertions(+), 66 deletions(-)

diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index 13af2a75..9f776b47 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -2,9 +2,8 @@
 <html lang="en">
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Puppetboard</title>
-    <button id="export" style="clear: right;width:127px;height:50px;color:#0a214a;box-shadow: 4px 4px #0a214a;margin-top: 5 px; margin-left: 5 px">Export data as csv</button>
-
+    <title>{{config.PAGE_TITLE}}</title>
+    <button id="export_data_button" style="clear: right;width:127px;height:50px;color:#0a214a;box-shadow: 4px 4px #0a214a;margin-top: 5 px; margin-left: 5 px">Export data as csv</button>
     {% if config.OFFLINE_MODE %}
     <style>
       @font-face {
@@ -21,14 +20,13 @@
     <link href="{{ url_for('static', filename='Semantic-UI-2.1.8/semantic.min.css') }}" rel="stylesheet" />
     <link href='//cdnjs.cloudflare.com/ajax/libs/datatables/1.10.13/css/dataTables.semanticui.min.css' rel='stylesheet' type='text/css'>
     {% endif %}
+    <link href="{{ url_for('static', filename='css/c3.min.css') }}" rel="stylesheet" />
     <link href="{{ url_for('static', filename='css/puppetboard.css') }}" rel="stylesheet" />
 
     {% if config.OFFLINE_MODE %}
       <script src="{{ url_for('static', filename='jquery-2.1.1/jquery.min.js') }}"></script>
       <script src="{{ url_for('static', filename='jquery-datatables-1.10.13/jquery.dataTables.min.js') }}"></script>
       <script src="{{ url_for('static', filename='jquery-datatables-1.10.13/dataTables.semanticui.min.js') }}"></script>
-
-      
       {% if config.LOCALISE_TIMESTAMP %}
       <script src="{{ url_for('static', filename='moment.js-2.7.0/moment.min.js') }}"></script>
       {% endif %}
@@ -48,9 +46,8 @@
     <script src="{{ url_for('static', filename='js/scroll.top.js') }}"></script>
     <script src="{{url_for('static', filename='js/d3.min.js')}}"></script>
     <script src="{{url_for('static', filename='js/c3.min.js')}}"></script>
-    <script src="{{url_for('static', filename='jquery-tablesort-v.0.0.11/jquery.tablesort.min.js')}}"></script> 
-
-
+    <script src="{{url_for('static',
+                  filename='jquery-tablesort-v.0.0.11/jquery.tablesort.min.js')}}"></script>
     {% block script %} {% endblock script %}
     <script type="text/javascript">
     {% block javascript %} {% endblock javascript %}
@@ -60,68 +57,65 @@
           $.getScript('{{url_for('static', filename='js/tables.js')}}')
           {% block onload_script %} {% endblock onload_script %}
         })
-
-    
-      $('#export').click(function() {
-      var titles = [];
-      var data = [];
-
-  $('.dataTable th').each(function() {
-    titles.push($(this).text());
-  });
-
-  $('.dataTable td').each(function() {
-    data.push($(this).text());
-  });
+       
+      $('#export_data_button').click(function() {
+        var titles = [];
+        var data = [];
+
+        $('.dataTable th').each(function() {
+          titles.push($(this).text());
+          });
+
+        $('.dataTable td').each(function() {
+          data.push($(this).text());
+          });
   
-  var CSVString = prepCSVRow(titles, titles.length, '');
-  CSVString = prepCSVRow(data, titles.length, CSVString);
+        var CSVString = prepCSVRow(titles, titles.length, '');
+        CSVString = prepCSVRow(data, titles.length, CSVString);
+
+        var downloadLink = document.createElement("a");
+        var blob = new Blob(["\ufeff", CSVString]);
+        var url = URL.createObjectURL(blob);
+        downloadLink.href = url;
+        downloadLink.download = "puppetboard_data.csv";
+
+        document.body.appendChild(downloadLink);
+        downloadLink.click();
+        document.body.removeChild(downloadLink);
+        });
+
+      function prepCSVRow(arr, columnCount, initial) {
+        var row = ''; 
+        var delimeter = ','; 
+        var newLine = '\r\n'; 
+
+        function splitArray(_arr, _count) {
+          var splitted = [];
+          var result = [];
+          _arr.forEach(function(item, idx) {
+            if ((idx + 1) % _count === 0) {
+              splitted.push(item);
+              result.push(splitted);
+              splitted = [];
+              } else {
+              splitted.push(item);
+              }
+            });
+            return result;
+            }
+          var plainArr = splitArray(arr, columnCount);
+
+          plainArr.forEach(function(arrItem) {
+            arrItem.forEach(function(item, idx) {
+             row += item + ((idx + 1) === arrItem.length ? '' : delimeter);
+             });
+           row += newLine;
+           });
+            return initial + row;
+        };
 
-  var downloadLink = document.createElement("a");
-  var blob = new Blob(["\ufeff", CSVString]);
-  var url = URL.createObjectURL(blob);
-  downloadLink.href = url;
-  downloadLink.download = "data.csv";
-
-  document.body.appendChild(downloadLink);
-  downloadLink.click();
-  document.body.removeChild(downloadLink);
-});
-
-function prepCSVRow(arr, columnCount, initial) {
-  var row = ''; // this will hold data
-  var delimeter = ','; // data slice separator, in excel it's `;`, in usual CSv it's `,`
-  var newLine = '\r\n'; // newline separator for CSV row
-
-  function splitArray(_arr, _count) {
-    var splitted = [];
-    var result = [];
-    _arr.forEach(function(item, idx) {
-      if ((idx + 1) % _count === 0) {
-        splitted.push(item);
-        result.push(splitted);
-        splitted = [];
-      } else {
-        splitted.push(item);
-      }
-    });
-    return result;
-  }
-  var plainArr = splitArray(arr, columnCount);
-  plainArr.forEach(function(arrItem) {
-    arrItem.forEach(function(item, idx) {
-      row += item + ((idx + 1) === arrItem.length ? '' : delimeter);
-    });
-    row += newLine;
-  });
-  return initial + row;
-}
-
-
-</script>
     </script>
     {% block head %} {% endblock head %}
-
   </head>
 
   <body>

From ca7d23864951681b54edc01597c45695dabf3397 Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Fri, 8 Dec 2017 09:50:24 +0100
Subject: [PATCH 07/11] Add files via upload

---
 puppetboard/templates/favicon.ico | Bin 0 -> 1406 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 puppetboard/templates/favicon.ico

diff --git a/puppetboard/templates/favicon.ico b/puppetboard/templates/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b502e6748911f8750740597cdcfda2188ae1a2bf
GIT binary patch
literal 1406
zcmeHHNiRcD6#ic8^|fA0tF5U;&8-@)AHWKGo7aW4#2>H~tZYaKk=STViN+9NZ3s&n
zX(L4>Vnc`5*Gkl`b>C1Gv5?sI+??S%_dB`gp2YzedaPDZYs3T#R0Hr*r73u*%6UZ?
z)%}d+bmsXMI_gcr4a8&`i_5Fn*$v_8<qabn?+_Ci<nwuOfe6G{3Y>2eq5T8c#;&n_
zw1=gYH4FtaF!-k^H;uvI2jzw_x|N2_?!esq0#47bkW5HOi3!S)U=$v}Fbp^$0@q9y
zY#@rm;}f}I<Z?M!#vd`fDM5@&h`lBezPrc3x&*xtg>yC!_jDGCcnTM1m)|~C3QH3x
zP2jH+AioJMCbDY6^1O?*lgcklcZ|F<inxo0tgV1stc18pc}1r~&G1$9mauL8T7}L)
zh?DsA1x#67z2DMUr_x!%E8X+FhG`k?hY*j3Yfau>w3eBhHQdo{viH@Pd%pM$@&;@&
S7We=wOR-_KPO-{M|1h62mU?0U

literal 0
HcmV?d00001


From 868d11fb66f650da7db5ace6ec008db38f30311d Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Thu, 21 Dec 2017 16:12:03 +0100
Subject: [PATCH 08/11] Add files via upload

---
 puppetboard/templates/_macros.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/puppetboard/templates/_macros.html b/puppetboard/templates/_macros.html
index acbca9ba..7d5ec07a 100644
--- a/puppetboard/templates/_macros.html
+++ b/puppetboard/templates/_macros.html
@@ -56,6 +56,19 @@
     "search": {"regex": true},
     // Default sort
     "order": [[ 0, "desc" ]],
+    //Sort ip adresses and parse integers where applicable
+    "columnDefs": [    
+    
+    { type: 'ip-address', targets: 1 },
+
+    {"targets": -1,
+    "render": function ( data, type, row )
+     {if (isNaN(parseInt(data)))
+      return (data)
+      else
+     return parseInt(data)}
+     },
+    ],
     // Custom options
     {% if extra_options %}{% call extra_options() %}Callback to parent defined options{% endcall %}{% endif %}
   });

From 4c57a2243dbc182e43f79521ef1321c3fd4819d2 Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Thu, 21 Dec 2017 16:30:55 +0100
Subject: [PATCH 09/11] Update layout.html

---
 puppetboard/templates/layout.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index 9f776b47..308a5dc7 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -103,14 +103,15 @@
             });
             return result;
             }
+      
           var plainArr = splitArray(arr, columnCount);
 
-          plainArr.forEach(function(arrItem) {
-            arrItem.forEach(function(item, idx) {
-             row += item + ((idx + 1) === arrItem.length ? '' : delimeter);
-             });
-           row += newLine;
-           });
+         plainArr.forEach(function(arrItem) {
+           arrItem.forEach(function(item, idx) {
+            row += item + ((idx + 1) === arrItem.length ? '' : delimeter);
+            });
+          row += newLine;
+          });
             return initial + row;
         };
 

From fd32dcab1cba2400b46574a8e6c3e218b66d7878 Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Thu, 21 Dec 2017 16:46:01 +0100
Subject: [PATCH 10/11] Update _macros.html

---
 puppetboard/templates/_macros.html | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/puppetboard/templates/_macros.html b/puppetboard/templates/_macros.html
index 7d5ec07a..acbca9ba 100644
--- a/puppetboard/templates/_macros.html
+++ b/puppetboard/templates/_macros.html
@@ -56,19 +56,6 @@
     "search": {"regex": true},
     // Default sort
     "order": [[ 0, "desc" ]],
-    //Sort ip adresses and parse integers where applicable
-    "columnDefs": [    
-    
-    { type: 'ip-address', targets: 1 },
-
-    {"targets": -1,
-    "render": function ( data, type, row )
-     {if (isNaN(parseInt(data)))
-      return (data)
-      else
-     return parseInt(data)}
-     },
-    ],
     // Custom options
     {% if extra_options %}{% call extra_options() %}Callback to parent defined options{% endcall %}{% endif %}
   });

From f9edc836deae394b416a84572637a9e66b9d72eb Mon Sep 17 00:00:00 2001
From: emlun007 <32731446+emlun007@users.noreply.github.com>
Date: Wed, 14 Feb 2018 08:54:53 +0100
Subject: [PATCH 11/11] Update _macros.html

---
 puppetboard/templates/_macros.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/puppetboard/templates/_macros.html b/puppetboard/templates/_macros.html
index acbca9ba..74c25c69 100644
--- a/puppetboard/templates/_macros.html
+++ b/puppetboard/templates/_macros.html
@@ -56,7 +56,19 @@
     "search": {"regex": true},
     // Default sort
     "order": [[ 0, "desc" ]],
-    // Custom options
+    // Rendering - add rendering options for columns
+    "columnDefs": [ {
+      "targets": -1,
+      "data:": null,
+      "render": function (data, type, full, meta) {
+       shorta = data.replace(/[{},]/g, "<br />");
+       shortb = shorta.replace(/u'/g, " "); 
+       shortc = shortb.replace(/'/g, " "); 
+       return shortc;
+       }}],
+      // Custom options
+      {% if extra_options %}{% call extra_options() %}Callback to parent defined options{% endcall %}{% endif %}
+    });
     {% if extra_options %}{% call extra_options() %}Callback to parent defined options{% endcall %}{% endif %}
   });
 
