From 86bda47156dc7832b499879a020baed55c1a0af8 Mon Sep 17 00:00:00 2001
From: vanzhiganov <vanzhiganov@ya.ru>
Date: Mon, 4 Apr 2016 03:08:11 +0300
Subject: [PATCH] update template for flash messaging

---
 .../templates/default/containers/create.html  |  9 ----
 .../templates/default/containers/delete.html  | 24 +++------
 .../default/containers/settings.html          | 54 ++++++++-----------
 SWSCloudCore/templates/default/id/api.html    | 10 ----
 SWSCloudCore/templates/default/id/edit.html   |  7 ---
 SWSCloudCore/templates/default/id/login.html  |  7 ---
 .../default/id/password_reset_step1.html      |  7 ---
 .../default/id/password_reset_step2.html      |  7 ---
 .../templates/default/id/password_update.html |  7 ---
 .../templates/default/id/registration.html    | 11 ----
 10 files changed, 30 insertions(+), 113 deletions(-)

diff --git a/SWSCloudCore/templates/default/containers/create.html b/SWSCloudCore/templates/default/containers/create.html
index 26ef8b8..ba85ebe 100644
--- a/SWSCloudCore/templates/default/containers/create.html
+++ b/SWSCloudCore/templates/default/containers/create.html
@@ -10,15 +10,6 @@
     </div>
     <div class="row">
         <div class="large-12 columns">
-            {% if g.errors['total'] > 0 %}
-                <div class="alert-box alert">
-                    <ul>
-                    {% for error in g.errors['items'] %}
-                        <li>{{ error }}</li>
-                    {% endfor %}
-                    </ul>
-                </div>
-            {% endif %}
             {% if datacenters['total'] == 0 %}
                 <div class="row">
                     <div class="small-12 columns">
diff --git a/SWSCloudCore/templates/default/containers/delete.html b/SWSCloudCore/templates/default/containers/delete.html
index e0595fa..a6fd53e 100644
--- a/SWSCloudCore/templates/default/containers/delete.html
+++ b/SWSCloudCore/templates/default/containers/delete.html
@@ -10,22 +10,14 @@
     </div>
     <div class="row">
         <div class="large-12 columns">
-            {% if g.errors['total'] > 0 %}
-                <div class="alert-box alert">
-                    <ul>
-                    {% for error in g.errors['items'] %}<li>{{ error }}</li>{% endfor %}
-                    </ul>
-                </div>
-            {% else %}
-                <form action="{{ url_for('containers.delete', container_id=container.id) }}" method="post">
-                    <input type="hidden" name="id" value="{{ container.id }}" />
-                    <p>
-                        Вы действительно хотите удалить контейнер?<br/>
-                    </p>
-                    <input type="submit" value="Удалить" class="button alert" />
-                    <a href="{{ url_for('containers.index') }}" class="">Отмена</a>
-                </form>
-            {% endif %}
+            <form action="{{ url_for('containers.delete', container_id=container.id) }}" method="post">
+                <input type="hidden" name="id" value="{{ container.id }}" />
+                <p>
+                    Вы действительно хотите удалить контейнер?<br/>
+                </p>
+                <input type="submit" value="Удалить" class="button alert" />
+                <a href="{{ url_for('containers.index') }}" class="">Отмена</a>
+            </form>
         </div>
     </div>
 {% endblock %}
diff --git a/SWSCloudCore/templates/default/containers/settings.html b/SWSCloudCore/templates/default/containers/settings.html
index 7f15cd4..0abbd7c 100644
--- a/SWSCloudCore/templates/default/containers/settings.html
+++ b/SWSCloudCore/templates/default/containers/settings.html
@@ -9,37 +9,27 @@
         </div>
     </div>
     <div class="row">
