From 3f66d74a1de86413b965be9dfaa4d430202e7fbe Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Mon, 18 May 2020 09:59:55 +0000 Subject: [PATCH 01/22] Update header.php hotfix: removed /bootstrap subdir --- mymodule/themes/fancytheme/default/includes/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mymodule/themes/fancytheme/default/includes/header.php b/mymodule/themes/fancytheme/default/includes/header.php index 257a7a1..4bc0060 100644 --- a/mymodule/themes/fancytheme/default/includes/header.php +++ b/mymodule/themes/fancytheme/default/includes/header.php @@ -47,7 +47,7 @@ header('X-Frame-Options: SAMEORIGIN'); <link rel="icon" type="image/icon" href="/<?php echo $this->data['baseurlpath']; ?>resources/icons/favicon.ico" /> <title>M4_LAB: User Login</title> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" /> -<link rel="stylesheet" type="text/css" href="/css/bootstrap/bootstrap.css"/> +<link rel="stylesheet" type="text/css" href="/css/bootstrap.css"/> <link rel="stylesheet" type="text/css" href="/css/Login-Form-Clean.css"/> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> -- GitLab From 3f80ca926b3a442fb3bdeec2be638b11aa079ab1 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Fri, 26 Jun 2020 09:02:27 +0000 Subject: [PATCH 02/22] Update footer.php- removed conflicting bootstrap script definition --- mymodule/themes/fancytheme/default/includes/footer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mymodule/themes/fancytheme/default/includes/footer.php b/mymodule/themes/fancytheme/default/includes/footer.php index 36b75fc..f9da9a2 100644 --- a/mymodule/themes/fancytheme/default/includes/footer.php +++ b/mymodule/themes/fancytheme/default/includes/footer.php @@ -6,7 +6,6 @@ if (!empty($this->data['htmlinject']['htmlContentPost'])) { } ?> - <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> <script src="/js/headfoot.js"></script> -- GitLab From f5a7267a3cbd4b27d8ccb5abbe8547738d4aa3c7 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Fri, 26 Jun 2020 09:04:18 +0000 Subject: [PATCH 03/22] Update header.php - removed conflicting bootstrap definition --- mymodule/themes/fancytheme/default/includes/header.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mymodule/themes/fancytheme/default/includes/header.php b/mymodule/themes/fancytheme/default/includes/header.php index 4bc0060..150b0ff 100644 --- a/mymodule/themes/fancytheme/default/includes/header.php +++ b/mymodule/themes/fancytheme/default/includes/header.php @@ -51,7 +51,8 @@ header('X-Frame-Options: SAMEORIGIN'); <link rel="stylesheet" type="text/css" href="/css/Login-Form-Clean.css"/> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> -<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> +<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> + <?php if (!empty($jquery)) { -- GitLab From daaffa079693c4e50f77965a7be748e214937a55 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Wed, 11 Nov 2020 15:25:18 +0000 Subject: [PATCH 04/22] Update .gitlab-ci.yml, test deployment new server --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1ad307..e3f1527 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ production: testing: script: - - rsync -a ./mymodule/ /var/simplesamlphptest/modules/mymodule/ + - rsync -a ./mymodule/ /data/simplesamlphptest/modules/mymodule/ only: - testing tags: -- GitLab From 24ca957807f43f3b76a7afd6008235c1cfe1402e Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 14:23:27 +0100 Subject: [PATCH 05/22] added localization --- mymodule/locales/de/LC_MESSAGES/mymodule.po | 519 ++++++++++++++++++ mymodule/locales/en/LC_MESSAGES/mymodule.po | 571 ++++++++++++++++++++ 2 files changed, 1090 insertions(+) create mode 100644 mymodule/locales/de/LC_MESSAGES/mymodule.po create mode 100644 mymodule/locales/en/LC_MESSAGES/mymodule.po diff --git a/mymodule/locales/de/LC_MESSAGES/mymodule.po b/mymodule/locales/de/LC_MESSAGES/mymodule.po new file mode 100644 index 0000000..4a53b47 --- /dev/null +++ b/mymodule/locales/de/LC_MESSAGES/mymodule.po @@ -0,0 +1,519 @@ + +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: SimpleSAMLphp 1.15\n" +"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n" +"POT-Creation-Date: 2016-10-12 09:23+0200\n" +"PO-Revision-Date: 2016-10-14 12:14+0200\n" +"Last-Translator: \n" +"Language: de\n" +"Language-Team: \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" + +msgid "{core:frontpage:link_phpinfo}" +msgstr "PHPinfo" + +msgid "{core:no_state:report_text}" +msgstr "" +"Wenn das Problem weiter besteht, kannst du diesen Fehler den " +"Systemadministratoren melden." + +msgid "{core:no_state:cause_backforward}" +msgstr "Das Benutzen der Zurück- und Vorwärts-Schaltflächen im Web-Browser." + +msgid "{core:no_metadata:not_found_for}" +msgstr "Für folgende Entität konnten keine Metadaten gefunden werden:" + +msgid "{core:no_state:suggestions}" +msgstr "Empfehlungen um dieses Problem zu lösen:" + +msgid "{core:frontpage:login_as_admin}" +msgstr "Als Administrator anmelden" + +msgid "{core:short_sso_interval:warning}" +msgstr "" +"Wir haben festgestellt, dass seit Ihrer letzten Anmeldung bei diesem " +"Diensteanbieter nur wenige Sekunden vergangen sind. Deswegen gehen wir " +"davon aus, dass es ein Problem mit diesem Anbieter gibt." + +msgid "{core:frontpage:link_doc_sp}" +msgstr "SimpleSAMLphp als Service Provider benutzen" + +msgid "{core:frontpage:link_meta_saml2sphosted}" +msgstr "Hosted SAML 2.0 Service Provider Metadaten (automatisch generiert)" + +msgid "{core:frontpage:link_openidprovider}" +msgstr "OpenID Provider Seite - Alpha Version (Testcode)" + +msgid "{core:frontpage:link_doc_install}" +msgstr "SimpleSAMLphp installieren" + +msgid "{core:frontpage:link_diagnostics}" +msgstr "Diagnose des Hostnamen, Ports und Protokolls" + +msgid "{core:no_state:suggestion_goback}" +msgstr "Kehre zur letzen Seite zurück und versuche es erneut." + +msgid "{core:no_state:causes}" +msgstr "Dieser Fehler könnte durch folgendes verursacht werden:" + +msgid "{core:frontpage:link_meta_saml2idphosted}" +msgstr "Hosted SAML 2.0 Identity Provider Metadaten (automatisch generiert)" + +msgid "{core:frontpage:optional}" +msgstr "Optional" + +msgid "{core:frontpage:doc_header}" +msgstr "Dokumentation" + +msgid "{core:frontpage:link_doc_advanced}" +msgstr "Fortgeschrittene Eigenschaften von SimpleSAMLphp" + +msgid "{core:frontpage:required_ldap}" +msgstr "Erforderlich für LDAP" + +msgid "{core:frontpage:authtest}" +msgstr "Teste die konfigurierten Authentifizierungsquellen" + +msgid "{core:frontpage:link_meta_overview}" +msgstr "Ãœberblick über die Metadaten dieser Installation. Diagnose der Metadaten." + +msgid "{core:frontpage:configuration}" +msgstr "Konfiguration" + +msgid "{core:frontpage:welcome}" +msgstr "Willkommen" + +msgid "{core:frontpage:link_doc_shibsp}" +msgstr "" +"Shibboleth 1.3 SP für die Zusammenarbeit mit einem SimpleSAMLphp IdP " +"konfigurieren" + +msgid "{core:no_state:header}" +msgstr "Statusinformationen verloren" + +msgid "{core:frontpage:metadata_header}" +msgstr "Metadaten" + +msgid "{core:frontpage:link_doc_maintenance}" +msgstr "Verwaltung und Konfiguration von SimpleSAMLphp" + +msgid "{core:frontpage:link_configcheck}" +msgstr "SimpleSAMLphp Konfigurationsprüfung" + +msgid "{core:frontpage:page_title}" +msgstr "SimpleSAMLphp Installationsseite" + +msgid "{core:no_cookie:header}" +msgstr "Cookie fehlt" + +msgid "{core:frontpage:warnings}" +msgstr "Warnungen" + +msgid "{core:frontpage:link_xmlconvert}" +msgstr "XML zu SimpleSAMLphp Metadaten Konvertierer" + +msgid "{core:frontpage:link_cleardiscochoices}" +msgstr "Lösche meine IdP Auswahl in den IdP \"discovery services\"" + +msgid "{core:frontpage:loggedin_as_admin}" +msgstr "Sie sind als Administrator angemeldet" + +msgid "{core:frontpage:auth}" +msgstr "Authentifizierung" + +msgid "{core:no_metadata:suggestion_user_link}" +msgstr "" +"Sind Sie lediglich einem Verweis einer anderen Website hierher gefolgt, " +"sollten Sie diesen Fehler den Betreibern der Website melden." + +msgid "{core:no_state:description}" +msgstr "" +"Wir konnten die Statusinformationen für die aktuelle Anfrage nicht " +"lokalisieren." + +msgid "{core:frontpage:show_metadata}" +msgstr "Metadaten zeigen" + +msgid "{core:no_state:suggestion_closebrowser}" +msgstr "Schließe den Web-Browser und versuche es erneut." + +msgid "{core:short_sso_interval:warning_header}" +msgstr "Zu kurzes Intervall zwischen generellen Anmeldeereignissen." + +msgid "{core:frontpage:intro}" +msgstr "" +"<strong>Glückwunsch</strong>, Sie haben erfolgreich SimpleSAMLphp " +"installiert. Dies ist die Startseite der Installation, hier gibts es " +"Links zu Testbeispielen, Diagnose, Metadaten und anderer relevanten " +"Dokumentation." + +msgid "{core:no_metadata:header}" +msgstr "Keine Metadaten gefunden" + +msgid "{core:frontpage:required}" +msgstr "Erforderlich" + +msgid "{core:no_metadata:config_problem}" +msgstr "" +"Ursache ist wahrscheinlich eine Fehlkonfiguration auf Seiten des Service " +"Providers oder des Identity Providers." + +msgid "{core:frontpage:warnings_suhosin_url_length}" +msgstr "" +"Die Länge der Anfrageparameter wird durch die PHP-Erweiterung Suhosin " +"begrenzt. Bitte erhöhe den Wert der Option suhosin.get.max_value_length " +"auf mindestens 2048 Bytes." + +msgid "{core:frontpage:warnings_https}" +msgstr "" +"<strong>Sie benutzen keine HTTPS</strong> - verschlüsselte Kommunikation " +"mit dem Nutzer. SimpleSAMLphp funktioniert zum Testen auch mit HTTP " +"problemlos, aber in einer Produktionsumgebung sollten Sie HTTPS benutzen." +" [ <a href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance" +"\">Lesen sie mehr über die Verwaltung von SimpleSAMLphp</a> " +"]" + +msgid "{core:frontpage:federation}" +msgstr "Föderation" + +msgid "{core:frontpage:required_radius}" +msgstr "Erforderlich für Radius" + +msgid "{core:no_state:cause_openbrowser}" +msgstr "Das Öffnen des Web-Browser mit gespeicherten Tabs aus der letzten Sitzung." + +msgid "{core:frontpage:checkphp}" +msgstr "Ãœberprüfen der PHP Installation" + +msgid "{core:frontpage:link_doc_idp}" +msgstr "SimpleSAMLphp als Identitiy Provider benutzen" + +msgid "{core:no_state:report_header}" +msgstr "Diesen Fehler melden" + +msgid "{core:frontpage:link_saml2example}" +msgstr "SAML 2.0 SP Beispiel - Anmelden über ihren IdP testen" + +msgid "{core:no_state:cause_nocookie}" +msgstr "Cookies könnten im Web-Browser deaktiviert sein." + +msgid "{core:frontpage:about_header}" +msgstr "Ãœber SimpleSAMLphp" + +msgid "{core:frontpage:about_text}" +msgstr "" +"Hey, dieses SimpleSAMLphp ist eine ziemlich coole Sache, wo kann ich mehr" +" darüber lesen? Sie finden mehr Informationen über <a " +"href=\"http://rnd.feide.no/simplesamlphp\">SimpleSAMLphp auf dem Feide " +"RnD blog</a> auf <a href=\"http://uninett.no\">UNINETT</a>." + +msgid "{core:no_metadata:suggestion_developer}" +msgstr "" +"Arbeiten Sie selbst an einem Web Single Sign-On System, stimmt mit den " +"benutzten Metadaten etwas nicht. Ãœberprüfen Sie die Metadaten des " +"Identity Providers und des Service Providers." + +msgid "{core:no_cookie:retry}" +msgstr "Erneut versuchen" + +msgid "{core:frontpage:useful_links_header}" +msgstr "Nützliche Links für ihre Installation" + +msgid "{core:frontpage:metadata}" +msgstr "Metadaten" + +msgid "{core:frontpage:recommended}" +msgstr "Empfohlen" + +msgid "{core:frontpage:link_doc_googleapps}" +msgstr "SimpleSAMLphp als IdP für Google Apps für Education verwernden" + +msgid "{core:frontpage:tools}" +msgstr "Werkzeuge" + +msgid "{core:short_sso_interval:retry}" +msgstr "Versuche Anmeldung erneut" + +msgid "{core:no_cookie:description}" +msgstr "" +"Sie scheinen Cookies in Ihrem Browser deaktiviert zu haben. Bitte " +"überprüfen Sie die Einstellungen in Ihrem Browser und versuchen Sie es " +"erneut." + +msgid "{core:frontpage:deprecated}" +msgstr "Veraltet" + +msgid "You are logged in as administrator" +msgstr "Sie sind als Administrator angemeldet" + +msgid "Go back to the previous page and try again." +msgstr "Kehre zur letzen Seite zurück und versuche es erneut." + +msgid "If this problem persists, you can report it to the system administrators." +msgstr "" +"Wenn das Problem weiter besteht, kannst du diesen Fehler den " +"Systemadministratoren melden." + +msgid "Welcome" +msgstr "Willkommen" + +msgid "SimpleSAMLphp configuration check" +msgstr "SimpleSAMLphp Konfigurationsprüfung" + +msgid "Metadata overview for your installation. Diagnose your metadata files" +msgstr "Ãœberblick über die Metadaten dieser Installation. Diagnose der Metadaten." + +msgid "XML to SimpleSAMLphp metadata converter" +msgstr "XML zu SimpleSAMLphp Metadaten Konvertierer" + +msgid "Required" +msgstr "Erforderlich" + +msgid "Warnings" +msgstr "Warnungen" + +msgid "Documentation" +msgstr "Dokumentation" + +msgid "Hosted Shibboleth 1.3 Service Provider Metadata (automatically generated)" +msgstr "Hosted Shibboleth 1.3 Service Provider Metadaten (automatisch generiert)" + +msgid "PHP info" +msgstr "PHPinfo" + +msgid "About SimpleSAMLphp" +msgstr "Ãœber SimpleSAMLphp" + +msgid "Hosted SAML 2.0 Service Provider Metadata (automatically generated)" +msgstr "Hosted SAML 2.0 Service Provider Metadaten (automatisch generiert)" + +msgid "Retry login" +msgstr "Versuche Anmeldung erneut" + +msgid "Required for LDAP" +msgstr "Erforderlich für LDAP" + +msgid "Close the web browser, and try again." +msgstr "Schließe den Web-Browser und versuche es erneut." + +msgid "Federation" +msgstr "Föderation" + +msgid "We were unable to locate the state information for the current request." +msgstr "" +"Wir konnten die Statusinformationen für die aktuelle Anfrage nicht " +"lokalisieren." + +msgid "Delete my choices of IdP in the IdP discovery services" +msgstr "Lösche meine IdP Auswahl in den IdP \"discovery services\"" + +msgid "" +"This is most likely a configuration problem on either the service " +"provider or identity provider." +msgstr "" +"Ursache ist wahrscheinlich eine Fehlkonfiguration auf Seiten des Service " +"Providers oder des Identity Providers." + +msgid "Configure Shibboleth 1.3 SP to work with SimpleSAMLphp IdP" +msgstr "" +"Shibboleth 1.3 SP für die Zusammenarbeit mit einem SimpleSAMLphp IdP " +"konfigurieren" + +msgid "Using the back and forward buttons in the web browser." +msgstr "Das Benutzen der Zurück- und Vorwärts-Schaltflächen im Web-Browser." + +msgid "Metadata not found" +msgstr "Keine Metadaten gefunden" + +msgid "Missing cookie" +msgstr "Cookie fehlt" + +msgid "Cookies may be disabled in the web browser." +msgstr "Cookies könnten im Web-Browser deaktiviert sein." + +msgid "Opened the web browser with tabs saved from the previous session." +msgstr "Das Öffnen des Web-Browser mit gespeicherten Tabs aus der letzten Sitzung." + +msgid "Tools" +msgstr "Werkzeuge" + +msgid "Test configured authentication sources " +msgstr "Teste die konfigurierten Authentifizierungsquellen" + +msgid "" +"You appear to have disabled cookies in your browser. Please check the " +"settings in your browser, and try again." +msgstr "" +"Sie scheinen Cookies in Ihrem Browser deaktiviert zu haben. Bitte " +"überprüfen Sie die Einstellungen in Ihrem Browser und versuchen Sie es " +"erneut." + +msgid "Installing SimpleSAMLphp" +msgstr "SimpleSAMLphp installieren" + +msgid "Deprecated" +msgstr "Veraltet" + +msgid "" +"<strong>Congratulations</strong>, you have successfully installed " +"SimpleSAMLphp. This is the start page of your installation, where you " +"will find links to test examples, diagnostics, metadata and even links to" +" relevant documentation." +msgstr "" +"<strong>Glückwunsch</strong>, Sie haben erfolgreich SimpleSAMLphp " +"installiert. Dies ist die Startseite der Installation, hier gibts es " +"Links zu Testbeispielen, Diagnose, Metadaten und anderer relevanten " +"Dokumentation." + +msgid "This error may be caused by:" +msgstr "Dieser Fehler könnte durch folgendes verursacht werden:" + +msgid "" +"<strong>You are not using HTTPS</strong> - encrypted communication with " +"the user. HTTP works fine for test purposes, but in a production " +"environment, you should use HTTPS. [ <a " +"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-" +"maintenance\">Read more about SimpleSAMLphp maintenance</a> ]" +msgstr "" +"<strong>Sie benutzen keine HTTPS</strong> - verschlüsselte Kommunikation " +"mit dem Nutzer. SimpleSAMLphp funktioniert zum Testen auch mit HTTP " +"problemlos, aber in einer Produktionsumgebung sollten Sie HTTPS benutzen." +" [ <a href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance" +"\">Lesen sie mehr über die Verwaltung von SimpleSAMLphp</a> " +"]" + +msgid "Metadata" +msgstr "Metadaten" + +msgid "Retry" +msgstr "Erneut versuchen" + +msgid "SimpleSAMLphp Maintenance and Configuration" +msgstr "Verwaltung und Konfiguration von SimpleSAMLphp" + +msgid "Diagnostics on hostname, port and protocol" +msgstr "Diagnose des Hostnamen, Ports und Protokolls" + +msgid "" +"If you are an user who received this error after following a link on a " +"site, you should report this error to the owner of that site." +msgstr "" +"Sind Sie lediglich einem Verweis einer anderen Website hierher gefolgt, " +"sollten Sie diesen Fehler den Betreibern der Website melden." + +msgid "Using SimpleSAMLphp as an Identity Provider" +msgstr "SimpleSAMLphp als Identitiy Provider benutzen" + +msgid "Optional" +msgstr "Optional" + +msgid "Suggestions for resolving this problem:" +msgstr "Empfehlungen um dieses Problem zu lösen:" + +msgid "" +"This SimpleSAMLphp thing is pretty cool, where can I read more about it? " +"You can find more information about it at the <a " +"href=\"https://simplesamlphp.org/\">SimpleSAMLphp web page </a> over at " +"<a href=\"http://uninett.no\">UNINETT</a>." +msgstr "" +"Hey, dieses SimpleSAMLphp ist eine ziemlich coole Sache, wo kann ich mehr" +" darüber lesen? Sie finden mehr Informationen über <a " +"href=\"http://rnd.feide.no/simplesamlphp\">SimpleSAMLphp auf dem Feide " +"RnD blog</a> auf <a href=\"http://uninett.no\">UNINETT</a>." + +msgid "Shibboleth 1.3 SP example - test logging in through your Shib IdP" +msgstr "Shibboleth 1.3 SP Beispiel - Anmelden über ihren Shibboleth IdP testen" + +msgid "Authentication" +msgstr "Authentifizierung" + +msgid "SimpleSAMLphp installation page" +msgstr "SimpleSAMLphp Installationsseite" + +msgid "Show metadata" +msgstr "Metadaten zeigen" + +msgid "SimpleSAMLphp as an IdP for Google Apps for Education" +msgstr "SimpleSAMLphp als IdP für Google Apps für Education verwernden" + +msgid "State information lost" +msgstr "Statusinformationen verloren" + +msgid "Hosted SAML 2.0 Identity Provider Metadata (automatically generated)" +msgstr "Hosted SAML 2.0 Identity Provider Metadaten (automatisch generiert)" + +msgid "OpenID Provider site - Alpha version (test code)" +msgstr "OpenID Provider Seite - Alpha Version (Testcode)" + +msgid "Required for Radius" +msgstr "Erforderlich für Radius" + +msgid "We were unable to locate the metadata for the entity:" +msgstr "Für folgende Entität konnten keine Metadaten gefunden werden:" + +msgid "SAML 2.0 SP example - test logging in through your IdP" +msgstr "SAML 2.0 SP Beispiel - Anmelden über ihren IdP testen" + +msgid "Using SimpleSAMLphp as a Service Provider" +msgstr "SimpleSAMLphp als Service Provider benutzen" + +msgid "" +"We have detected that there is only a few seconds since you last " +"authenticated with this service provider, and therefore assume that there" +" is a problem with this SP." +msgstr "" +"Wir haben festgestellt, dass seit Ihrer letzten Anmeldung bei diesem " +"Diensteanbieter nur wenige Sekunden vergangen sind. Deswegen gehen wir " +"davon aus, dass es ein Problem mit diesem Anbieter gibt." + +msgid "Recommended" +msgstr "Empfohlen" + +msgid "" +"If you are a developer who is deploying a single sign-on solution, you " +"have a problem with the metadata configuration. Verify that metadata is " +"configured correctly on both the identity provider and service provider." +msgstr "" +"Arbeiten Sie selbst an einem Web Single Sign-On System, stimmt mit den " +"benutzten Metadaten etwas nicht. Ãœberprüfen Sie die Metadaten des " +"Identity Providers und des Service Providers." + +msgid "SimpleSAMLphp Advanced Features" +msgstr "Fortgeschrittene Eigenschaften von SimpleSAMLphp" + +msgid "Too short interval between single sign on events." +msgstr "Zu kurzes Intervall zwischen generellen Anmeldeereignissen." + +msgid "Checking your PHP installation" +msgstr "Ãœberprüfen der PHP Installation" + +msgid "" +"The length of query parameters is limited by the PHP Suhosin extension. " +"Please increase the suhosin.get.max_value_length option to at least 2048 " +"bytes." +msgstr "" +"Die Länge der Anfrageparameter wird durch die PHP-Erweiterung Suhosin " +"begrenzt. Bitte erhöhe den Wert der Option suhosin.get.max_value_length " +"auf mindestens 2048 Bytes." + +msgid "Useful links for your installation" +msgstr "Nützliche Links für ihre Installation" + +msgid "Configuration" +msgstr "Konfiguration" + +msgid "Hosted Shibboleth 1.3 Identity Provider Metadata (automatically generated)" +msgstr "Hosted Shibboleth 1.3 Identity Provider Metadaten (automatisch generiert)" + +msgid "Login as administrator" +msgstr "Als Administrator anmelden" + +msgid "Report this error" +msgstr "Diesen Fehler melden" + diff --git a/mymodule/locales/en/LC_MESSAGES/mymodule.po b/mymodule/locales/en/LC_MESSAGES/mymodule.po new file mode 100644 index 0000000..51e246c --- /dev/null +++ b/mymodule/locales/en/LC_MESSAGES/mymodule.po @@ -0,0 +1,571 @@ +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: SimpleSAMLphp 1.15\n" +"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n" +"POT-Creation-Date: 2016-10-12 09:23+0200\n" +"PO-Revision-Date: 2016-10-14 12:14+0200\n" +"Last-Translator: \n" +"Language: en\n" +"Language-Team: \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.3.4\n" + +msgid "{core:frontpage:link_phpinfo}" +msgstr "PHP info" + + +msgid "{core:no_state:report_text}" +msgstr "If this problem persists, you can report it to the system administrators." + +msgid "{core:no_state:cause_badlink}" +msgstr "The link used to get here was bad, perhaps a bookmark." + +msgid "{core:no_state:cause_backforward}" +msgstr "Using the back and forward buttons in the web browser." + +msgid "{core:no_metadata:not_found_for}" +msgstr "We were unable to locate the metadata for the entity:" + +msgid "{core:no_state:suggestions}" +msgstr "Suggestions for resolving this problem:" + +msgid "{core:frontpage:login_as_admin}" +msgstr "Login as administrator" + +msgid "{core:short_sso_interval:warning}" +msgstr "" +"We have detected that there is only a few seconds since you last " +"authenticated with this service provider, and therefore assume that there" +" is a problem with this SP." + +msgid "{core:frontpage:link_doc_sp}" +msgstr "Using SimpleSAMLphp as a Service Provider" + +msgid "{core:frontpage:link_meta_saml2sphosted}" +msgstr "Hosted SAML 2.0 Service Provider Metadata (automatically generated)" + +msgid "{core:frontpage:link_openidprovider}" +msgstr "OpenID Provider site - Alpha version (test code)" + +msgid "{core:frontpage:link_doc_install}" +msgstr "Installing SimpleSAMLphp" + +msgid "{core:frontpage:link_consentAdmin}" +msgstr "Consent Administration" + +msgid "{core:frontpage:link_memcacheMonitor}" +msgstr "MemCache Statistics" + +msgid "{core:frontpage:link_oauth}" +msgstr "OAuth Consumer Registry" + +msgid "{core:frontpage:link_cron}" +msgstr "Cron module information page" + +msgid "{core:frontpage:link_statistics}" +msgstr "Show statistics" + +msgid "{core:frontpage:link_statistics_metadata}" +msgstr "Show statistics metadata" + +msgid "{core:frontpage:link_metarefresh}" +msgstr "Metarefresh: fetch metadata" + +msgid "{core:frontpage:link_sanitycheck}" +msgstr "Sanity check of your SimpleSAMLphp setup" + +msgid "{core:frontpage:link_diagnostics}" +msgstr "Diagnostics on hostname, port and protocol" + +msgid "{core:no_state:suggestion_badlink}" +msgstr "Check that the link you used to access the web site is correct." + +msgid "{core:no_state:suggestion_goback}" +msgstr "Go back to the previous page and try again." + +msgid "{core:no_state:causes}" +msgstr "This error may be caused by:" + +msgid "{core:frontpage:link_meta_saml2idphosted}" +msgstr "Hosted SAML 2.0 Identity Provider Metadata (automatically generated)" + +msgid "{core:frontpage:optional}" +msgstr "Optional" + +msgid "{core:frontpage:doc_header}" +msgstr "Documentation" + +msgid "{core:frontpage:link_doc_advanced}" +msgstr "SimpleSAMLphp Advanced Features" + +msgid "{core:frontpage:required_ldap}" +msgstr "Required for LDAP" + +msgid "{core:frontpage:warnings_secretsalt}" +msgstr "" +"<strong>The configuration uses the default secret salt</strong> - make " +"sure you modify the default 'secretsalt' option in the simpleSAML " +"configuration in production environments. [<a " +"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-install\">Read" +" more about SimpleSAMLphp configuration</a> ]" + +msgid "{core:frontpage:authtest}" +msgstr "Test configured authentication sources " + +msgid "{core:frontpage:link_meta_overview}" +msgstr "Metadata overview for your installation. Diagnose your metadata files" + +msgid "{core:frontpage:configuration}" +msgstr "Configuration" + +msgid "{core:frontpage:welcome}" +msgstr "Welcome" + +msgid "{core:frontpage:link_doc_shibsp}" +msgstr "Configure Shibboleth 1.3 SP to work with SimpleSAMLphp IdP" + +msgid "{core:no_state:header}" +msgstr "State information lost" + +msgid "{core:frontpage:metadata_header}" +msgstr "Metadata" + +msgid "{core:frontpage:link_doc_maintenance}" +msgstr "SimpleSAMLphp Maintenance and Configuration" + +msgid "{core:frontpage:link_configcheck}" +msgstr "SimpleSAMLphp configuration check" + +msgid "{core:frontpage:page_title}" +msgstr "SimpleSAMLphp installation page" + +msgid "{core:no_cookie:header}" +msgstr "Missing cookie" + +msgid "{core:frontpage:warnings}" +msgstr "Warnings" + +msgid "{core:frontpage:link_xmlconvert}" +msgstr "XML to SimpleSAMLphp metadata converter" + +msgid "{core:frontpage:link_cleardiscochoices}" +msgstr "Delete my choices of IdP in the IdP discovery services" + +msgid "{core:frontpage:warnings_outdated}" +msgstr "" +"You are running an outdated version of SimpleSAMLphp. Please update to <a" +" href=\"https://simplesamlphp.org/download\">the latest version</a> as soon as possible." + +msgid "{core:frontpage:loggedin_as_admin}" +msgstr "You are logged in as administrator" + +msgid "{core:frontpage:auth}" +msgstr "Authentication" + +msgid "{core:frontpage:logout}" +msgstr "Logout" + +msgid "{core:no_metadata:suggestion_user_link}" +msgstr "" +"If you are an user who received this error after following a link on a " +"site, you should report this error to the owner of that site." + +msgid "{core:no_state:description}" +msgstr "We were unable to locate the state information for the current request." + +msgid "{core:frontpage:show_metadata}" +msgstr "Show metadata" + +msgid "{core:no_state:suggestion_closebrowser}" +msgstr "Close the web browser, and try again." + +msgid "{core:short_sso_interval:warning_header}" +msgstr "Too short interval between single sign on events." + +msgid "{core:frontpage:intro}" +msgstr "" +"<strong>Congratulations</strong>, you have successfully installed " +"SimpleSAMLphp. This is the start page of your installation, where you " +"will find links to test examples, diagnostics, metadata and even links to" +" relevant documentation." + +msgid "{core:no_metadata:header}" +msgstr "Metadata not found" + +msgid "{core:frontpage:required}" +msgstr "Required" + +msgid "{core:no_metadata:config_problem}" +msgstr "" +"This is most likely a configuration problem on either the service " +"provider or identity provider." + +msgid "{core:frontpage:warnings_suhosin_url_length}" +msgstr "" +"The length of query parameters is limited by the PHP Suhosin extension. " +"Please increase the suhosin.get.max_value_length option to at least 2048 " +"bytes." + +msgid "{core:frontpage:warnings_https}" +msgstr "" +"<strong>You are not using HTTPS</strong> - encrypted communication with " +"the user. HTTP works fine for test purposes, but in a production " +"environment, you should use HTTPS. [ <a " +"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-" +"maintenance\">Read more about SimpleSAMLphp maintenance</a> ]" + +msgid "{core:frontpage:federation}" +msgstr "Federation" + +msgid "{core:frontpage:required_radius}" +msgstr "Required for Radius" + +msgid "{core:no_state:cause_openbrowser}" +msgstr "Opened the web browser with tabs saved from the previous session." + +msgid "{core:frontpage:checkphp}" +msgstr "Checking your PHP installation" + +msgid "{core:frontpage:link_doc_idp}" +msgstr "Using SimpleSAMLphp as an Identity Provider" + +msgid "{core:no_state:report_header}" +msgstr "Report this error" + +msgid "{core:frontpage:link_saml2example}" +msgstr "SAML 2.0 SP example - test logging in through your IdP" + +msgid "{core:no_state:cause_nocookie}" +msgstr "Cookies may be disabled in the web browser." + +msgid "{core:frontpage:about_header}" +msgstr "About SimpleSAMLphp" + +msgid "{core:frontpage:about_text}" +msgstr "" +"This SimpleSAMLphp thing is pretty cool, where can I read more about it? " +"You can find more information about it at the <a " +"href=\"https://simplesamlphp.org/\">SimpleSAMLphp web page </a> over at " +"<a href=\"http://uninett.no\">UNINETT</a>." + +msgid "{core:no_metadata:suggestion_developer}" +msgstr "" +"If you are a developer who is deploying a single sign-on solution, you " +"have a problem with the metadata configuration. Verify that metadata is " +"configured correctly on both the identity provider and service provider." + +msgid "{core:no_cookie:retry}" +msgstr "Retry" + +msgid "{core:frontpage:useful_links_header}" +msgstr "Useful links for your installation" + +msgid "{core:frontpage:metadata}" +msgstr "Metadata" + +msgid "{core:frontpage:recommended}" +msgstr "Recommended" + +msgid "{core:frontpage:link_doc_googleapps}" +msgstr "SimpleSAMLphp as an IdP for Google Apps for Education" + +msgid "{core:frontpage:tools}" +msgstr "Tools" + +msgid "{core:short_sso_interval:retry}" +msgstr "Retry login" + +msgid "{core:no_cookie:description}" +msgstr "" +"You appear to have disabled cookies in your browser. Please check the " +"settings in your browser, and try again." + +msgid "{core:frontpage:deprecated}" +msgstr "Deprecated" + +msgid "You are logged in as administrator" +msgstr "You are logged in as administrator" + +msgid "Go back to the previous page and try again." +msgstr "Go back to the previous page and try again." + +msgid "If this problem persists, you can report it to the system administrators." +msgstr "If this problem persists, you can report it to the system administrators." + +msgid "Welcome" +msgstr "Welcome" + +msgid "SimpleSAMLphp configuration check" +msgstr "SimpleSAMLphp configuration check" + +msgid "Metadata overview for your installation. Diagnose your metadata files" +msgstr "Metadata overview for your installation. Diagnose your metadata files" + +msgid "XML to SimpleSAMLphp metadata converter" +msgstr "XML to SimpleSAMLphp metadata converter" + +msgid "Required" +msgstr "Required" + +msgid "Warnings" +msgstr "Warnings" + +msgid "Documentation" +msgstr "Documentation" + +msgid "Hosted Shibboleth 1.3 Service Provider Metadata (automatically generated)" +msgstr "Hosted Shibboleth 1.3 Service Provider Metadata (automatically generated)" + +msgid "PHP info" +msgstr "PHP info" + +msgid "About SimpleSAMLphp" +msgstr "About SimpleSAMLphp" + +msgid "Hosted SAML 2.0 Service Provider Metadata (automatically generated)" +msgstr "Hosted SAML 2.0 Service Provider Metadata (automatically generated)" + +msgid "Retry login" +msgstr "Retry login" + +msgid "Required for LDAP" +msgstr "Required for LDAP" + +msgid "Close the web browser, and try again." +msgstr "Close the web browser, and try again." + +msgid "Federation" +msgstr "Federation" + +msgid "We were unable to locate the state information for the current request." +msgstr "We were unable to locate the state information for the current request." + +msgid "Delete my choices of IdP in the IdP discovery services" +msgstr "Delete my choices of IdP in the IdP discovery services" + +msgid "" +"This is most likely a configuration problem on either the service " +"provider or identity provider." +msgstr "" +"This is most likely a configuration problem on either the service " +"provider or identity provider." + +msgid "Configure Shibboleth 1.3 SP to work with SimpleSAMLphp IdP" +msgstr "Configure Shibboleth 1.3 SP to work with SimpleSAMLphp IdP" + +msgid "Using the back and forward buttons in the web browser." +msgstr "Using the back and forward buttons in the web browser." + +msgid "PHP cURL extension missing. Cannot check for SimpleSAMLphp updates." +msgstr "PHP cURL extension missing. Cannot check for SimpleSAMLphp updates." + +msgid "" +"You are running an outdated version of SimpleSAMLphp. Please update to <a" +" href=\"https://simplesamlphp.org/download\">the latest version</a> as soon as possible." +msgstr "" +"You are running an outdated version of SimpleSAMLphp. Please update to <a" +" href=\"https://simplesamlphp.org/download\">the latest version</a> as soon as possible." + +msgid "Metadata not found" +msgstr "Metadata not found" + +msgid "Missing cookie" +msgstr "Missing cookie" + +msgid "Cookies may be disabled in the web browser." +msgstr "Cookies may be disabled in the web browser." + +msgid "Opened the web browser with tabs saved from the previous session." +msgstr "Opened the web browser with tabs saved from the previous session." + +msgid "Tools" +msgstr "Tools" + +msgid "Test configured authentication sources " +msgstr "Test configured authentication sources " + +msgid "" +"You appear to have disabled cookies in your browser. Please check the " +"settings in your browser, and try again." +msgstr "" +"You appear to have disabled cookies in your browser. Please check the " +"settings in your browser, and try again." + +msgid "Installing SimpleSAMLphp" +msgstr "Installing SimpleSAMLphp" + +msgid "Deprecated" +msgstr "Deprecated" + +msgid "" +"<strong>Congratulations</strong>, you have successfully installed " +"SimpleSAMLphp. This is the start page of your installation, where you " +"will find links to test examples, diagnostics, metadata and even links to" +" relevant documentation." +msgstr "" +"<strong>Congratulations</strong>, you have successfully installed " +"SimpleSAMLphp. This is the start page of your installation, where you " +"will find links to test examples, diagnostics, metadata and even links to" +" relevant documentation." + +msgid "This error may be caused by:" +msgstr "This error may be caused by:" + +msgid "" +"<strong>You are not using HTTPS</strong> - encrypted communication with " +"the user. HTTP works fine for test purposes, but in a production " +"environment, you should use HTTPS. [ <a " +"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-" +"maintenance\">Read more about SimpleSAMLphp maintenance</a> ]" +msgstr "" +"<strong>You are not using HTTPS</strong> - encrypted communication with " +"the user. HTTP works fine for test purposes, but in a production " +"environment, you should use HTTPS. [ <a " +"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-" +"maintenance\">Read more about SimpleSAMLphp maintenance</a> ]" + +msgid "Metadata" +msgstr "Metadata" + +msgid "Retry" +msgstr "Retry" + +msgid "SimpleSAMLphp Maintenance and Configuration" +msgstr "SimpleSAMLphp Maintenance and Configuration" + +msgid "Diagnostics on hostname, port and protocol" +msgstr "Diagnostics on hostname, port and protocol" + +msgid "" +"If you are an user who received this error after following a link on a " +"site, you should report this error to the owner of that site." +msgstr "" +"If you are an user who received this error after following a link on a " +"site, you should report this error to the owner of that site." + +msgid "Using SimpleSAMLphp as an Identity Provider" +msgstr "Using SimpleSAMLphp as an Identity Provider" + +msgid "Optional" +msgstr "Optional" + +msgid "Suggestions for resolving this problem:" +msgstr "Suggestions for resolving this problem:" + +msgid "" +"This SimpleSAMLphp thing is pretty cool, where can I read more about it? " +"You can find more information about it at the <a " +"href=\"https://simplesamlphp.org/\">SimpleSAMLphp web page </a> over at " +"<a href=\"http://uninett.no\">UNINETT</a>." +msgstr "" +"This SimpleSAMLphp thing is pretty cool, where can I read more about it? " +"You can find more information about it at the <a " +"href=\"https://simplesamlphp.org/\">SimpleSAMLphp web page </a> over at " +"<a href=\"http://uninett.no\">UNINETT</a>." + +msgid "Shibboleth 1.3 SP example - test logging in through your Shib IdP" +msgstr "Shibboleth 1.3 SP example - test logging in through your Shib IdP" + +msgid "Authentication" +msgstr "Authentication" + +msgid "SimpleSAMLphp installation page" +msgstr "SimpleSAMLphp installation page" + +msgid "Show metadata" +msgstr "Show metadata" + +msgid "SimpleSAMLphp as an IdP for Google Apps for Education" +msgstr "SimpleSAMLphp as an IdP for Google Apps for Education" + +msgid "State information lost" +msgstr "State information lost" + +msgid "Hosted SAML 2.0 Identity Provider Metadata (automatically generated)" +msgstr "Hosted SAML 2.0 Identity Provider Metadata (automatically generated)" + +msgid "OpenID Provider site - Alpha version (test code)" +msgstr "OpenID Provider site - Alpha version (test code)" + +msgid "Required for Radius" +msgstr "Required for Radius" + +msgid "We were unable to locate the metadata for the entity:" +msgstr "We were unable to locate the metadata for the entity:" + +msgid "SAML 2.0 SP example - test logging in through your IdP" +msgstr "SAML 2.0 SP example - test logging in through your IdP" + +msgid "Using SimpleSAMLphp as a Service Provider" +msgstr "Using SimpleSAMLphp as a Service Provider" + +msgid "" +"We have detected that there is only a few seconds since you last " +"authenticated with this service provider, and therefore assume that there" +" is a problem with this SP." +msgstr "" +"We have detected that there is only a few seconds since you last " +"authenticated with this service provider, and therefore assume that there" +" is a problem with this SP." + +msgid "Recommended" +msgstr "Recommended" + +msgid "" +"If you are a developer who is deploying a single sign-on solution, you " +"have a problem with the metadata configuration. Verify that metadata is " +"configured correctly on both the identity provider and service provider." +msgstr "" +"If you are a developer who is deploying a single sign-on solution, you " +"have a problem with the metadata configuration. Verify that metadata is " +"configured correctly on both the identity provider and service provider." + +msgid "SimpleSAMLphp Advanced Features" +msgstr "SimpleSAMLphp Advanced Features" + +msgid "Too short interval between single sign on events." +msgstr "Too short interval between single sign on events." + +msgid "Checking your PHP installation" +msgstr "Checking your PHP installation" + +msgid "" +"The length of query parameters is limited by the PHP Suhosin extension. " +"Please increase the suhosin.get.max_value_length option to at least 2048 " +"bytes." +msgstr "" +"The length of query parameters is limited by the PHP Suhosin extension. " +"Please increase the suhosin.get.max_value_length option to at least 2048 " +"bytes." + +msgid "Useful links for your installation" +msgstr "Useful links for your installation" + +msgid "Configuration" +msgstr "Configuration" + +msgid "Hosted Shibboleth 1.3 Identity Provider Metadata (automatically generated)" +msgstr "Hosted Shibboleth 1.3 Identity Provider Metadata (automatically generated)" + +msgid "" +"<strong>The configuration uses the default secret salt</strong> - make " +"sure you modify the default 'secretsalt' option in the simpleSAML " +"configuration in production environments. [<a " +"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-install\">Read" +" more about SimpleSAMLphp configuration</a> ]" +msgstr "" +"<strong>The configuration uses the default secret salt</strong> - make " +"sure you modify the default 'secretsalt' option in the simpleSAML " +"configuration in production environments. [<a " +"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-install\">Read" +" more about SimpleSAMLphp configuration</a> ]" + +msgid "Login as administrator" +msgstr "Login as administrator" + +msgid "Report this error" +msgstr "Report this error" -- GitLab From b045c71c6e9b0cda352dc0d8b32934b15e6e93ca Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 14:50:04 +0100 Subject: [PATCH 06/22] added twig files --- mymodule/themes/fancytheme/default/_footer.twig | 12 ++++++++++++ mymodule/themes/fancytheme/default/_header.twig | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 mymodule/themes/fancytheme/default/_footer.twig create mode 100644 mymodule/themes/fancytheme/default/_header.twig diff --git a/mymodule/themes/fancytheme/default/_footer.twig b/mymodule/themes/fancytheme/default/_footer.twig new file mode 100644 index 0000000..f455b8d --- /dev/null +++ b/mymodule/themes/fancytheme/default/_footer.twig @@ -0,0 +1,12 @@ +<div id="footer"> + <script src="/js/headfoot.js"> </script> + <div class="wrap"> + <div class="center copyrights">© 2007-{{ year }} <a href="https://simplesamlphp.org/">SimpleSAMLphp</a> + </div> + <div class="logo-footer-right show-for-large"> + <div class="logo-footer"> + <img class="pure-img" src="{{ asset("icons/ssplogo-fish-small.png") }}" alt="Small fish logo"> + </div> + </div> + </div> +</div> diff --git a/mymodule/themes/fancytheme/default/_header.twig b/mymodule/themes/fancytheme/default/_header.twig new file mode 100644 index 0000000..7abc03d --- /dev/null +++ b/mymodule/themes/fancytheme/default/_header.twig @@ -0,0 +1,3 @@ +<div id="header"> + +</div> -- GitLab From 0eeffc3c9db8ca6d074c9db1fd06f1eea5529cee Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 14:56:14 +0100 Subject: [PATCH 07/22] added base twig file --- mymodule/themes/fancytheme/default/base.twig | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 mymodule/themes/fancytheme/default/base.twig diff --git a/mymodule/themes/fancytheme/default/base.twig b/mymodule/themes/fancytheme/default/base.twig new file mode 100644 index 0000000..b19f451 --- /dev/null +++ b/mymodule/themes/fancytheme/default/base.twig @@ -0,0 +1,36 @@ +{% spaceless %} +<!DOCTYPE html> +<html lang="{{ currentLanguage }}" xml:lang="{{ currentLanguage }}"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <meta name="viewport" content="initial-scale=1.0"> + <title>{{ pagetitle }}</title> + <link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}"> + <link rel="stylesheet" href="/css/bootstrap.min.css"> + <link rel="stylesheet" href="/css/m4lab.css"> + <link rel="icon" href="{{ asset("icons/favicon.ico") }}"> + {% if isRTL %} + <link rel="stylesheet" href="{{ asset("assets/css/src/default-rtl.css") }}"> + {% endif %} + <meta name="robots" content="noindex, nofollow"> + <link rel="preload" href="{{ asset('js/bundle.js') }}" as="script"> + {% block preload %}{% endblock %} + </head> + <body id="{{ templateId }}"> + <div id="layout"> + {% block header %}{% include "_header.twig" %}{% endblock %} + <div id="content"> + <div class="wrap"> + {% block contentwrapper %}{% block content %}{% endblock %}{% endblock contentwrapper %} + </div> + </div>{# content #} + <div id="push"></div> + </div>{# layout #} + <div id="foot"> + {% block footer %}{% include "_footer.twig" %}{% endblock %} + </div> + <script src="{{ asset('js/bundle.js') }}"></script> + {% block postload %}{% endblock %} + </body> +</html> +{% endspaceless %} -- GitLab From d9c0b2727943ced0136e77b86ac7c07d53845264 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 15:10:21 +0100 Subject: [PATCH 08/22] added different stylesheet --- mymodule/themes/fancytheme/default/base.twig | 3 ++- mymodule/www/stylesheet.css | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 mymodule/www/stylesheet.css diff --git a/mymodule/themes/fancytheme/default/base.twig b/mymodule/themes/fancytheme/default/base.twig index b19f451..05d45e6 100644 --- a/mymodule/themes/fancytheme/default/base.twig +++ b/mymodule/themes/fancytheme/default/base.twig @@ -5,9 +5,10 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="viewport" content="initial-scale=1.0"> <title>{{ pagetitle }}</title> - <link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}"> + <link rel="stylesheet" href="{{ asset("/mymodule/stylesheet.css") }}"> <link rel="stylesheet" href="/css/bootstrap.min.css"> <link rel="stylesheet" href="/css/m4lab.css"> + <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"> <link rel="icon" href="{{ asset("icons/favicon.ico") }}"> {% if isRTL %} <link rel="stylesheet" href="{{ asset("assets/css/src/default-rtl.css") }}"> diff --git a/mymodule/www/stylesheet.css b/mymodule/www/stylesheet.css new file mode 100644 index 0000000..9de1914 --- /dev/null +++ b/mymodule/www/stylesheet.css @@ -0,0 +1,3 @@ +header{ + background: none; +} -- GitLab From cfe54f089f773018595f71dd75600655dbe53797 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 15:14:12 +0100 Subject: [PATCH 09/22] added different stylesheet --- mymodule/themes/fancytheme/default/base.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mymodule/themes/fancytheme/default/base.twig b/mymodule/themes/fancytheme/default/base.twig index 05d45e6..1b148ce 100644 --- a/mymodule/themes/fancytheme/default/base.twig +++ b/mymodule/themes/fancytheme/default/base.twig @@ -5,7 +5,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="viewport" content="initial-scale=1.0"> <title>{{ pagetitle }}</title> - <link rel="stylesheet" href="{{ asset("/mymodule/stylesheet.css") }}"> + <link rel="stylesheet" href="{{baseurlpath}}module.php/mymodule/stylesheet.css"> <link rel="stylesheet" href="/css/bootstrap.min.css"> <link rel="stylesheet" href="/css/m4lab.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"> -- GitLab From 1d9fadd92312108dfddc1ea46df5212af089c3fb Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 15:18:55 +0100 Subject: [PATCH 10/22] added different stylesheet --- mymodule/themes/fancytheme/default/base.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mymodule/themes/fancytheme/default/base.twig b/mymodule/themes/fancytheme/default/base.twig index 1b148ce..16034b3 100644 --- a/mymodule/themes/fancytheme/default/base.twig +++ b/mymodule/themes/fancytheme/default/base.twig @@ -5,7 +5,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="viewport" content="initial-scale=1.0"> <title>{{ pagetitle }}</title> - <link rel="stylesheet" href="{{baseurlpath}}module.php/mymodule/stylesheet.css"> + <link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}"> <link rel="stylesheet" href="/css/bootstrap.min.css"> <link rel="stylesheet" href="/css/m4lab.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"> -- GitLab From b5c6f98beb98055c57742a435f1f11131798ef4d Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 15:21:53 +0100 Subject: [PATCH 11/22] footer added scripts --- mymodule/themes/fancytheme/default/_footer.twig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mymodule/themes/fancytheme/default/_footer.twig b/mymodule/themes/fancytheme/default/_footer.twig index f455b8d..cddc81c 100644 --- a/mymodule/themes/fancytheme/default/_footer.twig +++ b/mymodule/themes/fancytheme/default/_footer.twig @@ -1,4 +1,6 @@ <div id="footer"> + <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> + <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> <script src="/js/headfoot.js"> </script> <div class="wrap"> <div class="center copyrights">© 2007-{{ year }} <a href="https://simplesamlphp.org/">SimpleSAMLphp</a> -- GitLab From 3de5ccad98b7bc427942b542e21c0c3c0f8e7d65 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 15:31:58 +0100 Subject: [PATCH 12/22] added twig loginuserpass --- .../themes/fancytheme/core/loginuserpass.twig | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 mymodule/themes/fancytheme/core/loginuserpass.twig diff --git a/mymodule/themes/fancytheme/core/loginuserpass.twig b/mymodule/themes/fancytheme/core/loginuserpass.twig new file mode 100644 index 0000000..788c483 --- /dev/null +++ b/mymodule/themes/fancytheme/core/loginuserpass.twig @@ -0,0 +1,135 @@ +% set pagetitle = 'Enter your username and password'|trans %} + +{% extends "@core/base.twig" %} + +{% block postload %} + <script src="{{ asset('js/loginuserpass.js', 'core') }}"></script> +{% endblock %} + +{% block content %} + {%- if not isProduction %} + + <div class="message-box warning"> + {% trans %}You are now accessing a pre-production system. This authentication setup + {#- #} is for testing and pre-production verification only. If someone sent you + {#- #} a link that pointed you here, and you are not <i>a tester</i> you + {#- #} probably got the wrong link, and should <b>not be here</b>.{% endtrans %} + </div> + {% endif -%} + {% if errorcode -%} + <div class="pure-g"> + <div class="pure-u-1"> + <div class="message-box error"> + + {% set errtitles = errorcodes['title'] %} + {% set errtitle = errtitles[errorcode] %} + + <h3>{{ errtitle|trans(errorparams) }}</h3> + + {% set errdescs = errorcodes['descr'] %} + {% set errdesc = errdescs[errorcode] %} + + <p>{{ errdesc|trans(errorparams) }}</p> + + </div> + </div> + </div> + {%- endif %} + + <h1>{{ 'Enter your username and password'|trans }} einself</h1> + + <p>{{ 'A service has requested you to authenticate yourself. Please enter your username and password in the form below.'|trans }}</p> + <br> + <div class="center"> + <form class="pure-form pure-form-aligned center-form" action="?" method="post" name="f"> + <div class="form-align"> + + <div class="pure-control-group"> + <label for="username">{{ 'Username'|trans }}</label> + <input id="username" {{ forceUsername ? 'disabled' }} placeholder="{{ username }}" type="text" name="username" class="edge" + {%- if not forceUsername %} tabindex="1" value="{{ username }}" autocomplete="username" {% endif %} + {%- if not forceUsername and not username %} autofocus {% endif %} > + {% if rememberUsernameEnabled and not forceUsername -%} + </div> + <div class="pure-controls pure-form-message"> + <label for="remember_username" class="pure-checkbox"> + <input id="remember_username" type="checkbox" tabindex="4" + {{ rememberUsernameChecked ? 'checked' }} name="remember_username" value="Yes"> + <small>{{ 'Remember my username'|trans }}</small> + </label> + {%- endif %} + </div> + + <div class="pure-control-group"> + <label for="password">{{ 'Password'|trans}}</label> + <input id="password" type="password" tabindex="2" name="password" class="edge" autocomplete="current-password" + {%- if forceUsername or username %} autofocus {% endif %} > + + {% if rememberMeEnabled -%} + </div> + <div class="pure-controls pure-form-message"> + <label for="remember_me" class="pure-checkbox"> + <input id="remember_me" type="checkbox" tabindex="5" + {{ rememberMeChecked ? 'checked="checked"' }} name="remember_me" value="Yes"> + <small>{{ 'Remember me'|trans }}</small> + </label> + {%- endif %} + </div> + {% if organizations is defined -%} + <div class="pure-control-group"> + <label for="organization">{{ 'Organization'|trans }}</label> + <div class="pure-select right pure-input-1-2 pure-input-sm-1-1"> + <select name="organization" class="selectize" id="organization" tabindex="3"> + {{ selectedOrg ?: null }} + {%- for id, orgDesc in organizations -%} + {% if id == selectedOrg -%} + {%- set selected = 'selected="selected"' %} + {%- else -%} + {% set selected = '' -%} + {% endif -%} + {% if orgDesc -%} + <option value="{{ id }}" {{ selected }}>{{ orgDesc|trans }}</option> + {% endif -%} + {% endfor %} + </select> + </div> + {% if rememberOrganizationEnabled is defined -%} + <div class="pure-controls pure-form-message"> + <label for="remember_organization" class="pure-checkbox"> + <input type="checkbox" id="remember_organization" tabindex="5" name="remember_organization" value="Yes" + {{ rememberOrganizationChecked ? 'checked="checked"' }} > + <small>{{ 'Remember my organization'|trans }}</small> + </label> + </div> + {%- endif %} + </div> <!--pure-control-group--> + {%- endif %} + + </div> <!-- form-align--> + <br><br> + {%- for name, value in stateparams %} + + <input type="hidden" name="{{ name }}" value="{{ value }}"> + {%- endfor %} + + <button class="pure-button pure-button-red pure-input-1-2 pure-input-sm-1-1 right" id="submit_button" + type="submit" tabindex="6" data-processing="{% trans %}Processing...{% endtrans %}"> + {% trans %}Login{% endtrans %} + </button> + </form> + </div><!--center--> + {% if links -%} + <ul> + {% for link in links -%} + <li><a href="{{ link.href }}">{{ link['text']|trans }}</a></li> + {% endfor %} + </ul> + {%- endif %} + + <br><br> + <div class="pure-form-message"> + <strong>{{ 'Help! I don\'t remember my password.'|trans }}</strong> + <p>{{ 'Without your username and password you cannot authenticate yourself for access to the service. There may be someone that can help you. Consult the help desk at your organization!'|trans }}</p> + </div> + +{% endblock %} -- GitLab From 43f239e444a466b88ef1c78194350331a9b4fd74 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 15:35:10 +0100 Subject: [PATCH 13/22] added twig loginuserpass --- mymodule/themes/fancytheme/core/loginuserpass.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mymodule/themes/fancytheme/core/loginuserpass.twig b/mymodule/themes/fancytheme/core/loginuserpass.twig index 788c483..65582dc 100644 --- a/mymodule/themes/fancytheme/core/loginuserpass.twig +++ b/mymodule/themes/fancytheme/core/loginuserpass.twig @@ -1,6 +1,6 @@ -% set pagetitle = 'Enter your username and password'|trans %} +{ % set pagetitle = 'Enter your username and password'|trans %} -{% extends "@core/base.twig" %} +{% extends "@mymodule/base.twig" %} {% block postload %} <script src="{{ asset('js/loginuserpass.js', 'core') }}"></script> -- GitLab From e366d436d7e726f66664e62bfdd8d9e94572ccb9 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 15:48:24 +0100 Subject: [PATCH 14/22] added twig loginuserpass --- .../themes/fancytheme/core/loginuserpass.twig | 134 ++---------------- 1 file changed, 9 insertions(+), 125 deletions(-) diff --git a/mymodule/themes/fancytheme/core/loginuserpass.twig b/mymodule/themes/fancytheme/core/loginuserpass.twig index 65582dc..842044d 100644 --- a/mymodule/themes/fancytheme/core/loginuserpass.twig +++ b/mymodule/themes/fancytheme/core/loginuserpass.twig @@ -1,5 +1,3 @@ -{ % set pagetitle = 'Enter your username and password'|trans %} - {% extends "@mymodule/base.twig" %} {% block postload %} @@ -7,129 +5,15 @@ {% endblock %} {% block content %} - {%- if not isProduction %} - - <div class="message-box warning"> - {% trans %}You are now accessing a pre-production system. This authentication setup - {#- #} is for testing and pre-production verification only. If someone sent you - {#- #} a link that pointed you here, and you are not <i>a tester</i> you - {#- #} probably got the wrong link, and should <b>not be here</b>.{% endtrans %} - </div> - {% endif -%} - {% if errorcode -%} - <div class="pure-g"> - <div class="pure-u-1"> - <div class="message-box error"> - - {% set errtitles = errorcodes['title'] %} - {% set errtitle = errtitles[errorcode] %} - - <h3>{{ errtitle|trans(errorparams) }}</h3> - {% set errdescs = errorcodes['descr'] %} - {% set errdesc = errdescs[errorcode] %} - - <p>{{ errdesc|trans(errorparams) }}</p> - - </div> + <div class="login-clean" style="background-color: rgb(234,234,234);"> + <form method="post"> + <h2 class="sr-only">Login Form</h2> + <div class="illustration"><img src="/img/M4_LAB_LOGO.png" width="130"></div> + <div class="form-group"><input id="username" class="form-control" type="email" name="username" placeholder="E-Mail-Adresse"></div> + <div class="form-group"><input id="password" class="form-control" type="password" name="password" placeholder="Passwort"></div><a class="text-right forgot" href="/account/forgotPwd">Passwort vergessen?</a> + <div class="form-group"><button class="btn btn-primary btn-block" type="submit" style="background-color: #8a348b;"><strong>Anmelden</strong></button><a class="btn btn-primary btn-block" type="" style="background-color: rgb(234,234,234);color: rgb(0,0,0);" href="/account/registration"><strong>Neues Benutzerkonto anlegen</strong></a></div> + </form> </div> - </div> - {%- endif %} - - <h1>{{ 'Enter your username and password'|trans }} einself</h1> - - <p>{{ 'A service has requested you to authenticate yourself. Please enter your username and password in the form below.'|trans }}</p> - <br> - <div class="center"> - <form class="pure-form pure-form-aligned center-form" action="?" method="post" name="f"> - <div class="form-align"> - - <div class="pure-control-group"> - <label for="username">{{ 'Username'|trans }}</label> - <input id="username" {{ forceUsername ? 'disabled' }} placeholder="{{ username }}" type="text" name="username" class="edge" - {%- if not forceUsername %} tabindex="1" value="{{ username }}" autocomplete="username" {% endif %} - {%- if not forceUsername and not username %} autofocus {% endif %} > - {% if rememberUsernameEnabled and not forceUsername -%} - </div> - <div class="pure-controls pure-form-message"> - <label for="remember_username" class="pure-checkbox"> - <input id="remember_username" type="checkbox" tabindex="4" - {{ rememberUsernameChecked ? 'checked' }} name="remember_username" value="Yes"> - <small>{{ 'Remember my username'|trans }}</small> - </label> - {%- endif %} - </div> - - <div class="pure-control-group"> - <label for="password">{{ 'Password'|trans}}</label> - <input id="password" type="password" tabindex="2" name="password" class="edge" autocomplete="current-password" - {%- if forceUsername or username %} autofocus {% endif %} > - - {% if rememberMeEnabled -%} - </div> - <div class="pure-controls pure-form-message"> - <label for="remember_me" class="pure-checkbox"> - <input id="remember_me" type="checkbox" tabindex="5" - {{ rememberMeChecked ? 'checked="checked"' }} name="remember_me" value="Yes"> - <small>{{ 'Remember me'|trans }}</small> - </label> - {%- endif %} - </div> - {% if organizations is defined -%} - <div class="pure-control-group"> - <label for="organization">{{ 'Organization'|trans }}</label> - <div class="pure-select right pure-input-1-2 pure-input-sm-1-1"> - <select name="organization" class="selectize" id="organization" tabindex="3"> - {{ selectedOrg ?: null }} - {%- for id, orgDesc in organizations -%} - {% if id == selectedOrg -%} - {%- set selected = 'selected="selected"' %} - {%- else -%} - {% set selected = '' -%} - {% endif -%} - {% if orgDesc -%} - <option value="{{ id }}" {{ selected }}>{{ orgDesc|trans }}</option> - {% endif -%} - {% endfor %} - </select> - </div> - {% if rememberOrganizationEnabled is defined -%} - <div class="pure-controls pure-form-message"> - <label for="remember_organization" class="pure-checkbox"> - <input type="checkbox" id="remember_organization" tabindex="5" name="remember_organization" value="Yes" - {{ rememberOrganizationChecked ? 'checked="checked"' }} > - <small>{{ 'Remember my organization'|trans }}</small> - </label> - </div> - {%- endif %} - </div> <!--pure-control-group--> - {%- endif %} - - </div> <!-- form-align--> - <br><br> - {%- for name, value in stateparams %} - - <input type="hidden" name="{{ name }}" value="{{ value }}"> - {%- endfor %} - - <button class="pure-button pure-button-red pure-input-1-2 pure-input-sm-1-1 right" id="submit_button" - type="submit" tabindex="6" data-processing="{% trans %}Processing...{% endtrans %}"> - {% trans %}Login{% endtrans %} - </button> - </form> - </div><!--center--> - {% if links -%} - <ul> - {% for link in links -%} - <li><a href="{{ link.href }}">{{ link['text']|trans }}</a></li> - {% endfor %} - </ul> - {%- endif %} - - <br><br> - <div class="pure-form-message"> - <strong>{{ 'Help! I don\'t remember my password.'|trans }}</strong> - <p>{{ 'Without your username and password you cannot authenticate yourself for access to the service. There may be someone that can help you. Consult the help desk at your organization!'|trans }}</p> - </div> - + {% endblock %} -- GitLab From e528b4992a8329542fc4255fe234a1ef6a6e29b9 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 16:54:48 +0100 Subject: [PATCH 15/22] added twig loginuserpass --- mymodule/themes/fancytheme/core/loginuserpass.twig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mymodule/themes/fancytheme/core/loginuserpass.twig b/mymodule/themes/fancytheme/core/loginuserpass.twig index 842044d..2382cf2 100644 --- a/mymodule/themes/fancytheme/core/loginuserpass.twig +++ b/mymodule/themes/fancytheme/core/loginuserpass.twig @@ -6,6 +6,12 @@ {% block content %} + <div> + <div class="container"> + <div class="row"> + <div class="col-md-12" style="margin-bottom: 40px;"><img class="mx-auto" src="/img/Anmelden.png" width="100%"></div> + </div> + </div> <div class="login-clean" style="background-color: rgb(234,234,234);"> <form method="post"> <h2 class="sr-only">Login Form</h2> @@ -16,4 +22,5 @@ </form> </div> + </div> {% endblock %} -- GitLab From dc2086e1233e00281fcd0c468d3cc1536985bd43 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 16:56:04 +0100 Subject: [PATCH 16/22] added twig loginuserpass --- mymodule/themes/fancytheme/core/loginuserpass.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mymodule/themes/fancytheme/core/loginuserpass.twig b/mymodule/themes/fancytheme/core/loginuserpass.twig index 2382cf2..e48728d 100644 --- a/mymodule/themes/fancytheme/core/loginuserpass.twig +++ b/mymodule/themes/fancytheme/core/loginuserpass.twig @@ -1,4 +1,4 @@ -{% extends "@mymodule/base.twig" %} +{% extends "@core/base.twig" %} {% block postload %} <script src="{{ asset('js/loginuserpass.js', 'core') }}"></script> -- GitLab From 72268e2cc65d34835b2efa341c05f018d44facfc Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 12 Nov 2020 17:09:29 +0100 Subject: [PATCH 17/22] added twig loginuserpass stylesheet --- mymodule/themes/fancytheme/core/loginuserpass.twig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mymodule/themes/fancytheme/core/loginuserpass.twig b/mymodule/themes/fancytheme/core/loginuserpass.twig index e48728d..bee5701 100644 --- a/mymodule/themes/fancytheme/core/loginuserpass.twig +++ b/mymodule/themes/fancytheme/core/loginuserpass.twig @@ -1,5 +1,9 @@ {% extends "@core/base.twig" %} +{% block preload %} + <link rel="stylesheet" type="text/css" href="/css/Login-Form-Clean.css"> +{% endblock %} + {% block postload %} <script src="{{ asset('js/loginuserpass.js', 'core') }}"></script> {% endblock %} -- GitLab From d0b080859c41b8e4c49f8ed7ab9f7214c22815a3 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Fri, 13 Nov 2020 11:31:32 +0100 Subject: [PATCH 18/22] footer/ header adapted --- mymodule/themes/fancytheme/default/_footer.twig | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mymodule/themes/fancytheme/default/_footer.twig b/mymodule/themes/fancytheme/default/_footer.twig index cddc81c..b4c0520 100644 --- a/mymodule/themes/fancytheme/default/_footer.twig +++ b/mymodule/themes/fancytheme/default/_footer.twig @@ -1,14 +1,3 @@ -<div id="footer"> <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> <script src="/js/headfoot.js"> </script> - <div class="wrap"> - <div class="center copyrights">© 2007-{{ year }} <a href="https://simplesamlphp.org/">SimpleSAMLphp</a> - </div> - <div class="logo-footer-right show-for-large"> - <div class="logo-footer"> - <img class="pure-img" src="{{ asset("icons/ssplogo-fish-small.png") }}" alt="Small fish logo"> - </div> - </div> - </div> -</div> -- GitLab From 6e47a241621838d3da08e02c00c84527fbfabc3c Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Fri, 13 Nov 2020 13:20:13 +0100 Subject: [PATCH 19/22] added admin loginform --- .../fancytheme/admin/loginuserpass.twig | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 mymodule/themes/fancytheme/admin/loginuserpass.twig diff --git a/mymodule/themes/fancytheme/admin/loginuserpass.twig b/mymodule/themes/fancytheme/admin/loginuserpass.twig new file mode 100644 index 0000000..0023f92 --- /dev/null +++ b/mymodule/themes/fancytheme/admin/loginuserpass.twig @@ -0,0 +1,30 @@ +{% extends "@core/base.twig" %} + +{% block preload %} + <link rel="stylesheet" type="text/css" href="/css/Login-Form-Clean.css"> +{% endblock %} + +{% block postload %} + <script src="{{ asset('js/loginuserpass.js', 'core') }}"></script> +{% endblock %} + +{% block content %} + + <div> + <div class="container"> + <div class="row"> + <div class="col-md-12" style="margin-bottom: 40px;"><img class="mx-auto" src="/img/Anmelden.png" width="100%"></div> + </div> + </div> + <div class="login-clean" style="background-color: rgb(234,234,234);"> + <form method="post"> + <h2 class="sr-only">Login Form</h2> + <div class="illustration"><img src="/img/M4_LAB_LOGO.png" width="130"></div> + <div class="form-group"><input id="username" class="form-control" type="text" name="username" placeholder="Administrator"></div> + <div class="form-group"><input id="password" class="form-control" type="password" name="password" placeholder="Passwort"></div><a class="text-right forgot" href="/account/forgotPwd">Passwort vergessen?</a> + <div class="form-group"><button class="btn btn-primary btn-block" type="submit" style="background-color: #8a348b;"><strong>Anmelden</strong></button><a class="btn btn-primary btn-block" type="" style="background-color: rgb(234,234,234);color: rgb(0,0,0);" href="/account/registration"><strong>Neues Benutzerkonto anlegen</strong></a></div> + </form> + </div> + + </div> +{% endblock %} -- GitLab From e0b5eff53bd837e290268e54d72f46f0a876434a Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Fri, 13 Nov 2020 13:38:36 +0100 Subject: [PATCH 20/22] added admin loginform --- .../fancytheme/admin/loginuserpass.twig | 30 ------------------- .../themes/fancytheme/core/loginuserpass.twig | 6 +++- 2 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 mymodule/themes/fancytheme/admin/loginuserpass.twig diff --git a/mymodule/themes/fancytheme/admin/loginuserpass.twig b/mymodule/themes/fancytheme/admin/loginuserpass.twig deleted file mode 100644 index 0023f92..0000000 --- a/mymodule/themes/fancytheme/admin/loginuserpass.twig +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "@core/base.twig" %} - -{% block preload %} - <link rel="stylesheet" type="text/css" href="/css/Login-Form-Clean.css"> -{% endblock %} - -{% block postload %} - <script src="{{ asset('js/loginuserpass.js', 'core') }}"></script> -{% endblock %} - -{% block content %} - - <div> - <div class="container"> - <div class="row"> - <div class="col-md-12" style="margin-bottom: 40px;"><img class="mx-auto" src="/img/Anmelden.png" width="100%"></div> - </div> - </div> - <div class="login-clean" style="background-color: rgb(234,234,234);"> - <form method="post"> - <h2 class="sr-only">Login Form</h2> - <div class="illustration"><img src="/img/M4_LAB_LOGO.png" width="130"></div> - <div class="form-group"><input id="username" class="form-control" type="text" name="username" placeholder="Administrator"></div> - <div class="form-group"><input id="password" class="form-control" type="password" name="password" placeholder="Passwort"></div><a class="text-right forgot" href="/account/forgotPwd">Passwort vergessen?</a> - <div class="form-group"><button class="btn btn-primary btn-block" type="submit" style="background-color: #8a348b;"><strong>Anmelden</strong></button><a class="btn btn-primary btn-block" type="" style="background-color: rgb(234,234,234);color: rgb(0,0,0);" href="/account/registration"><strong>Neues Benutzerkonto anlegen</strong></a></div> - </form> - </div> - - </div> -{% endblock %} diff --git a/mymodule/themes/fancytheme/core/loginuserpass.twig b/mymodule/themes/fancytheme/core/loginuserpass.twig index bee5701..db2943d 100644 --- a/mymodule/themes/fancytheme/core/loginuserpass.twig +++ b/mymodule/themes/fancytheme/core/loginuserpass.twig @@ -20,7 +20,11 @@ <form method="post"> <h2 class="sr-only">Login Form</h2> <div class="illustration"><img src="/img/M4_LAB_LOGO.png" width="130"></div> - <div class="form-group"><input id="username" class="form-control" type="email" name="username" placeholder="E-Mail-Adresse"></div> + {%- if 'admin' in app.request.query.get("AuthState") -%} + <div class="form-group"><input id="username" class="form-control" type="email" name="username" placeholder="E-Mail-Adresse"></div> + {%- else -%} + <div class="form-group"><input id="username" class="form-control" type="email" name="username" placeholder="E-Mail-Adresse"></div> + {%- endif -%} <div class="form-group"><input id="password" class="form-control" type="password" name="password" placeholder="Passwort"></div><a class="text-right forgot" href="/account/forgotPwd">Passwort vergessen?</a> <div class="form-group"><button class="btn btn-primary btn-block" type="submit" style="background-color: #8a348b;"><strong>Anmelden</strong></button><a class="btn btn-primary btn-block" type="" style="background-color: rgb(234,234,234);color: rgb(0,0,0);" href="/account/registration"><strong>Neues Benutzerkonto anlegen</strong></a></div> </form> -- GitLab From b0e9dff453781a4ea03cd643dae79e9cf554b0c5 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Fri, 13 Nov 2020 13:50:25 +0100 Subject: [PATCH 21/22] admin field, global css Login-clean --- mymodule/themes/fancytheme/core/loginuserpass.twig | 8 ++------ mymodule/themes/fancytheme/default/base.twig | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mymodule/themes/fancytheme/core/loginuserpass.twig b/mymodule/themes/fancytheme/core/loginuserpass.twig index db2943d..d7e745f 100644 --- a/mymodule/themes/fancytheme/core/loginuserpass.twig +++ b/mymodule/themes/fancytheme/core/loginuserpass.twig @@ -1,9 +1,5 @@ {% extends "@core/base.twig" %} -{% block preload %} - <link rel="stylesheet" type="text/css" href="/css/Login-Form-Clean.css"> -{% endblock %} - {% block postload %} <script src="{{ asset('js/loginuserpass.js', 'core') }}"></script> {% endblock %} @@ -20,8 +16,8 @@ <form method="post"> <h2 class="sr-only">Login Form</h2> <div class="illustration"><img src="/img/M4_LAB_LOGO.png" width="130"></div> - {%- if 'admin' in app.request.query.get("AuthState") -%} - <div class="form-group"><input id="username" class="form-control" type="email" name="username" placeholder="E-Mail-Adresse"></div> + {%- if 'admin' in attribute(queryParams, "AuthState") -%} + <div class="form-group"><input id="username" class="form-control" type="text" name="username" placeholder="Administrator"></div> {%- else -%} <div class="form-group"><input id="username" class="form-control" type="email" name="username" placeholder="E-Mail-Adresse"></div> {%- endif -%} diff --git a/mymodule/themes/fancytheme/default/base.twig b/mymodule/themes/fancytheme/default/base.twig index 16034b3..48f3bb7 100644 --- a/mymodule/themes/fancytheme/default/base.twig +++ b/mymodule/themes/fancytheme/default/base.twig @@ -8,6 +8,7 @@ <link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}"> <link rel="stylesheet" href="/css/bootstrap.min.css"> <link rel="stylesheet" href="/css/m4lab.css"> + <link rel="stylesheet" href="/css/Login-Form-Clean.css"> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"> <link rel="icon" href="{{ asset("icons/favicon.ico") }}"> {% if isRTL %} -- GitLab From b93c36a2501549d4ef0bcc35ef44a4f851a2a6ff Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de> Date: Thu, 19 Nov 2020 13:57:02 +0000 Subject: [PATCH 22/22] Update .gitlab-ci.yml, change master deploymnet branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3f1527..32eea80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ production: script: - - rsync -a ./mymodule/ /var/simplesamlphp/modules/mymodule/ + - rsync -a ./mymodule/ /data/simplesamlphp/modules/mymodule/ only: - master tags: -- GitLab