diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89e15d75dbd4e71c3cb288e22df474040bd66ef3..32eea805286715f7135399e04ad94d7edf12b9ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ production: script: - - rsync -a ./mymodule/ /opt/simplesamlphp/modules/mymodule/ + - rsync -a ./mymodule/ /data/simplesamlphp/modules/mymodule/ only: - master tags: @@ -8,7 +8,7 @@ production: testing: script: - - rsync -a ./mymodule/ /opt/simplesamlphptest/modules/mymodule/ + - rsync -a ./mymodule/ /data/simplesamlphptest/modules/mymodule/ only: - testing tags: diff --git a/mymodule/themes/fancytheme/core/loginuserpass.twig b/mymodule/themes/fancytheme/core/loginuserpass.twig index a33afa362f50e23892c502d7ae9e5bc797eb4de2..d7e745fbf07fc4db054a9d5854d583c3fbebd64d 100644 --- a/mymodule/themes/fancytheme/core/loginuserpass.twig +++ b/mymodule/themes/fancytheme/core/loginuserpass.twig @@ -16,7 +16,7 @@ <form method="post"> <h2 class="sr-only">Login Form</h2> <div class="illustration"><img src="/img/M4_LAB_LOGO.png" width="130"></div> - {%- if 'AuthId=admin' in attribute(queryParams, "AuthState") -%} + {%- 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> diff --git a/mymodule/themes/fancytheme/default/_footer.twig b/mymodule/themes/fancytheme/default/_footer.twig index 569caf2089535b27c13d25aa173421ef37d6525f..b4c0520573cb0255766df11870184288b4bb3cb4 100644 --- a/mymodule/themes/fancytheme/default/_footer.twig +++ b/mymodule/themes/fancytheme/default/_footer.twig @@ -1,4 +1,3 @@ <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> - <script src="/js/mobile.js"> </script> diff --git a/mymodule/themes/fancytheme/default/base.twig b/mymodule/themes/fancytheme/default/base.twig index 469c29bde10c57f58900519ac5a08241acf04a11..48f3bb794a6702988b61101b6b1a1d882839f384 100644 --- a/mymodule/themes/fancytheme/default/base.twig +++ b/mymodule/themes/fancytheme/default/base.twig @@ -8,7 +8,6 @@ <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/m4lab-mobile.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") }}">