From 9603599a1d0f161d1365fe8d0d60ce1d3133e197 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Tue, 27 Apr 2021 14:53:03 +0000
Subject: [PATCH] ui nach www geschoben, Steuerung daran angepasst
---
www/data/tpl/test_form.txt | 0
www/hamburger.css | 0
www/data/menu/untermenue-2.json | 0
www/data/tpl/abs_sel.txt | 0
www/font/Roboto-Regular.ttf | 0
www/app.css | 17 ++++++++
www/data/tpl/abspieler_liste.txt | 0
www/data/tpl/form_livestream.txt | 0
www/data/tpl/dlg-loeschen.txt | 0
www/data/tpl/dlg-info.txt | 0
www/data/tpl/form_einstellung.txt | 0
www/font/pikto.ttf | 0
www/data/tpl/geraet_schalt_liste.txt | 0
www/data/tpl/ablageort_liste.txt | 0
www/data/tpl/form_ablageort.txt | 0
www/data/tpl/form_geraet_status.txt | 0
www/data/tpl/geraet_liste.txt | 0
www/index.html | 2
www/data/tpl/top_btns.txt | 0
src/de/uhilger/tango/api/MediaSteuerung.java | 2
www/js/app-menu.js | 0
www/data/tpl/katalog_root_liste.txt | 0
www/data/tpl/livestream_liste.txt | 0
www/data/tpl/pl_sel.txt | 0
www/js/app.js | 78 +++++++++++++++++++-------------------
www/data/menu/hauptmenue.json | 7 +++
www/js/mustache/mustache.min.js | 0
www/data/tpl/abspielliste_liste.txt | 0
www/data/tpl/app-menu.txt | 0
www/data/menu/untermenue-1.json | 0
www/data/tpl/titel_liste.txt | 0
www/data/tpl/katalog_inhalt_liste.txt | 0
www/data/tpl/form_abspieler.txt | 0
www/app-menu.css | 0
www/data/tpl/einstellung_liste.txt | 0
www/data/tpl/form_abspielliste.txt | 0
www/data/menu/einstellungen.json | 2
www/data/tpl/ctrl.txt | 0
www/data/tpl/form_geraet.txt | 0
39 files changed, 65 insertions(+), 43 deletions(-)
diff --git a/src/de/uhilger/tango/api/MediaSteuerung.java b/src/de/uhilger/tango/api/MediaSteuerung.java
index 365ede5..7cb8672 100644
--- a/src/de/uhilger/tango/api/MediaSteuerung.java
+++ b/src/de/uhilger/tango/api/MediaSteuerung.java
@@ -68,7 +68,7 @@
public static final String PL_CMD_PLAY = "play";
public static final String PL_DEFAULT_PARAMS = "?titel=";
public static final String PL_PARAM_RUECK = "&r=";
- public static final String PL_API_STRG = "/api/strg/";
+ public static final String PL_API_STRG = "api/strg/";
public static final String PL_CMD_ENDE = "ende";
public static final String PL_CMD_STOP = "stop";
public static final String PL_CMD_PAUSE = "pause";
diff --git a/www/ui/app-menu.css b/www/app-menu.css
similarity index 100%
rename from www/ui/app-menu.css
rename to www/app-menu.css
diff --git a/www/ui/app.css b/www/app.css
similarity index 95%
rename from www/ui/app.css
rename to www/app.css
index c8d2cf9..4d2a00f 100644
--- a/www/ui/app.css
+++ b/www/app.css
@@ -1,3 +1,20 @@
+/*
+ Tango - Personal Media Center
+ Copyright (C) 2021 Ulrich Hilger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
html, body {
margin: 0;
padding: 0;
diff --git a/www/ui/data/menu/einstellungen.json b/www/data/menu/einstellungen.json
similarity index 95%
rename from www/ui/data/menu/einstellungen.json
rename to www/data/menu/einstellungen.json
index fb76f56..eafdcbd 100644
--- a/www/ui/data/menu/einstellungen.json
+++ b/www/data/menu/einstellungen.json
@@ -1,6 +1,6 @@
{
"menue": {
- "menuetitel": "Einstellungen",
+ "menuetitel": "Konfiguration",
"wurzel": false,
"vorgaenger": {
"vtitel": "Hauptmenü",
diff --git a/www/ui/data/menu/hauptmenue.json b/www/data/menu/hauptmenue.json
similarity index 87%
rename from www/ui/data/menu/hauptmenue.json
rename to www/data/menu/hauptmenue.json
index 6af5b8b..73f5b35 100644
--- a/www/ui/data/menu/hauptmenue.json
+++ b/www/data/menu/hauptmenue.json
@@ -33,11 +33,16 @@
"funktion": ""
},
{
- "titel": "Einstellungen",
+ "titel": "Konfiguration",
"umenue": true,
"verweis": "einstellungen.json"
},
{
+ "titel": "",
+ "umenue": false,
+ "funktion": ""
+ },
+ {
"titel": "Info",
"umenue": false,
"funktion": "app.info_dialog_zeigen"
diff --git a/www/ui/data/menu/untermenue-1.json b/www/data/menu/untermenue-1.json
similarity index 100%
rename from www/ui/data/menu/untermenue-1.json
rename to www/data/menu/untermenue-1.json
diff --git a/www/ui/data/menu/untermenue-2.json b/www/data/menu/untermenue-2.json
similarity index 100%
rename from www/ui/data/menu/untermenue-2.json
rename to www/data/menu/untermenue-2.json
diff --git a/www/ui/data/tpl/ablageort_liste.txt b/www/data/tpl/ablageort_liste.txt
similarity index 100%
rename from www/ui/data/tpl/ablageort_liste.txt
rename to www/data/tpl/ablageort_liste.txt
diff --git a/www/ui/data/tpl/abs_sel.txt b/www/data/tpl/abs_sel.txt
similarity index 100%
rename from www/ui/data/tpl/abs_sel.txt
rename to www/data/tpl/abs_sel.txt
diff --git a/www/ui/data/tpl/abspieler_liste.txt b/www/data/tpl/abspieler_liste.txt
similarity index 100%
rename from www/ui/data/tpl/abspieler_liste.txt
rename to www/data/tpl/abspieler_liste.txt
diff --git a/www/ui/data/tpl/abspielliste_liste.txt b/www/data/tpl/abspielliste_liste.txt
similarity index 100%
rename from www/ui/data/tpl/abspielliste_liste.txt
rename to www/data/tpl/abspielliste_liste.txt
diff --git a/www/ui/data/tpl/app-menu.txt b/www/data/tpl/app-menu.txt
similarity index 100%
rename from www/ui/data/tpl/app-menu.txt
rename to www/data/tpl/app-menu.txt
diff --git a/www/ui/data/tpl/ctrl.txt b/www/data/tpl/ctrl.txt
similarity index 100%
rename from www/ui/data/tpl/ctrl.txt
rename to www/data/tpl/ctrl.txt
diff --git a/www/ui/data/tpl/dlg-info.txt b/www/data/tpl/dlg-info.txt
similarity index 100%
rename from www/ui/data/tpl/dlg-info.txt
rename to www/data/tpl/dlg-info.txt
diff --git a/www/ui/data/tpl/dlg-loeschen.txt b/www/data/tpl/dlg-loeschen.txt
similarity index 100%
rename from www/ui/data/tpl/dlg-loeschen.txt
rename to www/data/tpl/dlg-loeschen.txt
diff --git a/www/ui/data/tpl/einstellung_liste.txt b/www/data/tpl/einstellung_liste.txt
similarity index 100%
rename from www/ui/data/tpl/einstellung_liste.txt
rename to www/data/tpl/einstellung_liste.txt
diff --git a/www/ui/data/tpl/form_ablageort.txt b/www/data/tpl/form_ablageort.txt
similarity index 100%
rename from www/ui/data/tpl/form_ablageort.txt
rename to www/data/tpl/form_ablageort.txt
diff --git a/www/ui/data/tpl/form_abspieler.txt b/www/data/tpl/form_abspieler.txt
similarity index 100%
rename from www/ui/data/tpl/form_abspieler.txt
rename to www/data/tpl/form_abspieler.txt
diff --git a/www/ui/data/tpl/form_abspielliste.txt b/www/data/tpl/form_abspielliste.txt
similarity index 100%
rename from www/ui/data/tpl/form_abspielliste.txt
rename to www/data/tpl/form_abspielliste.txt
diff --git a/www/ui/data/tpl/form_einstellung.txt b/www/data/tpl/form_einstellung.txt
similarity index 100%
rename from www/ui/data/tpl/form_einstellung.txt
rename to www/data/tpl/form_einstellung.txt
diff --git a/www/ui/data/tpl/form_geraet.txt b/www/data/tpl/form_geraet.txt
similarity index 100%
rename from www/ui/data/tpl/form_geraet.txt
rename to www/data/tpl/form_geraet.txt
diff --git a/www/ui/data/tpl/form_geraet_status.txt b/www/data/tpl/form_geraet_status.txt
similarity index 100%
rename from www/ui/data/tpl/form_geraet_status.txt
rename to www/data/tpl/form_geraet_status.txt
diff --git a/www/ui/data/tpl/form_livestream.txt b/www/data/tpl/form_livestream.txt
similarity index 100%
rename from www/ui/data/tpl/form_livestream.txt
rename to www/data/tpl/form_livestream.txt
diff --git a/www/ui/data/tpl/geraet_liste.txt b/www/data/tpl/geraet_liste.txt
similarity index 100%
rename from www/ui/data/tpl/geraet_liste.txt
rename to www/data/tpl/geraet_liste.txt
diff --git a/www/ui/data/tpl/geraet_schalt_liste.txt b/www/data/tpl/geraet_schalt_liste.txt
similarity index 100%
rename from www/ui/data/tpl/geraet_schalt_liste.txt
rename to www/data/tpl/geraet_schalt_liste.txt
diff --git a/www/ui/data/tpl/katalog_inhalt_liste.txt b/www/data/tpl/katalog_inhalt_liste.txt
similarity index 100%
rename from www/ui/data/tpl/katalog_inhalt_liste.txt
rename to www/data/tpl/katalog_inhalt_liste.txt
diff --git a/www/ui/data/tpl/katalog_root_liste.txt b/www/data/tpl/katalog_root_liste.txt
similarity index 100%
rename from www/ui/data/tpl/katalog_root_liste.txt
rename to www/data/tpl/katalog_root_liste.txt
diff --git a/www/ui/data/tpl/livestream_liste.txt b/www/data/tpl/livestream_liste.txt
similarity index 100%
rename from www/ui/data/tpl/livestream_liste.txt
rename to www/data/tpl/livestream_liste.txt
diff --git a/www/ui/data/tpl/pl_sel.txt b/www/data/tpl/pl_sel.txt
similarity index 100%
rename from www/ui/data/tpl/pl_sel.txt
rename to www/data/tpl/pl_sel.txt
diff --git a/www/ui/data/tpl/test_form.txt b/www/data/tpl/test_form.txt
similarity index 100%
rename from www/ui/data/tpl/test_form.txt
rename to www/data/tpl/test_form.txt
diff --git a/www/ui/data/tpl/titel_liste.txt b/www/data/tpl/titel_liste.txt
similarity index 100%
rename from www/ui/data/tpl/titel_liste.txt
rename to www/data/tpl/titel_liste.txt
diff --git a/www/ui/data/tpl/top_btns.txt b/www/data/tpl/top_btns.txt
similarity index 100%
rename from www/ui/data/tpl/top_btns.txt
rename to www/data/tpl/top_btns.txt
diff --git a/www/ui/font/Roboto-Regular.ttf b/www/font/Roboto-Regular.ttf
similarity index 100%
rename from www/ui/font/Roboto-Regular.ttf
rename to www/font/Roboto-Regular.ttf
Binary files differ
diff --git a/www/ui/font/pikto.ttf b/www/font/pikto.ttf
similarity index 100%
rename from www/ui/font/pikto.ttf
rename to www/font/pikto.ttf
Binary files differ
diff --git a/www/ui/hamburger.css b/www/hamburger.css
similarity index 100%
rename from www/ui/hamburger.css
rename to www/hamburger.css
diff --git a/www/ui/index.html b/www/index.html
similarity index 98%
rename from www/ui/index.html
rename to www/index.html
index 7072ba9..931bcca 100644
--- a/www/ui/index.html
+++ b/www/index.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
- Mediazentrale - Personal Media Center
+ Tango - Personal Media Center
Copyright (C) 2021 Ulrich Hilger
This program is free software: you can redistribute it and/or modify
diff --git a/www/ui/js/app-menu.js b/www/js/app-menu.js
similarity index 100%
rename from www/ui/js/app-menu.js
rename to www/js/app-menu.js
diff --git a/www/ui/js/app.js b/www/js/app.js
similarity index 91%
rename from www/ui/js/app.js
rename to www/js/app.js
index af2c49d..ac8ada4 100644
--- a/www/ui/js/app.js
+++ b/www/js/app.js
@@ -44,7 +44,7 @@
this.livestream_selection = function() {
document.querySelector('.breadcrumb-behaelter').textContent = '';
document.querySelector('.bereich-name').textContent = 'Livestream-Auswahl';
- self.http_get('../api/store/Livestream/liste/', function(responseText) {
+ self.http_get('api/store/Livestream/liste/', function(responseText) {
self.html_erzeugen("data/tpl/livestream_liste.txt", JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
@@ -66,7 +66,7 @@
var bb = document.querySelector('.breadcrumb-behaelter');
bb.textContent = "Kataloge";
// Kataloge listen
- self.http_get('../api/store/Ablageort/liste/', function (responseText) {
+ self.http_get('api/store/Ablageort/liste/', function (responseText) {
//document.querySelector('#top-up-btn').removeEventListener('click', self.media_liste_herauf);
self.html_erzeugen("data/tpl/katalog_root_liste.txt", JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
@@ -74,7 +74,7 @@
var t = event.target;
self.katName = t.textContent;
if(self.katName !== "Livestreams") {
- self.http_get('../api/store/Ablageort/' + t.textContent, function(responseText) {
+ self.http_get('api/store/Ablageort/' + t.textContent, function(responseText) {
var ablageort = JSON.parse(responseText);
self.ortPfad = ablageort.url;
self.media_liste();
@@ -108,7 +108,7 @@
self.mediaPfad = neuerPfad;
self.media_liste();
});
- var url = '..' + self.ortPfad + self.mediaPfad;
+ var url = self.ortPfad + self.mediaPfad;
if(!url.endsWith('/')) {
url = url + '/';
}
@@ -162,13 +162,13 @@
var nameElem = event.target.parentNode.querySelector('.schalt-geraet-name');
if(nameElem.classList.contains('schalt-geraet-true')) {
// ausschalten
- self.http_get('../api/gstrg/geraet/' + geraetName + "/aus", function(responseText) {
+ self.http_get('api/gstrg/geraet/' + geraetName + "/aus", function(responseText) {
// console.log(responseText);
self.geraet_schalt_liste();
});
} else {
// einschalten
- self.http_get('../api/gstrg/geraet/' + geraetName + "/ein", function(responseText) {
+ self.http_get('api/gstrg/geraet/' + geraetName + "/ein", function(responseText) {
// console.log(responseText);
self.geraet_schalt_liste();
});
@@ -180,8 +180,8 @@
/*self.entitaet_liste('Geräte schalten','../api/store/Geraet/listealles/',
"data/tpl/geraet_schalt_liste.txt", '../api/store/Geraet/',
"self.form_geraet_status", function(responseText) {*/
- self.entitaet_liste('Geräte schalten','../api/store/Geraet/listealles/',
- "data/tpl/geraet_schalt_liste.txt", '../api/store/Geraet/',
+ self.entitaet_liste('Geräte schalten','api/store/Geraet/listealles/',
+ "data/tpl/geraet_schalt_liste.txt", 'api/store/Geraet/',
"", function(responseText) {
//var geraet = JSON.parse(responseText);
//self.geraet_status_form(geraet);
@@ -189,8 +189,8 @@
};
this.geraet_liste = function() {
- self.entitaet_liste('Geräte','../api/store/Geraet/liste/',
- "data/tpl/geraet_liste.txt", '../api/store/Geraet/',
+ self.entitaet_liste('Geräte','api/store/Geraet/liste/',
+ "data/tpl/geraet_liste.txt", 'api/store/Geraet/',
"self.geraet_form", function(responseText) {
var geraet = JSON.parse(responseText);
self.geraet_form(geraet);
@@ -198,8 +198,8 @@
};
this.ablageort_liste = function() {
- self.entitaet_liste('Kataloge','../api/store/Ablageort/liste/',
- "data/tpl/ablageort_liste.txt", '../api/store/Ablageort/',
+ self.entitaet_liste('Kataloge','api/store/Ablageort/liste/',
+ "data/tpl/ablageort_liste.txt", 'api/store/Ablageort/',
"self.ablageort_form", function(responseText) {
var ablageort = JSON.parse(responseText);
self.ablageort_form(ablageort);
@@ -207,8 +207,8 @@
};
this.prefs_liste = function() {
- self.entitaet_liste('Einstellungen','../api/store/Einstellung/liste/',
- "data/tpl/einstellung_liste.txt", '../api/store/Einstellung/',
+ self.entitaet_liste('Einstellungen','api/store/Einstellung/liste/',
+ "data/tpl/einstellung_liste.txt", 'api/store/Einstellung/',
"self.prefs_form", function(responseText) {
var einstellung = JSON.parse(responseText);
self.prefs_form(einstellung);
@@ -216,8 +216,8 @@
};
this.abspieler_liste = function() {
- self.entitaet_liste('Abspieler','../api/store/Abspieler/liste/',
- "data/tpl/abspieler_liste.txt", '../api/store/Abspieler/',
+ self.entitaet_liste('Abspieler','api/store/Abspieler/liste/',
+ "data/tpl/abspieler_liste.txt", 'api/store/Abspieler/',
"self.abspieler_form", function(responseText) {
var abspieler = JSON.parse(responseText);
self.abspieler_form(abspieler);
@@ -225,8 +225,8 @@
};
this.livestream_liste = function() {
- self.entitaet_liste('Livestreams','../api/store/Livestream/liste/',
- "data/tpl/livestream_liste.txt", '../api/store/Livestream/',
+ self.entitaet_liste('Livestreams','api/store/Livestream/liste/',
+ "data/tpl/livestream_liste.txt", 'api/store/Livestream/',
"self.livestream_form", function(responseText) {
var livestream = JSON.parse(responseText);
self.livestream_form(livestream);
@@ -234,8 +234,8 @@
};
this.abspielliste_liste = function() {
- self.entitaet_liste('Abspielliste','../api/store/Abspielliste/liste/',
- "data/tpl/abspielliste_liste.txt", '../api/store/Abspielliste/',
+ self.entitaet_liste('Abspielliste','api/store/Abspielliste/liste/',
+ "data/tpl/abspielliste_liste.txt", 'api/store/Abspielliste/',
"self.abspielliste_form", function(responseText) {
//console.log("responseTest: '" + responseText + "'");
var abspielliste = JSON.parse(responseText);
@@ -247,7 +247,7 @@
this.abspielliste_form = function(al) {
self.entitaet_form('Abspielliste', al, al.name,
- "data/tpl/form_abspielliste.txt", '../api/store/Abspielliste/',
+ "data/tpl/form_abspielliste.txt", 'api/store/Abspielliste/',
'#abspielliste-name', 'name', function(event) {
if(event !== undefined) {
event.preventDefault();
@@ -259,7 +259,7 @@
this.abspieler_form = function(pl) {
self.entitaet_form('Abspieler', pl, pl.key,
- "data/tpl/form_abspieler.txt", '../api/store/Abspieler/',
+ "data/tpl/form_abspieler.txt", 'api/store/Abspieler/',
'#abspieler-name', 'name', function() {
self.abspieler_auswahl_fuellen();
self.abspieler_liste();
@@ -268,7 +268,7 @@
this.livestream_form = function(ls) {
self.entitaet_form('Livestream', ls, ls.name,
- "data/tpl/form_livestream.txt", '../api/store/Livestream/',
+ "data/tpl/form_livestream.txt", 'api/store/Livestream/',
'#livestream-name', 'name', function() {
self.livestream_liste();
});
@@ -276,7 +276,7 @@
this.geraet_form = function(ge) {
self.entitaet_form('Gerät', ge, ge.name,
- "data/tpl/form_geraet.txt", '../api/store/Geraet/',
+ "data/tpl/form_geraet.txt", 'api/store/Geraet/',
'#geraet-name', 'name', function() {
self.geraet_liste();
});
@@ -284,7 +284,7 @@
this.geraet_status_form = function(ge) {
self.entitaet_form('Gerät', ge, ge.name,
- "data/tpl/form_geraet_status.txt", '../api/store/Geraet/',
+ "data/tpl/form_geraet_status.txt", 'api/store/Geraet/',
'#geraet-name', 'name', function() {
self.geraet_schalt_liste();
});
@@ -292,7 +292,7 @@
this.prefs_form = function(k) {
self.entitaet_form('Einstellung', k, k.key,
- "data/tpl/form_einstellung.txt", '../api/store/Einstellung/',
+ "data/tpl/form_einstellung.txt", 'api/store/Einstellung/',
'#einstellung-key', 'key', function() {
self.prefs_liste();
});
@@ -308,7 +308,7 @@
*/
this.ablageort_form = function(ort) {
self.entitaet_form('Katalog', ort, ort.name,
- "data/tpl/form_ablageort.txt", '../api/store/Ablageort/',
+ "data/tpl/form_ablageort.txt", 'api/store/Ablageort/',
'#ablageort-name', 'name', function() {
self.ablageort_liste();
});
@@ -323,7 +323,7 @@
};
this.abspieler_auswahl_fuellen = function() {
- self.http_get('../api/store/Abspieler/liste/', function (responseText) {
+ self.http_get('api/store/Abspieler/liste/', function (responseText) {
self.html_erzeugen("data/tpl/abs_sel.txt", JSON.parse(responseText), function (html) {
document.querySelector(".abs-sel").innerHTML = html;
});
@@ -331,7 +331,7 @@
};
this.abspielliste_auswahl_fuellen = function() {
- self.http_get('../api/store/Abspielliste/', function (responseText) {
+ self.http_get('api/store/Abspielliste/', function (responseText) {
self.html_erzeugen("data/tpl/pl_sel.txt", JSON.parse(responseText), function (html) {
document.querySelector(".pl-sel").innerHTML = html;
self.addEvtListener('#playlist', 'change', function() {
@@ -386,7 +386,7 @@
document.querySelector('.bereich-name').textContent = 'Abspielliste ' + plname;
var bb = document.querySelector('.breadcrumb-behaelter');
bb.textContent = "";
- self.http_get('../api/alist/' + plname, function (responseText) {
+ self.http_get('api/alist/' + plname, function (responseText) {
self.html_erzeugen("data/tpl/titel_liste.txt", JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
@@ -406,14 +406,14 @@
var titel = self.titelErmitteln(document.querySelector(".selected"));
var playername = document.querySelector('#abspieler').value;
console.log('plname: ' + playername + ' url: ' + titel.katalogUrl + titel.pfad + titel.name);
- self.http_post('../api/strg/' + playername + '/play/titel', JSON.stringify(titel), function(responseText) {
+ self.http_post('api/strg/' + playername + '/play/titel', JSON.stringify(titel), function(responseText) {
self.meldung_mit_timeout(responseText, 1500);
});
} else if(bereichName === 'Livestream-Auswahl') {
var streamName = document.querySelector(".selected").textContent;
var playername = document.querySelector('#abspieler').value;
var stream = new Livestream(streamName, '-');
- self.http_post('../api/strg/' + playername + '/play/stream', JSON.stringify(stream), function(responseText) {
+ self.http_post('api/strg/' + playername + '/play/stream', JSON.stringify(stream), function(responseText) {
self.meldung_mit_timeout(responseText, 1500);
});
} else {
@@ -422,7 +422,7 @@
console.log(
"play playlist.value: " + document.querySelector('#playlist').value +
", abspieler.value: " + document.querySelector('#abspieler').value);
- self.http_get('../api/strg/' + abs + '/play/liste/' + lst, function(responseText) {
+ self.http_get('api/strg/' + abs + '/play/liste/' + lst, function(responseText) {
self.meldung_mit_timeout(responseText, 1500);
});
}
@@ -434,7 +434,7 @@
var titel = self.titelErmitteln(document.querySelector(".selected"));
var playername = document.querySelector('#abspieler').value;
console.log('plname: ' + playername + ' url: ' + titel.katalogUrl + titel.pfad + titel.name);
- self.http_post('../api/strg/' + playername + '/weiter/titel', JSON.stringify(titel), function(responseText) {
+ self.http_post('api/strg/' + playername + '/weiter/titel', JSON.stringify(titel), function(responseText) {
self.meldung_mit_timeout(responseText, 1500);
});
}
@@ -442,7 +442,7 @@
this.kommando = function(kommando) {
var abs = document.querySelector('#abspieler').value;
- self.http_get('../api/strg/' + abs + '/' + kommando, function(responseText) {
+ self.http_get('api/strg/' + abs + '/' + kommando, function(responseText) {
self.meldung_mit_timeout(responseText, 1500);
});
};
@@ -466,7 +466,7 @@
var streamName = document.querySelector(".selected").textContent;
// hier den Stream-URL abrufen
//GET /mz/api/store/[typname]/[name]
- self.http_get('../api/store/Livestream/' + streamName, function(responseText) {
+ self.http_get('api/store/Livestream/' + streamName, function(responseText) {
var stream = JSON.parse(responseText);
url = stream.url;
window.open(url);
@@ -489,7 +489,7 @@
self.alleTitelEntfernen = function() {
var plname = document.querySelector('#playlist').value;
- self.http_delete('../api/alist/' + plname + '/alle', '', function(responseText) {
+ self.http_delete('api/alist/' + plname + '/alle', '', function(responseText) {
// DELETE http://localhost:9090/mz/api/alist/liste1/0
//self.meldung_mit_timeout(responseText, 1500);
self.titel_liste();
@@ -512,7 +512,7 @@
}
*/
var plname = document.querySelector('#playlist').value;
- self.http_put('../api/alist/' + plname, JSON.stringify(titel), function(responseText) {
+ self.http_put('api/alist/' + plname, JSON.stringify(titel), function(responseText) {
//self.meldung_mit_timeout(responseText, 1500);
});
};
@@ -534,7 +534,7 @@
}
// /mz/api/alist/[pl-name]/[nr]
var plname = document.querySelector('#playlist').value;
- self.http_delete('../api/alist/' + plname + '/' + index,'', function(responseText) {
+ self.http_delete('api/alist/' + plname + '/' + index,'', function(responseText) {
// DELETE http://localhost:9090/mz/api/alist/liste1/0
//self.meldung_mit_timeout(responseText, 1500);
self.titel_liste();
diff --git a/www/ui/js/mustache/mustache.min.js b/www/js/mustache/mustache.min.js
similarity index 100%
rename from www/ui/js/mustache/mustache.min.js
rename to www/js/mustache/mustache.min.js
--
Gitblit v1.9.3