From b90d6705d78a7ad60a1e0419eb27ab20927d3fdd Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 07 Apr 2021 07:09:58 +0000
Subject: [PATCH] Piktogramme und Dropdown
---
www/ui/data/tpl/ctrl.tpl | 18 +++---
www/ui/font/pikto.ttf | 0
www/ui/app.css | 115 ++++++++++++++++++++++++++++++++++++++
www/ui/font/pikto-alt.ttf | 0
www/ui/data/tpl/ablageort_liste.tpl | 2
www/ui/js/app.js | 4 +
www/ui/index.html | 6 +-
www/ui/data/tpl/katalog_inhalt_liste.tpl | 2
8 files changed, 133 insertions(+), 14 deletions(-)
diff --git a/www/ui/app.css b/www/ui/app.css
index 1b33670..3587412 100644
--- a/www/ui/app.css
+++ b/www/ui/app.css
@@ -196,6 +196,23 @@
.ctrl-btn {
width: 4rem;
+ font-size: medium;
+ display: inline-block;
+ height: 2rem;
+ /* padding: 0 30px; */
+ color: #555;
+ text-align: center;
+ font-weight: 600;
+ line-height: 2rem;
+ letter-spacing: .1rem;
+ text-transform: none;
+ text-decoration: none;
+ white-space: nowrap;
+ background-color: transparent;
+ border-radius: 4px;
+ border: 1px solid #bbb;
+ cursor: pointer;
+ box-sizing: border-box;
}
.ctrl-select {
@@ -231,6 +248,104 @@
}
}
+/* Font für Piktogramme mit Fontello aus FontAwesome erzeugt */
+
+@font-face {
+ font-family: 'pikto';
+ src: url('font/pikto.ttf?49751252') format('truetype');
+ font-weight: normal;
+ font-style: normal;
+}
+/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
+/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
+/*
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+ @font-face {
+ font-family: 'pikto';
+ src: url('../font/pikto.svg?49751252#pikto') format('svg');
+ }
+}
+*/
+
+ [class^="icon-"]:before, [class*=" icon-"]:before {
+ font-family: "pikto";
+ font-style: normal;
+ font-weight: normal;
+ speak: never;
+
+ display: inline-block;
+ text-decoration: inherit;
+ width: 1em;
+ margin-right: .2em;
+ text-align: center;
+ /* opacity: .8; */
+
+ /* For safety - reset parent styles, that can break glyph codes*/
+ font-variant: normal;
+ text-transform: none;
+
+ /* fix buttons height, for twitter bootstrap */
+ line-height: 1em;
+
+ /* Animation center compensation - margins should be symmetric */
+ /* remove if not needed */
+ margin-left: .2em;
+
+ /* you can be more comfortable with increased icons size */
+ /* font-size: 120%; */
+
+ /* Font smoothing. That was taken from TWBS */
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+
+ /* Uncomment for 3D effect */
+ /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+}
+
+.icon-cancel:before { content: '\e800'; } /* '' */
+.icon-th-large:before { content: '\e801'; } /* '' */
+.icon-th-list:before { content: '\e802'; } /* '' */
+.icon-folder:before { content: '\e803'; } /* '' */
+.icon-folder-open:before { content: '\e804'; } /* '' */
+.icon-doc:before { content: '\e805'; } /* '' */
+.icon-pencil:before { content: '\e806'; } /* '' */
+.icon-trash-empty:before { content: '\e807'; } /* '' */
+.icon-down-dir:before { content: '\e808'; } /* '' */
+.icon-up-dir:before { content: '\e809'; } /* '' */
+.icon-left-dir:before { content: '\e80a'; } /* '' */
+.icon-right-dir:before { content: '\e80b'; } /* '' */
+.icon-down-open:before { content: '\e80c'; } /* '' */
+.icon-left-open:before { content: '\e80d'; } /* '' */
+.icon-right-open:before { content: '\e80e'; } /* '' */
+.icon-up-open:before { content: '\e80f'; } /* '' */
+.icon-floppy:before { content: '\e810'; } /* '' */
+.icon-eye:before { content: '\e811'; } /* '' */
+.icon-logout:before { content: '\e812'; } /* '' */
+.icon-play:before { content: '\e813'; } /* '' */
+.icon-stop:before { content: '\e814'; } /* '' */
+.icon-pause:before { content: '\e815'; } /* '' */
+.icon-video:before { content: '\e816'; } /* '' */
+.icon-music:before { content: '\e817'; } /* '' */
+.icon-forward:before { content: '\e818'; } /* '' */
+.icon-list:before { content: '\e819'; } /* '' */
+.icon-docs:before { content: '\f0c5'; } /* '' */
+.icon-menu:before { content: '\f0c9'; } /* '' */
+.icon-doc-text:before { content: '\f0f6'; } /* '' */
+.icon-angle-left:before { content: '\f104'; } /* '' */
+.icon-angle-right:before { content: '\f105'; } /* '' */
+.icon-angle-up:before { content: '\f106'; } /* '' */
+.icon-angle-down:before { content: '\f107'; } /* '' */
+.icon-tablet:before { content: '\f10a'; } /* '' */
+.icon-folder-empty:before { content: '\f114'; } /* '' */
+.icon-folder-open-empty:before { content: '\f115'; } /* '' */
+.icon-ellipsis:before { content: '\f141'; } /* '' */
+.icon-ellipsis-vert:before { content: '\f142'; } /* '' */
+.icon-doc-inv:before { content: '\f15b'; } /* '' */
+.icon-doc-text-inv:before { content: '\f15c'; } /* '' */
+.icon-database:before { content: '\f1c0'; } /* '' */
+.icon-sliders:before { content: '\f1de'; } /* '' */
+.icon-trash:before { content: '\f1f8'; } /* '' */
+
/* Dropdown Menu */
/* Style The Dropdown Button */
diff --git a/www/ui/data/tpl/ablageort_liste.tpl b/www/ui/data/tpl/ablageort_liste.tpl
index 16f1f32..c7d5e1d 100644
--- a/www/ui/data/tpl/ablageort_liste.tpl
+++ b/www/ui/data/tpl/ablageort_liste.tpl
@@ -2,7 +2,7 @@
<div class='entity-formular'>
<div class='entity-liste-kopf'>
Ablageorte
- <button class='button' id='neu-btn'>Neu</button>
+ <button class='ctrl-btn' id='neu-btn' title='Neu'><i class='icon-doc'></i></button>
</div>
<ul class='entity-liste'>
{{#ArrayList}}
diff --git a/www/ui/data/tpl/ctrl.tpl b/www/ui/data/tpl/ctrl.tpl
index 5b55a59..6717df1 100644
--- a/www/ui/data/tpl/ctrl.tpl
+++ b/www/ui/data/tpl/ctrl.tpl
@@ -1,23 +1,23 @@
<div class="ctrl">
<div class="ctrl-btns">
- <button class="button ctrl-item ctrl-btn" id="play-btn">Play</button>
- <button class="button ctrl-item ctrl-btn" id="play-btn">Pause</button>
- <button class="button ctrl-item ctrl-btn" id="play-btn">Stop</button>
- <button class="button ctrl-item ctrl-btn" id="play-btn">Weiter</button>
- <button class="button ctrl-item ctrl-btn" id="play-btn">Hier</button>
+ <button class="ctrl-btn ctrl-item" id="play-btn" title="Abspielen"><i class="icon-play"></i></button>
+ <button class="ctrl-btn ctrl-item" id="pause-btn" title="Pause"><i class="icon-pause"></i></button>
+ <button class="ctrl-btn ctrl-item" id="stop-btn" title="Stopp"><i class="icon-stop"></i></button>
+ <button class="ctrl-btn ctrl-item" id="weiter-btn" title="Weiterspielen"><i class="icon-right-open"></i></button>
+ <button class="ctrl-btn ctrl-item" id="hier-btn" title="hier spielen"><i class="icon-tablet"></i></button>
</div>
<div class="ctrl-orte">
- <select class="u-full-width ctrl-item ctrl-select" id="abspieler">
+ <select class="u-full-width ctrl-item ctrl-select" id="abspieler" title="Abspieler">
<option value="as1">Wohnzimmer langtext</option>
<option value="as2">Arbeitsz</option>
<option value="as3">Küche</option>
</select>
- <select class="u-full-width ctrl-item ctrl-select" id="playlist">
+ <select class="u-full-width ctrl-item ctrl-select" id="playlist" title="Playliste">
<option value="Pl1">Liste 1</option>
<option value="Pl2">Liste 2</option>
<option value="Pl3">Liste 3</option>
</select>
- <button class="button ctrl-item ctrl-btn" id="dazu-btn">Dazu</button>
- <button class="button ctrl-item ctrl-btn" id="weg-btn">Weg</button>
+ <button class="ctrl-btn ctrl-item" id="dazu-btn" title="der Playlist hinzufügen"><i class="icon-forward"></i></button>
+ <button class="ctrl-btn ctrl-item" id="weg-btn" title="aus Playlist entfernen"><i class="icon-trash-empty"></i></button>
</div>
</div>
diff --git a/www/ui/data/tpl/katalog_inhalt_liste.tpl b/www/ui/data/tpl/katalog_inhalt_liste.tpl
index bece70a..bca65d5 100644
--- a/www/ui/data/tpl/katalog_inhalt_liste.tpl
+++ b/www/ui/data/tpl/katalog_inhalt_liste.tpl
@@ -1,7 +1,7 @@
<div class='entity-formular'>
<div class='entity-liste-kopf'>
Media-Liste
- <button class='button' id='zurueck-btn'>Zurück</button>
+ <button class='ctrl-btn' id='zurueck-btn'><i class='icon-up-open'></i></button>
</div>
<ul class='entity-liste'>
{{#Medialiste}}
diff --git a/www/ui/font/pikto-alt.ttf b/www/ui/font/pikto-alt.ttf
new file mode 100644
index 0000000..4be0bcb
--- /dev/null
+++ b/www/ui/font/pikto-alt.ttf
Binary files differ
diff --git a/www/ui/font/pikto.ttf b/www/ui/font/pikto.ttf
new file mode 100644
index 0000000..3cbaa31
--- /dev/null
+++ b/www/ui/font/pikto.ttf
Binary files differ
diff --git a/www/ui/index.html b/www/ui/index.html
index 6fce169..c81f404 100644
--- a/www/ui/index.html
+++ b/www/ui/index.html
@@ -55,9 +55,9 @@
<a id="mi-neues-dok"><i class="icon-doc-text"></i> Neues Dokument</a>
<a id="mi-abmelden"><i class="icon-logout"></i> Abmelden</a>
-->
- <a id="mi-katalog"><i class="icon-eye"></i> Katalog</a>
- <a id="mi-orte"><i class="icon-eye"></i> Orte</a>
- <a id="mi-list"><i class="icon-eye"></i> Playlist</a>
+ <a id="mi-katalog"><i class="icon-music"></i> Media</a>
+ <a id="mi-orte"><i class="icon-database"></i> Orte</a>
+ <a id="mi-list"><i class="icon-list"></i> Playlist</a>
</div>
</div>
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index a217ade..c5637bc 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -210,6 +210,10 @@
self.menue_umschalten();
});
+ self.addEvtListener('#mi-katalog', 'click', self.media_liste);
+ self.addEvtListener('#mi-orte', 'click', self.ablageort_liste);
+ //self.addEvtListener('#mi-list', 'click', self.media_liste);
+
self.fusszeile_umschalten();
self.seitenleiste_umschalten();
self.dialog_unten_zeigen();
--
Gitblit v1.9.3