[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en catalogue/... [rel_3_0]

Antoine Farnault antoine at koha-fr.org
Thu Jan 11 18:09:46 CET 2007


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	07/01/11 17:09:46

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/catalogue: ISBDdetail.tmpl 
	                                           MARCdetail.tmpl 
	                                           detail.tmpl 
	                                           issuehistory.tmpl 
Added files:
	koha-tmpl/intranet-tmpl/prog/en/includes: action-catalogue.inc 

Log message:
	write the catalogue action's button to an included file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.6&r2=1.2.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.13&r2=1.3.2.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.17&r2=1.2.2.18
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1

Patches:
Index: catalogue/ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -b -r1.2.2.6 -r1.2.2.7
--- catalogue/ISBDdetail.tmpl	11 Jan 2007 16:38:25 -0000	1.2.2.6
+++ catalogue/ISBDdetail.tmpl	11 Jan 2007 17:09:46 -0000	1.2.2.7
@@ -6,47 +6,7 @@
 
 <h1 class="catalogue">MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
 
-    <div id="action">
-            <a class="button catalogue" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=">
-                Edit biblio
-            </a>
-            <a class="button catalogue" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=duplicate">
-                Duplicate
-            </a>
-            <a class="button catalogue" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                Edit item
-            </a>
-            <a class="button catalogue" href="javascript:confirm_deletion()">
-                Delete
-            </a>
-            <a class="button catalogue" 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 class="button catalogue" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                ISBD
-            </a>
-            <a class="button catalogue" href="#" onclick="javascript:window.open('/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_bookshelf','width=500,height=400,toolbar=false,scrollbars=yes');">
-                Add to shelf
-            </a>
-            <a class="button cataloge" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                Print
-            </a>
-            <!-- TMPL_IF name="subscriptionsnumber" -->
-            <a class="button catalogue" href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                Subscription(s)
-            </a>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="norequests" -->
-            <!-- TMPL_ELSE -->
-                <a class="button catalogue" 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" -->">Issue history</a>
-    </div>
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
 
 	<div id="catalogue_ISBDdetail">
 		<!-- TMPL_VAR NAME="ISBD" -->

Index: catalogue/MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3.2.13
retrieving revision 1.3.2.14
diff -u -b -r1.3.2.13 -r1.3.2.14
--- catalogue/MARCdetail.tmpl	11 Dec 2006 16:42:26 -0000	1.3.2.13
+++ catalogue/MARCdetail.tmpl	11 Jan 2007 17:09:46 -0000	1.3.2.14
@@ -8,47 +8,9 @@
     <h1>
         Biblionumber : <!-- TMPL_VAR NAME="biblionumber" -->
     </h1>
-    <div id="action">
-            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=" class="button catalogue" >
-                Edit biblio
-            </a>
-            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=duplicate" class="button catalogue" >
-                Duplicate
-            </a>
-            <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
-                Edit item
-            </a>
-            <a href="javascript:confirm_deletion()">
-                Delete
-            </a>
-            <a href="#?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
-            Complete
-            </a>
-            <a class="button catalogue" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                Normal
-            </a>
-            <a class="button catalogue" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                ISBD
-            </a>
-            <a href="#" onclick="JavaScript:window.open('/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_bookshelf','width=500,height=400,toolbar=false,scrollbars=yes');">
-                Add to shelf
-            </a>
-            <a class="button catalogue" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                Print
-            </a>
-            <!-- TMPL_IF name="subscriptionsnumber" -->
-            <a class="button catalogue" href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                Subscription(s)
-            </a>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="norequests" -->
-            <!-- TMPL_ELSE -->
-                <a class="button catalogue" 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" -->">Issue history</a>
-    </div>
+    
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
+
 <!-- /TMPL_UNLESS -->
 
     <p><b>With Framework :<!--TMPL_VAR Name="framework" --></b></p>

Index: catalogue/detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl,v
retrieving revision 1.2.2.17
retrieving revision 1.2.2.18
diff -u -b -r1.2.2.17 -r1.2.2.18
--- catalogue/detail.tmpl	19 Dec 2006 17:06:20 -0000	1.2.2.17
+++ catalogue/detail.tmpl	11 Jan 2007 17:09:46 -0000	1.2.2.18
@@ -4,48 +4,9 @@
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
     <h1><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
-    <div id="action">
-            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=">
-                Edit biblio
-            </a>
-            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&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()">
-                Delete
-            </a>
-            <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-            Complete
-            </a>
-            <a href="#">
-                Normal
-            </a>
-            <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                ISBD
-            </a>
-            <a href=# onclick="javascript:window.open('/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_bookshelf','width=500,height=400,toolbar=false,scrollbars=yes');">
-                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?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                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" -->">Issue history</a>
-    </div>
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
+    
     <div id="catalogue_detail_biblio">
         <h2>Biblio detail</h2>
         <!-- TMPL_IF name="subtitles" -->

Index: catalogue/issuehistory.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/issuehistory.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- catalogue/issuehistory.tmpl	17 Nov 2006 14:57:22 -0000	1.1.2.5
+++ catalogue/issuehistory.tmpl	11 Jan 2007 17:09:46 -0000	1.1.2.6
@@ -4,48 +4,8 @@
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
     <h1>Issue hitory for <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) </h1>
-    <div id="action">
-            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=">
-                Edit biblio
-            </a>
-            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&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()">
-                Delete
-            </a>
-            <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>
-            <a href="#" onclick="JavaScript:window.open('/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_bookshelf','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?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                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="#" >Issue history</a>
-    </div>
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
     
 <div class="searchresults">
     <!-- TMPL_IF NAME="issues" -->

Index: includes/action-catalogue.inc
===================================================================
RCS file: includes/action-catalogue.inc
diff -N includes/action-catalogue.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/action-catalogue.inc	11 Jan 2007 17:09:46 -0000	1.1.2.1
@@ -0,0 +1,46 @@
+    <div id="action">
+            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=">
+                Edit biblio
+            </a>
+            <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&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()">
+                Delete
+            </a>
+            <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>
+            <a href="#" onclick="JavaScript:window.open('/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_bookshelf','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?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                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"-->" >Issue 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 -->            
+    </div>





More information about the Koha-cvs mailing list