Cleanup of catalogue files, previously excluded from layout fixes. Some bugs may...

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
index d13b0f9..6195e31 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
@@ -1,57 +1,30 @@
     <div id="action">
             
             <div class="edit">
-                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">
-                    Edit biblio
-                </a>
-                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">
-                    Duplicate
-                </a>
-                <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                    Edit item
-                </a>
-                <a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">
-                    Delete
-                </a>
+<ul>
+       <li>                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit biblio</a></li>
+       <li>                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate</a></li>
+       <li>                <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit item</a></li>
+       <li>                <a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Delete</a></li>
+</ul>
             </div>
             
             <div class="view">
-                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                Complete
-                </a>
-                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                    Normal
-                </a>
-                <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                    ISBD
-                </a>
+<ul>
+       <li>                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Complete</a></li>
+       <li>                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal</a></li>
+       <li>                <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li>
+</ul>
             </div>
             
             <div class="others">
-                <a href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">
-                    Add to shelf
-                </a>
-                <a href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                    Print
-                </a>
-                <!-- TMPL_IF name="subscriptionsnumber" -->
-                <a href="/cgi-bin/koha/serials/serials-home.pl?searched=1&title_filter=<!-- TMPL_VAR NAME="subscriptiontitle" -->">
-                    Subscription(s)
-                </a>
-                <!-- /TMPL_IF -->
-                <!-- TMPL_IF NAME="norequests" -->
-                <!-- TMPL_ELSE -->
-                    <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                        Request
-                    </a>
-                <!-- /TMPL_IF -->
-                
-                <a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&title=<!-- TMPL_VAR NAME="title"-->&author=<!-- TMPL_VAR NAME="author"-->" >
-                    Circulation history
-                </a>
-  
-                <!-- TMPL_IF NAME="CAN_user_parameters"-->
-               <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&module=CATALOGUING&action=MODIFY&object=<!-- TMPL_VAR NAME="biblionumber"-->">Modification log</a>
-                <!-- /TMPL_IF --> 
+<ul>
+       <li>                <a href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Add to shelf</a></li>
+       <li>                <a href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
+                       <!-- TMPL_IF name="subscriptionsnumber" --><li><a href="/cgi-bin/koha/serials/serials-home.pl?searched=1&amp;title_filter=<!-- TMPL_VAR NAME="subscriptiontitle" -->">Subscription(s)</a></li><!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Request</a></li><!-- /TMPL_IF -->
+       <li>                <a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;title=<!-- TMPL_VAR NAME="title"-->&amp;author=<!-- TMPL_VAR NAME="author"-->" >Circulation history</a></li>
+                         <!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=CATALOGUING&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="biblionumber"-->">Modification log</a> </li><!-- /TMPL_IF -->
+</ul>
             </div>
     </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
index 011d473..6a33472 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@@ -4,9 +4,14 @@
 </head>
 <body>
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
 
 <h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
 
