Rewrite templates

aleksis/core/templates/account/account_inactive.html

@@ -9,8 +9,10 @@
   <div class="container">
     <div class="card red">
       <div class="card-content white-text">
-        <div class="material-icons small left">error_outline</div>
-        <span class="card-title">{% blocktrans %}Account inactive.{% endblocktrans %}</span>
+        <div class="card-title">
+          <i class="material-icons small left">error_outline</i>
+          {% blocktrans %}Account inactive.{% endblocktrans %}
+        </div>
         <p>
           {% blocktrans %}
             This account is currently inactive. If you think this is an

aleksis/core/templates/account/password_change.html

@@ -3,21 +3,29 @@
 {% load i18n material_form %}
 
 {% block browser_title %}{% trans "Change password" %}{% endblock %}
-{% block page_title %}{% trans "Change password" %}{% endblock %}
+{% block no_page_title %}{% endblock %}
 
 {% block content %}
-  <div class="alert warning">
-    <p>
-      <i class="material-icons left">warning</i>
-      {% trans "Forgot your current password? Click here to reset it:" %} <a href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>.
-    </p>
+ <div class="row">
+  <div class="col m1 l2 xl3"></div>
+  <div class="col s12 m10 l8 xl6">
+   <div class="card">
+    <form method="post" action="{% url 'account_change_password' %}">
+     <div class="card-content">
+      <div class="card-title">{% trans "Change password" %}</div>
+       {% csrf_token %}
+       {% form form=form %}{% endform %}
+      </div>
+      <div class="card-action-light">
+       {% trans "Change password" as caption %}
+       {% include "core/partials/save_button.html" with caption=caption icon="priority_high" %}
+       <a href="{% url "account_reset_password" %}" class="btn-flat right waves-effect waves-light">
+        {% trans "Reset password" %}
+       </a>
+      </div>
+     </div>
+    </form>
+   </div>
   </div>
-
-  <form method="post" action="{% url 'account_change_password' %}">
-    {% csrf_token %}
-    {% form form=form %}{% endform %}
-    {% trans "Change password" as caption %}
-    {% include "core/partials/save_button.html" with caption=caption icon="priority_high" %}
-  </form>
-
+ </div>
 {% endblock %}

aleksis/core/templates/account/password_reset_from_key_done.html

@@ -9,11 +9,13 @@
   <div class="container">
     <div class="card green">
       <div class="card-content white-text">
-        <div class="material-icons small left">success</div>
-        <span class="card-title">{% blocktrans %}Password changed!{% endblocktrans %}</span>
+        <div class="card-title">
+          <i class="material-icons small left">success</i>
+          {% blocktrans %}Password changed{% endblocktrans %}
+        </div>
         <p>
           {% blocktrans %}
-            Your password is now changed!
+            Your password is now changed.
           {% endblocktrans %}
         </p>
       </div>

aleksis/core/templates/account/signup_closed.html

@@ -9,8 +9,10 @@
   <div class="container">
     <div class="card red">
       <div class="card-content white-text">
-        <div class="material-icons small left">error_outline</div>
-        <span class="card-title">{% blocktrans %}Signup closed.{% endblocktrans %}</span>
+        <div class="card-title">
+        <i class="material-icons small left">error_outline</i>
+          {% blocktrans %}Signup closed.{% endblocktrans %}
+        </div>
         <p>
           {% blocktrans %}
             This sign up is currently closed. If you think this is an

aleksis/core/templates/core/person/full.html

@@ -14,6 +14,7 @@
   {% has_perm 'core.change_person_preferences_rule' user person as can_change_person_preferences %}
   {% has_perm 'core.delete_person_rule' user person as can_delete_person %}
   {% has_perm "core.impersonate_rule" user person as can_impersonate %}
+  {% has_perm "core.can_invite" user person as can_invite %}
 
   {% if can_change_person or can_change_person_preferences or can_delete_person or can_impersonate %}
     <p>
@@ -43,7 +44,13 @@
           <i class="material-icons left">portrait</i>
           {% trans "Impersonate" %}
         </a>
-      {% endif %}
+    {% endif %}
+    {% if can_invite and not person.user %}
+        <a href="{% url "invite_person_by_id" person.id %}" class="btn waves-effect waves-light">
+          <i class="material-icons left">giftcard</i>
+          {% trans "Invite user" %}
+        </a>
+    {% endif %}
     </p>
   {% endif %}
 

aleksis/core/templates/invitations/enter.html

+{# -*- engine:django -*- #}
+
+{% extends "core/base.html" %}
+
+{% load material_form i18n %}
+
+{% block browser_title %}{% blocktrans %}Accept invitation{% endblocktrans %}{% endblock %}
+{% block no_page_title %}{% endblock %}
+
+{% block extra_head %}
+  {{ form.media.css }}
+{% endblock %}
+
+{% block content %}
+  <div class="row">
+  <div class="col m1 l2 xl3"></div>
+  <div class="col s12 m10 l8 xl6">
+    <div class="card">
+      <form method="post">
+        <div class="card-content">
+          <div class="card-title">{% trans "Accept your invitation" %}</div>
+          <div class="alert primary">
+            <div>
+              <i class="material-icons left">info</i>
+              {% blocktrans %}
+                Please enter your invitation code to register
+                your new user account:
+              {% endblocktrans %}
+            </div>
+          </div>
+          {% csrf_token %}
+          {% form form=form %}{% endform %}
+        </div>
+        <div class="card-action-light">
+          <button type="submit" class="btn green waves-effect waves-light">
+            <i class="material-icons left">card_giftcard</i>
+            {% trans "Accept invite" %}
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+  {{ form.media.js }}
+{% endblock %}

aleksis/core/templates/invitations/forms/_invite.html

+{# -*- engine:django -*- #}
+
+{% extends "core/base.html" %}
+
+{% load material_form i18n %}
+
+{% load render_table from django_tables2 %}
+
+{% block browser_title %}{% blocktrans %}Invite{% endblocktrans %}{% endblock %}
+{% block page_title %}{% blocktrans %}Invite{% endblocktrans %}{% endblock %}
+
+
+{% block content %}
+
+  <div class="row">
+    <div class="col s6">
+      <h5>{% trans "Invite by email address" %}</h5>
+      <form method="post">
+        {% csrf_token %}
+        {% form form=form %}{% endform %}
+        {% trans "Invite" as caption %}
+        {% include "core/partials/save_button.html" with caption=caption icon="card_giftcard" %}
+      </form>
+    </div>
+    <div class="col s6">        
+      <h5>{% trans "Generate invitation code" %}</h5>
+
+      <a class="btn waves-effect waves-light hundred-percent" href="{% url 'generate_invitation_code' %}">
+        {% trans "Generate code" %}
+      </a>
+    </div>
+    <div class="col s12">
+      <h5>{% trans "Invitations" %}</h5>
+
+      {% render_table table %}
+    </div>
+  </div>
+{% endblock %}

aleksis/core/templates/invitations/messages/invite_accepted.txt

+{% load i18n %}
+
+{% blocktrans %}The invitation for {{ email }} has been accepted.{% endblocktrans %}