-        {% if g.errors['total'] > 0 %}
-            <div class="large-12 columns">
-                {% for error in g.errors['items'] %}
-                    <div class="alert-box alert">
-                        {{ error }}
-                    </div>
-                {% endfor %}
-            </div>
-        {% else %}
-            <div class="large-12 columns">
-                <h4>Статус</h4>
-                {% if container.status == 0 %}
-                    <p style="color: red">Неактивен</p>
-                {% else %}
-                    <p style="color: green">Активен</p>
-                {% endif %}
-                <form action="{{ url_for('containers.settings', container_id=container.id) }}" method="post">
-                    <input type="hidden" name="action" value="set_status">
-                    <div class="input-group">
-                        <select name="status">
-                            <option value="active">Активировать</option>
-                            <option value="inactive">Деактивировать</option>
-                        </select>
-                    </div>
-                    <input type="submit" value="Изменить статус" class="button success small">
-                </form>
-                <h4>Удалить</h4>
-                <a href="{{ url_for('containers.delete', container_id=container.id) }}">
-                    <button class="button alert">Удалить</button>
-                </a>
-            </div>
-        {% endif %}
+        <div class="large-12 columns">
+            <h4>Статус</h4>
+            {% if container.status == 0 %}
+                <p style="color: red">Неактивен</p>
+            {% else %}
+                <p style="color: green">Активен</p>
+            {% endif %}
+            <form action="{{ url_for('containers.settings', container_id=container.id) }}" method="post">
+                <input type="hidden" name="action" value="set_status">
+                <div class="input-group">
+                    <select name="status">
+                        <option value="active">Активировать</option>
+                        <option value="inactive">Деактивировать</option>
+                    </select>
+                </div>
+                <input type="submit" value="Изменить статус" class="button success small">
+            </form>
+            <h4>Удалить</h4>
+            <a href="{{ url_for('containers.delete', container_id=container.id) }}">
+                <button class="button alert">Удалить</button>
+            </a>
+        </div>
     </div>
 {% endblock %}
diff --git a/SWSCloudCore/templates/default/id/api.html b/SWSCloudCore/templates/default/id/api.html
index 0767aa8..bab18c9 100644
--- a/SWSCloudCore/templates/default/id/api.html
+++ b/SWSCloudCore/templates/default/id/api.html
@@ -19,16 +19,6 @@
 
     <div class="row">
         <div class="large-12 columns">
-            {% if g.errors['total'] > 0 %}
-                <div class="alert-box alert">
-                    <ul>
-                    {% for error in g.errors['items'] %}
-                        <li>{{ error }}</li>
-                    {% endfor %}
-                    </ul>
-                </div>
-            {% endif %}
-
             <form action="{{ url_for('account.api_update') }}" method="post">
                 <input type="hidden" name="method" value="secret_update" />
                 <label>
diff --git a/SWSCloudCore/templates/default/id/edit.html b/SWSCloudCore/templates/default/id/edit.html
index ba2466d..329b89a 100644
--- a/SWSCloudCore/templates/default/id/edit.html
+++ b/SWSCloudCore/templates/default/id/edit.html
@@ -14,13 +14,6 @@
         <h3>Учётная запись</h3>
     </div>
     <div class="large-12 columns">
-        {% if g.errors['total'] > 0 %}
-            <div class="alert-box alert">
-                <ul>
-                {% for error in g.errors['items'] %}<li>{{ error }}</li>{% endfor %}
-                </ul>
-            </div>
-        {% endif %}
         {% include "default/id/_account_information_edit.html" %}
     </div>
 </div>
diff --git a/SWSCloudCore/templates/default/id/login.html b/SWSCloudCore/templates/default/id/login.html
index 26507d9..a23f806 100644
--- a/SWSCloudCore/templates/default/id/login.html
+++ b/SWSCloudCore/templates/default/id/login.html
@@ -10,13 +10,6 @@
     </div>
     <div class="row">
         <div class="large-12 columns">
-            {% if g.errors['total'] > 0 %}
-                <div data-alert class="alert-box alert">
-                    {% for error in g.errors['items'] %}
-                        {{ error }}
-                    {% endfor %}
-                </div>
-            {% endif %}
             <form action="{{ url_for('account.login') }}" method="post">
                 <input type="hidden" name="method" value="login" />
                 <label>
