From d5e3d22d48047e383494746cd5205325ad458d3f Mon Sep 17 00:00:00 2001
From: vanzhiganov <vanzhiganov@ya.ru>
Date: Sun, 26 Jun 2016 12:21:02 +0300
Subject: [PATCH] =?UTF-8?q?=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B2=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/administrator/_layout.auth.html       | 13 +++++++++++++
 .../templates/administrator/settings/create.html    |  7 -------
 .../templates/administrator/settings/delete.html    |  7 -------
 .../administrator/settings/messages/email.html      |  7 -------
 .../templates/administrator/settings/update.html    |  7 -------
 5 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/SWSCloudAdministrator/templates/administrator/_layout.auth.html b/SWSCloudAdministrator/templates/administrator/_layout.auth.html
index a1a56f2..4ec5ead 100644
--- a/SWSCloudAdministrator/templates/administrator/_layout.auth.html
+++ b/SWSCloudAdministrator/templates/administrator/_layout.auth.html
@@ -46,6 +46,19 @@
         </div>
         <div class="large-10 columns">
             <div class="container-fluid">
+                {% with messages = get_flashed_messages(with_categories=true) %}
+                    {% if messages %}
+                    <div class="row">
+                        <div class="large-12 columns">
+                            <ul class="flashes">
+                                {% for category, message in messages %}
+                                    <li class="{{ category }}">{{ message }}</li>
+                                {% endfor %}
+                            </ul>
+                        </div>
+                    </div>
+                    {% endif %}
+                {% endwith %}
                 <!-- Page Heading -->
                 <div class="row">
                     <div class="col-lg-12">
diff --git a/SWSCloudAdministrator/templates/administrator/settings/create.html b/SWSCloudAdministrator/templates/administrator/settings/create.html
index 4525114..58c8b66 100644
--- a/SWSCloudAdministrator/templates/administrator/settings/create.html
+++ b/SWSCloudAdministrator/templates/administrator/settings/create.html
@@ -5,13 +5,6 @@
 {% block subtitle %}Create{% endblock %}
 
 {% block content %}
-    {% if g.errors['total'] > 0 %}
-        <div class="alert alert-danger">
-            <ul>
-            {% for error in g.errors['items'] %}<li>{{ error }}</li>{% endfor %}
-            </ul>
-        </div>
-    {% endif %}
     <form action="{{ url_for('administrator.settings_create') }}" method="post">
         <table class="table table-bordered">
             <thead>
diff --git a/SWSCloudAdministrator/templates/administrator/settings/delete.html b/SWSCloudAdministrator/templates/administrator/settings/delete.html
index e68fcc9..20dbc01 100644
--- a/SWSCloudAdministrator/templates/administrator/settings/delete.html
+++ b/SWSCloudAdministrator/templates/administrator/settings/delete.html
@@ -5,13 +5,6 @@
 {% block subtitle %}Delete{% endblock %}
 
 {% block content %}
-    {% if g.errors['total'] > 0 %}
-        <div class="alert alert-danger">
-            <ul>
-            {% for error in g.errors['items'] %}<li>{{ error }}</li>{% endfor %}
-            </ul>
-        </div>
-    {% endif %}
     <form action="{{ url_for('administrator.settings_delete', id=setting.id) }}" method="post">
         <input type="hidden" name="id" value="{{ setting.id }}">
         <table class="table table-bordered">
diff --git a/SWSCloudAdministrator/templates/administrator/settings/messages/email.html b/SWSCloudAdministrator/templates/administrator/settings/messages/email.html
index db8c0a8..c306b49 100644
--- a/SWSCloudAdministrator/templates/administrator/settings/messages/email.html
+++ b/SWSCloudAdministrator/templates/administrator/settings/messages/email.html
@@ -5,13 +5,6 @@
 {% block subtitle %}Create{% endblock %}
 
 {% block content %}
-    {% if g.errors['total'] > 0 %}
-        <div class="alert alert-danger">
-            <ul>
-            {% for error in g.errors['items'] %}<li>{{ error }}</li>{% endfor %}
-            </ul>
-        </div>
-    {% endif %}
     <form action="{{ url_for('administrator.settings_create') }}" method="post">
         <table class="table table-bordered">
             <tr>
diff --git a/SWSCloudAdministrator/templates/administrator/settings/update.html b/SWSCloudAdministrator/templates/administrator/settings/update.html
index fa3bac8..14ebae4 100644
--- a/SWSCloudAdministrator/templates/administrator/settings/update.html
+++ b/SWSCloudAdministrator/templates/administrator/settings/update.html
@@ -5,13 +5,6 @@
 {% block subtitle %}Update{% endblock %}
 
 {% block content %}
-    {% if g.errors['total'] > 0 %}
-        <div class="alert alert-danger">
-            <ul>
-            {% for error in g.errors['items'] %}<li>{{ error }}</li>{% endfor %}
-            </ul>
-        </div>
-    {% endif %}
     <form action="{{ url_for('administrator.settings_update', id=setting.id) }}" method="post">
         <input type="hidden" name="id" value="{{ setting.id }}">
         <table class="table table-bordered">