Make form messages dismissable

modules/installed/apps/templates/owncloud.html

@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <form class="form" method="post">
     {% csrf_token %}

modules/installed/router/templates/pagekite_configure.html

@@ -31,9 +31,7 @@
 
 {% else %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <form class="form" method="post">
     {% csrf_token %}

modules/installed/router/templates/router_setup.html

@@ -24,9 +24,7 @@
 
   <h3>WAN Connection</h3>
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <form class="form" method="post">
     {% csrf_token %}

modules/installed/services/templates/xmpp_configure.html

@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <form class="form" method="post">
     {% csrf_token %}

modules/installed/services/templates/xmpp_register.html

@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <form class="form" method="post">
     {% csrf_token %}

modules/installed/system/templates/config.html

@@ -24,9 +24,7 @@
 
 {% if  cfg.users.expert %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <form class="form" method="post">
     {% csrf_token %}

modules/installed/system/templates/expert_mode.html

@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <p>The {{ cfg.box_name }} can be administered in two modes, 'basic'
   and 'expert'.  Basic mode hides a lot of features and configuration

modules/installed/system/templates/packages.html

@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <p>aptitude purge modules</p>
 

modules/installed/system/templates/users_add.html

@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <form class="form" method="post">
     {% csrf_token %}

modules/installed/system/templates/users_edit.html

@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <form class="form" method="post">
     {% csrf_token %}

modules/installed/system/templates/wan.html

@@ -24,9 +24,7 @@
 
 {% if  cfg.users.expert %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <p>For security reasons, neither WAN Administration nor WAN SSH is
     available to the `admin` user account.</p>

modules/installed/templates/firstboot_state0.html

@@ -24,9 +24,7 @@
 
   <h2>Welcome to Your FreedomBox!</h2>
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <p>Welcome.  It looks like this FreedomBox isn't set up yet.  We'll
     need to ask you a just few questions to get started.</p>

templates/form.html

@@ -22,9 +22,7 @@
 
 {% block main_block %}
 
-  {% for severity, message in messages %}
+  {% include 'messages.html' %}
-    <div class='alert alert-{{ severity }}'>{{ message }}</div>
-  {% endfor %}
 
   <form class="form" method="post">
     {% csrf_token %}

templates/messages.html

@@ -0,0 +1,25 @@
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+{% endcomment %}
+
+{% for severity, message in messages %}
+  <div class='alert alert-{{ severity }} alert-dismissable'>
+    <a class="close" data-dismiss="alert">&times;</a>
+    {{ message }}
+  </div>
+{% endfor %}