Fix for Bug 4532, Use include file for bibliodefaultview logic

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / virtualshelves / shelves.tmpl

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 ff5edb0..3f7b387 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -88,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>
@@ -176,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>
@@ -242,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 -->
@@ -292,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">
@@ -420,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"/>