From 426d363577a298d23c5cd13bd260be650bb99d68 Mon Sep 17 00:00:00 2001 From: Graham Jones Date: Mon, 25 Jul 2016 21:44:04 +0100 Subject: [PATCH] Modified web interface to display log files correctly (removed jquery-mobile) --- app/src/main/assets/www/index.html | 18 +--- app/src/main/assets/www/index_orig.html | 99 +++++++++++++++++++ app/src/main/assets/www/js/osd_logs.js | 2 +- app/src/main/assets/www/logfiles.html | 28 ++++++ .../org/openseizuredetector/SdWebServer.java | 1 + 5 files changed, 131 insertions(+), 17 deletions(-) create mode 100644 app/src/main/assets/www/index_orig.html create mode 100644 app/src/main/assets/www/logfiles.html diff --git a/app/src/main/assets/www/index.html b/app/src/main/assets/www/index.html index c464145..0ce2ad3 100644 --- a/app/src/main/assets/www/index.html +++ b/app/src/main/assets/www/index.html @@ -1,15 +1,13 @@ - Ben's Pebble Watch Seizure Detector + Open Seizure Detector - - @@ -77,23 +75,11 @@
- Logs + View Log Files
-
-
- logo -

Open Seizure Detector - Logs

-
-
-
-
-
- Home -
-
diff --git a/app/src/main/assets/www/index_orig.html b/app/src/main/assets/www/index_orig.html new file mode 100644 index 0000000..c464145 --- /dev/null +++ b/app/src/main/assets/www/index_orig.html @@ -0,0 +1,99 @@ + + + + Ben's Pebble Watch Seizure Detector + + + + + + + + + + + +
+ +
+
+ OK +
+
+
+ Pebble Watch Connected +
+
+ Pebble App Running +
+
+ Pebble Battery +
+
+ +
+ + +
+ +
+

Seizure Detector Data

+
+ Maximum Frequency: +
+
+ Maximum Value: +
+
+ Spectrum Power: +
+
+ Region Of Interest Power: +
+
+ Alarm Status: +
+
+ Alarm Phrase: +
+
+
+

Seizure Detector Settings

+ +
+ SD Settings +
+
+
+

+ For details see + + OpenSeizureDetector.org.uk + +

+
+
+
+ Logs +
+
+
+ +
+
+ logo +

Open Seizure Detector - Logs

+
+
+
+
+
+ Home +
+
+ + + diff --git a/app/src/main/assets/www/js/osd_logs.js b/app/src/main/assets/www/js/osd_logs.js index 9685376..05a1ea7 100644 --- a/app/src/main/assets/www/js/osd_logs.js +++ b/app/src/main/assets/www/js/osd_logs.js @@ -21,7 +21,7 @@ function populate_filelist(dataStr) { -$(document).delegate("#logs","pageinit", function() { +$(document).ready(function() { //alert("logs page opened"); get_filelist(); }); diff --git a/app/src/main/assets/www/logfiles.html b/app/src/main/assets/www/logfiles.html new file mode 100644 index 0000000..59b7ebf --- /dev/null +++ b/app/src/main/assets/www/logfiles.html @@ -0,0 +1,28 @@ + + + + Open Seizure Detector + + + + + + + + + +
+
+ logo +

Open Seizure Detector - Logs

+
+
+
+
+
+ Home +
+
+ + + diff --git a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java index 2113716..9206594 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java @@ -112,6 +112,7 @@ public class SdWebServer extends NanoHTTPD { default: if (uri.startsWith("/index.html") || + uri.startsWith("/logfiles.html") || uri.startsWith("/favicon.ico") || uri.startsWith("/js/") || uri.startsWith("/css/") ||