diff --git a/SWSCloudCore/templates/default/id/password_reset_step1.html b/SWSCloudCore/templates/default/id/password_reset_step1.html
index d8113b6..88c46a9 100644
--- a/SWSCloudCore/templates/default/id/password_reset_step1.html
+++ b/SWSCloudCore/templates/default/id/password_reset_step1.html
@@ -6,13 +6,6 @@
     <div class="row">
         <div class="large-12 columns">
             <h2>Восстановление пароля</h2>
-            {% if g.errors['total'] > 0 %}
-                <div data-alert class="alert-box alert">
-                    {% for error in g.errors['items'] %}
-                        {{ error }}
-                    {% endfor %}
-                </div>
-            {% endif %}
             <form action="{{ url_for('account.password_reset') }}" method="post">
                 <label for="email">
                     Адрес е.почты
diff --git a/SWSCloudCore/templates/default/id/password_reset_step2.html b/SWSCloudCore/templates/default/id/password_reset_step2.html
index 414bd1b..b936020 100644
--- a/SWSCloudCore/templates/default/id/password_reset_step2.html
+++ b/SWSCloudCore/templates/default/id/password_reset_step2.html
@@ -6,13 +6,6 @@
     <div class="row">
         <div class="large-12 columns">
             <h2>Сброс пароля. Шаг №2</h2>
-            {% if g.errors['total'] > 0 %}
-                <div data-alert class="alert-box alert">
-                    {% for error in g.errors['items'] %}
-                        {{ error }}
-                    {% endfor %}
-                </div>
-            {% endif %}
             <form action="{{ url_for('account.password_reset_step2') }}" method="post">
                 <input type="hidden" name="recovery" value="1" />
                 <label for='email'>
diff --git a/SWSCloudCore/templates/default/id/password_update.html b/SWSCloudCore/templates/default/id/password_update.html
index f66dcff..4f69cc9 100644
--- a/SWSCloudCore/templates/default/id/password_update.html
+++ b/SWSCloudCore/templates/default/id/password_update.html
@@ -16,13 +16,6 @@
             <h3>Смена пароля</h3>
         </div>
         <div class="large-12 columns">
-            {% if g.errors['total'] > 0 %}
-                <div data-alert class="alert-box alert">
-                    {% for error in g.errors['items'] %}
-                        {{ error }}
-                    {% endfor %}
-                </div>
-            {% endif %}
             <form action="{{ url_for('account.password_update') }}" method="post">
                 <label>
                     Старый пароль
diff --git a/SWSCloudCore/templates/default/id/registration.html b/SWSCloudCore/templates/default/id/registration.html
index 7d01a30..0745d93 100644
--- a/SWSCloudCore/templates/default/id/registration.html
+++ b/SWSCloudCore/templates/default/id/registration.html
@@ -6,15 +6,6 @@
     <div class="row">
         <div class="large-6 columns">
             <h2>Регистрация</h2>
-            {% if g.errors['total'] > 0  %}
-                <div id='errors'>
-                    <ul>
-                        {% for error in g.errors['items'] %}
-                            <li>{{ error }}</li>
-                        {% endfor %}
-                    </ul>
-                </div>
-            {% endif %}
             <form action="{{ url_for('account.registration') }}" method="post">
                 <input type="hidden" name="method" value="member_add" />
                 <label for="email">
@@ -29,8 +20,6 @@
                     Пароль (повторно)
                     <input type="password" name="password2" value="" id="password2" />
                 </label>
-    {#            <input type="checkbox" name="agree1" value="1" /> I agree <a href="">&Prime;Terms of Service&Prime;</a><br/>#}
-    {#            <input type="checkbox" name="agree2" value="1" /> I agree <a href="">&Prime;Privacy Policy&Prime;</a><br/>#}
                 <input type="submit" value="Зарегистрироваться" class="button success" />
             </form>
         </div>