4 files changed, 22 insertions, 7 deletions
diff --git a/ishtar_common/templates/registration/password_change_form.html b/ishtar_common/templates/registration/form.html
index deb7af503..f75a82c0f 100644
--- a/ishtar_common/templates/registration/password_change_form.html
+++ b/ishtar_common/templates/registration/form.html
@@ -5,7 +5,7 @@
 <div class="container">
   <div class="row justify-content-center">
     <div class="col-lg-4 col-md-6 col-sm-10">
-      <h3 class="text-center">{% trans "Change password" %}</h3>
+      <h3 class="text-center">{{page_title}}</h3>
       <form method="post" action=".">{% csrf_token %}
         {% if form.non_field_errors %}
         <div class="form-group row">
diff --git a/ishtar_common/templates/registration/login.html b/ishtar_common/templates/registration/login.html
index adefb3176..de7c28317 100644
--- a/ishtar_common/templates/registration/login.html
+++ b/ishtar_common/templates/registration/login.html
@@ -35,8 +35,10 @@
 <hr/>
 <div class="row justify-content-center">
     <div class="col-md-6">
-        <small class="text-secondary">{% trans "Forgot password?" %} <a href="{% url 'password_reset' %}">{% trans "Reset it" %}</a> &ndash;
-        {% trans "Not member?" %} <a href="{% url 'registration_register' %}">{% trans "Register" %}</a></small>
+        <small class="text-secondary">{% trans "Forgot password?" %} <a href="{% url 'password_reset' %}">{% trans "Reset it" %}</a>
+        {% if registration_open %}&ndash;
+        {% trans "Not member?" %} <a href="{% url 'registration_register' %}">{% trans "Register" %}</a>
+        {% endif %}</small>
     </div>
 </div>
 {% endblock %}
diff --git a/ishtar_common/templates/registration/registration_closed.html b/ishtar_common/templates/registration/registration_closed.html
new file mode 100644
index 000000000..7e68ad378
--- /dev/null
+++ b/ishtar_common/templates/registration/registration_closed.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<div class="container">
+  <div class="row justify-content-center">
+    <div class="col-lg-4 col-md-6 col-sm-10">
+      <p>{% trans "Registration are closed." %}</p>
+    </div>
+  </div>
+</div>
+{% endblock %}
diff --git a/ishtar_common/templates/registration/registration_form.html b/ishtar_common/templates/registration/registration_form.html
index b15f0e74b..e6c7c42e2 100644
--- a/ishtar_common/templates/registration/registration_form.html
+++ b/ishtar_common/templates/registration/registration_form.html
@@ -2,10 +2,11 @@
 {% load i18n %}
 
 {% block content %}
-<div class='form'>
-<form method="post" action=".">{% csrf_token %}
-  <table>
-  <caption>{% trans "Register" %}</caption>
+<div class="container">
+  <div class="row justify-content-center">
+    <div class="col-lg-4 col-md-6 col-sm-10">
+      <h3 class="text-center">{% trans "Register" %}</h3>
+      <form method="post" action=".">{% csrf_token %}
   {{ form.as_table }}
   <tr><td colspan='2'><input type="submit" value="{% trans 'Submit' %}" /></td></tr>
   </table>