]> git.agnieray.net Git - galette.git/commitdiff
Messages refine
authorGuillaume AGNIERAY <dev@agnieray.net>
Tue, 28 Feb 2023 10:50:41 +0000 (11:50 +0100)
committerJohan Cwiklinski <johan@x-tnd.be>
Wed, 1 Mar 2023 06:54:26 +0000 (07:54 +0100)
12 files changed:
galette/templates/default/elements/edit_entitleds.html.twig
galette/templates/default/elements/messages_inline.html.twig
galette/templates/default/modals/plugin_initdb.html.twig
galette/templates/default/pages/admintools.html.twig
galette/templates/default/pages/export.html.twig
galette/templates/default/pages/groups_list.html.twig
galette/templates/default/pages/import.html.twig
galette/templates/default/pages/mailing_form.html.twig
galette/templates/default/pages/members_public_gallery.html.twig
galette/templates/default/pages/members_public_list.html.twig
galette/templates/default/pages/password_recover.html.twig
galette/templates/default/pages/preferences.html.twig

index 404b93ecae617fe7b926352259a250a72c32ea32..4b8fa620b6b31096943769597c371c3e8e8b1eea 100644 (file)
@@ -1,5 +1,10 @@
 {% if class == 'Status' %}
-    <div class="ui blue message">{{ _T("Note: members with a status priority lower than %priority are staff members.")|replace({'%priority': non_staff_priority}) }}</div>
+    <div class="ui icon info visible message">
+        <i class="info circle blue icon"></i>
+        <div class="content">
+            {{ _T("Note: members with a status priority lower than %priority are staff members.")|replace({'%priority': non_staff_priority}) }}
+        </div>
+    </div>
 {% endif %}
     <div class="ui basic fitted segment loader_selector">
         <table class="listing ui celled striped table">
index 6c7e4597ac9f20eb5efe58fd2f458815fc14f956..159fbf747268e9653e2290c09578054f800fe5ea 100644 (file)
@@ -43,7 +43,7 @@
 {% endif %}
 {% if warnings is iterable and warnings|length > 0 %}
     <div class="ui warning icon message with-transition">
-        <i class="exclamation icon"></i>
+        <i class="exclamation triangle icon"></i>
         <i class="window close outline icon"></i>
         <div class="content">
             <div class="header">{{ _T("- WARNING -") }}</div>
index 5bf9702e3cc7707b8013fc8835fd3c21acb91661..d0272e0c145d9d95d5d75d90965c97a9f7870764 100644 (file)
                         <ul>
                             <li>{{ _T("you already have installed %name, and you want to upgrade to the latest version")|replace({'%name': plugin.name}) }}.</li>
                         </ul>
-                        <p class="ui orange message">{{ _T("Warning: Don't forget to backup your current database.") }}</p>
+                        <div class="ui icon yellow icon message">
+                            <i class="exclamation triangle icon"></i>
+                            <div class="content">
+                                {{ _T("Warning: Don't forget to backup your current database.") }}
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
index 6d748fc63f5762c716744c4df8aafbbf23b049d0..acccb61da4d1fbd656207004a80e4c2c014c038f 100644 (file)
@@ -2,7 +2,12 @@
 
 {% block content %}
     <form action="{{ url_for('doAdminTools') }}" method="post" class="ui form">
-        <div class="ui orange message">{{ _T("Make sure you've done a backup of the database before using any of the following tools!") }}</div>
+        <div class="ui icon yellow icon message with-transition">
+            <i class="exclamation triangle icon"></i>
+            <div class="content">
+                {{ _T("Make sure you've done a backup of the database before using any of the following tools!") }}
+            </div>
+        </div>
         <div class="ui top attached accordion-styled header">
             {{ _T('Select actions(s)') }}
         </div>
index bc707e58d645a5bffa4e5fe4d6d0106fe049ccaa..c600673c8eb6ddd9f52962ea3cbb44649ddfa168 100644 (file)
@@ -1,19 +1,27 @@
 {% extends 'page.html.twig' %}
 
 {% block content %}
+        <div class="ui icon info visible message">
+            <i class="info circle blue icon"></i>
+            <div class="content">
+                {{ _T("Each selected export will be stored into a separate file in the exports directory.") }}
+            </div>
+        </div>
         <form class="form" action="{{ url_for("doExport") }}" method="post" enctype="multipart/form-data">
