From 6b96f8281c78881030f5994b2946de60e0d19881 Mon Sep 17 00:00:00 2001 From: Anonymous Contributor Date: Tue, 5 Sep 2023 01:15:40 +0200 Subject: [PATCH] Adapt all templates to new templating system --- .../{dashboard-admin.html => __dashboard.php} | 23 +- templates/{error.html => __presession.php} | 16 +- ...dashboard-home.html => dashboard-home.php} | 7 +- templates/dashboard.html | 135 ------------ templates/deine-regionen.html | 1 - templates/error.php | 13 ++ templates/forgot.html | 65 ------ templates/forgot.php | 26 +++ templates/{identities.html => identities.php} | 18 +- templates/invite.html | 24 --- templates/login.html | 77 ------- templates/login.php | 36 ++++ templates/{mail.html => mail.php} | 8 +- templates/online-anzeige.html | 1 - templates/online-display.php | 10 + templates/{profile.html => profile.php} | 40 ++-- templates/register.html | 88 -------- templates/register.php | 47 ++++ templates/reset-password.html | 66 ------ templates/reset-password.php | 27 +++ templates/{users.html => users.php} | 8 +- templates/viewerWelcomeImages.html | 202 ------------------ templates/viewerWelcomeImages.php | 202 ++++++++++++++++++ 23 files changed, 413 insertions(+), 727 deletions(-) rename templates/{dashboard-admin.html => __dashboard.php} (89%) rename templates/{error.html => __presession.php} (82%) rename templates/{dashboard-home.html => dashboard-home.php} (86%) delete mode 100644 templates/dashboard.html delete mode 100644 templates/deine-regionen.html create mode 100644 templates/error.php delete mode 100644 templates/forgot.html create mode 100644 templates/forgot.php rename templates/{identities.html => identities.php} (87%) delete mode 100644 templates/invite.html delete mode 100644 templates/login.html create mode 100644 templates/login.php rename templates/{mail.html => mail.php} (85%) delete mode 100644 templates/online-anzeige.html create mode 100644 templates/online-display.php rename templates/{profile.html => profile.php} (92%) delete mode 100644 templates/register.html create mode 100644 templates/register.php delete mode 100644 templates/reset-password.html create mode 100644 templates/reset-password.php rename templates/{users.html => users.php} (82%) delete mode 100644 templates/viewerWelcomeImages.html create mode 100644 templates/viewerWelcomeImages.php diff --git a/templates/dashboard-admin.html b/templates/__dashboard.php similarity index 89% rename from templates/dashboard-admin.html rename to templates/__dashboard.php index c19de37..573cb02 100644 --- a/templates/dashboard-admin.html +++ b/templates/__dashboard.php @@ -6,14 +6,14 @@ - OpenSim - Kontrollzentrum - %%USERNAME%% - %%EchoTitle%% + OpenSim - Kontrollzentrum - <?= $v['username'] ?> - <?= $v['title'] ?> - + - %%echoHeader%% + @@ -26,7 +26,7 @@
@@ -111,12 +110,12 @@
  • Gridverwaltung
    • -
  • %%EchoTitle%%
    • +

    • - %%EchoInhalt%% +
    @@ -155,4 +154,4 @@ - \ No newline at end of file + diff --git a/templates/error.html b/templates/__presession.php similarity index 82% rename from templates/error.html rename to templates/__presession.php index c037e70..b048637 100644 --- a/templates/error.html +++ b/templates/__presession.php @@ -3,7 +3,7 @@ - Fehler - MCP + <?= $v['title'] ?> @@ -22,19 +22,7 @@
    -
    - - Fehler - - -
    - %%MESSAGE%% -
    - -
    - Zurück zum Login -
    -
    +
    diff --git a/templates/dashboard-home.html b/templates/dashboard-home.php similarity index 86% rename from templates/dashboard-home.html rename to templates/dashboard-home.php index 9d37525..5879544 100644 --- a/templates/dashboard-home.html +++ b/templates/dashboard-home.php @@ -1,4 +1,3 @@ -
    @@ -6,7 +5,7 @@
    -
    %%GLOBAL-USER-COUNT%%
    +
    Benutzer / Online
    @@ -25,9 +24,9 @@
    -
    %%GLOBAL-REGION-COUNT%%
    +
    Regionen - \ No newline at end of file + diff --git a/templates/dashboard.html b/templates/dashboard.html deleted file mode 100644 index c427d7e..0000000 --- a/templates/dashboard.html +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - OpenSim - Kontrollzentrum - %%USERNAME%% - %%EchoTitle%% - - - - - - - %%echoHeader%% - - - - - -
    - -
    -
    -
      -
    1. - Gridverwaltung -
      2. -
    2. %%EchoTitle%%
      3. -
    - -

    - - %%EchoInhalt%% -
    -
    -
    - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/deine-regionen.html b/templates/deine-regionen.html deleted file mode 100644 index c1ffa3e..0000000 --- a/templates/deine-regionen.html +++ /dev/null @@ -1 +0,0 @@ -%%REGION-LIST%% \ No newline at end of file diff --git a/templates/error.php b/templates/error.php new file mode 100644 index 0000000..33ed62a --- /dev/null +++ b/templates/error.php @@ -0,0 +1,13 @@ +
    + + Fehler + + +
    + +
    + +
    + Zurück zum Login +
    +
    diff --git a/templates/forgot.html b/templates/forgot.html deleted file mode 100644 index 2315f1f..0000000 --- a/templates/forgot.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - Passwort vergessen - - - - - - - - - - - - - - - -
    -
    -
    -
    - - Passwort vergessen - - -
    - %%MESSAGE%% -
    - -
    - - -
    - -
    - - -
    - -
    - %%CSRF%% - -
    -
    -
    -
    -
    - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/forgot.php b/templates/forgot.php new file mode 100644 index 0000000..fbbe281 --- /dev/null +++ b/templates/forgot.php @@ -0,0 +1,26 @@ +
    + + Passwort vergessen + + +
    + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    +
    diff --git a/templates/identities.html b/templates/identities.php similarity index 87% rename from templates/identities.html rename to templates/identities.php index b92aa69..0c59e46 100644 --- a/templates/identities.html +++ b/templates/identities.php @@ -5,16 +5,14 @@ Nach der Änderung musst du dich neu anmelden.
    -
    %%MESSAGE%%
    - - +

    -
    +
    - %%IDENT-LIST%% +
    -
    +
    Hier kannst du eine neue Identität erstellen.
    @@ -30,12 +28,12 @@
    - %%CSRF%% +
    -
    -
    -
    \ No newline at end of file +
    + + diff --git a/templates/invite.html b/templates/invite.html deleted file mode 100644 index 8b6e9cb..0000000 --- a/templates/invite.html +++ /dev/null @@ -1,24 +0,0 @@ -
    - Hier kannst du einen Invite-Link erstellen.
    - Jeder, der solch einen Link bekommt, kann sich im Grid registrieren. - Der Link ist einzigartig und funktioniert nur einmalig.
    - Nach Aufrufen des Links muss ein Name, Passwort und Standardavatar ausgewählt werden. -
    - -
    -
    -
    -
    - - -
    -
    - -
    -
    - %%CSRF%% - -
    -
    -
    -
    \ No newline at end of file diff --git a/templates/login.html b/templates/login.html deleted file mode 100644 index f272fcd..0000000 --- a/templates/login.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - Login - - - - - - - - - - - - - - - -
    -
    -
    -
    - - Login - - -
    - %%LOGINMESSAGE%% -
    - -
    - - -
    - -
    - - -
    - -
    -
    - -
    - - -
    - -
    - %%CSRF%% - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/login.php b/templates/login.php new file mode 100644 index 0000000..5181957 --- /dev/null +++ b/templates/login.php @@ -0,0 +1,36 @@ +
    + + Login + + +
    + +
    + +
    + + +
    + +
    + + +
    + +
    +
    + +
    + +
    + Passwort vergessen? +
    +
    + +
    + + +
    +
    diff --git a/templates/mail.html b/templates/mail.php similarity index 85% rename from templates/mail.html rename to templates/mail.php index 7658e03..1cc7977 100644 --- a/templates/mail.html +++ b/templates/mail.php @@ -24,15 +24,15 @@ - +
    Logo -

    %%EchoTitle%%

    +

    - %%MESSAGE%% +
    - \ No newline at end of file + diff --git a/templates/online-anzeige.html b/templates/online-anzeige.html deleted file mode 100644 index e6443c7..0000000 --- a/templates/online-anzeige.html +++ /dev/null @@ -1 +0,0 @@ -%%ONLINE-LIST%% \ No newline at end of file diff --git a/templates/online-display.php b/templates/online-display.php new file mode 100644 index 0000000..838ee63 --- /dev/null +++ b/templates/online-display.php @@ -0,0 +1,10 @@ + + + + Benutzer online + + + + + + \ No newline at end of file diff --git a/templates/profile.html b/templates/profile.php similarity index 92% rename from templates/profile.html rename to templates/profile.php index bf2ff48..b0c9961 100644 --- a/templates/profile.html +++ b/templates/profile.php @@ -1,30 +1,30 @@ -
    %%INFOMESSAGE%%
    +
    -
    -
    +
    +
    - +
    - +
    - +
    - + >
    @@ -38,7 +38,7 @@
    - +
    @@ -50,15 +50,15 @@
    - %%CSRF%% +
    -
    -
    +
    +
    @@ -85,7 +85,7 @@
    - %%CSRF%% +
    @@ -98,15 +98,15 @@

    IAR Sicherung

    -
    %%IARINFOMESSAGE%%
    +
    Hier kannst du eine IAR deines Inventars erstellen.
    Dies wird einige Zeit dauern. Du bekommst eine PM mit einem Downloadlink sobald deine IAR fertig erstellt wurde.
    - %%CSRF%% -
    + +
    @@ -136,19 +136,19 @@
    - %%CSRF%% +
    -
    -
    +
    +
    \ No newline at end of file + diff --git a/templates/register.html b/templates/register.html deleted file mode 100644 index 93a70dc..0000000 --- a/templates/register.html +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - Registrieren - - - - - - - - - - - - - - - -
    -
    -
    -
    - - Registrieren - - -
    - %%MESSAGE%% -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - Wähle deinen Standardavatar aus: -
    - -
    - -
    - -
    - Ich habe die Nutzungsbedingungen gelesen. - -
    - -
    - %%CSRF%% - - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/register.php b/templates/register.php new file mode 100644 index 0000000..d0e9226 --- /dev/null +++ b/templates/register.php @@ -0,0 +1,47 @@ +
    + + Registrieren + + +
    + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + Wähle deinen Standardavatar aus: +
    + +
    + +
    + +
    + Ich habe die Nutzungsbedingungen gelesen. + +
    + +
    + + + +
    +
    \ No newline at end of file diff --git a/templates/reset-password.html b/templates/reset-password.html deleted file mode 100644 index 34883e4..0000000 --- a/templates/reset-password.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - Neues Passwort festlegen - - - - - - - - - - - - - - - -
    -
    -
    -
    - - Neues Passwort festlegen - - -
    - %%MESSAGE%% -
    - -
    - - -
    - -
    - - -
    - -
    - %%CSRF%% - - -
    -
    -
    -
    -
    - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/reset-password.php b/templates/reset-password.php new file mode 100644 index 0000000..dacb8ea --- /dev/null +++ b/templates/reset-password.php @@ -0,0 +1,27 @@ +
    + + Neues Passwort festlegen + + +
    + +
    + +
    + + +
    + +
    + + +
    + +
    + + + +
    +
    \ No newline at end of file diff --git a/templates/users.html b/templates/users.php similarity index 82% rename from templates/users.html rename to templates/users.php index 5ef1b73..ba29a28 100644 --- a/templates/users.html +++ b/templates/users.php @@ -1,8 +1,8 @@
    - %%MESSAGE%% - %%USER-LIST%% + '.$v['message'].'
    '?> +
    @@ -17,13 +17,13 @@
    - +
    - %%CSRF%% +
    diff --git a/templates/viewerWelcomeImages.html b/templates/viewerWelcomeImages.html deleted file mode 100644 index b433172..0000000 --- a/templates/viewerWelcomeImages.html +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - - -
    -
    %%GRIDNAME%%
    - Willkommen
    - Bitte melde dich an, um %%GRIDNAME%% zu betreten.
    -
    - - %%SHOWNEWS%% -
    -
    -
    - Status: Online -
    - %%SHOWSTATS%% -
    - - \ No newline at end of file diff --git a/templates/viewerWelcomeImages.php b/templates/viewerWelcomeImages.php new file mode 100644 index 0000000..5dfd041 --- /dev/null +++ b/templates/viewerWelcomeImages.php @@ -0,0 +1,202 @@ + + + + + + + + +
    +
    + Willkommen
    + Bitte melde dich an, um zu betreten.
    +
    + + +
    +
    +
    + Status: Online +
    + +
    + +