Versionsstring hinzugefügt

This commit is contained in:
silas 2018-12-01 19:08:21 +01:00
parent 9a59f9f80a
commit 0d70067fe4
11 changed files with 19 additions and 4 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectTasksOptions">
<TaskOptions isEnabled="false">
<TaskOptions isEnabled="true">
<option name="arguments" value="--no-source-map --update $FileName$:$FileNameWithoutExtension$.css" />
<option name="checkSyntaxErrors" value="true" />
<option name="description" />

1
.idea/wordRotator.iml generated
View File

@ -3,6 +3,7 @@
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/module/Application/src" isTestSource="false" packagePrefix="Application\" />
<sourceFolder url="file://$MODULE_DIR$/src/module/Application/pwa/public" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/public/js" />
<excludeFolder url="file://$MODULE_DIR$/publicTest" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/event-manager" />

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 setting-row hidden" id=install-button><span class="columns small-6" data-translation=install></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row setting-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><label class="switch row setting-row"><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 setting-row"><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 setting-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 setting-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 setting-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 setting-row" id=contact-button><span class="columns small-6" data-translation=contact></span> <span class="columns small-6 text-right" data-translation=">"></span></div><label class="switch row setting-row"><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><div class="row setting-row hidden"><span class="column small-10" id=storage-info></span> <span class="columns small-2 text-right" data-translation=">"></span></div><button id=reset-levels class="button hidden" 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 setting-row hidden" id=install-button><span class="columns small-6" data-translation=install></span> <span class="columns small-6 text-right" data-translation=">"></span></div><div class="row setting-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><label class="switch row setting-row"><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 setting-row"><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 setting-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 setting-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 setting-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 setting-row" id=contact-button><span class="columns small-6" data-translation=contact></span> <span class="columns small-6 text-right" data-translation=">"></span></div><label class="switch row setting-row"><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><div class="row setting-row hidden"><span class="column small-10" id=storage-info></span> <span class="columns small-2 text-right" data-translation=">"></span></div><div class="row setting-row"><span class="column small-6" data-translation=version-label></span> <span class="column small-6 text-right" id=version-info></span></div><button id=reset-levels class="button hidden" data-translation=reset-levels></button></div></div></div>

View File

@ -7704,6 +7704,7 @@ class WordRotatorSettingFragment extends LocalStorageSettingsFragment {
this.findBy("#impressum-button").addEventListener("click", () => {
this.getSite().startSite(ImpressumSite);
});
this.findBy("#version-info").innerText = window["version"];
InstallManager.setCanInstallListener(() => {
let installButton = this.findBy("#install-button");
@ -7924,6 +7925,8 @@ if (window.location.pathname.indexOf("publicTest/") >= 0)
SystemSettings.setBasePath(basePath);
Translator.supportedLanguages = ["de"];
Translator.markTranslations = false;
window["version"] = "1-local";
Matomo.SIDE_ID = "2";

File diff suppressed because one or more lines are too long

View File

@ -5,5 +5,6 @@ SystemSettings.setBasePath("/");
Translator.supportedLanguages = ["de"];
Translator.markTranslations = false;
Translator.markUntranslatedTranslations = false;
window["version"] = "1-beta";
Matomo.SIDE_ID = 1;

View File

@ -5,5 +5,6 @@ SystemSettings.setBasePath("/");
Translator.supportedLanguages = ["de"];
Translator.markTranslations = false;
Translator.markUntranslatedTranslations = false;
window["version"] = "1.1";
Matomo.SIDE_ID = 3;

View File

@ -10,5 +10,7 @@ if (window.location.pathname.indexOf("publicTest/") >= 0)
SystemSettings.setBasePath(basePath);
Translator.supportedLanguages = ["de"];
Translator.markTranslations = false;
window["version"] = "1-local";
Matomo.SIDE_ID = "2";

View File

@ -69,6 +69,7 @@ export class WordRotatorSettingFragment extends LocalStorageSettingsFragment {
this.findBy("#impressum-button").addEventListener("click", () => {
this.getSite().startSite(ImpressumSite);
});
this.findBy("#version-info").innerText = window["version"];
InstallManager.setCanInstallListener(() => {
let installButton = this.findBy("#install-button");

View File

@ -56,6 +56,11 @@
<span class='columns small-2 text-right' data-translation=">"></span>
</div>
<div class='row setting-row' >
<span class = "column small-6" data-translation="version-label"></span>
<span class = "column small-6 text-right" id='version-info'></span>
</div>
<!--<iframe-->
<!--style="border: 0; height: 200px; width: 600px;"-->
<!--src="https://matomo.silas.link/index.php?module=CoreAdminHome&action=optOut&language=de&backgroundColor=&fontColor=&fontSize=&fontFamily="-->

View File

@ -35,5 +35,6 @@
"already-persisted-dialog-message":"Damit die Daten dauerhaft gespeichert werden, muss eins von drei Kriterien erfüllt sein:<br/>1) Die Seite muss als Lesezeichen gespeichert werden (und maximal 5 Lesezeichen ingsesamt).<br/>2) Die Seite muss mit die meistbenutzte Seite sein. <br/>3) Benachrichtigungen müssen erlaubt werden.<br/> Du erfüllst schon ein Kriterium und daher wird dein Fortschritt dauerhaft gespeichert (außer du löscht sie)",
"already-persisted-dialog-title":"Daten werden dauerhaft gespeichert!",
"persist-storage-dialog-message-firefox":"Damit dein Fortschritt dauerhaft gespeichert wird, musst du zulassen, dass Daten dauerhaft gespeichert werden.",
"warning-data-not-persistent":"Achtung! Dein Fortschritt kann verloren gehen! Gehe die Einstellungen für mehr Infos."
"warning-data-not-persistent":"Achtung! Dein Fortschritt kann verloren gehen! Gehe die Einstellungen für mehr Infos.",
"version-label": "Version:"
}