X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fvirtualshelves%2Fshelves.tmpl;h=3f7b387682bbe4caa23847dab2926bab3e47352d;hb=a9c90b6dfb4e5648d9155294e0c911b2de9ecf43;hp=8b0a7d3055c36ec341167275bf479725b7723a74;hpb=5a93f0b806ae9cb151e665e48fd04cb129be4fe7;p=koha_fer

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 8b0a7d3055..3f7b387682 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -9,8 +9,8 @@ var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
 
 $(document).ready(function(){
 	$("#addbarcode").focus();
-	$("span.clearall").html("<a id=\"CheckNone\" href=\"/cgi-bin/koha/shelves.pl\">Clear All<\/a>");
-	$("span.checkall").html("<a id=\"CheckAll\" href=\"/cgi-bin/koha/shelves.pl\">Select All<\/a>");
+	$("span.clearall").html("<a id=\"CheckNone\" href=\"/cgi-bin/koha/shelves.pl\">"+_('Clear All')+"<\/a>");
+	$("span.checkall").html("<a id=\"CheckAll\" href=\"/cgi-bin/koha/shelves.pl\">"+_('Select All')+"<\/a>");
     $("#CheckAll").click(function(){
         $(".checkboxed").checkCheckboxes();
         return false;
@@ -24,11 +24,26 @@ $(document).ready(function(){
 
 	function confirmDelete(message){
 		if (window.confirm(message)) {
-			location.href="/cgi-bin/koha/virtualshelves/shelves.pl?<!-- TMPL_IF NAME="showprivateshelves" -->display=privateshelves&<!-- /TMPL_IF -->shelves=1&amp;DEL-<!-- TMPL_VAR NAME="shelfnumber" -->=1";
+			location.href="/cgi-bin/koha/virtualshelves/shelves.pl?<!-- TMPL_IF NAME="showprivateshelves" -->display=privateshelves&<!-- /TMPL_IF -->shelves=1&DEL-<!-- TMPL_VAR NAME="shelfnumber" -->=1";
 		} else { 
 			return false;
 		}
 	}
+
+    /**
+     * 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;
+    }
+
     /**
      * This function checks all checkboxes if all are empty,
      * or unchecks all if any already checked.
@@ -73,6 +88,26 @@ function placeHold () {
     $("#hold_form").submit();
     return false;
 }
+    /**
+     * This function checks to make sure a list title is assigned
+     */
+      function Check(f) {
+		var _alertString="";
+		var alertString2;
+
+	    if(f.addshelf.value.length ==0){
+			_alertString += _("- You must enter a List Name") + "\n";
+		}
+
+		if (_alertString.length==0) {
+			document.Aform.submit();
+		} else {
+			alertString2 = _("Form not submitted because of the following problem(s)");
+			alertString2 += "\n------------------------------------------------------------------------------------\n\n";
+			alertString2 += _alertString;
+			alert(alertString2);
+		}
+	}
 //]]>
 </script>
 </head>
@@ -120,17 +155,17 @@ function placeHold () {
    <div class="yui-g">
     <!-- TMPL_IF NAME="itemsloop" -->
 
-<form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post" class="checkboxed">
+	<form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post" class="checkboxed">
         <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
         <input type="hidden" name="modifyshelfcontents" value="1" />
  <fieldset>
   <legend>Contents of <i><!-- TMPL_VAR NAME="shelfname" --></i></legend>
+   
  <!--TMPL_IF NAME="manageshelf" -->
-   <p>
-     <span class="checkall"></span>
-     <span class="clearall"></span>
-   </p>
+     <p><span class="checkall"></span> |
+     <span class="clearall"></span></p>
  <!-- /TMPL_IF -->
+	
  <!-- TMPL_VAR name='pagination_bar'-->
     <table>
             <tr>
@@ -161,14 +196,8 @@ function placeHold () {
                 <img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /><!-- TMPL_VAR NAME="description" -->
 			</td><!-- /TMPL_UNLESS -->
 			<td>
-			<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
-				<a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-            <!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
-				<a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-            <!-- TMPL_ELSE -->
-				<a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-			<!-- /TMPL_IF -->
-			<!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" --></a>
+			<!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
+			<!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></a>
 			</td>
 			<td><!-- TMPL_VAR NAME="author" --></td>
 			<td><!-- TMPL_VAR NAME="dateadded" --></td>
@@ -179,14 +208,15 @@ function placeHold () {
 			</td>
 			</tr>
 		<!-- /TMPL_LOOP --><!-- /itemsloop -->
-    </table>
- </fieldset>
- <fieldset class="action">
+    </table><fieldset class="action">
         <!-- TMPL_IF name="manageshelf" -->
-            <input type="button" id="placehold" style="display:none" onclick="placeHold(); return false;" value="Place Hold"/>
-            <input type="submit" value="Remove selected Items" onclick='return confirm(_("Are you sure you want to remove these items from the shelf?"))' />
+            <input type="button" id="placehold" style="display:none" onclick="placeHold(); return false;" value="Place Holds" />
+            <input type="submit" value="Remove selected Items" onclick="return confirm(_('Are you sure you want to remove these items from the shelf?'));" />
+            <input type="submit" value="Merge selected Items" onclick="return MergeItems();" />
         <!-- /TMPL_IF -->
  </fieldset>
+ </fieldset>
+ 
 </form>
 	<!-- /TMPL_IF -->
    </div>
@@ -226,10 +256,10 @@ function placeHold () {
         <input type="hidden" name="shelves" value="1" />
         <legend>Create a new List</legend>
         <ol>
-        <li><label for="addshelf">Name: </label><input id="addshelf" type="text" name="addshelf" size="25" /></li>
+        <li><label class="required" for="addshelf">List Name:</label><input id="addshelf" type="text" name="addshelf" size="25" /></li>
         <li><span class="label">Owner: </span><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->" /><!-- TMPL_VAR name="loggedinusername" --></li>
 		<li><label for="sortfield" >Sort this list by: </label>
-		<select name="sortfield">
+		<select name="sortfield" id="sortfield">
 		<!-- TMPL_IF NAME="sort_title" --><option value="title" selected="selected">Title</option><!-- TMPL_ELSE --><option value="title">Title</option><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="sort_author" --><option value="author" selected="selected">Author</option><!-- TMPL_ELSE --><option value="author">Author</option><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="sort_copyrightdate" --><option value="copyrightdate" selected="selected">Copyrightdate</option><!-- TMPL_ELSE --><option value="copyrightdate">Copyrightdate</option><!-- /TMPL_IF -->
@@ -276,7 +306,7 @@ function placeHold () {
 	<!-- /TMPL_IF -->
 
 		</fieldset>
-		<fieldset class="action"><input type="submit" value="Save" /><a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a></fieldset>
+		<fieldset class="action"><input type="submit" onclick="Check(this.form); return false;" value="Save" class="submit" /><a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a></fieldset>
     </form>
     </div>
     <div class="yui-u">
@@ -324,6 +354,9 @@ function placeHold () {
 		</td>
         <td>
             <!-- TMPL_IF NAME="mine" -->
+				<form action="merge.pl" method="get">
+					<input type="hidden" name="shelf" value="<!-- TMPL_VAR NAME="shelf" -->" />
+				</form>
 				<form action="shelves.pl" method="get">
 					<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelf" -->" />
 					<input type="hidden" name="op" value="modif" />
@@ -346,10 +379,10 @@ function placeHold () {
 		</td>
 		</tr>
                 <!-- /TMPL_LOOP -->
+        </table>
             <!-- TMPL_ELSE -->
-            <tr><td colspan="4">No Private Lists.</td></tr>
+            <p>No Private Lists.</p>
             <!-- /TMPL_IF --><!-- /shelveslooppriv -->
-        </table>
 		</div><!-- /privateshelves -->
 
         <!-- TMPL_IF NAME="showpublicshelves" -->
@@ -401,7 +434,7 @@ function placeHold () {
 		</div>
 <!-- /TMPL_UNLESS -->
 
-<form id="hold_form" method="get" action="/cgi-bin/koha/reserve/request.pl"/>
+<form id="hold_form" method="get" action="/cgi-bin/koha/reserve/request.pl">
     <!-- Value will be set here by placeHold() -->
     <input id="hold_form_biblios" type="hidden" name="biblionumbers" value="" />
     <input type="hidden" name="multi_hold" value="1"/>