Bug 13618: Specific for other prefs

[koha.git] / koha-tmpl / opac-tmpl / bootstrap / en / includes / opac-bottom.inc

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index dda9446..41017e0 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -1,10 +1,11 @@
 [% UNLESS ( is_popup ) %]
+    [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
     [% IF ( opaccredits ) %]
         <div class="container-fluid">
             <div class="row-fluid">
                 <div class="span12">
                     <div id="opaccredits" class="noprint">
-                        [% opaccredits %]
+                        [% opaccredits.raw %]
                     </div>
                 </div>
             </div>
@@ -29,7 +30,7 @@
     [% END # / OpacKohaUrl %]
 
 </div> <!-- / #wrap in masthead.inc -->
-
+[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
     [% IF ( opaclanguagesdisplay ) %]
         [% IF ( languages_loop && opaclanguagesdisplay ) %]
             [% UNLESS ( one_language_enabled ) %]
@@ -37,7 +38,7 @@
                     <div class="navbar-inner">
                         <ul id="i18nMenu" class="nav">
                             <li><p class="lang navbar-text"><strong>Languages:&nbsp;</strong></p></li>
-                            [% FOREACH languages_loo IN languages_loop %]
+                            [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
                                 [% IF ( languages_loo.group_enabled ) %]
                                     [% IF ( languages_loo.plural ) %]
                                         <li class="dropdown">
@@ -71,6 +72,7 @@
             [% END # / UNLESS ( one_language_enabled ) %]
         [% END # / IF ( languages_loop && opaclanguagesdisplay ) %]
     [% END # / IF opaclanguagesdisplay %]
+[% END %]
 [% END # / UNLESS is_popup %]
 
 
@@ -94,6 +96,9 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
         "[% interface %]/[% theme %]/lib/enquire.min.js",
         "[% interface %]/[% theme %]/js/script.js"
     ]);
+
+    // Fix for datepicker in a modal
+    $.fn.modal.Constructor.prototype.enforceFocus = function () {};
 </script>
 [% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %]
 <script type="text/javascript">//<![CDATA[
@@ -129,7 +134,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
         var MSG_TAG_ALL_BAD = _("Error! Your tag was entirely markup code.  It was NOT added.  Please try again with plain text.");
         var MSG_ILLEGAL_PARAMETER = _("Error! Illegal parameter");
         var MSG_TAG_SCRUBBED = _("Note: your tag contained markup code that was removed. The tag was added as ");
-        var MSG_ADD_TAG_FAILED = _("Error! The add_tag operation failed on");
+        var MSG_ADD_TAG_FAILED = _("Error! Adding tags failed at");
         var MSG_ADD_TAG_FAILED_NOTE = _("Note: you can only tag an item with a given term once.  Check 'My Tags' to see your current tags.");
         var MSG_DELETE_TAG_FAILED = _("Error! You cannot delete the tag");
         var MSG_DELETE_TAG_FAILED_NOTE = _("Note: you can only delete your own tags.")
@@ -236,7 +241,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
         signinLink.onclick = function(evt) {
             // Requests a signed identity assertion from the user.
             navigator.id.request({
-                siteName: "[% LibraryName | html %]",
+                siteName: "[% LibraryName %]",
                 returnTo: '/cgi-bin/koha/opac-user.pl',
                 oncancel: function() { alert('user refuses to share identity.'); }
                 });
@@ -245,12 +250,27 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 
     </script>
 [% END #  / IF persona %]
+
+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    if($('#searchsubmit').length) {
+        $(document).on("click", '#searchsubmit', function(e) {
+            jQuery.removeCookie("form_serialized", { path: '/'});
+            jQuery.removeCookie("form_serialized_itype", { path: '/'});
+            jQuery.removeCookie("form_serialized_limits", { path: '/'});
+            jQuery.removeCookie("num_paragraph", { path: '/'});
+            jQuery.removeCookie("search_path_code", { path: '/'});
+        });
+    }
+});
+</script>
 [% PROCESS jsinclude %]
 
-[% IF ( opacuserjs ) %]
+[% IF ( OPACUserJS ) %]
     <script type="text/javascript">
         //<![CDATA[
-        [% opacuserjs %]
+        [% OPACUserJS.raw %]
         //]]>
     </script>
 [% END %]