diff --git a/templates/config.tpl b/templates/config.tpl index bc49871..4658e19 100644 --- a/templates/config.tpl +++ b/templates/config.tpl @@ -18,10 +18,7 @@ *}
(obligatoire)
- {input type="textarea" name="objet_asso" source=$plugin.config label="" required="required" cols="50" rows="6" maxlength=300} - {* - {input type="text" name="objet_asso" source=$plugin.config label="" required="required" maxlength=300} -*} + {input type="textarea" name="objet_asso" source=$plugin.config label="" required="required" cols="50" rows="4" maxlength=300}
{* diff --git a/templates/index.tpl b/templates/index.tpl index 4f48de1..4aff8bf 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -52,11 +52,13 @@

Choisir le taux de réduction

{foreach from=$plugin_config->reduction item="reduc"} + {if $reduc->valeur == 1} + {/if} {/foreach}
@@ -92,11 +94,13 @@ {foreach from=$plugin_config->reduction item="reduc"} + {if $reduc->valeur == 1} + {/if} {/foreach} {if $activite.descActivite != ""}{$activite.descActivite} ; {/if}{$activite.descTarif} diff --git a/uninstall.php b/uninstall.php index 22bc6d1..5f8bdeb 100644 --- a/uninstall.php +++ b/uninstall.php @@ -6,10 +6,15 @@ use Garradin\Entities\Files\File; // signature par défaut $default_signature_file = \Garradin\Files\Files::get('skel/plugin/recusfiscaux/default_signature.png'); -$default_signature_file->delete(); +if (null !== $default_signature_file) { + $default_signature_file->delete(); +} // signature réelle $signature = $plugin->getConfig('signature'); if (null !== $signature) { - \Garradin\Files\Files::get($signature)->delete(); + $sig_file = \Garradin\Files\Files::get($signature); + if (null !== $sig_file) { + $sig_file->delete(); + } } diff --git a/www/admin/config.php b/www/admin/config.php index 76b2739..ebd1137 100644 --- a/www/admin/config.php +++ b/www/admin/config.php @@ -50,7 +50,10 @@ if (f('save') && $form->check('recusfiscaux_config')) // supprimer la signature précédente, si besoin if (null !== $plugin->getConfig('signature')) { - \Garradin\Files\Files::get($plugin->getConfig('signature'))->delete(); + $sig_file = \Garradin\Files\Files::get($plugin->getConfig('signature')); + if (null !== $sig_file) { + $sig_file->delete(); + } } // puis installer la nouvelle $plugin->setConfig('signature', $_SESSION['sig_file'][0]->path); diff --git a/www/admin/style.css b/www/admin/style.css index 3d95bfb..735c4a3 100644 --- a/www/admin/style.css +++ b/www/admin/style.css @@ -26,8 +26,9 @@ h3.personne { } #signature { + padding : 1em 0.5em 0 0.5em; max-width: 300px; - max-height 150px; + max-height: 150px; } dl.config {