Few buttons fixes

Use FA for installation buttons
Use FA for mailing buttons
Fix mailing nojs preview
Remove useless images and css rules
HTML buttons were not handled as UI buttons

diff --git a/galette/install/steps/db.php b/galette/install/steps/db.php
index 6e1ad7d91c7c1eb51b18a8f8156e349ca8e2a0bd..cdc4220fc2be2da4befbbdf54a61016f0f2c7f1a 100644 (file)
--- a/galette/install/steps/db.php
+++ b/galette/install/steps/db.php
@@ -107,8 +107,8 @@ if ($install->isUpgrade()) {
                     </div>
                 </fieldset>
                 <p id="btn_box">
-                    <input id="next_btn" type="submit" value="<?php echo _T("Next step"); ?>"/>
-                    <input type="submit" id="btnback" name="stepback_btn" value="<?php echo _T("Back"); ?>" formnovalidate/>
+                    <button id="next_btn" type="submit"><?php echo _T("Next step"); ?> <i class="fas fa-forward"></i></button>
+                    <button type="submit" id="btnback" name="stepback_btn" formnovalidate><i class="fas fa-backward"></i> <?php echo _T("Back"); ?></button>
                 </p>
             </form>
             <script type="text/javascript">

diff --git a/galette/install/steps/db_checks.php b/galette/install/steps/db_checks.php
index 2fb3d3e6064f47397700e4b2577c3ed1f4911c8f..7bf754a0b27ff7377636d7a852222136fb042997 100644 (file)
--- a/galette/install/steps/db_checks.php
+++ b/galette/install/steps/db_checks.php
@@ -238,7 +238,7 @@ if (!isset($install_plugin)) {
 ?>
             <form action="installer.php" method="POST">
                 <p id="btn_box">
-                    <input id="next_btn" type="submit" value="<?php echo _T("Next step"); ?>"<?php if (!$conndb_ok || !$permsdb_ok) { echo ' disabled="disabled"'; } ?>/>
+                    <button id="next_btn" type="submit"<?php if (!$conndb_ok || !$permsdb_ok) { echo ' disabled="disabled"'; } ?>><?php echo _T("Next step"); ?> <i class="fas fa-forward"></i></button>
 <?php
 if ($conndb_ok && $permsdb_ok) {
     ?>
@@ -247,7 +247,7 @@ if ($conndb_ok && $permsdb_ok) {
     <?php
 }
 ?>
-                    <input type="submit" id="btnback" name="stepback_btn" value="<?php echo _T("Back"); ?>"/>
+                    <button type="submit" id="btnback" name="stepback_btn" formnovalidate><i class="fas fa-backward"></i> <?php echo _T("Back"); ?></button>
                 </p>
             </form>
 <?php

diff --git a/galette/install/steps/db_install.php b/galette/install/steps/db_install.php
index c2d478cc62fef911fb7255c4d66a3d89b426579d..ba623fe1accbfbd5d0179458e79f43f9b223759f 100644 (file)
--- a/galette/install/steps/db_install.php
+++ b/galette/install/steps/db_install.php
@@ -79,7 +79,7 @@ if (!$db_installed) {
 }
 ?>
 
-                        <input id="next_btn" type="submit" value="<?php echo _T("Next step"); ?>"<?php if (!$db_installed) { echo ' disabled="disabled"'; } ?>/>
+                        <button id="next_btn" type="submit"<?php if (!$db_installed) { echo ' disabled="disabled"'; } ?>><?php echo _T("Next step"); ?> <i class="fas fa-forward"></i></button>
 <?php
 if ($db_installed) {
     ?>
@@ -90,7 +90,7 @@ if ($db_installed) {
 if (!$db_installed) {
     //once DB is installed, that does not make sense to go back
     ?>
-                        <input type="submit" id="btnback" name="stepback_btn" value="<?php echo _T("Back"); ?>"/>
+                        <button type="submit" id="btnback" name="stepback_btn" formnovalidate><i class="fas fa-backward"></i> <?php echo _T("Back"); ?></button>
     <?php
 }
 ?>

diff --git a/galette/install/steps/db_select_version.php b/galette/install/steps/db_select_version.php
index 0f2b0e3caa57797b8d7a904220bf003732b28067..93abbbc35283ea3a09811f42270ba9328eb63d59 100644 (file)
--- a/galette/install/steps/db_select_version.php
+++ b/galette/install/steps/db_select_version.php
@@ -58,7 +58,7 @@ if (count($versions) == 0) {
 ?>
                 <p id="btn_box">
                     <input id="logout" type="submit" name="abort_btn" value="<?php echo _T("Cancel"); ?>"/>
-                    <input type="submit" id="btnback" name="stepback_btn" value="<?php echo _T("Back"); ?>" formnovalidate/>
+                    <button type="submit" id="btnback" name="stepback_btn" formnovalidate><i class="fas fa-backward"></i> <?php echo _T("Back"); ?></button>
                 </p>
 
 <?php
@@ -131,8 +131,8 @@ if (count($versions) == 0) {
                     </ul>
                 </fieldset>
                 <p id="btn_box">
-                    <input id="next_btn" type="submit" value="<?php echo _T("Next step"); ?>"/>
-                    <input type="submit" id="btnback" name="stepback_btn" value="<?php echo _T("Back"); ?>" formnovalidate/>
+                    <button id="next_btn" type="submit"><?php echo _T("Next step"); ?> <i class="fas fa-forward"></i></button>
+                    <button type="submit" id="btnback" name="stepback_btn" formnovalidate><i class="fas fa-backward"></i> <?php echo _T("Back"); ?></button>
                 </p>
     <?php
 }

diff --git a/galette/install/steps/galette.php b/galette/install/steps/galette.php
index fff3d9e45eb5a9781fc8668e16bf7b7a962e5eb0..7a11ca5010334ba75b4ccb69b50b907789e2a28d 100644 (file)
--- a/galette/install/steps/galette.php
+++ b/galette/install/steps/galette.php
@@ -78,7 +78,7 @@ if (!$config_file_ok || !$objects_ok) {
 }
 ?>
 
-                        <input id="next_btn" type="submit" value="<?php echo _T("Next step"); ?>"<?php if (!$config_file_ok || !$objects_ok) { echo ' disabled="disabled"'; } ?>/>
+                        <button id="next_btn" type="submit"<?php if (!$config_file_ok || !$objects_ok) { echo ' disabled="disabled"'; } ?>><?php echo _T("Next step"); ?> <i class="fas fa-forward"></i></button>
 <?php
 if ($config_file_ok && $objects_ok) {
     ?>
@@ -89,7 +89,7 @@ if ($config_file_ok && $objects_ok) {
 if (!$config_file_ok || !$objects_ok) {
     //once DB is installed, that does not make sense to go back
     ?>
-                        <input type="submit" id="btnback" name="stepback_btn" value="<?php echo _T("Back"); ?>"/>
+                        <button type="submit" id="btnback" name="stepback_btn" formnovalidate><i class="fas fa-backward"></i> <?php echo _T("Back"); ?></button>
     <?php
 }
 ?>

diff --git a/galette/install/steps/type.php b/galette/install/steps/type.php
index 91f78d485a84b2575bc77f4c24fc84a9a821277c..361dd3d18d270385aa6cde28fcb71d5571583c31 100644 (file)
--- a/galette/install/steps/type.php
+++ b/galette/install/steps/type.php
@@ -62,7 +62,7 @@ use Galette\Core\Install as GaletteInstall;
                     </div>
 
                     <p id="btn_box">
-                        <input id="next_btn" type="submit" value="<?php echo _T("Next step"); ?>"/>
-                        <input type="submit" id="btnback" name="stepback_btn" value="<?php echo _T("Back"); ?>"/>
+                        <button id="next_btn" type="submit"><?php echo _T("Next step"); ?> <i class="fas fa-forward"></i></button>
+                        <button type="submit" id="btnback" name="stepback_btn" formnovalidate><i class="fas fa-backward"></i> <?php echo _T("Back"); ?></button>
                     </p>
                 </form>

diff --git a/galette/lib/Galette/Controllers/Crud/MailingsController.php b/galette/lib/Galette/Controllers/Crud/MailingsController.php
index 1581142d5b3467598a2c221c9d5f0b3bb1160e0b..bfa7ae9af5b8738ef92a718fb79f4bcb44cbde0a 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/MailingsController.php
+++ b/galette/lib/Galette/Controllers/Crud/MailingsController.php
@@ -225,8 +225,7 @@ class MailingsController extends CrudController
         $success_detected = [];
 
         $goto = $this->router->pathFor('mailings');
-        $redirect_url = ($this->session->redirect_mailing !== null) ?
-            $this->session->redirect_mailing : $this->router->pathFor('members');
+        $redirect_url = $this->session->redirect_mailing ?? $this->router->pathFor('members');
 
         //We're done :-)
         if (
@@ -373,6 +372,8 @@ class MailingsController extends CrudController
                 } else {
                     $mailing->current_step = Mailing::STEP_START;
                 }
+                //until mail is sent (above), we redirect to mailing page
+                $goto = $this->router->pathFor('mailing');
             }
 
             if (isset($post['mailing_confirm']) && count($error_detected) == 0) {

diff --git a/galette/templates/default/mailing_adherents.tpl b/galette/templates/default/mailing_adherents.tpl
index 8aeffa31410eaf40e307a3550b09cdbd67a9146f..ba917d96dcfb54be32c3bdf93fbeead14aa56820 100644 (file)
--- a/galette/templates/default/mailing_adherents.tpl
+++ b/galette/templates/default/mailing_adherents.tpl
@@ -119,9 +119,19 @@
                 </div>
                 <div>
                     <p>
-                        <input type="submit" name="mailing_reset" class="button" id="btnback" value="{_T string="Modifiy mailing"}"/>
-                        <input type="submit" name="mailing_confirm" id="btnsend" value="{_T string="Send"}"{if $GALETTE_MODE eq 'DEMO'} class="disabled" disabled="disabled"{/if}/>
-                        <input type="submit" id="btncancel" name="mailing_cancel" value="{_T string="Cancel mailing"}"/>
+                        <button type="submit" name="mailing_reset">
+                            <i class="fas fa-backward"></i>
+                            {_T string="Modifiy mailing"}
+                        </button>
+                        <button type="submit" name="mailing_confirm"{if $GALETTE_MODE eq 'DEMO'} class="disabled" disabled="disabled"{/if}>
+                            <i class="fas fa-rocket" aria-hidden="true"></i>
+                            {_T string="Send"}
+                        </button>
+                        <button type="submit" name="mailing_cancel" formnovalidate>
+                            <i class="fas fa-trash" aria-hidden="true"></i>
+                            {_T string="Cancel mailing"}
+                        </button>
+
                         <input type="hidden" name="mailing_objet" value="{$mailing->subject}"/>
                         <input type="hidden" name="mailing_corps" value="{$mailing->message|escape}"/>
                     </p>

diff --git a/galette/templates/default/plugin_initdb.tpl b/galette/templates/default/plugin_initdb.tpl
index b3b7247528ceb0186feedd1bde3fc5bb9adecf99..c09d3cd83841dce92ea5200407917e2621ab6690 100644 (file)
--- a/galette/templates/default/plugin_initdb.tpl
+++ b/galette/templates/default/plugin_initdb.tpl
@@ -113,13 +113,13 @@
     {if $error_detected|@count > 0}
             <input type="submit" value="{_T string="Retry"}"/>
     {else}
-            <input id="next" type="submit" value="{_T string="Next step"}"/>
+            <button id="next" type="submit">{_T string="Next step"} <i class="fas fa-forward"></i></button>
     {/if}
 {else}
     {if $mode eq 'ajax'}
             <a href="#" class="button" id="btnback">{_T string="Close"}</a>
     {else}
-            <a href="{path_for name="plugins"}" class="button" id="btnback">{_T string="Back to plugins managment page"}</a>
+            <a href="{path_for name="plugins"}" class="button" id="btnback"><i class="fas fa-backward"></i> {_T string="Back to plugins managment page"}</a>
     {/if}
 {/if}
         </p>

diff --git a/galette/webroot/js/common.js b/galette/webroot/js/common.js
index 8cd53538f7bd92a0fd2bbab70661e76169b916b1..ad4c5a6b67ce94e3b765c22d6d776b7215334df8 100644 (file)
--- a/galette/webroot/js/common.js
+++ b/galette/webroot/js/common.js
@@ -214,7 +214,7 @@ $(function() {
         });
     }
 
-    $('input:submit, .button, input:reset, button:submit' ).button({
+    $('input:submit, .button, input:reset, button[type=submit]' ).button({
         create: function(event, ui) {
             if ( $(event.target).hasClass('disabled') ) {
                 $(event.target).button('disable');

diff --git a/galette/webroot/themes/default/galette.css b/galette/webroot/themes/default/galette.css
index 1b724cbd2cd0b38d78bdab454baa1b83f887fc9e..a332068a2bf710e28248fcbd9996c35df6d19014 100644 (file)
--- a/galette/webroot/themes/default/galette.css
+++ b/galette/webroot/themes/default/galette.css
@@ -624,14 +624,14 @@ footer a:hover {
 }
 
 /* == Buttons */
-#btnvalid, #btnadd, #btncancel, #btnsend, #btnback {
+#btnvalid, #btnadd {
     padding-left: 1.4em!important;
     background-position: 10px 50%, 50% 50%!important;
     background-repeat: no-repeat, repeat!important;
 }
 
 
-input#btnvalid, input#btnadd, input#btncancel, input#btnsend, input#btnback {
+input#btnvalid, input#btnadd {
     padding-left:2.4em!important;
 }
 
@@ -781,13 +781,6 @@ legend .tab-button {
     right: 2.5em;
 }
 
-#btncancel {
-    background-image:url(images/icon-cancel.png), url("jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png");
-}
-#btncancel.ui-state-hover {
-    background-image:url(images/icon-cancel.png), url("jquery-ui/images/ui-bg_glass_75_ffb619_1x400.png");
-}
-
 #btnvalid {
     background-image:url(images/icon-valid.png), url("jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png");
 }
@@ -795,20 +788,6 @@ legend .tab-button {
     background-image:url(images/icon-valid.png), url("jquery-ui/images/ui-bg_glass_75_ffb619_1x400.png");
 }
 
-#btnback {
-    background-image:url(images/prev.png), url("jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png");
-}
-#btnback.ui-state-hover {
-    background-image:url(images/prev.png), url("jquery-ui/images/ui-bg_glass_75_ffb619_1x400.png");
-}
-
-#btnsend {
-    background-image:url(images/icon-mail-send.png), url("jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png");
-}
-#btnsend.ui-state-hover {
-    background-image:url(images/icon-mail-send.png), url("jquery-ui/images/ui-bg_glass_75_ffb619_1x400.png");
-}
-
 #btnattach {
     margin-bottom: .5em;
 }

diff --git a/galette/webroot/themes/default/images/icon-mail-send.png b/galette/webroot/themes/default/images/icon-mail-send.png
deleted file mode 100644 (file)
index bb3cab8..0000000
Binary files a/galette/webroot/themes/default/images/icon-mail-send.png and /dev/null differ

diff --git a/galette/webroot/themes/default/images/icon-mailing.png b/galette/webroot/themes/default/images/icon-mailing.png
deleted file mode 100644 (file)
index 5817e80..0000000
Binary files a/galette/webroot/themes/default/images/icon-mailing.png and /dev/null differ

diff --git a/galette/webroot/themes/default/images/prev.png b/galette/webroot/themes/default/images/prev.png
deleted file mode 100644 (file)
index c7bab28..0000000
Binary files a/galette/webroot/themes/default/images/prev.png and /dev/null differ

diff --git a/galette/webroot/themes/default/install.css b/galette/webroot/themes/default/install.css
index 18f9586e725d6f61914b67282106b74d511adbc7..37bdad5ee31f9a742501633f33dcaae867e15fa7 100644 (file)
--- a/galette/webroot/themes/default/install.css
+++ b/galette/webroot/themes/default/install.css
@@ -241,7 +241,6 @@ ul.leaders span + span {
 
 #btnback {
     float: left;
-    background-position: .4em 50%, 50% 50% !important
 }
 
 #plang_selector {