From c5b1dc7622b6ace78b2c5389bb7418b5299de9b7 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 15 Oct 2020 07:31:45 +0200
Subject: [PATCH] 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
---
 galette/install/steps/db.php                  |   4 +--
 galette/install/steps/db_checks.php           |   4 +--
 galette/install/steps/db_install.php          |   4 +--
 galette/install/steps/db_select_version.php   |   6 ++---
 galette/install/steps/galette.php             |   4 +--
 galette/install/steps/type.php                |   4 +--
 .../Controllers/Crud/MailingsController.php   |   5 ++--
 .../templates/default/mailing_adherents.tpl   |  16 ++++++++---
 galette/templates/default/plugin_initdb.tpl   |   4 +--
 galette/webroot/js/common.js                  |   2 +-
 galette/webroot/themes/default/galette.css    |  25 ++----------------
 .../themes/default/images/icon-mail-send.png  | Bin 833 -> 0 bytes
 .../themes/default/images/icon-mailing.png    | Bin 947 -> 0 bytes
 .../webroot/themes/default/images/prev.png    | Bin 669 -> 0 bytes
 galette/webroot/themes/default/install.css    |   1 -
 15 files changed, 34 insertions(+), 45 deletions(-)
 delete mode 100644 galette/webroot/themes/default/images/icon-mail-send.png
 delete mode 100644 galette/webroot/themes/default/images/icon-mailing.png
 delete mode 100644 galette/webroot/themes/default/images/prev.png