-        <div class="ui orange message">{{ _T("Each selected export will be stored into a separate file in the exports directory.") }}</div>
 
 {% set written_exports = flash.getMessage('written_exports') %}
 
 {% if written is iterable and written|length > 0 %}
-        <div class="ui success message">
-            <p>{{ _T('The following files have been written on disk:') }}</p>
-            <ul>
+        <div class="ui icon success visible message with-transition">
+            <i class="download icon"></i>
+            <div class="content">
+                <p>{{ _T('The following files have been written on disk:') }}</p>
+                <ul>
     {% for ex in written %}
-                <li>{{ ex }}</li>
+                    <li>{{ ex|raw }}</li>
     {% endfor %}
-            </ul>
+                </ul>
+            </div>
         </div>
 {% endif %}
 
index a34b292266c3163b011d321fc5960dab234c1ff5..cd22e91252f10e6ca6654f97d736d46703cec6ac 100644 (file)
                         loader: "button"
                     } %},
                     success: function(res){
-                        var _modified = '<div class="ui orange message with-transition"><div class="content">{{ _T("Items in this list have been modified. Don't forget to save your changes.")|e('js') }}</div></div>';
+                        var _modified = '<div class="ui icon yellow small message with-transition"><i class="exclamation triangle icon"></i><div class="content">{{ _T("Items in this list have been modified. Don't forget to save your changes.")|e('js') }}</div></div>';
                         _container.find('.message').remove();
                         if ( res != 0 ) {
                             _container.find('.loader_selector').remove();
                         }
                         $('.members-selection').modal('hide');
                         $('.message.with-transition').transition('flash');
-;
                     },
                     error: function() {
                         {% include "elements/js/modal.js.twig" with {
index a4ffbae97a2c9d04690dc4b52f2741d6df5a9dd9..fa34a351e4da59be1dd0dbd11b777f5738b0d82d 100644 (file)
@@ -1,17 +1,12 @@
 {% extends 'page.html.twig' %}
 
 {% block content %}
-        <div class="ui basic horizontal segments">
-            <div class="ui basic fitted segment">
-                <a
-                    href="{{ url_for('importModel') }}"
-                    class="ui labeled icon button"
-                >
-                    <i class="cogs icon" aria-hidden="true"></i>
-                    {{ _T('Configure import model') }}
-                </a>
+            <div class="ui icon yellow icon message with-transition">
+                <i class="exclamation triangle icon"></i>
+                <div class="content">
+                    {{ _T("Warning: Don't forget to backup your current database.") }}
+                </div>
             </div>
-        </div>
             <div class="ui basic fitted segment">
                 <div class="ui styled fluid accordion row">
                     <div class="active title">
@@ -20,9 +15,6 @@
                     </div>
                     <div class="active content field">
                         <form class="ui form" action="{{ url_for('doImport') }}" method="post">
-                            <div class="ui yellow message">
-                                {{ _T("Warning: Don't forget to backup your current database.") }}
-                            </div>
 {% if existing|length > 0 %}
                             <p>{{ _T('The following files seems ready to import on the disk:') }}</p>
                             <table class="listing ui celled striped table">
                     </div>
                 </div>
             </div>
-            <div class="ui basic fitted segment">
-                <div class="ui styled fluid accordion row">
-                    <div class="active title">
-                        <i class="jsonly displaynone icon dropdown"></i>
-                        {{ _T('Upload new file') }}
-                    </div>
-                    <div class="active content field">
-                        <form class="ui form" action="{{ url_for('uploadImportFile') }}" method="post" enctype="multipart/form-data">
+            <form class="ui form" action="{{ url_for('uploadImportFile') }}" method="post" enctype="multipart/form-data">
+                <div class="ui basic fitted segment">
+                    <div class="ui styled fluid accordion row">
+                        <div class="active title">
+                            <i class="jsonly displaynone icon dropdown"></i>
+                            {{ _T('Upload new file') }}
+                        </div>
+                        <div class="active content field">
                             <div class="field">
                                 <div class="ui file action input">
                                     <input type="file" name="new_file" accept="text/csv" id="new_file"/>
                                         {{ _T('Choose a file') }}
                                     </label>
                                 </div>
-
-
                             </div>
-                            <div class="ui basic center aligned segment">
-                                <button type="submit" name="upload" id="upload" class="ui labeled icon button">
-                                    <i class="upload blue icon" aria-hidd="true"></i>
-                                    {{ _T('Upload file') }}
-                                </button>
-                                {% include "components/forms/csrf.html.twig" %}
-                            </div>
-                        </form>
+                        </div>
                     </div>
                 </div>
-            </div>
+                <div class="ui basic center aligned segment">
+                    <button type="submit" name="upload" id="upload" class="ui primary labeled icon button">
+                        <i class="upload icon" aria-hidd="true"></i>
+                        {{ _T('Upload file') }}
+                    </button>
+                    <a
+                        href="{{ url_for('importModel') }}"
+                        class="ui labeled icon button"
+                    >
+                        <i class="cogs icon" aria-hidden="true"></i>
+                        {{ _T('Configure import model') }}
+                    </a>
+                    {% include "components/forms/csrf.html.twig" %}
+                </div>
+            </form>
 {% endblock %}
 
 {% block javascripts %}
index 79d1aff35212d6c57ed6673a1f0c4d1fdeab08d6..ab8f8f21456445e3e4fe30c2b0f94c29e625283b 100644 (file)
@@ -2,9 +2,11 @@
 
 {% block content %}
 {% if preferences.pref_mail_method == constant('Galette\\Core\\Mailing::METHOD_DISABLED') and constant('GALETTE_MODE') != 'DEMO' %}
-        <div id="errorbox" class="ui red message">
-            <h1>{{ _T("- ERROR -") }}</h1>
-            <p>{{ _T("Email sent is disabled in the preferences. Ask galette admin") }}</p>
+        <div id="errorbox" class="ui negative icon message">
+            <i class="ban icon"></i>
+            <div class="content">
+                <p>{{ _T("Email sent is disabled in the preferences. Ask galette admin") }}</p>
+            </div>
         </div>
 {% elseif mailing_saved is not defined %}
         <form action="{{ url_for('doMailing') }}" id="listform" method="post" enctype="multipart/form-data" class="ui form">
index 88fd27b01ad7adb79f14c798a04301e9ffc882fc..bd1ce93c74fb72a4eb6454ca61278aee844b0559 100644 (file)
@@ -1,13 +1,13 @@
 {% extends 'public_page.html.twig' %}
 
 {% block content %}
-{% if members|length > 0 %}
-        <div class="ui icon yellow small message">
-            <i class="info circle icon"></i>
+        <div class="ui icon info visible message">
+            <i class="info circle blue icon"></i>
             <div class="content">
                 {{ _T("This page shows only members who have choosen to be visible on the public lists and are up-to-date within their contributions. If you want your account to be visible here, edit your profile and check 'Be visible in the members list'") }}
             </div>
         </div>
+{% if members|length > 0 %}
         <form action="{{ url_for("filterPublicList", {"type": "trombi"}) }}" method="POST" class="ui form">
             <div class="infoline">
                 <div class="ui basic horizontal segments">
             </div>
         </div>
 {% else %}
-    <div class="ui icon info small message">
-        <i class="info icon"></i>
+    <div class="ui small message">
         <div class="content">
-            <div class="header">
-                {{ _T('No member to show') }}
-            </div>
+            <em>{{ _T('No member to show') }}</em>
         </div>
     </div>
 {% endif %}
index 78017506233626a68f8ba995cdc9212233c15e01..c6c76c10a498ca4468d5a4c909c3d713e10739ce 100644 (file)
@@ -46,8 +46,8 @@
 {% endblock %}
 
 {% block search %}
-    <div class="ui icon yellow small message">
-        <i class="info circle icon"></i>
+    <div class="ui icon info visible message">
+        <i class="info circle blue icon"></i>
         <div class="content">
             {{ _T("This page shows only members who have choosen to be visible on the public lists and are up-to-date within their contributions. If you want your account to be visible here, edit your profile and check 'Be visible in the members list'") }}
         </div>
         </tr>
     {% else %}
         <tr>
-            <td colspan="4">
-                <div class="ui icon info small message">
-                    <i class="info icon"></i>
-                    <div class="content">
-                        <div class="header">
-                            {{ _T('No member to show') }}
-                        </div>
-                    </div>
-                </div>
+            <td class="emptylist" colspan="4">
+                {{ _T('No member to show') }}
             </td>
         </tr>
     {% endfor %}
index 9ca9b2e0aa2838da173f8fd3125cb569d0ec5caa..5c6df08df679eaad5cff54ba62e419687dfe744c 100644 (file)
@@ -5,6 +5,7 @@
 {% block content %}
         <form action="{{ url_for('do-password-recovery') }}" method="post" enctype="multipart/form-data" class="ui form">
             <div class="ui segment">
+                <p class="ui yellow small message"><i class="exclamation triangle icon"></i> {{ _T('(at least 4 characters)') }}</p>
                 <div class="field">
                     <div class="ui left icon input">
                         <i class="lock icon"></i><span class="displaynone"><label for="mdp_adh">{{ _T('New password:') }}</label></span>
@@ -17,7 +18,6 @@
                         <input type="password" name="mdp_adh2" id="mdp_adh2" value="" required="required" placeholder="{{ _T('Confirmation:') }}"/>
                     </div>
                 </div>
-                <p class="ui orange center aligned message">{{ _T('(at least 4 characters)') }}</p>
                 <input type="submit" name="change_passwd" value="{{ _T('Change my password') }}" class="ui fluid large primary submit button"/>
                 <input type="hidden" name="hash" value="{{ hash }}"/>
                 {% include "components/forms/csrf.html.twig" %}
index 547ca607b962f32d398ddae304070a53aefa72f9..19b325d0f5a3b41b112acd63a3b74591ab789a7c 100644 (file)
             </div>
         </div>{# /tab segment #}
         <div class="ui{{ tab == 'mail' ? ' active' }} tab segment" data-tab="mail">
-            <div class="ui stackable two column grid">
-                <div class="column">
     {% if constant('GALETTE_MODE') == constant('\\Galette\\Core\\Galette::MODE_DEMO') %}
-                    <div class="ui negative message">
-                        <p>{{ _T("Application runs under demo mode. This functionnality is not enabled, sorry.") }}</p>
-                    </div>
+            <div class="ui icon negative message">
+                <i class="ban icon"></i>
+                <div class="content">
+                    {{ _T("Application runs under demo mode. This functionnality is not enabled, sorry.") }}
+                </div>
+            </div>
     {% else %}
+            <div class="ui stackable two column grid">
+                <div class="column">
                     <div class="field">
                         <label for="pref_email_nom">{{ _T("Sender name:") }}</label>
                         <input type="text" name="pref_email_nom" id="pref_email_nom" value="{{ pref.pref_email_nom }}" maxlength="50"{% if required.pref_email_nom is defined and required.pref_email_nom == 1 %} required="required"{% endif %}/>
                             <input type="password" name="pref_mail_smtp_password" id="pref_mail_smtp_password" value="{{ pref.pref_mail_smtp_password }}" autocomplete="off" maxlength="100" size="30"{% if required.pref_mail_smtp_password is defined and required.pref_mail_smtp_password == 1 %} required="required"{% endif %}/>
                         </div>
                     </div>
-    {% endif %}
                 </div>{# /column #}
             </div>{# /column grid #}
+    {% endif %}
         </div>{# /tab segment #}
         <div class="ui{{ tab == 'labels' ? ' active' }} tab segment" data-tab="labels">
             <div class="ui two column grid">
             </div>{# /column grid #}
         </div>{# /tab segment #}
         <div class="ui{{ tab == 'cards' ? ' active' }} tab segment" data-tab="cards">
-            <div class="ui message">
-                <p>{{ _T("Each card is 75mm width and 40mm height. Each page contains 2 columns and 6 rows.<br/>Double check margins and spacings ;)") }}</p>
+            <div class="ui icon info visible message">
+                <i class="info circle blue icon"></i>
+                <div class="content">
+                    {{ _T("Each card is 75mm width and 40mm height. Each page contains 2 columns and 6 rows.<br/>Double check margins and spacings ;)")|raw }}
+                </div>
             </div>
             <div class="ui two column grid">
                 <div class="column">
 {% if login.isSuperAdmin() %}
         <div class="ui{{ tab == 'admin' ? ' active' }} tab red segment" data-tab="admin">
     {% if constant('GALETTE_MODE') == constant('\\Galette\\Core\\Galette::MODE_DEMO') %}
-                <div class="ui negative message">
-                    {{ _T("Application runs under demo mode. This functionnality is not enabled, sorry.") }}
+                <div class="ui icon negative message">
+                    <i class="ban icon"></i>
+                    <div class="content">
+                        {{ _T("Application runs under demo mode. This functionnality is not enabled, sorry.") }}
+                    </div>
                 </div>
     {% else %}
                 <div class="inline field">