Commit a9519321 authored by Mondi Ravi's avatar Mondi Ravi

Merge branch 'william' into 'master'

Enhancements of the UI

See merge request ungleich-public/ungleich-user!2
parents 5cc22c09 d0faf781
......@@ -56,6 +56,29 @@
border: 2px solid #8396C4;
}
.choicered-btn {
min-width: 110px;
background-color: red;
color: #fff;
border: 2px solid red;
padding: 4px 10px;
transition: 0.3s all ease-out;
}
.choicered-btn:focus,
.choicered-btn:hover,
.choicered-btn:active {
color: red;
background-color: #fff;
}
.choicered-btn-faded {
background-color: #8396C4;
border: 2px solid #8396C4;
}
@media (max-width: 767px) {
.h1-thin {
font-size: 27px;
......
......@@ -10,8 +10,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<title>ungleich</title>
{% block title %}
{% endblock %}
<!-- Bootstrap Core CSS -->
<link href="{% static 'datacenterlight/css/bootstrap-3.3.7.min.css' %}" rel="stylesheet">
......@@ -47,14 +47,14 @@
<!-- End Google Analytics -->
</head>
<body>
<body style="overflow-x: hidden">
<!-- cms_toolbar %}-->
{% block navbar %}
{% include "includes/_navbar_transparent.html" %}
{% endblock navbar %}
<div class="{% if request.user.is_authenticated %}content-dashboard{% endif %}">
<div class="{% if request.user.is_authenticated %}content-dashboard{% endif %}" style="min-height: auto">
{% block content %}
{% endblock %}
</div>
......
<title> Userdata changed. </title>
<h2> The data for {{user}} has been changed. </h2>
<br><br>
<ul>
<li> Username: {{user}} </li>
<li> Firstname: {{firstname}} </li>
<li> Lastname: {{lastname}} </li>
<li> Email: {{email}} </li>
</ul>
<br><br>
<form action={% url 'index' %} method="get">
<input type="submit" value="Back to indexpage">
</form>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
{% block title %}
<title> Success! </title>
{% endblock %}
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading allcaps">{% trans " Data successfully updated." %}</h1>
<form action="{% url 'index' %}" method="get" class="form" novalidated>
<hr>
<div class="text-center">
<button type="submit" class="btn choice-btn btn-block">
{% trans "Back to indexpage" %}
</button>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
<title> Password for {{user}} changed. </title>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
<h2> The password for {{user}} has been changed. </h2>
<br><br>
<form action={% url 'index' %} method="get">
<input type="submit" value="Back to indexpage">
</form>
{% block title %}
<title> Password Updated. </title>
{% endblock %}
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h2 class="section-heading allcaps">{% trans " Password successfully updated " %}</h2>
<form action="{% url 'index' %}" method="get" class="form" novalidated>
<div class="text-center">
<button type="submit" class="btn choice-btn btn-block">
{% trans "Back to indexpage" %}
</button>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
<title> Changing the password for {{user}} </title>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
<h2> Changing the password for {{user}} </h2>
<br><br>
<form action={% url 'index' %} method="get">
<input type="submit" value="Back to indexpage">
</form>
<br><br>
To change the password for {{user}}, please supply
<form action={% url 'change_password' %} method="post">
{% csrf_token %}
<br>The old password:<br>
<input type="password" name="oldpassword" id="oldpassword">
<br><br>The new password (at least 8 characters):<br>
<input type="password" name="password1" id="password1">
<br>Please repeat the new Password:<br>
<input type="password" name="password2" id="password2">
<br><br>
<input type="submit" value="Submit">
</form>
{% block title %}
<title> Changing the password for {{user}} </title>
{% endblock %}
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading allcaps">{% trans " Password change " %}</h1>
<form action="{% url 'change_password' %}" method="post" class="form" novalidated>
{% csrf_token %}
<br>
<div class="form-group">
<label class="sr-only control-label" for="password1">oldpassword</label>
<input type="password" name="oldpassword" class="form-control" placeholder="Type your current password" title="" required="" id="oldpassword">
</div>
<hr>
<div class="form-group">
<label class="sr-only control-label" for="password1">password1</label>
<input type="password" name="password1" class="form-control" placeholder="New Password (at least 8 characters):" title="" required="" id="password1">
</div>
<div class="form-group">
<label class="sr-only control-label" for="password2">password2</label>
<input type="password" name="password2" class="form-control" placeholder="Please confirm your new Password:" title="" required="" id="password2">
</div>
<hr>
<div class="text-center">
<button type="submit" class="btn choice-btn btn-block">
{% trans "Change Password" %}
</button>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
<title> Changing user data for {{user}} </title>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
{% block title %}
<title> Changing user data for {{user}} </title>
{% endblock %}
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading allcaps">{% trans " Update your info " %} </h1>
<form action="{% url 'change_data' %}" method="post" class="form" novalidated>
{% csrf_token %}
<div class="form-group">
<label class="sr-only control-label" for="firstname">firstname</label>
<input type="text" name="firstname" placeholder="firstname" value="{{firstname}}" class="form-control" required="" id="firstname">
</div>
<div class="form-group">
<label class="sr-only control-label" for="lastname">lastname</label>
<input type="text" name="lastname" placeholder="lastname" value="{{lastname}}" class="form-control" required="" id="lastname">
</div>
<div class="form-group">
<label class="sr-only control-label" for="email">email</label>
<input type="text" name="email" placeholder="email" value="{{email}}" class="form-control" required="" id="email">
</div>
<hr>
<div class="text-center">
<button type="submit" class="btn choice-btn btn-block">
{% trans "Change User Data" %}
</button>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
<h2> Changing user data for {{user}} </h2>
<br><br>
<form action={% url 'index' %} method="get">
<input type="submit" value="Back to indexpage">
</form>
<br><br>
<form action={% url 'change_data' %} method="post">
{% csrf_token %}
<br>Firstname:<br>
<input type="text" name="firstname" id="firstname" value="{{firstname}}">
<br><br>Lastname:<br>
<input type="text" name="lastname" id="lastname" value="{{lastname}}">
<br><br>Email:<br>
<input type="text" name="email" id="email" value="{{email}}">
<br><br>
<input type="submit" value="Submit">
</form>
<title> Deleting an Account </title>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
<h2> Deleting an Account </h2>
<br><br>
<form action={% url 'index' %} method="get">
<input type="submit" value="Back to indexpage">
</form>
<br><br>
To delete an account, please type the username and password below:
<form action={% url 'account_delete' %} method="post">
{% csrf_token %}
<br><br>Username:<br>
<input type="text" name="username" id="username">
<br><br>Password:<br>
<input type="password" name="password" id="password">
<br><br>
<input type="submit" value="Submit">
</form>
{% block title %}
<title> Deleting Account </title>
{% endblock %}
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading allcaps">{% trans " Enter your credentials to confirm " %}</h1>
<form action="{% url 'account_delete' %}" method="post" class="form" novalidated>
{% csrf_token %}
<br><br>
<div class="form-group">
<label class="sr-only control-label" for="username">username</label>
<input type="text" name="username" class="form-control" placeholder="Username" title="" required="" id="username">
</div>
<div class="form-group">
<label class="sr-only control-label" for="password">password</label>
<input type="password" name="password" class="form-control" placeholder="Password" title="" required="" id="password">
</div>
<hr>
<div class="text-center">
<button type="submit" class="btn choicered-btn btn-block">
{% trans "Delete Account" %}
</button>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
<title> Deleted user {{user}} </title>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
<h2> The user {{user}} was deleted from our system. </h2>
<br>
<form action={% url 'index' %} method="get">
<input type="submit" value="Back to indexpage">
</form>
{% block title %}
<title> Deleted user {{user}} </title>
{% endblock %}
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading allcaps">{% trans " User Removed " %}</h1>
<form action="{% url 'index' %}" method="get" class="form" novalidated>
<div class="text-center">
<button type="submit" class="btn choice-btn btn-block">
{% trans "Back to indexpage" %}
</button>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
<title> An error has occurred! </title>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
{% block title %}
<title>An error has occurred!</title>
{% endblock %}
{% block content %}
<div class="container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading">{% trans " We are sorry, an error has occurred. " %}</h1>
<br>
<div class="auth-footer">
While trying to {{service}}, an error was encountered: <strong>{{error}}</strong>
</div>
<div class="text-center">
{% if urlname %}
<br>You can: <br><br>
<a class="btn choice-btn mr-2" href="{% url urlname %}" role="button">Go back and try again</a>
{% endif %}
<a class="btn choice-btn ml-2" href="{% url 'index' %}" role="button">Go to the indexpage</a>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
<h2> We are sorry, an error has occured while handling your request. </h2>
While trying to {{service}}, an error was encountered: {{error}}
<br><br>
You can try to:
<br>
{% if urlname %}
<form action={% url urlname %} method="get">
<input type="submit" value="Go back and try again">
</form>
<br>or<br>
{% endif %}
<form action={% url 'index' %} method="get">
<input type="submit" value="Go to the indexpage">
</form>
{% load i18n %}
<footer>
<div class="container">
<div class="row">
<div class="row">
<div class="container">
<div class="col-lg-12">
<ul class="list-inline">
</ul>
......
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
{% block title %}
<title>ungleich</title>
{% endblock %}
{% block content %}
<div class="auth-container">
......@@ -17,7 +21,7 @@
{% endfor %}
<p class="red">{{form.non_field_errors|striptags}}</p>
<div class="text-center">
<button type="submit" class="btn choice-btn">
<button type="submit" class="btn choice-btn btn-block">
{% trans "Log in" %}
</button>
</div>
......
<title> Login failed! </title>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
<h2> Sorry, but your login has failed </h2>
<br><br>This service runs for our LDAP users, so maybe you don't already have an LDAP account with us? If so, please register one.
<form action={% url 'register' %} method="get">
<input type="submit" value="Register an user">
</form>
<br><br>
<form action={% url 'index' %} method="get">
<input type="submit" value="Back to indexpage">
</form>
{% block title %}
<title>Login failed!</title>
{% endblock %}
{% block content %}
<div class="container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading">{% trans " Sorry, but your login has failed. " %}</h1>
<br>
<div class="auth-footer">
{% trans " This service runs for our LDAP users, so maybe you don't already have an LDAP account with us? If so, please register one " %}
</div>
<div class="text-center">
<br><br>
<a class="btn choice-btn mr-2" href="{% url 'register' %}" role="button">Register an user</a>
<a class="btn choice-btn ml-2" href="{% url 'index' %}" role="button">Back to the indexpage</a>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
<title> You must be logged in to access this page </title>
<h2> You must be logged in to access this page </h2>
<br><br>
<form action={% url 'index' %} method="get">
<input type="submit" value="Back to indexpage">
</form>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
{% block title %}
<title> You must be logged in to access this page </title>
{% endblock %}
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading allcaps">{% trans " You need to login to access " %}</h1>
<form action="{% url 'index' %}" method="get" class="form" novalidated>
<div class="text-center">
<button type="submit" class="btn choice-btn btn-block">
{% trans "Back to indexpage" %}
</button>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
<title> Register an user at ungleich </title>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
<h2> Register an user at ungleich </h2>
<br><br>
<form action={% url 'index' %} method="get">
<input type="submit" value="Back to indexpage">
</form>
<br><br>
To register yourself an user, please fill out the fields below:
<br>
<form action={% url 'register' %} method="post">
{% csrf_token %}
<br>Username (alphanumeric):<br>
<input type="text" name="username" id="username">
<br>Password (at least 8 characters):<br>
<input type="password" name="password1" id="password1">
<br>Please confirm your Password:<br>
<input type="password" name="password2" id="password2">
<br>Firstname:<br>
<input type="text" name="firstname" id="firstname">
<br>Lastname:<br>
<input type="text" name="lastname" id="lastname">
<br>Emailaddress:<br>
<input type="text" name="email" id="email">
<br>
<input type="submit" value="Submit">
</form>
{% block title %}
<title> Register an user at ungleich </title>
{% endblock %}
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading allcaps">{% trans "Sign Up" %}</h1>
{% include 'includes/_messages.html' %}
<form action="{% url 'register' %}" method="post" class="form" novalidated>
{% csrf_token %}
<div class="form-group">
<label class="sr-only control-label" for="username">Username</label>
<input type="text" name="username" class="form-control" placeholder="Username (alphanumeric)" title="" required="" id="username">
</div>
<div class="form-group">
<label class="sr-only control-label" for="password1">password1</label>
<input type="password" name="password1" class="form-control" placeholder="Password (at least 8 characters):" title="" required="" id="password1">
</div>
<div class="form-group">
<label class="sr-only control-label" for="password2">password2</label>
<input type="password" name="password2" class="form-control" placeholder="Please confirm your Password:" title="" required="" id="password2">
</div>
<div class="form-group">
<label class="sr-only control-label" for="firstname">First Name</label>
<input type="text" name="firstname" class="form-control" placeholder="firstname" title="" required="" id="firstname">
</div>
<div class="form-group">
<label class="sr-only control-label" for="lastname">Last Name</label>
<input type="text" name="lastname" class="form-control" placeholder="lastname" title="" required="" id="lastname">
</div>
<div class="form-group">
<label class="sr-only control-label" for="id_email">Email</label>
<input type="text" name="email" class="form-control" placeholder="Email" title="" required="" id="email">
</div>
<p class="red">{{form.non_field_errors|striptags}}</p>
<div class="text-center">
<button type="submit" class="btn choice-btn btn-block">
{% trans "Register" %}
</button>
</div>
</form>
<div class="auth-footer">
<div>
{% trans "If you already have an account" %}&nbsp;<a href="{% url 'index' %}">{% trans "Sign In" %}</a>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
<title> Password reset </title>
<h2> Password reset </h2>
<br><br>
To reset your password, please enter your username below. You will get an email with a link to change your password.
<br><br>
<form action={% url 'reset_password' %} method="post">
{% csrf_token %}
Username:<br>
<input type="text" name="user" id="user">
<br>
<input type="submit" value="Submit">
</form>
{% extends "base_short.html" %}
{% load i18n staticfiles bootstrap3 %}
{% block title %}
<title> Password reset </title>
{% endblock %}
{% block content %}
<div class="auth-container">
<div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-content">
<div class="auth-box">
<h1 class="section-heading allcaps">{% trans " Password Reset " %}</h1>
<p class="text-center">{% trans "Please enter your username below. You will get an email with a link to change your password." %}</p>
<form action="{% url 'reset_password' %}" method="post" class="form" novalidated>
{% csrf_token %}
<div class="form-group">
<label class="sr-only control-label" for="user">user</label>
<input type="text" name="user" class="form-control" placeholder="User" title="" required="" id="user">
</div>