From 9514414907d78587d5ad78abd6849397d4973ff6 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 27 Oct 2018 07:38:31 -0400
Subject: attach logs instead of pasting

---
 www/templates/log.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'www/templates/log.html')

diff --git a/www/templates/log.html b/www/templates/log.html
index 0ad840d8..c67cab4c 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -4,7 +4,10 @@
 
     &nbsp;
     <button ng-class="selectOn? 'button button-icon button-clear ion-ios-copy':'button button-icon button-clear ion-ios-copy-outline'"
-      ng-click="selectToggle()"></button>
+      ng-click="selectToggle()"></button> &nbsp;
+
+
+     
 
     <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge"
       ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
@@ -13,7 +16,7 @@
     <a class="button button-icon icon ion-arrow-swap" ng-href="" ng-click="flipLogs()"></a>
     <a ng-if="logEntity == $root.appName" class="button button-icon icon ion-trash-a" ng-href="" ng-click="deleteLogs()"></a>
     <div ng-if="$root.platformOS!='desktop'">
-      <a class="button button-icon icon ion-email" ng-href="" ng-click="sendEmail(log.logString)"> </a>
+      <a class="button button-icon icon ion-email" ng-href="" ng-click="attachLogs()"> </a>
     </div>
     <div ng-if="$root.platformOS=='desktop'">
       <a class="button button-icon icon ion-android-download" ng-href="" ng-click="sendEmail(log.logString)"> </a>
@@ -32,6 +35,9 @@
       </button>
       <button class="button button-small button-stable icon ion-chevron-right" ng-click="changePage(-1)">
       </button>
+
+     
+
     </div>
 
     <div ng-if="logEntity==$root.appName">
-- 
cgit v1.2.3


From d5e7a99c63213ad3b62a9e8e95cb57f0bb0c7e6a Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 29 Oct 2018 10:45:16 -0400
Subject: desktop logs rework

---
 www/templates/log.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/templates/log.html')

diff --git a/www/templates/log.html b/www/templates/log.html
index c67cab4c..99de95d3 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -19,7 +19,7 @@
       <a class="button button-icon icon ion-email" ng-href="" ng-click="attachLogs()"> </a>
     </div>
     <div ng-if="$root.platformOS=='desktop'">
-      <a class="button button-icon icon ion-android-download" ng-href="" ng-click="sendEmail(log.logString)"> </a>
+      <a class="button button-icon icon ion-android-download" ng-href="" ng-click="downloadLogs()"> </a>
     </div>
   </ion-nav-buttons>
   <ion-content delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
-- 
cgit v1.2.3


From 73014ac9a48fd584a4e0665358d240dde3024887 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 2 Nov 2018 14:32:25 -0400
Subject: add ZM version to display

---
 www/templates/log.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'www/templates/log.html')

diff --git a/www/templates/log.html b/www/templates/log.html
index 99de95d3..2884c4bb 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -34,14 +34,14 @@
       <button class="button button-small button-stable icon ion-chevron-left" ng-click="changePage(1)">
       </button>
       <button class="button button-small button-stable icon ion-chevron-right" ng-click="changePage(-1)">
-      </button>
-
-     
+      </button><br/>
+      <b>ZoneMinder {{'kVersion'|translate}}: {{zmVersion}} </b><br/>
 
     </div>
 
     <div ng-if="logEntity==$root.appName">
-      <b>{{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}} ({{$root.platformOS}})</b>
+      <b>{{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}} ({{$root.platformOS}})</b><br/>
+      <b>ZoneMinder {{'kVersion'|translate}}: {{zmVersion}} </b>
     </div>
 
     <div ng-if="selectOn" class="aside-1">{{'kLogsCopyPaste' | translate }}</div>
-- 
cgit v1.2.3