From dfae0d7d3ac1b8e34ede8c2c544a21b4e4d120f4 Mon Sep 17 00:00:00 2001 From: syw1-art <77171502+syw1-art@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:40:48 -0400 Subject: [PATCH] =?UTF-8?q?cam21712=20-=20ajouter=20la=20section=20en=20fr?= =?UTF-8?q?an=C3=A7ais=20(#23)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Koha/Plugin/Carrousel.pm | 6 ++--- Koha/Plugin/Carrousel/configure.tt | 1 + Koha/Plugin/Carrousel/configure_fr-CA.tt | 28 +++++++++++++++++++++++- Koha/Plugin/Carrousel/configure_fr.tt | 26 ++++++++++++++++++++++ Koha/Plugin/Carrousel/opac-carrousel.tt | 14 +++++------- 5 files changed, 63 insertions(+), 12 deletions(-) diff --git a/Koha/Plugin/Carrousel.pm b/Koha/Plugin/Carrousel.pm index 413be71..18c050d 100755 --- a/Koha/Plugin/Carrousel.pm +++ b/Koha/Plugin/Carrousel.pm @@ -54,13 +54,13 @@ BEGIN { $module->import; } -our $VERSION = "4.3.1"; +our $VERSION = "4.3.2"; our $metadata = { - name => 'Carrousel 4.3.1', + name => 'Carrousel 4.3.2', author => 'Mehdi Hamidi, Maryse Simard, Brandon Jimenez, Alexis Ripetti, Salman Ali, Hinemoea Viault, Hammat Wele, Salah Eddine Ghedda, Matthias Le Gac, Alexandre Noël, Shi Yao Wang', description => 'Generates a carrousel from available data sources (lists, reports or collections).', date_authored => '2016-05-27', - date_updated => '2024-10-04', + date_updated => '2024-10-10', minimum_version => '18.05', maximum_version => undef, version => $VERSION, diff --git a/Koha/Plugin/Carrousel/configure.tt b/Koha/Plugin/Carrousel/configure.tt index 2793fac..a9935cd 100644 --- a/Koha/Plugin/Carrousel/configure.tt +++ b/Koha/Plugin/Carrousel/configure.tt @@ -486,6 +486,7 @@ function addLine (module, id, name) { + " " [% END %] + " " + + " " [% END %] + " " + " " diff --git a/Koha/Plugin/Carrousel/configure_fr-CA.tt b/Koha/Plugin/Carrousel/configure_fr-CA.tt index a27b9fe..3fb022b 100644 --- a/Koha/Plugin/Carrousel/configure_fr-CA.tt +++ b/Koha/Plugin/Carrousel/configure_fr-CA.tt @@ -38,6 +38,9 @@ Nom Titre Type + [% IF !Koha.Preference('IndependentBranches') %] + Bibliothèque + [% END %] Auto rotation Ordre URL externe @@ -87,6 +90,16 @@ + [% IF !Koha.Preference('IndependentBranches') %] + + + + [% END %] @@ -387,8 +400,11 @@ $("#doc3 form").submit(function (){ title : carrousel.find("[name^='title']").val(), suffix : carrousel.find("[name^='suffix']").val(), type : carrousel.find("[name^='type']:checked").val(), + [% IF !Koha.Preference('IndependentBranches') %] + branchcode : carrousel.find("[name^='library']").val(), + [% END %] autorotate : carrousel.find("[name^='autorotate']").prop('checked') ? 1 : 0, - external : carrousel.find("[name^='external']").prop('checked') ? 1 : 0 + external : carrousel.find("[name^='external']").prop('checked') ? 1 : 0 }; enablings.push(data); }); @@ -462,6 +478,16 @@ function addLine (module, id, name) { + " " + " " + " " +[% IF !Koha.Preference('IndependentBranches') %] + + " " + + " " + + " " +[% END %] + " " + " " + " " diff --git a/Koha/Plugin/Carrousel/configure_fr.tt b/Koha/Plugin/Carrousel/configure_fr.tt index 2a0a167..3fb022b 100644 --- a/Koha/Plugin/Carrousel/configure_fr.tt +++ b/Koha/Plugin/Carrousel/configure_fr.tt @@ -38,6 +38,9 @@ Nom Titre Type + [% IF !Koha.Preference('IndependentBranches') %] + Bibliothèque + [% END %] Auto rotation Ordre URL externe @@ -87,6 +90,16 @@ + [% IF !Koha.Preference('IndependentBranches') %] + + + + [% END %] @@ -387,6 +400,9 @@ $("#doc3 form").submit(function (){ title : carrousel.find("[name^='title']").val(), suffix : carrousel.find("[name^='suffix']").val(), type : carrousel.find("[name^='type']:checked").val(), + [% IF !Koha.Preference('IndependentBranches') %] + branchcode : carrousel.find("[name^='library']").val(), + [% END %] autorotate : carrousel.find("[name^='autorotate']").prop('checked') ? 1 : 0, external : carrousel.find("[name^='external']").prop('checked') ? 1 : 0 }; @@ -462,6 +478,16 @@ function addLine (module, id, name) { + " " + " " + " " +[% IF !Koha.Preference('IndependentBranches') %] + + " " + + " " + + " " +[% END %] + " " + " " + " " diff --git a/Koha/Plugin/Carrousel/opac-carrousel.tt b/Koha/Plugin/Carrousel/opac-carrousel.tt index f5861d4..9ddb760 100644 --- a/Koha/Plugin/Carrousel/opac-carrousel.tt +++ b/Koha/Plugin/Carrousel/opac-carrousel.tt @@ -43,7 +43,7 @@ [% item.title %][% IF carrousel.type == "scrolling-title" %]

[% item.title %]

[% END %] [% ELSE %] [% item.title %][% IF carrousel.type == "scrolling-title" %]

[% item.title %]

[% END %] - [% END %] + [% END %] [% END %] @@ -89,7 +89,7 @@ } /*De bootstrap pour le carrousel*/ - + .carousel { position: relative; margin-bottom: 20px; @@ -170,7 +170,6 @@ padding-right: 5px; /*opacity: 0.5;*/ filter: alpha(opacity=50); - } .carousel-control.right { @@ -233,7 +232,7 @@ .carousel-caption p { margin-bottom: 0; } - + /*De bootstrap pour le carrousel FIN*/ @@ -301,7 +300,7 @@ background-color: #d5e1df; } -#inlibro-carrousel .special-title{ +#inlibro-carrousel .special-title{ text-align: center; margin: 0; margin-top: 10px; @@ -487,7 +486,7 @@ function Left (button){ }, scrolling_duration, function() { $(container).css("left", "0"); $(container).append($(container).find("a").first()); - }); + }); }; function Right (button){ let container = document.getElementById(button.className).getElementsByClassName("images")[0]; @@ -507,10 +506,9 @@ window.addEventListener('load', function() { $('.carrousel .cloudcarousel').each( function() { if( $(this).length > 0 ){ - if( (this.complete != null) && (!this.complete) || this.naturalHeight == 0 ){ $(this).parent().remove(); - } + } } });