From 9c7bda01801855aeb45adf1fe1ddbada80cc050d Mon Sep 17 00:00:00 2001 From: ulrich Date: Wed, 14 Apr 2021 06:22:51 +0000 Subject: [PATCH] UI- und Menue-Anpassungen --- www/ui/font/Roboto-Regular.ttf | 0 www/ui/app.css | 7 +-- www/ui/data/menu/hauptmenue.json | 21 +++++++++- www/ui/data/tpl/dlg-info.txt | 4 +- src/de/uhilger/mediaz/entity/Geraet.java | 37 ++++++++++++++++++ www/ui/data/tpl/form_livestream.txt | 4 +- 6 files changed, 61 insertions(+), 12 deletions(-) diff --git a/src/de/uhilger/mediaz/entity/Geraet.java b/src/de/uhilger/mediaz/entity/Geraet.java new file mode 100644 index 0000000..c498d33 --- /dev/null +++ b/src/de/uhilger/mediaz/entity/Geraet.java @@ -0,0 +1,37 @@ +/* + Mediazentrale - 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/>. + */ +package de.uhilger.mediaz.entity; + +/** + * + * @author Ulrich Hilger + */ +public class Geraet implements Entity { + + private String name; + + public void setName(String name) { + this.name = name; + } + + @Override + public String getName() { + return name; + } + +} diff --git a/www/ui/app.css b/www/ui/app.css index 5799afd..fee32a3 100644 --- a/www/ui/app.css +++ b/www/ui/app.css @@ -164,7 +164,6 @@ .entity-formular { display: flex; flex-flow: column; - user-select: none; font-size: smaller; } @@ -185,11 +184,9 @@ user-select: none; } -/* -.entity-element:focus { - outline: none; +.entity-form-element { + margin: 0.4rem; } -*/ .entity-element:hover { background-color: #ececec; diff --git a/www/ui/data/menu/hauptmenue.json b/www/ui/data/menu/hauptmenue.json index 3dc5c53..b1b735f 100644 --- a/www/ui/data/menu/hauptmenue.json +++ b/www/ui/data/menu/hauptmenue.json @@ -8,9 +8,19 @@ }, "inhalt": [ { - "titel": "Media", + "titel": "Eig. Quellen", "umenue": false, "funktion": "app.media_liste" + }, + { + "titel": "Live", + "umenue": false, + "funktion": "app.livestream_selection" + }, + { + "titel": "", + "umenue": false, + "funktion": "" }, { "titel": "Abspielliste", @@ -33,14 +43,19 @@ "funktion": "app.abspiellisten_liste" }, { + "titel": "Livestreams", + "umenue": false, + "funktion": "app.livestream_liste" + }, + { "titel": "Einstellungen", "umenue": false, "funktion": "app.prefs_liste" }, { - "titel": "Form Test", + "titel": "", "umenue": false, - "funktion": "app.test_form" + "funktion": "" }, { "titel": "Info", diff --git a/www/ui/data/tpl/dlg-info.txt b/www/ui/data/tpl/dlg-info.txt index f471ae1..12f0154 100644 --- a/www/ui/data/tpl/dlg-info.txt +++ b/www/ui/data/tpl/dlg-info.txt @@ -1,8 +1,8 @@ <div class="dlg-info"> <span class="close-btn pointer-cursor">✖</span> <div class="dlg-behaelter"> - <div class="dlg-info-app-titel">Intendant</div> - <div class="dlg-info-app-info">Deine persönliche Mediazentrale von <a href='https://uhilger.de'>Ulrich Hilger</a>.</div> + <div class="dlg-info-app-titel">Pan</div> + <div class="dlg-info-app-info">Die Mediazentrale von <a href='https://uhilger.de'>Ulrich Hilger</a>.</div> <div class="dlg-info-app-info">Weitere Infos im Code-Repository.</div> </div> </div> diff --git a/www/ui/data/tpl/form_livestream.txt b/www/ui/data/tpl/form_livestream.txt index c5144d6..8afa3c2 100644 --- a/www/ui/data/tpl/form_livestream.txt +++ b/www/ui/data/tpl/form_livestream.txt @@ -1,7 +1,7 @@ <form> <div class="entity-formular"> - <input name="name" class="entity-element" type="text" id="livestream-name" placeholder="Name" value="{{name}}" /> - <input name="url" class="entity-element" type="text" id="livestream-url" placeholder="Pfad" value="{{url}}" /> + <input name="name" class="entity-form-element" type="text" id="livestream-name" placeholder="Name" value="{{name}}" /> + <input name="url" class="entity-form-element" type="text" id="livestream-url" placeholder="Pfad" value="{{url}}" /> <div class="entity-buttons"> <button type="submit" class="button-primary" id="ok-btn">Speichern</button> <button class="button" id="cancel-btn">Abbrechen</button> diff --git a/www/ui/font/Roboto-Regular.ttf b/www/ui/font/Roboto-Regular.ttf new file mode 100644 index 0000000..3d6861b --- /dev/null +++ b/www/ui/font/Roboto-Regular.ttf Binary files differ -- Gitblit v1.9.3