X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fcataloguing%2Faddbooks.tt;h=9ef3543af8970842fd37e2484d8edccb70351e0a;hb=edd64d30188fef2b3ecb314ceeb1f613e2217cc2;hp=21a7140008939f97dce90e82521d7a70595fc86f;hpb=91d5a8384939b6a6a6082ccaef69645ef31f91e2;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index 21a7140008..9ef3543af8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Cataloging</title>
 [% INCLUDE 'greybox.inc' %]
@@ -18,24 +19,47 @@
             PopupZ3950($(this).prop('id'));
             return false;
         });
+        $(".merge-items").on("click",function(e){
+            e.preventDefault();
+            MergeItems();
+        });
+
+        $("#useadvanced").click(function(){
+            $.cookie( 'catalogue_editor_[% USER_INFO.0.borrowernumber %]', 'advanced', { expires: 365, path: '/' } );
+            return true;
+        });
      });
 
     /* this function open a popup to search on z3950 server.  */
     function PopupZ3950(fw) {
         var strQuery = GetZ3950Terms(fw);
         if(strQuery){
-            window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber %]"+strQuery,"z3950search",'width=760,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
+            window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber %]"+strQuery,"z3950search",'width=800,height=500,location=yes,toolbar=no,scrollbars=yes,resize=yes');
         }
     }
     /* provide Z3950 search points */
     function GetZ3950Terms(fw){
         var strQuery="&frameworkcode=" + fw;
         [% FOREACH z3950_search_param IN z3950_search_params %]
-            strQuery += "&" + "[% z3950_search_param.name |uri %]" + "=" + "[% z3950_search_param.encvalue |uri %]";
+            strQuery += "&" + "[% z3950_search_param.name | uri %]" + "=" + "[% z3950_search_param.value | uri %]";
         [% END %]
         return strQuery;
     }
 
+    /**
+     * This function checks if the adequate number of records are checked for merging
+     */
+    function MergeItems() {
+     var checkboxes = $("input:checkbox:checked");
+        var nbCheckbox = checkboxes.length;
+     if (nbCheckbox != 2) {
+         alert(_("Two records must be selected for merging."));
+     } else {
+         location.href='/cgi-bin/koha/cataloguing/merge.pl?biblionumber=' + checkboxes[0].value + '&amp;biblionumber=' + checkboxes[1].value;
+     }
+     return false;
+    }
+
     //]]>
 </script>
 </head>
@@ -48,12 +72,15 @@
 <div id="doc" class="yui-t7">
 
    <div id="bd">
-	<div id="yui-main">
+     <div id="yui-main">
 
 [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
   <div id="toolbar" class="btn-toolbar">
+        [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 %]
+            <a id="useadvanced" href="/cgi-bin/koha/cataloguing/editor.pl" class="btn btn-small"><i class="icon-edit"></i> Advanced editor</a>
+        [% END %]
         <div class="btn-group">
-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New record <span class="caret"></span></button>
+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New record <span class="caret"></span></button>
             <ul class="dropdown-menu">
                 <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li>
                 [% FOREACH frameworkcodeloo IN frameworkcodeloop %]
@@ -62,7 +89,7 @@
             </ul>
         </div>
         <div class="btn-group">
-            <button class="btn btn-small" id="z3950search"><i class="icon-search"></i> New from Z39.50/SRU</button>
+            <button class="btn btn-small" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button>
             <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
                 <span class="caret"></span>
             </button>
@@ -73,22 +100,28 @@
                 [% END %]
             </ul>
         </div>
+    [% IF ( total ) %]
+        <div class="btn-group"><button type="submit" class="btn btn-small merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>
+    [% END %]
   </div>
 [% END %]
 
-	[% IF ( noitemsfound ) %]
-		No results found
-	[% END %]
+     [% IF ( noitemsfound ) %]
+          No results found
+     [% END %]
 
-<!-- display the search results -->
+[%# display the search results %]
 
 [% IF ( total ) %]
-[% total %] result(s) found in catalog,
-<a href="#searchresult-breeding">[% breeding_count %] result(s) found in reservoir</a>
+<div>
+    [% total %] result(s) found in catalog,
+    <a href="#searchresult-breeding">[% breeding_count %] result(s) found in reservoir</a>
+</div>
 <div class="pages">[% pagination_bar %]</div>
 <div class="searchresults">
     <table>
         <tr>
+            <th>&nbsp;</th>
             <th>Title</th>
             <th>Location</th>
             <th>Preview</th>
@@ -101,6 +134,7 @@
         [% ELSE %]
             <tr>
         [% END %]
+            <td><input type="checkbox" class="selection" id="bib[% resultsloo.biblionumber %]" name="biblionumber" value="[% resultsloo.biblionumber %]" /></td>
             <td>
                 <p>
                     <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber %]">[% resultsloo.title |html %]</a>
@@ -114,14 +148,14 @@
                         [% ELSE %]
                             &nbsp;
                         [% END %]
-			[% IF ( resultsloo.isbn ) %] - [% resultsloo.isbn %] [% END %]
+               [% IF ( resultsloo.isbn ) %] - [% resultsloo.isbn %] [% END %]
                         [% IF ( resultsloo.publicationyear ) %] - [% resultsloo.publicationyear %][% END %]
                         [% IF ( resultsloo.publishercode ) %]- [% resultsloo.publishercode %][% END %]
                         [% IF ( resultsloo.copyrightdate ) %] - [% resultsloo.copyrightdate %][% END %]
                         [% IF ( resultsloo.edition ) %]Edition: [% resultsloo.edition %][% END %]
                         [% IF ( resultsloo.place ) %] ; [% resultsloo.place %][% END %]
                         [% IF ( resultsloo.pages ) %] - [% resultsloo.pages %][% END %]
-                        [% IF ( resultsloo.size ) %] ; [% resultsloo.size %][% END %]
+                        [% IF ( resultsloo.item('size') ) %] ; [% resultsloo.item('size') %][% END %]
                         [% IF ( resultsloo.timestamp ) %] <i>(modified on [% resultsloo.timestamp %])</i>[% END %]
                     </p>
                 [% END %]
@@ -152,7 +186,7 @@
                         [% IF ( resultsloo.notforloancount ) %] Not for loan ([% resultsloo.notforloancount %])[% END %]
                     </span>
                 </td>
-				<td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% resultsloo.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a>
+                    <td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% resultsloo.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a>
                 </td>
                 [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber %]">Edit biblio</a></td>[% END %]
                 [% IF ( CAN_user_editcatalogue_edit_items ) %]<td><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber %]">Add/Edit items</a></td>[% END %]
@@ -196,7 +230,7 @@
                 <td>[% breeding_loo.edition %]</td>
                 <td>[% breeding_loo.file %]</td>
                 <td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.id %]" title="MARC" rel="gb_page_center[600,500]">Card</a>
-				</td>
+                    </td>
                 [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<td>
                     <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]">Add biblio</a>
                 </td>[% END %]