Merge branch 'develop' into feature/importer_to_vue

cookbook/templates/openid/login.html

@@ -0,0 +1,39 @@
+{% extends "base.html" %}
+{% load crispy_forms_filters %}
+{% load i18n %}
+{% load static %}
+
+{% load account socialaccount %}
+
+{% block title %}OpenID {% trans 'Login' %}{% endblock %}
+
+{% block content %}
+
+
+    <div class="row">
+        <div class="col-12" style="text-align: center">
+            <h3>{% trans "Sign In" %}</h3>
+        </div>
+    </div>
+
+
+    <div class="row">
+        <div class="col-sm-12 col-lg-6 col-md-6 offset-lg-3 offset-md-3">
+            <hr>
+            <form id="openid_login_form" class="openid_login" method="post" action="{% url 'openid_login' %}">
+                {% csrf_token %}
+                {{ form | crispy }}
+                <button class="btn btn-success" type="submit">{% trans "Sign In" %}</button>
+                <a class="btn btn-secondary" href="{% url 'account_login' %}">{% trans "Back" %}</a>
+            </form>
+        </div>
+    </div>
+
+
+    <script>
+        $('#id_openid').focus()
+    </script>
+
+{% endblock %}
+
+

cookbook/templates/socialaccount/authentication_error.html

@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load static %}
+
+{% load account socialaccount %}
+
+{% block head_title %}{% trans "Social Network Login Failure" %}{% endblock %}
+
+
+{% block content %}
+
+
+    <div class="row">
+        <div class="col-12" style="text-align: center">
+            <h3>{% trans "Sign In" %}</h3>
+        </div>
+    </div>
+
+
+    <div class="row">
+        <div class="col-sm-12 col-lg-6 col-md-6 offset-lg-3 offset-md-3">
+            <hr>
+            <h6>{% trans "Social Network Login Failure" %}</h6>
+
+            <p>{% trans "An error occurred while attempting to login via your social network account." %}</p>
+
+            <a class="btn btn-secondary" href="{% url 'account_login' %}">{% trans "Back" %}</a>
+        </div>
+    </div>
+
+
+
+{% endblock %}

cookbook/templates/system.html

@@ -105,7 +105,7 @@
     <br/>
     <h4>Debug</h4>
     <textarea class="form-control" rows="20">
-Gunicoren Media: {{ gunicorn_media }}
+Gunicorn Media: {{ gunicorn_media }}
 Sqlite: {{ postgres }}
 Debug: {{ debug }}