diff --git a/galette/install/steps/db.php b/galette/install/steps/db.php
index 6e1ad7d91..cdc4220fc 100644
--- 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 2fb3d3e60..7bf754a0b 100644
--- 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 c2d478cc6..ba623fe1a 100644
--- 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 0f2b0e3ca..93abbbc35 100644
--- 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 fff3d9e45..7a11ca501 100644
--- 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 91f78d485..361dd3d18 100644
--- 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 1581142d5..bfa7ae9af 100644
--- 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 8aeffa314..ba917d96d 100644
--- 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 b3b724752..c09d3cd83 100644
--- 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 8cd53538f..ad4c5a6b6 100644
--- 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 1b724cbd2..a332068a2 100644
--- 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
index bb3cab8f309beb40436493078b9cc01283b8e53a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 833
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVxZ#d
zAk65bF}ngN$X?><>&kwMQH)7Mw$lIh51^jq0X`wFKq&}dVq)S11DF7U21)@rjEsy3
zA#5y&G6Mqxh@`EpEs!y5)+_-5f!VWX$Hv8(nwd2;G;Ub8{^-$TFJHa-`0-;vP;g*S
z@Snf`|Nj5~@83TO2`L%(IkIx{@}Beb!<IM{9Cj`|5?FgOy!UD3gy-pV-<6bAbj&-^
z)!o}Q|734(UvKZkzP|px#iu4roHS+Xv}sePPoFt^=B(K>XV0E9Z^5e7>&{=eeEI6l
zYgaGbx_kfjy@z)nK7R1%>4V2lA3l2a@bR-pk6%1~`uy38S1(?^dhzPbi&t-7yng%g
z)w`Fk-@JP9<kjnUuik!s{r27KcVFMUegEd&`#0~uzJ2%p?fXyfKYV=u@#BY2pMYNY
z`04W}Ao%j_^H(7H`Q`J6FJHcX`TFh4*Y97xegFFT<JT{rz5)S|{r%^+&mX>h`~L06
zukYV~{P_9n$FDy>zkm7p>-W#!e}4V`^Bai%{QdnGi2nci^A{8>fB*gc_a6u@7|mD)
z3{Cx#AirP+MkZ!94qkp?ITZtA3oC0Idj~g9FW=zk*u><_{QTmHlc&vJwd35qPv3z-
z`tRStNf+CIS{akP-CcTexGy;aIX66A977~7Cnqp4nX#&tv8fzTx_epqc-I4C&Wsl?
zGrJ59v+lSOm6bjF>Q2dpHGEI6<tVHOe%kWkr^xG4;Rc80?yfEI4h`*&SK_?)8|kdM
z6ma|0@&zXIr#otBoiMdhP&lM)aqZA0o45&%7UpNIFWkR=UVGE2BWFwkXE?68d+g{*
zV-*v%bq5dJ&~WW>+_P-Q4i#%tOU<2Uu3g;aHpg+1rmgK_CH?igR%jTjul8+nTxD#%
z`{Kc~ch8-*w6WeD-Q~D!`GyU9m|1qM;^wYSkw~cyXwYe1V#76og+Zy*f$`>+IhjB|
OGI+ZBxvX<aXaWFN=bwK7

diff --git a/galette/webroot/themes/default/images/icon-mailing.png b/galette/webroot/themes/default/images/icon-mailing.png
deleted file mode 100644
index 5817e80196b938e3714532b5525ae5b9aa720d9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 947
zcmV;k15EshP)<h;3K|Lk000e1NJLTq000jF000mO1^@s6$yOx<00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4#NNd4#NS*Z>VGd000McNliru;R6g51Pp3VC2Rly13*bc
zK~yNuZPRZ|lm!6C@$d8Jj{C#?0gpd=sr-ouXv73TEoc&pvpHH)Xj^W~SGHO&)K+cv
zwpEMXG;=G*+U$=rNljbiw2;Aik(&z#h63IlNN^q;JkQ-dchBAPJiVy4+Wfr!{eJI$
z0{?K;yh!@aw><pPpkG&44sLHK_|f4H2+J{*<v8liQv<7TTjxIn0Dt2F)+SB^I69Ah
zGhVUTUFI(-E{w%e_GoyOwRB$9^^BU+)DLFQ9QnMqe~{@f4*gvQgz~4}eWkvs_IUSm
z&8X`d_vRBs?yY0E3h?+Gh=PD&n4}WP;mNVtefNJks)>Nu_ukOCyt;P0XKx)d6N@Cm
zD@39RmKW!77no$SdGw4<I+Z1!%!X`1-xYXSlDdx#wom?{zQ0@e5_?UEsq@!J6_pT<
z#)w2yOnv_q1zs<>e5@vtq>>pFRSSxRu8UG__n{BXTW1<xeRd;vrEMhj42{Z3I-OVP
z-4&qRqcJ^liiD?ybPhH-9n4*s5RAy`tZbTAdsmZ(%C_Cy7#Zd8;}M)`k%q3f@Ou0l
zd|qR`!^`0dlgNQq7Uq@^;wy*_N53cwLeb{Ow$t#$)9kDkY3ba{*0vse<rP?fX;~C)
zsHCCT;LnA1;!7%WnG30`uud$NvN=<b0oWCKhDc<E(wb(J^(1q13tayBH!Pory2g4+
z$_l8g34mZwSmZ=Z%qOmfc2=WnDo(ctkH^i}PnU@=MhI;1($UdE^+TH|+fssc`y6>e
z#<isiEt5%0cV?>c&2?tqw$@sNd>+5gO?A~)ylw|FCPH4v(lxTTE-^A~lJ(Y+N@?Vk
zyFZAonyS%{FRiHUt$WOqCq6?<#=tVL3<Jx^VdZqJT$b8LoA~|4b&^RHn|U9Usnb$!
zaX8)9^JetdvGLxavlr(-`Sk3Xp)98CcFXRRMcFQyh(?YJqY=IvzJ`%pLXXd^W|nWh
z!M<Z(1JJzxoi0ytKmlF{jyP@NiTcXG&}%QWUO)fQe)Y*6J1oGm$+89X@<4*{2+#<G
zfIiXYI?%nRf5vWiSf!;w9eDeHuX@k~U<(E-yn(>RfpB=*C5n=wD2V~X$WQ$n`U`4W
VX4X8Z`)2?E002ovPDHLkV1mzU%uWCR

diff --git a/galette/webroot/themes/default/images/prev.png b/galette/webroot/themes/default/images/prev.png
deleted file mode 100644
index c7bab2806ce9f3e9a25a4face18361804e45ce16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmV;O0%HA%P)<h;3K|Lk000e1NJLTq000pH000mO1^@s6@G+EM00004b3#c}2nYxW
zd<bNS00009a7bBm000n+000n+0X?0JfdBvi8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10vbs~K~y-6g_Fx`Q$ZBQzj@^5(Z(7ZjkYDIp<+SAgqYR{Eh@Nj
zp;GEvD3+w+#{a^dk0w=c<w8MM;zE&%uGCbmLJ_f8v8BY?5>1-s=HAS`$3-pDCO17W
zFwD&P%{kwE!-xn@aph*Wo3!>U2g_X_c|GoQjyr7(-%aiyE%?f|aM1=XINsz0NoN!L
zeTv@i3w6c%4<Bik4*+1B+ev5p`Z&YWSfr=*bUZ1hzD?uV<eOC~_-rEpfqmQn8O<cl
zgYgHaq6yjCbBGZs)Rc+Yd>({)?TY0UOiX=%Twh3K5?2Km*Ulyf_`z@&D&`k(=7V4!
zL^}NSI&d!vrM5N5(8D1STAsh<k?!Ha{sF!xxDCb1XV_!_C_3t(i6E5a0RYI|g}Hkk
zk9Y9g@uc+o7?w-ZAhNcQ5>Qe{)m)oPn_$>vlWtTXg+RqHK%};WSS}q^lK}w4<dcQR
z(YK+%*ZKU>fWL+Ny#eS(31-beO)1AgBvCaPW)>FzKk;ZLkp>etqLB^}-Wfo}SOn)9
z1lJl?BDjXKZsEnJnT<Y4jrE@49FO+y+V1M^Z0AHal%=rvr`iytn+o55{;oIM<*{Qi
zaQk_n)$Kpf+2+a@D){lMyvjH=G#hA>+16v^PCP7?nDDxJxJ47%QrUc&N##yBiQMq-
z+`jZ~PDv}S8+LAKrRJ2|9P$rTRMI-h7{&qIZwC1bt$Xd*l>=bS00000NkvXXu0mjf
Dh#@rK

diff --git a/galette/webroot/themes/default/install.css b/galette/webroot/themes/default/install.css
index 18f9586e7..37bdad5ee 100644
--- 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 {
-- 
2.39.2