* Add success messages to all the forms.

* Minor cleanups here and there.
bgroff · Jun 29, 2018 · 0c08607 · 0c08607
1 parent f496e7b
commit 0c08607
Show file tree

Hide file tree

Showing 44 changed files with 276 additions and 22 deletions.
diff --git a/django_kala/auth/templates/accounts/settings/avatar.html b/django_kala/auth/templates/accounts/settings/avatar.html
@@ -58,6 +58,16 @@
             </div>
         </div>
         <div class="twelve wide column">
+            {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
             <form class="ui form {% if form.errors %}error{% endif %}" enctype="multipart/form-data" method="post">
                 {% csrf_token %}
                 <div class="field">

diff --git a/django_kala/auth/templates/accounts/settings/details.html b/django_kala/auth/templates/accounts/settings/details.html
@@ -57,6 +57,16 @@
             </div>
         </div>
         <div class="twelve wide column">
+            {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
             <form class="ui form {% if form.errors %}error{% endif %}" method="post">
                 {% csrf_token %}
                 <div class="field">

diff --git a/django_kala/auth/views/invite_user.py b/django_kala/auth/views/invite_user.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse
 from django.shortcuts import redirect
@@ -30,5 +31,6 @@ def post(self, request, *args, **kwargs):
                     organization.add_change(user)
                     organization.add_delete(user)
             user.send_invite(settings.EMAIL_APP, 'email/invite_user', 'Invitation to collaborate', user)
+            messages.success(request, 'The invitation has been sent.')
             return redirect(reverse('users:details', args=[user.pk]))
         return self.render_to_response(self.get_context_data())
diff --git a/django_kala/auth/views/settings/avatar.py b/django_kala/auth/views/settings/avatar.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.contrib import messages
 
 from auth.forms.settings.avatar import AvatarForm
 from django.contrib.auth import get_user_model
@@ -46,6 +47,8 @@ def post(self, request, *args, **kwargs):
 
             except Exception as exception:
                 print(exception)
+            messages.success(request, 'The avatar has been updated.')
+
             return redirect(reverse('users:avatar', args=[self.user.pk]))
         return self.render_to_response(self.get_context_data())
 

diff --git a/django_kala/auth/views/settings/details.py b/django_kala/auth/views/settings/details.py
@@ -1,3 +1,4 @@
+from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.exceptions import PermissionDenied
@@ -29,5 +30,6 @@ def dispatch(self, request, pk, *args, **kwargs):
     def post(self, request, *args, **kwargs):
         if self.form.is_valid():
             self.form.save()
+            messages.success(request, 'The user has been updated.')
             return redirect(reverse('users:details', args=[self.user.pk]))
         return self.render_to_response(self.get_context_data())
diff --git a/django_kala/django_kala/templates/base.html b/django_kala/django_kala/templates/base.html
@@ -83,13 +83,13 @@
                     {% endif %}
                     {% if can_invite  %}
                         <div class="header">This organization</div>
-                        <a class="item">Invite someone</a>
+                        <a class="item" href="{% url 'organizations:invite_user' organization.pk %}">Invite someone</a>
                         <div class="divider"></div>
                     {% endif %}
                     {% if project and can_create %}
                         <div class="header">This project</div>
                         <a class="item" href="{% url 'projects:new_document' project.pk %}">New document</a>
-                        <a class="item">Invite someone</a>
+                        <a class="item" href="{% url 'projects:project_invite_user' project.pk %}">Invite someone</a>
                     {% endif %}
                     </div>
                 {% endif %}

diff --git a/django_kala/organizations/templates/organizations/invite_user.html b/django_kala/organizations/templates/organizations/invite_user.html
@@ -37,6 +37,16 @@ <h2 class="active section">Invite User
         </div>
         <div class="ui one column grid container">
             <div class="twelve wide column">
+                {% if messages %}
+                    <div class="ui success message">
+                        <i class="close icon"></i>
+                        <ul class="messages" style="margin-top: 0">
+                            {% for message in messages %}
+                                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                {% endif %}
                 <form class="ui form {% if form.errors %}error{% endif %}" method="post">
                 {% csrf_token %}
                 <div class="field">

diff --git a/django_kala/organizations/templates/organizations/organizations.html b/django_kala/organizations/templates/organizations/organizations.html
@@ -23,6 +23,17 @@ <h2 class="section">Organizations</h2>
         {% endif %}
 
         <div class="ui container">
+            {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
+
             <div class="ui cards">
                 {% for organization in organizations %}
                     <div class="ui card">

diff --git a/django_kala/organizations/templates/organizations/settings/details.html b/django_kala/organizations/templates/organizations/settings/details.html
@@ -44,6 +44,17 @@
             </div>
         </div>
         <div class="twelve wide column">
+            {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
+
             <form class="ui form {% if form.errors %}error{% endif %}" method="post">
                 {% csrf_token %}
                 <div class="field">

diff --git a/django_kala/organizations/templates/organizations/settings/manage_access.html b/django_kala/organizations/templates/organizations/settings/manage_access.html
@@ -44,6 +44,17 @@
             </div>
         </div>
         <div class="twelve wide column">
+            {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
+
             <form id="form" class="ui form" method="post">
                 {% csrf_token %}
                 <table class="ui very basic collapsing celled table">

diff --git a/django_kala/organizations/views/invite_user.py b/django_kala/organizations/views/invite_user.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import redirect, get_object_or_404
@@ -50,6 +51,7 @@ def post(self, request, *args, **kwargs):
                 self.organization.add_change(user)
                 self.organization.add_delete(user)
             user.send_invite(settings.EMAIL_APP, 'email/invite_organization', 'Invitation to collaborate', self.organization)
+            messages.success(request, 'The invitation has been sent.')
             return redirect(
                 reverse(
                     'organizations:invite_user',

diff --git a/django_kala/organizations/views/new_organization.py b/django_kala/organizations/views/new_organization.py
@@ -1,3 +1,4 @@
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import redirect
@@ -24,5 +25,6 @@ def dispatch(self, request, *args, **kwargs):
     def post(self, request, *args, **kwargs):
         if self.form.is_valid():
             company = self.form.save()
+            messages.success(request, 'The organization has been saved.')
             return redirect(reverse('organizations:organization', args=[company.pk]))
         return self.render_to_response(self.get_context_data())
diff --git a/django_kala/organizations/views/settings/details.py b/django_kala/organizations/views/settings/details.py
@@ -1,3 +1,4 @@
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404, redirect
@@ -29,5 +30,6 @@ def dispatch(self, request, pk, *args, **kwargs):
     def post(self, request, *args, **kwargs):
         if self.form.is_valid():
             self.form.save()
+            messages.success(request, 'The organization has been updated.')
             return redirect(reverse('organizations:details', args=[self.organization.pk]))
         return self.render_to_response(self.get_context_data())
diff --git a/django_kala/projects/templates/documents/document.html b/django_kala/projects/templates/documents/document.html
@@ -55,6 +55,16 @@
         </div>
         <div class="ui divider">
         </div>
+        {% if messages %}
+            <div class="ui success message">
+                <i class="close icon"></i>
+                <ul class="messages" style="margin-top: 0">
+                    {% for message in messages %}
+                        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                    {% endfor %}
+                </ul>
+            </div>
+        {% endif %}
         <div class="ui container">
             <div class="ui cards">
                 {% for documentversion in document.documentversion_set.all %}

diff --git a/django_kala/projects/templates/documents/invite_user.html b/django_kala/projects/templates/documents/invite_user.html
@@ -53,6 +53,17 @@ <h2 class="active section">Invite User
         </div>
         <div class="ui one column grid container">
             <div class="twelve wide column">
+                {% if messages %}
+                    <div class="ui success message">
+                        <i class="close icon"></i>
+                        <ul class="messages" style="margin-top: 0">
+                            {% for message in messages %}
+                                <li{% if message.tags %}
+                                    class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                {% endif %}
                 <form class="ui form {% if form.errors %}error{% endif %}" method="post">
                 {% csrf_token %}
                 <div class="field">

diff --git a/django_kala/projects/templates/documents/new_document.html b/django_kala/projects/templates/documents/new_document.html
@@ -14,6 +14,16 @@
             </div>
         </div>
     <div class="ui divider"></div>
+        {% if messages %}
+            <div class="ui success message">
+                <i class="close icon"></i>
+                <ul class="messages" style="margin-top: 0">
+                    {% for message in messages %}
+                        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                    {% endfor %}
+                </ul>
+            </div>
+        {% endif %}
     </div>
 
     <div class="ui one column grid container">

diff --git a/django_kala/projects/templates/documents/new_version.html b/django_kala/projects/templates/documents/new_version.html
@@ -14,6 +14,16 @@ <h2>
             </div>
         </div>
         <div class="ui divider"></div>
+            {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
     </div>
 
     <div class="ui one column grid container">
@@ -31,7 +41,7 @@ <h2>
                 </div>
                 <div class="field">
                     <label>{{ form.description.label }}</label>
-                    {{ form.description.errors }}
+                    {{ form.description }}
                     {% if form.description %}
                     <div class="ui error message">
                         {{ form.description.errors }}

diff --git a/django_kala/projects/templates/documents/settings/archive.html b/django_kala/projects/templates/documents/settings/archive.html
@@ -17,7 +17,7 @@
 
         <div class="ui tabular menu">
             <div class="ui container">
-                <a class="item">
+                <a class="item" href="{% url 'projects:document' project.pk document.pk %}">
                     <i class="git branch icon"></i>
                     Versions
                 </a>

diff --git a/django_kala/projects/templates/documents/settings/details.html b/django_kala/projects/templates/documents/settings/details.html
@@ -17,7 +17,7 @@
 
         <div class="ui tabular menu">
             <div class="ui container">
-                <a class="item">
+                <a class="item" href="{% url 'projects:document' project.pk document.pk %}">
                     <i class="git branch icon"></i>
                     Versions
                 </a>
@@ -33,7 +33,6 @@
                 </a>
             </div>
         </div>
-
     </div>
 
     <div class="ui two column grid container">
@@ -45,7 +44,7 @@
                         <div class="menu">
                             <a class="active item"
                                href="{% url 'projects:document_details' document.project.pk document.pk %}">Details</a>
-                            <a class="item" href="{% url 'projects:document_archive' document.project.pk document.pk %}"">Archive</a>
+                            <a class="item" href="{% url 'projects:document_archive' document.project.pk document.pk %}">Archive</a>
                         </div>
                     </div>
                     <div class="item">
@@ -60,6 +59,16 @@
             </div>
         </div>
         <div class="twelve wide column">
+            {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
             <form class="ui form {% if form.errors %}error{% endif %}" method="post">
                 {% csrf_token %}
                 <div class="field">

diff --git a/django_kala/projects/templates/documents/settings/manage_access.html b/django_kala/projects/templates/documents/settings/manage_access.html
@@ -17,7 +17,7 @@
 
         <div class="ui tabular menu">
             <div class="ui container">
-                <a class="item">
+                <a class="item" href="{% url 'projects:document' project.pk document.pk %}">
                     <i class="git branch icon"></i>
                     Versions
                 </a>
@@ -57,9 +57,19 @@
             </div>
         </div>
         <div class="twelve wide column">
+            {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
             <form id="form" class="ui form" method="post">
                 {% csrf_token %}
-                <table class="ui very basic collapsing celled table">
+                <table class="ui very basic table">
                     <thead>
                     <tr>
                         <th>Name</th>

diff --git a/django_kala/projects/templates/projects/invite_user.html b/django_kala/projects/templates/projects/invite_user.html
@@ -46,6 +46,16 @@ <h2 class="active section">Invite User
                 </div>
             </div>
             <div class="ui divider"></div>
+            {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
         </div>
         <div class="ui one column grid container">
             <div class="twelve wide column">

diff --git a/django_kala/projects/templates/projects/new_project.html b/django_kala/projects/templates/projects/new_project.html
@@ -15,6 +15,16 @@ <h2 class="active section">New Project</h2>
 
     <div class="ui one column grid container">
         <div class="twelve wide column">
+                    {% if messages %}
+                <div class="ui success message">
+                    <i class="close icon"></i>
+                    <ul class="messages" style="margin-top: 0">
+                        {% for message in messages %}
+                            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            {% endif %}
             <form class="ui form {% if form.errors %}error{% endif %}" method="post">
                 {% csrf_token %}
                 <div class="field">