@@ -45,4 +50,9 @@ function confirm_deletion(count) {
 
 </script>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index d83a1fe..d0ab82a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -1,17 +1,73 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue MARC Detail</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script language="JavaScript" type="text/javascript">
+function active(numlayer){
+    for (i=0; i <= 10 ; i++ ) {
+        var tab = document.getElementById(i+'XX');
+        if (numlayer==i) {
+            tab.setAttribute("class","content_visible");
+            var tabactive=document.getElementById('link'+i);
+            tabactive.removeAttribute("class");
+            tabactive.setAttribute("class","tab_active");
+        } else {
+            tab.setAttribute("class","content_hidden");
+            try {
+                var tabactive=document.getElementById('link'+i);
+                tabactive.removeAttribute("class");
+                tabactive.setAttribute("class","tab_inactive");
+            }
+            catch(e){};
+        }
+    }
+}
+
+function confirm_deletion(count) {
+
+        var is_confirmed;
+       if (count>0){
+               is_confirmed= alert('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio');
+       }
+    else{
+                   is_confirmed= confirm('Are you sure you want to delete this biblio? ');
+       }
+
+     if (is_confirmed) {
+        if (count=0){
+                       window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+               }
+    }
+}
+
+function Dopop(link) {
+    window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+}
+
+function Changefwk(FwkList) {
+       var fwk = FwkList.options[FwkList.selectedIndex].value;
+       window.location = "MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
+}
+
+function Addbiblio(op) {
+       var fwk = document.forms['f'].Frameworks.options[document.forms['f'].Frameworks.selectedIndex].value;
+       window.location = "../cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+}
+
+</script>
 </head>
 <body>
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_UNLESS name="popup" -->
-    <h1>
-        MARC biblio : <!-- TMPL_VAR NAME="biblionumber" -->
-    </h1>
+    <h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
     
 <!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
 
@@ -79,6 +135,7 @@
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
+            </div>
             </div> <!-- class='tag' -->
         <!-- /TMPL_LOOP -->
     </div>
@@ -110,6 +167,7 @@
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
+            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
@@ -140,6 +198,7 @@
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
+            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
@@ -170,6 +229,7 @@
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
+            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
@@ -200,6 +260,7 @@
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
+            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
@@ -230,6 +291,7 @@
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
+            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
@@ -260,6 +322,7 @@
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
+            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
@@ -290,6 +353,7 @@
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
+            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
@@ -320,6 +384,7 @@
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
+            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
@@ -350,15 +415,15 @@
                 </p>
             <!-- /TMPL_LOOP -->
             </div>
+            </div>
         <!-- /TMPL_LOOP -->
     </div>
     
     <div id="10XX" class="content_hidden">
-        <br />
-        <table class="noborder">
+        <table>
                 <tr>
                     <!-- TMPL_LOOP NAME="item_header_loop" -->
-                        <th class="noborder">
+                        <th>
                             <!-- TMPL_VAR NAME="header_value" -->
                         </th>
                     <!-- /TMPL_LOOP -->
@@ -370,57 +435,10 @@
                 <!-- /TMPL_LOOP -->
         </table>
     </div>
-<script language="JavaScript" type="text/javascript">
-function active(numlayer){
-    for (i=0; i <= 10 ; i++ ) {
-        var tab = document.getElementById(i+'XX');
-        if (numlayer==i) {
-            tab.setAttribute("class","content_visible");
-            var tabactive=document.getElementById('link'+i);
-            tabactive.removeAttribute("class");
-            tabactive.setAttribute("class","tab_active");
-        } else {
-            tab.setAttribute("class","content_hidden");
-            try {
-                var tabactive=document.getElementById('link'+i);
-                tabactive.removeAttribute("class");
-                tabactive.setAttribute("class","tab_inactive");
-            }
-            catch(e){};
-        }
-    }
-}
 
-function confirm_deletion(count) {
+</div>
+</div>
+</div>
 
-        var is_confirmed;
-       if (count>0){
-               is_confirmed= alert('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio');
-       }
-    else{
-                   is_confirmed= confirm('Are you sure you want to delete this biblio? ');
-       }
-
-     if (is_confirmed) {
-        if (count=0){
-                       window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-               }
-    }
-}
-
-function Dopop(link) {
-    window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
-}
-
-function Changefwk(FwkList) {
-       var fwk = FwkList.options[FwkList.selectedIndex].value;
-       window.location = "MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
-}
-
-function Addbiblio(op) {
-       var fwk = document.forms['f'].Frameworks.options[document.forms['f'].Frameworks.selectedIndex].value;
-       window.location = "../cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
-}
-
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index 998c73d..1f227f3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -1,13 +1,34 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue &rsaquo; Advanced Search</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/JavaScript" language="JavaScript">
+       document.getElementById('search_box').focus(); // auto focus on the search input.
+       
+       /**
+        *  Function add_field();
+        *  This function allows to display a new field to search.
+        */
+       function add_field() {
+           var ButtonPlus = document.getElementById('ButtonPlus');
+           var line       = ButtonPlus.parentNode;
+           var dad        = line.parentNode;
+           dad.appendChild(line.cloneNode(true));
+           line.removeChild(ButtonPlus);
+       }
+</script>
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
+
+<div id="doc" class="yui-t7">
+   <div id="bd">
+       <div class="yui-g">
+
 <form action="search.pl" method="get">
-<div id="main-sidebar"><div id="advanced-search">
+<div id="advanced-search">
 <!-- TMPL_IF NAME="expanded_options" -->
 <h1>Advanced Search</h1>
 <!-- TMPL_ELSE -->
@@ -20,11 +41,9 @@
 
 <fieldset>
         <legend>Select local databases</legend>
-            <p>
                 <!-- TMPL_LOOP NAME="local_servers_loop" -->
                 <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->" /><label for="<!-- TMPL_VAR NAME="id" -->"><img width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR NAME="label" --></label>
                 <!-- /TMPL_LOOP -->
-            </p>
 </fieldset>
 <!-- /DATABASES -->
 <!-- /TMPL_IF -->
@@ -33,11 +52,9 @@
 <!-- REMOTE DATABASES -->
 <fieldset>
     <legend>Select remote databases:</legend>
-        <p>
                 <!-- TMPL_LOOP NAME="outer_servers_loop" -->
                 <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->" /><label for="<!-- TMPL_VAR NAME="id" -->"><img alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /><!-- TMPL_VAR NAME="label" --></label>
                 <!-- /TMPL_LOOP -->
-    </p>
     </fieldset>
 <!-- /REMOTE DATABASES -->
 <!-- /TMPL_IF -->
@@ -53,7 +70,6 @@
                 <p><label for="scan">Scan Indexes</label><input type="checkbox" name="scan" id="scan" value="1" /></p>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
-            <p>
         <!-- TMPL_IF NAME="expanded_options" -->
             <select name="op">
                 <option value="and" selected="selected">and</option>
@@ -209,7 +225,7 @@
 </fieldset>
 <!--/TMPL_IF -->
 <!--TMPL_IF Name="UNIMARC" -->
-</div></div>
+</div>
 <div id="sidebar">
 <!-- SUBTYPE LIMITS -->
                <fieldset>
@@ -518,22 +534,9 @@
 </div>
 </form>
 
-<script type="text/JavaScript" language="JavaScript">
-
-document.getElementById('search_box').focus(); // auto focus on the search input.
 
-/**
- *  Function add_field();
- *  This function allows to display a new field to search.
- */
-function add_field() {
-    var ButtonPlus = document.getElementById('ButtonPlus');
-    var line       = ButtonPlus.parentNode;
-    var dad        = line.parentNode;
-    dad.appendChild(line.cloneNode(true));
-    line.removeChild(ButtonPlus);
-}
 
-</script>
+</div>
+</div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 0607332..247d3af 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -1,13 +1,44 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue Detail</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script language="javascript" type="text/javascript">
+function Dopop(link) {
+    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+}
+function confirm_deletion(count) {
+        var is_confirmed;
+       if (count>0){
+                   is_confirmed= alert(_('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio'));
+                   }
+        else{
+                   is_confirmed= confirm(_('Are you sure you want to delete this biblio? '));
+       }
+
+    
+     if (is_confirmed) {
+        if (count>0){
+//     window.location="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+       }
+       else{
+       window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+       }
+               
+    }
+}
+</script>
 </head>
 <body>
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
-    <h1><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
+    <h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="class" --></h1>
     
 <!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
     
@@ -134,8 +165,7 @@
                 <tr>
                     <td><!-- TMPL_VAR NAME="description" --></td>
                     <td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR name="location" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
-                    <td>
-                        <!-- TMPL_IF name="datedue" -->
+                    <td><!-- TMPL_IF name="datedue" -->
                             On issue to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
                         <!-- TMPL_ELSE -->
                             <!-- TMPL_IF name="notforloan" -->
@@ -147,15 +177,13 @@
                                 <!-- TMPL_IF NAME="wthdrawn" -->Item Cancelled<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
                                 <!-- /TMPL_IF -->
                             <!-- /TMPL_IF -->
-                        <!-- /TMPL_IF -->
-                    </td>
+                        <!-- /TMPL_IF --></td>
                     <td><!-- TMPL_VAR NAME="datedue" --></td>
                     <td><!-- TMPL_VAR NAME="datelastseen" --></td>
-                    <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+                    <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
                     <td><!-- TMPL_VAR NAME="volumeddesc" --></td>
                     <!-- TMPL_IF NAME="type" -->
-                        <td>
-                            <a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
+                        <td>    <a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
                         </td>
                     <!-- /TMPL_IF -->
                 </tr>
@@ -179,16 +207,12 @@
                     <th>Date</th>
                     <th>Status</th>
                     <th>Note</th>
+                               </tr>
             <!--TMPL_LOOP Name="latestserials"-->
                 <tr>
-                    <td>
-                        <!--TMPL_VAR Name="serialseq"-->
-                    </td>
-                    <td>
-                        <!--TMPL_VAR Name="planneddate"-->
-                    </td>
-                    <td>
-                        <!--TMPL_IF Name="status1"-->Waited
+                    <td><!--TMPL_VAR Name="serialseq"--></td>
+                    <td><!--TMPL_VAR Name="planneddate"--></td>
+                    <td><!--TMPL_IF Name="status1"-->Waited
                         <!--TMPL_ELSE -->
                             <!-- TMPL_IF Name="status2"-->Arrived
                             <!--TMPL_ELSE -->
@@ -201,11 +225,8 @@
                                     <!--/TMPL_IF-->
                                 <!--/TMPL_IF-->
                             <!--/TMPL_IF-->
-                        <!--/TMPL_IF-->
-                    </td>
-                    <td>
-                        <!--TMPL_VAR Name="notes"-->
-                    </td>
+                        <!--/TMPL_IF--></td>
+                    <td><!--TMPL_VAR Name="notes"--></td>
                 </tr>
             <!--/TMPL_LOOP -->
             </table>
@@ -214,30 +235,11 @@
 </div>
 <!-- /TMPL_IF -->
 
-<script language="javascript" type="text/javascript">
-function Dopop(link) {
-    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
-}
-function confirm_deletion(count) {
-        var is_confirmed;
-       if (count>0){
-                   is_confirmed= alert(_('you have [ '+ count +' ] item(s) linked \n you must delete all items before delete this biblio'));
-                   }
-        else{
-                   is_confirmed= confirm(_('Are you sure you want to delete this biblio? '));
-       }
 
-    
-     if (is_confirmed) {
-        if (count>0){
-//     window.location="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-       }
-       else{
-       window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-       }
-               
-    }
-}
-</script>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
index 44b72e9..bf8451a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
@@ -4,6 +4,13 @@
 </head>
 <body>
 
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
        <h1>Dictionary Search</h1>
 <form name="f" method="post" action="/cgi-bin/koha/catalogue/dictionary.pl">
        <input type="hidden" name="op" value="do_search" />
@@ -136,5 +143,9 @@
        
 <!-- /TMPL_IF -->
 
-</body>
-</html>
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
index 0b131c1..7af17a3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
@@ -4,73 +4,55 @@
 </head>
 <body>
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
-    <h1>Issue history for <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) </h1>
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
+<h1>Issue history for <!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF --> </h1>
 
 <!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
     
 <div class="searchresults">
     <!-- TMPL_IF NAME="issues" -->
-        <br />
-        <b>Has been issued <!-- TMPL_VAR NAME="total" --> times</b>
+        <p><b>Has been issued <!-- TMPL_VAR NAME="total" --> times</b></p>
         <table>
-            <th>
-                Date
-            </th>
-            <th>
-                Surname
-            </th>
-            <th>
-                Firstname
-            </th>
-            <th>
-                Issuing branch
-            </th>
-            <th>
-                Renew
-            </th>
-            <th>
-                Date due
-            </th>
-            <th>
-                Return date
-            </th>
+            <tr><th>Date</th>
+            <th>Surname</th>
+            <th>Firstname</th>
+            <th>Issuing branch</th>
+            <th>Renew</th>
+            <th>Date due</th>
+            <th>Return date</th></tr>
         <!-- TMPL_LOOP NAME="issues" -->
             <tr>
-                <td>
-                    <!-- TMPL_IF NAME="timestamp" -->
+                <td><!-- TMPL_IF NAME="timestamp" -->
                         <!-- TMPL_VAR NAME="timestamp" -->
                     <!-- TMPL_ELSE -->
                         &nbsp;
-                    <!-- /TMPL_IF -->
-                </td>
-                <td>
-                    <!-- TMPL_IF NAME="surname" -->
+                    <!-- /TMPL_IF --></td>
+                <td><!-- TMPL_IF NAME="surname" -->
                         <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
                             <!-- TMPL_VAR NAME="surname" -->
                         </a>
                     <!-- TMPL_ELSE -->
                         &nbsp;
-                    <!-- /TMPL_IF -->
-                </td>
-                <td>
-                    <!-- TMPL_IF NAME="firstname" -->
+                    <!-- /TMPL_IF --></td>
+                <td><!-- TMPL_IF NAME="firstname" -->
                         <!-- TMPL_VAR NAME="firstname" -->
                     <!-- TMPL_ELSE -->
                         &nbsp;
-                    <!-- /TMPL_IF -->
-                </td>
-                <td>
-                    <!-- TMPL_IF NAME="issuingbranch" -->
+                    <!-- /TMPL_IF --></td>
+                <td><!-- TMPL_IF NAME="issuingbranch" -->
                         <!-- TMPL_VAR NAME="issuingbranch" -->
                     <!-- TMPL_ELSE -->
                         &nbsp;
-                    <!-- /TMPL_IF -->
-                </td>
-                <td>
-                    <!-- TMPL_IF NAME="renewals"-->
+                    <!-- /TMPL_IF --></td>
+                <td><!-- TMPL_IF NAME="renewals"-->
                         YES<br />
                         <small>
                             <!-- TMPL_IF NAME="lastreneweddate" -->
@@ -79,29 +61,30 @@
                         </small>
                     <!-- TMPL_ELSE -->
                         NO
-                    <!-- /TMPL_IF -->
-                </td>
-                <td>
-                    <!-- TMPL_IF NAME="date_due" -->
+                    <!-- /TMPL_IF --></td>
+                <td><!-- TMPL_IF NAME="date_due" -->
                         <!-- TMPL_VAR NAME="date_due" -->
                     <!-- TMPL_ELSE -->
                         &nbsp;
-                    <!-- /TMPL_IF -->
-                </td>
-                <td>
-                    <!-- TMPL_IF NAME="returndate" -->
+                    <!-- /TMPL_IF --></td>
+                <td><!-- TMPL_IF NAME="returndate" -->
                         <!-- TMPL_VAR NAME="returndate" -->
                     <!-- TMPL_ELSE -->
                         &nbsp;
-                    <!-- /TMPL_IF -->
-                </td>
+                    <!-- /TMPL_IF --></td>
            </tr>
         <!-- /TMPL_LOOP -->
+               </table>
     <!-- TMPL_ELSE -->
-        <br />
-        <b><!-- TMPL_VAR NAME="title" -->(<!-- TMPL_VAR NAME="author" -->) <span class="problem">has never been issued.</span></b>
+        <p>
+        <b><!-- TMPL_VAR NAME="title" -->(<!-- TMPL_VAR NAME="author" -->) <span class="problem">has never been issued.</span></p>
         
     <!-- /TMPL_IF -->
 </div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index f24c20b..2612f31 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -4,11 +4,16 @@
 </head>
 <body>
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
 <div id="catalogue_detail_biblio">
-       <div id="bloc25">
        <!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
                <h2>
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra">
@@ -38,10 +43,8 @@
                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Requests</a>
          <br />      
        <!-- /TMPL_LOOP -->
-       </div>
 <!-- TMPL_LOOP NAME="ITEM_DATA" -->
-<div id="bloc25">
-       <h2>BARCODE <!-- TMPL_VAR NAME="barcode" --></h2>
+<h2>BARCODE <!-- TMPL_VAR NAME="barcode" --></h2>
        <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR
 NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modify</a> |
         <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Delete</a>
@@ -68,12 +71,15 @@ NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modif
        Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br />
        <b>Group Number:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br />
        <b>Biblio number:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br />
-       </h2>
-</div>
 <!-- /TMPL_LOOP -->
 
-<p>
-</form>
-</center>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+
+
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index a4d382e..5d2bbbe 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -3,9 +3,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
     <!-- TMPL_IF NAME="koha_spsuggest" -->
         <div style="font-size: 12px;">Did you mean: 
             <ul style="list-style: none;">
@@ -378,7 +384,10 @@
     
     <!-- /TMPL_IF -->
 
+
+</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl
index b6582cc..48365d0 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl
@@ -4,9 +4,15 @@
 </head>
 <body>
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
 <div id="catalogue_detail_biblio">
 
 <h1>Subject search results</h1>
@@ -28,4 +34,10 @@
 <p><a  class="button" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a> <a class="button" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a></p>
 
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl
index 6dc53cb..ac1ae2b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl
@@ -4,6 +4,13 @@
 </head>
 <body>
 
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<div id="doc3" class="yui-t2">
+   
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
         <table>
         <caption>Catalog Search</caption>
             <tr>
@@ -36,5 +43,9 @@
     }
 </script>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</div>
+</div>
 
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl
index 8b86f77..761f204 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl
@@ -1,15 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Add to Virtual Shelf</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<style type="text/css">
+   #custom-doc { width:38.46em;*width:37.53em;min-width:500px; margin:auto; text-align:left; }
+   </style>
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="doc3" class="yui-t2">
-   
+<div id="custom-doc" class="yui-t7">
    <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+       <div class="yui-g">
 
 
 <h1>Add 
@@ -50,9 +50,7 @@
     <input type="submit" value="Add to virtual shelf" class="submit" /> 
 </form>
 
-</div>
 </div>
 </div>
 
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

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 16dafec..64f1b42 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -1,6 +1,44 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Virtual Shelves</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript">
+       function confirmDelete(s){
+               if (window.confirm(s))
+                       return true;
+               return false;
+       }
+       /**
+        * this function checks all checkbox 
+        * or uncheck all if there are already checked.
+        */
+       function CheckAll(){
+               var checkboxes = document.getElementsByTagName('input');
+               var nbCheckbox = checkboxes.length;
+               var check = areAllChecked();
+               check = !check;
+               for(var i=0;i<nbCheckbox;i++){
+                       if(checkboxes[i].getAttribute('type') == "checkbox" ){
+                               checkboxes[i].checked = check;
+                       }
+               }
+       }
+       /**
+        * this function return true if all checkbox are checked
+        */
+       function areAllChecked(){
+               var checkboxes = document.getElementsByTagName('input');
+               var nbCheckbox = checkboxes.length;
+               for(var i=0;i<nbCheckbox;i++){
+                       if(checkboxes[i].getAttribute('type') == "checkbox" ){
+                               if(checkboxes[i].checked == 0){
+                                       return false;
+                               }
+                       }
+               }
+               return true;
+       }
+       
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -69,8 +107,8 @@
         <!-- /TMPL_LOOP -->
     </table>
     <!-- TMPL_ELSE -->
-    <br />
-    <b>This shelf is empty.</b>
+
+    <p><b>This shelf is empty.</b></p>
     <!-- TMPL_UNLESS NAME="itemsloop" -->
         <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" />
         <input type="hidden" name="shelves" value="1" />
@@ -92,7 +130,6 @@
 </form>
     <!-- TMPL_IF name="manageshelf" -->
     
-<br />
 <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post">
     <table>
         <tr><th colspan="2">Add an item to this shelf by barcode</th></tr>
@@ -165,7 +202,7 @@
         <input type="submit" value="Delete shelves" /></form>
         <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
-        <br />
+
         <p><form class="inline" action="/cgi-bin/koha/virtualshelves/shelves.pl" method="get"><input type="submit" value="Back to virtual shelves" /></form></p>
 
     <!-- TMPL_ELSE -->
@@ -230,43 +267,4 @@
 </div>
 
 <!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-<script type="text/javascript">
-       function confirmDelete(s){
-               if (window.confirm(s))
-                       return true;
-               return false;
-       }
-       /**
-        * this function checks all checkbox 
-        * or uncheck all if there are already checked.
-        */
-       function CheckAll(){
-               var checkboxes = document.getElementsByTagName('input');
-               var nbCheckbox = checkboxes.length;
-               var check = areAllChecked();
-               check = !check;
-               for(var i=0;i<nbCheckbox;i++){
-                       if(checkboxes[i].getAttribute('type') == "checkbox" ){
-                               checkboxes[i].checked = check;
-                       }
-               }
-       }
-       /**
-        * this function return true if all checkbox are checked
-        */
-       function areAllChecked(){
-               var checkboxes = document.getElementsByTagName('input');
-               var nbCheckbox = checkboxes.length;
-               for(var i=0;i<nbCheckbox;i++){
-                       if(checkboxes[i].getAttribute('type') == "checkbox" ){
-                               if(checkboxes[i].checked == 0){
-                                       return false;
-                               }
-                       }
-               }
-               return true;
-       }
-       
-</script>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file