From ed9c917bf26b78473c0a3bcc5fd80c55cc54e978 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 12 Feb 2015 16:59:16 +0100 Subject: [PATCH] LSP restructure (v3) --- .gitignore | 1 + Makefile | 9 +- lsp/.gitignore | 3 - lsp/footer.html | 107 +- lsp/header.html | 9 +- lsp/main.css | 1005 +++--- lsp/main.js | 2161 ------------ lsp/mist.js | 3948 ++++++++++++++++++++++ lsp/pages.js | 1696 ---------- lsp/plugins/cattablesort.js | 86 + lsp/plugins/jquery.flot.crosshair.min.js | 1 - lsp/plugins/jquery.js | 6 +- lsp/plugins/placeholder.js | 8 - lsp/plugins/tablesort.js | 216 -- lsp/server.html | 123 +- lsp/test_embedmultitrack.html | 139 + lsp/test_streamembed.html | 6 +- src/embed.js | 216 +- 18 files changed, 4898 insertions(+), 4842 deletions(-) delete mode 100644 lsp/.gitignore mode change 100755 => 100644 lsp/main.css delete mode 100755 lsp/main.js create mode 100644 lsp/mist.js delete mode 100755 lsp/pages.js create mode 100644 lsp/plugins/cattablesort.js delete mode 100644 lsp/plugins/jquery.flot.crosshair.min.js delete mode 100755 lsp/plugins/placeholder.js delete mode 100755 lsp/plugins/tablesort.js mode change 100755 => 100644 lsp/server.html create mode 100644 lsp/test_embedmultitrack.html diff --git a/.gitignore b/.gitignore index 5fe04d33..5dcd978f 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,5 @@ server.html* .settings .cproject .project +.sync diff --git a/Makefile b/Makefile index 2c5499dd..f44ff66b 100644 --- a/Makefile +++ b/Makefile @@ -178,7 +178,8 @@ MistOutJSON: override CPPFLAGS += "-DOUTPUTTYPE=\"output_json.h\"" MistOutJSON: src/output/mist_out.cpp src/output/output.cpp src/output/output_http.cpp src/output/output_json.cpp $(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@ -lspSOURCES=lsp/plugins/jquery.js lsp/plugins/placeholder.js lsp/plugins/md5.js lsp/main.js lsp/pages.js lsp/plugins/tablesort.js lsp/plugins/jquery.flot.min.js lsp/plugins/jquery.flot.time.min.js lsp/plugins/jquery.flot.crosshair.min.js +lspSOURCES=lsp/plugins/md5.js lsp/plugins/cattablesort.js lsp/mist.js +lspSOURCESmin=lsp/plugins/jquery.js lsp/plugins/jquery.flot.min.js lsp/plugins/jquery.flot.time.min.js lspDATA=lsp/header.html lsp/main.css lsp/footer.html JAVA := $(shell which java 2> /dev/null) @@ -197,9 +198,10 @@ src/embed.js.h: src/embed.js sourcery ./sourcery embed.min.js embed_js > src/embed.js.h rm embed.min.js -src/controller/server.html: $(lspDATA) $(lspSOURCES) - cat lsp/header.html > $@ +src/controller/server.html: $(lspDATA) $(lspSOURCES) $(lspSOURCESmin) + cat lsp/header.html >> $@ echo " + + +
+
+ + + \ No newline at end of file diff --git a/lsp/test_streamembed.html b/lsp/test_streamembed.html index 8d425d00..e0db24b8 100644 --- a/lsp/test_streamembed.html +++ b/lsp/test_streamembed.html @@ -3,7 +3,7 @@ Test the stream embedding - +