Commit 11f7570c authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'testing' into 'master'

deployment

See merge request !60
parents 9274cb19 d68072d7
Pipeline #5335 passed with stage
in 1 second
production: production:
script: script:
- rsync -a ./mymodule/ /data/simplesamlphp/modules/mymodule/ - rsync -a ./mymodule/ /opt/simplesamlphp/modules/mymodule/
only: only:
- master - master
tags: tags:
...@@ -8,7 +8,7 @@ production: ...@@ -8,7 +8,7 @@ production:
testing: testing:
script: script:
- rsync -a ./mymodule/ /data/simplesamlphptest/modules/mymodule/ - rsync -a ./mymodule/ /opt/simplesamlphptest/modules/mymodule/
only: only:
- testing - testing
tags: tags:
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<form method="post"> <form method="post">
<h2 class="sr-only">Login Form</h2> <h2 class="sr-only">Login Form</h2>
<div class="illustration"><img src="/img/M4_LAB_LOGO.png" width="130"></div> <div class="illustration"><img src="/img/M4_LAB_LOGO.png" width="130"></div>
{%- if 'admin' in attribute(queryParams, "AuthState") -%} {%- if 'AuthId=admin' in attribute(queryParams, "AuthState") -%}
<div class="form-group"><input id="username" class="form-control" type="text" name="username" placeholder="Administrator"></div> <div class="form-group"><input id="username" class="form-control" type="text" name="username" placeholder="Administrator"></div>
{%- else -%} {%- else -%}
<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="username" class="form-control" type="email" name="username" placeholder="E-Mail-Adresse"></div>
......
<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://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="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/headfoot.js"> </script>
<script src="/js/mobile.js"> </script>
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}"> <link rel="stylesheet" href="{{ asset("css/stylesheet.css") }}">
<link rel="stylesheet" href="/css/bootstrap.min.css"> <link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/m4lab.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="/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="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") }}"> <link rel="icon" href="{{ asset("icons/favicon.ico") }}">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment