Ainias/wordRotator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Settings angepasst

Browse Source
This commit is contained in:
silas
2018-09-30 18:05:41 +02:00
parent ac32aa83dd
commit 4b6e965e68
17 changed files with 91 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/css/foundation.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/css/wordRotator.css
View File

File diff suppressed because one or more lines are too long

2
public/html/application/dialog/chooseTheme.html
View File

@@ -1 +1 @@
<div id=theme-choose-container><div id=choose-theme-template><div class=name></div></div></div>
<div><div id=theme-choose-container><div id=choose-theme-template><div class=name></div></div></div></div>

2
public/html/application/fragment/settings.html
View File

@@ -1 +1 @@
<div class="max-height fill-me"><div class="row max-width grow flex-center"><div class="columns small-centered small-12 smedium-11 medium-9 large-7"><div class=row id=theme-chooser><span class="columns small-6" data-translation=theme></span> <span class="columns small-6 text-right"><div id=theme-name></div></span></div><div class=row><span class="columns small-6" data-translation=sound></span> <span class="columns small-6 text-right"><label class=switch><input type=checkbox class=setting id=play-sound name=play-sound value=1 data-default=1> <span class=slider></span></label></span></div><div class=row><span class="columns small-6" data-translation=music></span> <span class="columns small-6 text-right"><label class=switch><input type=checkbox class=setting id=play-music name=play-music value=1 data-default=1> <span class=slider></span></label></span></div><div class=row id=credits-button><span class="columns small-6" data-translation=credits></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class=row id=privacy-policy-button><span class="columns small-6" data-translation=privacy-policy></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class=row id=impressum-button><span class="columns small-6" data-translation=impressum></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class=row><span class="columns small-6" data-translation=track></span> <span class="columns small-6 text-right"><label class=switch><input type=checkbox class=setting id=track-switch name=matomoShouldTrack value=1 data-default=1 data-raw=1> <span class=slider></span></label></span></div><button id=reset-levels class=button data-translation=reset-levels></button></div></div></div>
<div class="max-height fill-me"><div class="row max-width grow flex-center"><div class="columns small-centered small-12 smedium-11 medium-9 large-7"><div class="row clickable" id=theme-chooser><span class="columns small-6" data-translation=theme></span> <span class="columns small-6 text-right"><div id=theme-name></div></span></div><label class="switch row max-width"><span class="columns small-6" data-translation=sound></span> <span class="columns small-6 text-right"><input type=checkbox class=setting id=play-sound name=play-sound value=1 data-default=1> <span class=slider></span></span></label> <label class="switch row max-width"><span class="columns small-6" data-translation=music></span> <span class="columns small-6 text-right"><input type=checkbox class=setting id=play-music name=play-music value=1 data-default=1> <span class=slider></span></span></label><div class="row clickable" id=credits-button><span class="columns small-6" data-translation=credits></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row clickable" id=privacy-policy-button><span class="columns small-6" data-translation=privacy-policy></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row clickable" id=impressum-button><span class="columns small-6" data-translation=impressum></span> <span class="columns small-6 text-right" data-translation=">"></span></div><label class="switch row max-width"><span class="columns small-6" data-translation=track></span> <span class="columns small-6 text-right"><input type=checkbox class=setting id=track-switch name=matomoShouldTrack value=1 data-default=1 data-raw=1> <span class=slider></span></span></label> <button id=reset-levels class=button data-translation=reset-levels></button></div></div></div>

8
public/js/app.js
View File

@@ -3212,7 +3212,7 @@ function applyPolyfills() {
//Fallback
setTimeout(() => {
resolve(false);
}, time*1000);
}, (time+delay)*1000);
//Nach Seitenneuzeichnen, damit chrome das immer macht (und FF auch)
requestAnimationFrame(function () {
@@ -6509,11 +6509,12 @@ class ChooseThemeDialog extends Dialog {
constructor() {
let viewPromise = ViewInflater.inflate("html/application/dialog/chooseTheme.html").then(view => {
let template = view.querySelector("#choose-theme-template");
template.remove();
template.id = null;
let themeTemplateContainer = template.querySelector("#theme-choose-container");
let themeTemplateContainer = view.querySelector("#theme-choose-container");
for (let i = 0; i < ThemeManager.themes.length; i++) {
let themeElem = Helper.cloneNode(template);
@@ -6568,8 +6569,7 @@ class WordRotatorSettingFragment extends LocalStorageSettingsFragment {
let themeNameElem = this.findBy("#theme-name");
themeNameElem.removeAllChildren().appendChild(Translator.makePersistentTranslation(currentThemeName));
this.findBy("#theme-chooser").addEventListener("click", async () => {
console.log("clicked");
let newTheme = (new ChooseThemeDialog()).show();
let newTheme = await (new ChooseThemeDialog()).show();
if (Helper.isNotNull(newTheme)){
SettingsManager.getInstance().setSetting("theme", newTheme);
ThemeManager.changeCurrentTheme(newTheme);

2
public/js/lang/de.json
View File

File diff suppressed because one or more lines are too long