[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en admin/admi...
Tumer Garip
tgarip at neu.edu.tr
Wed Sep 27 23:40:47 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Changes by: Tumer Garip <tgarip1957> 06/09/27 21:40:47
Modified files:
koha-tmpl/intranet-tmpl/prog/en/admin: admin-home.tmpl
aqbookfund.tmpl
aqbudget.tmpl
koha-electronic.tmpl
koha_attr.tmpl
koha-tmpl/intranet-tmpl/prog/en/authorities: auth_finder.tmpl
authorities-home.tmpl
authorities.tmpl
detail.tmpl
searchresultlist-auth.tmpl
searchresultlist.tmpl
koha-tmpl/intranet-tmpl/prog/en/catalogue: catalogue_search.tmpl
catalogue_searchresults.tmpl
koha-tmpl/intranet-tmpl/prog/en/circ: circulation.tmpl
returns.tmpl
koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl
koha-tmpl/intranet-tmpl/prog/en/tools: tools-home.tmpl
Removed files:
koha-tmpl/intranet-tmpl/prog/en/export: marc.tmpl
koha-tmpl/intranet-tmpl/prog/en/import: breeding.tmpl
Log message:
updated templates for new XML API
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/koha-electronic.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/koha_attr.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_search.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_searchresults.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/export/marc.tmpl?cvsroot=koha&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/import/breeding.tmpl?cvsroot=koha&r1=1.1&r2=0
Patches:
Index: admin/admin-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- admin/admin-home.tmpl 11 Sep 2006 17:41:55 -0000 1.5
+++ admin/admin-home.tmpl 27 Sep 2006 21:40:47 -0000 1.6
@@ -103,55 +103,7 @@
</tr>
</table>
-<table>
- <caption>Tools</caption>
- <tr>
- <th colspan="2" class="header">Facult members credit</th>
- </tr>
- <tr>
- <th><a href="/cgi-bin/koha/members/manualcredit.pl">Faculty members credit</a></th>
- <td> Clears the debts of all faculty members</td>
- </tr>
- <tr>
- <th colspan="2" class="header">ZEBRA Queue</th>
- </tr>
- <tr>
- <th><a href="/cgi-bin/koha/z3950/zebraqueue_windows_start.pl">ZEBRA queue starter</a></th>
- <td> Starts Zebra queue if stopped or system restarted. ZEBRA queue is required for the system to update ZEBRA</td>
- </tr>
- <tr>
- <th colspan="2" class="header">Export</th>
- </tr>
- <tr>
- <th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
- <td> Exporting in MARC format.</td>
- </tr>
- <tr>
- <th><a href="/cgi-bin/koha/export/marc-time.pl">MARC biblio export by date</a></th>
- <td> Exporting in MARC format by date.</td>
- </tr>
- <tr>
- <th colspan="2" class="header">Import</th>
- </tr>
- <tr>
- <th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
- <td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
- </td>
- </tr>
- <th colspan="2" class="header">Barcode generator</th>
- </tr>
- <tr>
- <th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
- <td>the barcode generator deals with generating barcodes for items you acquire
- </td>
- </tr>
- <tr><th colspan="2" class="header">Membership Cards</th></tr>
- <tr>
- <th><a href="/cgi-bin/koha/barcodes/cbarcodes.pl">Membership cards</a></th>
- <td>create membership cards from member cardnumbers
- </td>
- </tr>
-</table>
+
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: admin/aqbookfund.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- admin/aqbookfund.tmpl 11 Sep 2006 17:41:55 -0000 1.3
+++ admin/aqbookfund.tmpl 27 Sep 2006 21:40:47 -0000 1.4
@@ -1,66 +1,98 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="else" -->Book Funds<!-- /TMPL_IF -->
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="header" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="add_validate" -->Data Recorded<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Fund '<!-- TMPL_VAR name="bookfundname" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Koha -- System Administration: Book Funds
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
<!-- TMPL_IF name="else" -->
<h1>Book Fund Administration</h1>
-<!-- TMPL_IF NAME="bookfund" --><form action="<!-- TMPL_VAR name=scriptname -->" method="post">
-<input type="text" name="searchfield" value="" /> <input type="submit" name="search" value="Search" class="submit" /></form>
-<!-- TMPL_IF name="search" -->
- <div id="results">You Searched for <span class="ex"><!-- TMPL_VAR name="searchfield" --></span></div>
-<!-- /TMPL_IF -->
-
+ <!-- TMPL_IF NAME="bookfund" -->
<table>
-<tr>
- <th>Book Fund</th>
+ <tr>
+ <th>Code</th>
<th>Name</th>
<th>Branch</th>
- <th>Edit</th>
- <th>Delete</th>
- </tr>
-<!-- TMPL_LOOP name="bookfund" -->
- <tr>
- <td><a href="<!-- TMPL_VAR name="action" -->?op=add_form&bookfundid=<!-- TMPL_VAR name="bookfundid" --> "><!-- TMPL_VAR name="bookfundid" --></a></td>
- <td><!-- TMPL_VAR name="bookfundname" --></td>
- <td><!--TMPL_VAR Name="branchname"--></td>
- <td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
- <td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
+ <th>Actions</th>
</tr>
- <tr>
- <td> </td>
- <td><b>Budget</b></td>
- <td>Branch</td>
- <td><form action="aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="submit" value="Add Budget" /></form></td>
- <td></td>
+
+<form action="<!-- TMPL_VAR name="scriptname" -->" method="post">
+ <tr class="filter">
+ <td>
+ <select name="filter_bookfundid">
+ <option value="">----</option>
+ <!-- TMPL_LOOP name="filter_bookfundids" -->
+ <!-- TMPL_IF NAME="selected" -->
+ <option value="<!-- TMPL_VAR name="bookfundid" -->" selected="selected"><!-- TMPL_VAR name="bookfundid" --></option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></option>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ </select>
+ </td>
+ <td>
+ <input type="text" name="filter_bookfundname" value="<!-- TMPL_VAR name="filter_bookfundname" -->" />
+ </td>
+ <td>
+ <select name="filter_branchcode">
+ <option value="">----</option>
+ <!-- TMPL_LOOP name="filter_branches" -->
+ <!-- TMPL_IF NAME="selected" -->
+ <option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="name" --></option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="name" --></option>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ </select>
+ </td>
+ <td>
+ <input type="submit" name="filter" value="Filter" />
+ </td>
</tr>
- <!-- TMPL_LOOP name="budget" -->
+</form>
+
+<form action="aqbudget.pl" method="post">
+ <!-- TMPL_LOOP name="bookfund" -->
+ <!-- TMPL_IF NAME="toggle" -->
+ <tr class="highlight">
+ <!-- TMPL_ELSE -->
<tr>
- <td> </td>
+ <!-- /TMPL_IF -->
<td>
- <!-- TMPL_VAR name="startdate" --> - <!-- TMPL_VAR name="enddate" --> : <b><!-- TMPL_VAR name="budgetamount" --></b>
+ <!-- TMPL_VAR name="bookfundid" -->
</td>
<td>
- <!--TMPL_IF Name="branchcode"-->
- <!--TMPL_VAR Name="branchcode"-->
- <!--TMPL_ELSE -->
-
- <!--/TMPL_IF-->
+ <!-- TMPL_VAR name="bookfundname" -->
+ </td>
+ <td>
+ <!-- TMPL_IF NAME="branchname" -->
+ <!-- TMPL_VAR name="branchname" -->
+ <!-- TMPL_ELSE -->
+ None
+ <!-- /TMPL_IF -->
+ </td>
+ <td>
+ <a href="<!-- TMPL_VAR name="scriptname" -->?op=add_form&bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Edit</a>
+ <a href="<!-- TMPL_VAR name="scriptname" -->?op=delete_confirm&bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Delete</a>
+ <a href="aqbudget.pl?op=add_form&bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Add budget</a>
+ <!-- TMPL_IF NAME="has_budgets" -->
+ <a href="aqbudget.pl?filter_bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Show budgets</a>
+ <!-- /TMPL_IF -->
</td>
- <td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
- <td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
-
</tr>
- <!-- /TMPL_LOOP -->
-<!-- /TMPL_LOOP -->
-</table><!-- /TMPL_IF -->
-<form action="<!-- TMPL_VAR name="scriptname" -->" method="post">
- <p><input type="hidden" name="op" value="add_form" /></p>
-<input type="submit" value="Add bookfund" class="submit" /></form>
-<!-- /TMPL_IF -->
+
+ <!-- /TMPL_LOOP --> <!-- bookfund -->
+</table>
+
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+ <!-- /TMPL_IF --> <!-- bookfund -->
+
+<p>
+ <a href="<!-- TMPL_VAR name=scriptname -->?op=add_form">Add bookfund</a>
+ <a href="aqbudget.pl">Show all budgets</a>
+</p>
+
+</form>
+<!-- /TMPL_IF --> <!-- else -->
<!-- TMPL_IF name="add_form" -->
<script>
@@ -115,46 +147,108 @@
alert(alertString2);
}
}
- </SCRIPT>
+ </script>
+
<form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
-<input type="hidden" name="op" value="add_validate" />
-<input type="hidden" name="checked" value="0" />
-<div class="data">
-<table>
-<caption><!-- TMPL_VAR name="header" --></caption>
-<!-- TMPL_IF name="add_or_modify" -->
-<tr><th>Book fund</th><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><!-- TMPL_VAR name="bookfundid" --></td></tr>
-<!-- TMPL_ELSE -->
-<tr><th>Book fund</th><td><input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" /></td></tr>
-<!-- /TMPL_IF -->
-<tr><th>Name</th><td><input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" /></td></tr>
-<tr><th><label>Branch</label></th><td><!-- TMPL_VAR NAME="CGIbranch"--> Select one if budget is branch-specific, otherwise, leave it blank.</td></tr>
-</table>
-</div>
-<p><input type="button" value="<!-- TMPL_VAR name="header" -->" onclick="Check(this.form); return false;" class="submit" /> <input type="submit" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="action" -->'; return false;" /></p>
+ <input type="hidden" name="op" value="add_validate" />
+ <input type="hidden" name="checked" value="0" />
+
+ <table>
+ <caption><!-- TMPL_VAR name="header" --></caption>
+
+ <!-- TMPL_IF name="add_or_modify" -->
+ <tr>
+ <th>Book fund</th>
+ <td>
+ <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
+ <!-- TMPL_VAR name="bookfundid" -->
+ </td>
+ </tr>
+ <!-- TMPL_ELSE -->
+ <tr>
+ <th>Book fund</th>
+ <td>
+ <input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" />
+ </td>
+ </tr>
+ <!-- /TMPL_IF --> <!-- add_or_modify -->
+
+ <tr>
+ <th>Name</th>
+ <td>
+ <input type="text"
+ name="bookfundname"
+ size="40"
+ maxlength="80"
+ value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->"
+ />
+ </td>
+ </tr>
+
+ <tr>
+ <th>Branch</th>
+ <td>
+ <select name="branchcode">
+ <option value="">None</option>
+ <!-- TMPL_LOOP NAME="branches" -->
+ <option value="<!-- TMPL_VAR NAME="branchcode" -->" <!-- TMPL_IF NAME="selected" -->selected="selected" <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option>
+ <!-- /TMPL_LOOP -->
+ </td>
+ </tr>
+
+ </table>
+
+ <p>
+ <input type="button" value="Submit" onclick="Check(this.form); return false;" />
+ <input type="reset" value="Reset" />
+ </p>
</form>
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --> <!-- add_form -->
<!-- TMPL_IF name="add_validate" -->
<h3>Data Recorded</h3>
-<form action="<!-- TMPL_VAR name="action" -->" method="post">
-<input type="submit" value="OK" class="submit" />
-</form></td></tr></table>
+
+<p>
+ <a href="<!-- TMPL_VAR name="action" -->">Return to fund list</a>
+</p>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_confirm" -->
<h3>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></h3>
-<div class="data"><table>
-<tr><th>Book fund</th><td><!-- TMPL_VAR name="bookfundid" --></td></tr>
-<tr><th>Name</th><td><!-- TMPL_VAR name="bookfundname" --></td></tr><tr><th>Group</th><td><!-- TMPL_VAR name="bookfundgroup" --></td></tr>
-</table></div><div class="tabitem"><form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" value="Delete this Fund" class="cancel" /></form> <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
-<!-- /TMPL_IF -->
+<table>
+ <tr>
+ <th>Book fund</th>
+ <td><!-- TMPL_VAR name="bookfundid" --></td>
+ </tr>
+ <tr>
+ <th>Name</th>
+ <td><!-- TMPL_VAR name="bookfundname" --></td>
+ </tr>
+ <tr>
+ <th>Group</th>
+ <td><!-- TMPL_VAR name="bookfundgroup" --></td>
+ </tr>
+</table>
+
+<form action="<!-- TMPL_VAR name="action" -->" method="post">
+ <input type="hidden" name="op" value="delete_confirmed" />
+ <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
+
+ <div id="action">
+ <input type="submit" value="Delete this Fund" />
+ </div>
+</form>
+
+<form action="<!-- TMPL_VAR name="action" -->" method="post">
+ <input type="submit" value="Do not Delete" />
+</form>
+<!-- /TMPL_IF --> <!-- delete_confirm -->
<!-- TMPL_IF name="delete_confirmed" -->
<h3>Data Deleted</h3>
-<div class="form"><form action="<!-- TMPL_VAR name="action" -->" method="post">
-<input type="submit" value="OK" class="submit" /></form></div>
-<!-- /TMPL_IF -->
-
+<form action="<!-- TMPL_VAR name="action" -->" method="post">
+ <input type="submit" value="OK" />
+</form>
+<!-- /TMPL_IF --> <!-- delete_confirmed -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: admin/aqbudget.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- admin/aqbudget.tmpl 11 Sep 2006 17:41:55 -0000 1.3
+++ admin/aqbudget.tmpl 27 Sep 2006 21:40:47 -0000 1.4
@@ -87,7 +87,7 @@
Calendar.setup(
{
inputField : "filter_startdate",
- ifFormat : "%Y-%m-%d",,
+ ifFormat : "%Y-%m-%d",
button : "filter_startdate_button"
}
);
@@ -170,6 +170,10 @@
</td>
</tr>
<!-- /TMPL_LOOP --> <!-- budget -->
+<p>
+ <a href="aqbookfund.pl?op=add_form">Add bookfund</a>
+ <a href="aqbudget.pl">Show all budgets</a>
+</p>
</table>
<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
Index: admin/koha-electronic.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/koha-electronic.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- admin/koha-electronic.tmpl 11 Sep 2006 17:41:55 -0000 1.1
+++ admin/koha-electronic.tmpl 27 Sep 2006 21:40:47 -0000 1.2
@@ -46,7 +46,7 @@
<tr>
<td colspan="2">
<input class="button" type="submit" value="Save">
- <input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/admin/opac-electronic.pl'">
+ <input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/admin/koha-electronic.pl'">
</td>
</tr>
</table>
@@ -67,7 +67,7 @@
<input type="submit" class="button" value="Filter">
</form>
- <form name="del_form" method="post" action="/cgi-bin/koha/admin/opac-electronic.pl" onsubmit="return confirm("Are you sure you want to delete the selected database?')">
+ <form name="del_form" method="post" action="/cgi-bin/koha/admin/koha-electronic.pl" onsubmit="return confirm("Are you sure you want to delete the selected database?')">
<table border="0" cellspacing="0" cellpadding="3">
<tr bgcolor="#99cc33">
<th></td>
Index: admin/koha_attr.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/koha_attr.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- admin/koha_attr.tmpl 11 Sep 2006 17:41:55 -0000 1.1
+++ admin/koha_attr.tmpl 27 Sep 2006 21:40:47 -0000 1.2
@@ -4,7 +4,7 @@
<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menu.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
<h1>KOHA attr matching for biblios,holdings and authorities XML & MARC records</h1>
<script language="javascript" type="text/javascript">
@@ -67,12 +67,14 @@
<div class="data"><table>
<caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
<tr><th><label>Kohafield<label></th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
- <tr><th><label for="liblibrarian">Field description</label></th><td><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
- <tr><th><label for="attr">Bib1 or other defined attribute</label></th><td><input type="text" id="attr" name="attr" value="<!-- TMPL_VAR NAME="attr" escape="HTML" -->" size="40" maxlength="80" />Add all common attributes to field</td></tr>
+ <tr><th><label for="label">Field description</label></th><td><input type="text" id="label" name="label" value="<!-- TMPL_VAR NAME="label" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
+ <tr><th><label for="attr">Main attribute name</label></th><td><input type="text" id="attr" name="attr" value="<!-- TMPL_VAR NAME="attr" escape="HTML" -->" size="40" maxlength="80" />Do not insert the "@attr 1=" part </td></tr>
+ <tr><th><label for="attr">Extra attributes</label></th><td><input type="text" id="extraattr" name="extraattr" value="<!-- TMPL_VAR NAME="extraattr" escape="HTML" -->" size="40" maxlength="80" />any other structure attribute like @attr 4=5 for date</td></tr>
<tr><th><label for="taglist">MARC tag for this field</label></th><td><!-- TMPL_VAR NAME="tagfield" --></td></tr>
<tr><th><label for="tagsublist">MARC subfieldcode for this field</label></th><td><!-- TMPL_VAR NAME="tagsubfield" --></td></tr>
<tr><th><label for="sorts">Sorts on this field</label></th><td><!-- TMPL_VAR NAME="sorts" --></td></tr>
<tr><th><label for="opacshow">Shows in librarian searches</label></th><td><!-- TMPL_VAR NAME="intrashow" --><label for="opacshow">Shows in opac search</label><!-- TMPL_VAR NAME="opacshow" --></td></tr>
+ <tr><th><label for="facets_label">Grouping name in facets</label></th><td><input type="text" id="facets_label" name="facets_label" value="<!-- TMPL_VAR NAME="facets_label" escape="HTML"-->" size="80" /></td></tr>
<tr><th><label for="serverlist">Record type for this field</label></th><td><!-- TMPL_VAR NAME="recordtype" --></td></tr>
@@ -87,7 +89,7 @@
<div class="data"><table>
<caption>Confirm Deletion of Field <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
<tr><th>Kohafield: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
- <tr><th>Description: </th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+ <tr><th>Description: </th><td><!-- TMPL_VAR NAME="label" --></td></tr>
</table></div>
<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"/><input type="hidden" name="id" value='<!-- TMPL_VAR NAME="id" -->' /> <input type="submit" class="cancel" value="Yes, Delete this Tag" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="No, Do Not Delete" /></form>
<!-- /TMPL_IF -->
@@ -126,6 +128,7 @@
<th scope="col">Sorts</th>
<th scope="col">Intra Show</th>
<th scope="col">Opac Show</th>
+ <th scope="col">Facets Group</th>
<th scope="col">Related record</th>
@@ -136,13 +139,14 @@
<input type="hidden" value="<!-- TMPL_VAR NAME="attr" -->" />
<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
<tr class="highlight">
- <td><b><!-- TMPL_VAR NAME="marctokoha" --></b></td>
- <td><!-- TMPL_VAR NAME="attr" --></td>
+ <td><b><!-- TMPL_VAR NAME="kohafield" --></b></td>
+ <td>@attr 1=<!-- TMPL_VAR NAME="attr" --> <!-- TMPL_VAR NAME="extraattr" --></td>
<td><!-- TMPL_VAR NAME="tagfield" --><!-- TMPL_VAR NAME="tagsubfield" --></td>
- <td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+ <td><!-- TMPL_VAR NAME="label" --></td>
<td><!-- TMPL_IF NAME="sorts" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
<td><!-- TMPL_IF NAME="intrashow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
<td><!-- TMPL_IF NAME="opacshow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ <td><!-- TMPL_VAR NAME="facets_label" --></td>
<td><!-- TMPL_VAR NAME="recordtype" --></td>
<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
</tr>
@@ -157,13 +161,14 @@
<!-- TMPL_LOOP NAME="loop" -->
<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
- <td><b><!-- TMPL_VAR NAME="marctokoha" --></b></td>
- <td><!-- TMPL_VAR NAME="attr" --></td>
+ <td><b><!-- TMPL_VAR NAME="kohafield" --></b></td>
+ <td>@attr 1=<!-- TMPL_VAR NAME="attr" --> <!-- TMPL_VAR NAME="extraattr" --></td>
<td><!-- TMPL_VAR NAME="tagfield" --><!-- TMPL_VAR NAME="tagsubfield" --></td>
- <td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+ <td><!-- TMPL_VAR NAME="label" --></td>
<td><!-- TMPL_IF NAME="sorts" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
<td><!-- TMPL_IF NAME="intrashow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
<td><!-- TMPL_IF NAME="opacshow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ <td><!-- TMPL_VAR NAME="facets_label" --></td>
<td><!-- TMPL_VAR NAME="recordtype" --></td>
<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
</tr>
Index: authorities/auth_finder.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- authorities/auth_finder.tmpl 11 Sep 2006 17:41:55 -0000 1.1
+++ authorities/auth_finder.tmpl 27 Sep 2006 21:40:47 -0000 1.2
@@ -1,9 +1,8 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-<div id="main">
<h1>Authority search</h1>
@@ -47,7 +46,7 @@
</p>
</div>
</form>
-</div>
+
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: authorities/authorities-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- authorities/authorities-home.tmpl 11 Sep 2006 17:41:55 -0000 1.2
+++ authorities/authorities-home.tmpl 27 Sep 2006 21:40:47 -0000 1.3
@@ -1,10 +1,8 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-<div id="main">
<form name="f" method="post">
<input type="hidden" name="op" value="do_search" />
@@ -38,7 +36,7 @@
<input type="submit" value="Start search" class="submit">
</p>
</form>
-</div>
+
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: authorities/authorities.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- authorities/authorities.tmpl 11 Sep 2006 17:41:55 -0000 1.3
+++ authorities/authorities.tmpl 27 Sep 2006 21:40:47 -0000 1.4
@@ -1,12 +1,14 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Authorities
-<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="masthead.inc" --><!--/TMPL_UNLESS-->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" --><!--/TMPL_UNLESS-->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
+<!--TMPL_ELSE-->
+<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
+<!--/TMPL_UNLESS-->
+
+
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
-<div id="main">
<!-- TMPL_IF name="error" -->
<div class="error">
<!--TMPL_IF NAME="xmlerror"-->
@@ -107,7 +109,7 @@
<!-- TMPL_IF NAME="repeatable" -->
<a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
<!-- /TMPL_IF -->
- <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" --><!--TMPL_VAR NAME="id"-->"/>
+ <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
Index: authorities/detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- authorities/detail.tmpl 11 Sep 2006 17:41:55 -0000 1.2
+++ authorities/detail.tmpl 27 Sep 2006 21:40:47 -0000 1.3
@@ -1,9 +1,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="masthead.inc" --><!--/TMPL_UNLESS-->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" --><!--/TMPL_UNLESS-->
-
+<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
+<!--TMPL_ELSE-->
+<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
+<!--/TMPL_UNLESS-->
<div id="main">
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
@@ -17,7 +18,7 @@
</a>
<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">
Print
- </a><!--/TMPL_UNLESS--><!--TMPL_IF NAME="count"--> <a href="/cgi-bin/koha/catalogue/catalogue-search.pl?value=<!-- TMPL_VAR NAME="authid" -->&kohafield=auth_authid&op=do_search&zoom=1" class="button authority">Used in <!-- TMPL_VAR NAME="count" --> biblio(s)</a><!--/TMPL_IF-->
+ </a><!--/TMPL_UNLESS--><!--TMPL_IF NAME="count"--> <a href="/cgi-bin/koha/catalogue/catalogue-search.pl?value=<!-- TMPL_VAR NAME="authid" -->&kohafield=authid&op=do_search&zoom=1" class="button authority">Used in <!-- TMPL_VAR NAME="count" --> biblio(s)</a><!--/TMPL_IF-->
</div>
<div name="0XX" id="0XX" class="tab" style="visibility:visible">
Index: authorities/searchresultlist-auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- authorities/searchresultlist-auth.tmpl 11 Sep 2006 17:41:55 -0000 1.1
+++ authorities/searchresultlist-auth.tmpl 27 Sep 2006 21:40:47 -0000 1.2
@@ -1,8 +1,6 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-
-<div id="main">
+<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
<h1 class="authority">Authority search results</h1>
<div id="resultnumber">
<p>
@@ -83,7 +81,7 @@
</p>
</div><a href="auth_finder.pl?index=<!-- TMPL_VAR NAME="index" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Search again</a>
</div>
-</div>
+
<script language="JavaScript" type="text/javascript">
Index: authorities/searchresultlist.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- authorities/searchresultlist.tmpl 11 Sep 2006 17:41:55 -0000 1.2
+++ authorities/searchresultlist.tmpl 27 Sep 2006 21:40:47 -0000 1.3
@@ -1,10 +1,8 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-<div id="main">
<h1 class="authority">Authority search results</h1>
<div id="resultnumber">
<p>
@@ -48,7 +46,7 @@
<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
<td><!-- TMPL_VAR NAME="summary" --></td>
- <td><a href="/cgi-bin/koha/catalogue/catalogue-search.pl?kohafield=auth_authid&value=<!-- TMPL_VAR NAME="authid" -->&op=do_search&zoom=1" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
+ <td><a href="/cgi-bin/koha/catalogue/catalogue-search.pl?kohafield=authid&value=<!-- TMPL_VAR NAME="authid" -->&op=do_search&zoom=1" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
<td><!-- TMPL_VAR NAME="authid" -->
<!-- TMPL_UNLESS name="used" -->
@@ -88,7 +86,7 @@
From:<input type="text" size="10" name="mergefrom" id="mergefrom" value=""/> To:<input type="text" size="10" id="mergeto" name="mergeto" value=""/>
<input type="button" class="submit" value="Merge" onclick="do_merge(); return false;" /></form>
-</div>
+
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: catalogue/catalogue_search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- catalogue/catalogue_search.tmpl 11 Sep 2006 17:41:55 -0000 1.1
+++ catalogue/catalogue_search.tmpl 27 Sep 2006 21:40:47 -0000 1.2
@@ -1,9 +1,8 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Simple Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
-
<h1>Catalogue Search</h1>
+
<table align ="center" >
<td align ="center">
@@ -12,20 +11,24 @@
<td align ="center">
<input id="searchType2" type="button" value="SQL search" onclick="changeSearch2()" <!-- TMPL_IF name="sql_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF --> background-color="orange">
</td>
+ <td align ="center">
+ <input id="searchType3" type="button" value="Brave search" onclick="changeSearch3()" <!-- TMPL_IF name="brave_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF --> background-color="orange">
+ </td>
</tr>
</table>
+
<form name="zoom_form" id="zoom_form" action="/cgi-bin/koha/catalogue/catalogue-search.pl" method='post' <!-- TMPL_IF name="zoom_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
<input type="hidden" name="op" value="do_search">
<input type="hidden" name="search_type" value="zoom">
<input type="hidden" name="startfrom" value="0">
<input type="hidden" name="zoom" value="1">
-<table style="border:0" align="center">
+<table style="border:0" align="center"><tbody id="queryarea">
-<tr><td><b>Format to display</b></td><td>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></td><td><b>Display per page:</b><input type text name="number_of_results" value="10" size="3"/></td></tr>
+<tr><td ><fieldset><b>Display per page:</b><input type text name="number_of_results" value="10" size="3"/></fieldset></td><td colspan="2"><fieldset><b>Format to display </b>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></fieldset></td></tr>
-<tr> <td>Search on:</td><td><select size="1" name="kohafield" style="width:170px">
+<tr> <td align="right">Search on:</td><td><select size="1" name="kohafield" style="width:170px">
<!-- TMPL_LOOP name="kohafields" -->
- <option value="<!-- TMPL_VAR name="marctokoha" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF --> ><!-- TMPL_VAR name="liblibrarian" --></option>
+ <option value="<!-- TMPL_VAR name="kohafield" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF --> ><!-- TMPL_VAR name="label" --></option>
<!-- /TMPL_LOOP --></select></td><td><input type="text" size="25" name="value" value="<!-- TMPL_VAR name="value" -->" ></td>
<td>With</td><td><Select type="text" name="relation">
<option value=" " <!-- TMPL_IF name="blank" -->selected<!-- /TMPL_IF --> >
@@ -47,7 +50,7 @@
<option value="@attr 2=4 " <!-- TMPL_IF name="@attr 2=4 " -->selected<!-- /TMPL_IF --> >Greater than & equal
</option>
</select></td></tr>
- <tr><td>
+ <tr id="andor"><td>
<Select type="text" name="and_or">
<option value="@and" <!-- TMPL_IF name="and" -->selected<!-- /TMPL_IF --> >AND
</option>
@@ -55,11 +58,11 @@
</option>
<option value="@not" <!-- TMPL_IF name="not" -->selected<!-- /TMPL_IF --> >NOT
</option>
- </select></td></tr>
- <tr> <td>Search on:</td><td><select size="1" name="kohafield" style="width:170px">
- <option value="">All</option>
+ </select></td>
+ <td><select size="1" name="kohafield" id="kohafield" style="width:170px">
+
<!-- TMPL_LOOP name="kohafields" -->
- <option value="<!-- TMPL_VAR name="marctokoha" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF --> ><!-- TMPL_VAR name="liblibrarian" --></option>
+ <option value="<!-- TMPL_VAR name="kohafield" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF --> ><!-- TMPL_VAR name="label" --></option>
<!-- /TMPL_LOOP --></select></td><td><input type="text" size="25" name="value" value="<!-- TMPL_VAR name="value" -->" ></td>
<td>With</td><td><Select type="text" name="relation">
<option value=" " <!-- TMPL_IF name="blank" -->selected<!-- /TMPL_IF --> >
@@ -80,18 +83,47 @@
</option>
<option value="@attr 2=4 " <!-- TMPL_IF name="@attr 2=4 " -->selected<!-- /TMPL_IF --> >Greater than & equal
</option>
- </select></td></tr>
+ </select></td></tr></tbody>
+ <tr>
+<td ><fieldset>Limit with itemtype:
+ <input type="hidden" name="kohafield" value="itemtype"/>
+ <input type="hidden" name="and_or" value="@and"/>
+ <select name="value" style="width:170px">
+ <option value="">All item types</option>
+ <!-- TMPL_LOOP NAME="itemtypeloop" -->
+ <option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
+ <!-- /TMPL_LOOP -->
+ </select></fieldset>
+</td>
+<td colspan="4">
+ <fieldset>Location:<input type="hidden" name="kohafield" value="holdingbranch"/>
+ <input type="hidden" name="and_or" value="@and"/>
+ <select name="value" id="branchloop" size="1">
+ <option value="">All Branches</option>
+ <!-- TMPL_LOOP NAME="branchloop" -->
+ <option value=<!-- TMPL_VAR NAME="branchcode" --> ><!-- TMPL_VAR NAME="branchname"--></option>
+ <!-- /TMPL_LOOP -->
+ </select>
+ <input type="hidden" name="kohafield" value="date_due"/>
+ <input type="hidden" name="and_or" value="@and"/>
+ <input type="checkbox" id="available-items" name="value" value="0000-00-00"/><label for="available-items">Only items currently available</label></p>
+ </fieldset>
+</td>
+
+</tr>
<tr>
- <td colspan=2><b>Sort on:</b><select size="1" name="order" style="width:170px">
+ <td colspan="2"><fieldset >Sort on:<select size="1" name="order" style="width:170px">
<option value="">System Ranked</option>
<!-- TMPL_LOOP name="sorts" -->
- <option value="<!-- TMPL_VAR name="marctokoha" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF --> ><!-- TMPL_VAR name="liblibrarian" --></option>
+ <option value="<!-- TMPL_VAR name="attr" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF --> ><!-- TMPL_VAR name="label" --></option>
<!-- /TMPL_LOOP --></select>
<select size="1" name="asc" style="width:100px">
- <option value="1">Ascending</option>
- <option value="2">Descending</option>
- </td>
- </tr><tr><td colspan=2><input class = "button" type="submit" value="Start search"></td></tr>
+ <option value="<i">Ascending</option>
+ <option value=">i">Descending</option>
+ </fieldset></td>
+
+</tr>
+<tr><td colspan=2><input class = "button" type="submit" value="Start search"></td><td><a href="#" onClick="cloneQuery();" title="add another search field">[+]</a></td></tr>
</form>
<form onSubmit="return checkSQLSearch()" name="precise_form" id="sql_form" action="/cgi-bin/koha/catalogue/catalogue-search.pl" method='post' <!-- TMPL_IF name="sql_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
@@ -121,18 +153,46 @@
</table>
</form>
+<form onSubmit="return BraveSearch()" name="brave_form" id="brave_form" action="/cgi-bin/koha/catalogue/catalogue-search.pl" method='post' <!-- TMPL_IF name="brave_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
+
+ <input type="hidden" name = "op" value="do_search">
+ <input type="hidden" name="search_type" value="brave">
+<input type="hidden" name="zoom" value="1">
+ <table style="border:0" align="center">
+<tr>
+<td><fieldset><b>Format to display </b>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></fieldset></td><td><fieldset><b>Display per page:</b><input type text name="number_of_results" value="10" size="1"/></fieldset></td></tr>
+ <tr>
+ <td>Query <textarea name = "value" id="bravetext" cols="40" rows="5" ></textarea></td>
+ <td> of type: <select name = "searchtype" >
+ <option value="pqf">PQF</option>
+ <option value="ccl">CCL</option>
+ <option value="cql">CQL</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan = "4" align = "center">
+ <br>
+ <input class = "button" type="submit" value="Start search">
+ </td>
+ </tr>
+
+ </table>
+</form>
</table>
<script language="JavaScript" type="text/javascript">
function hideSearchsTypes() {
document.getElementById('zoom_form').style.display = 'none';
document.getElementById('sql_form').style.display = 'none';
+ document.getElementById('brave_form').style.display = 'none';
}
function resetButtonsColors() {
document.getElementById('searchType1').style.backgroundColor = 'yellow';
document.getElementById('searchType2').style.backgroundColor = 'yellow';
-
+ document.getElementById('searchType3').style.backgroundColor = 'yellow';
}
@@ -149,6 +209,12 @@
hideSearchsTypes();
document.getElementById('sql_form').style.display = 'inline';
}
+ function changeSearch3() {
+ resetButtonsColors();
+ document.getElementById('searchType3').style.backgroundColor = 'orange';
+ hideSearchsTypes();
+ document.getElementById('brave_form').style.display = 'inline';
+ }
function checkSQLSearch() {
if ( (document.sql_form.barcode.value == '') &&
(document.sql_form.itemnumber.value == '') && (document.sql_form.biblionumber.value == '') ) {
@@ -158,5 +224,20 @@
return true;
}
}
+
+function BraveSearch() {
+ if ( document.brave_form.text.value == '') {
+ alert("Enter some code to start searching.");
+ return false;
+ } else {
+ return true;
+ }
+ }
+function cloneQuery() {
+var cloneoriginal = document.getElementById('andor');
+ var clone = cloneoriginal.cloneNode(true);
+queryarea.appendChild(clone);
+
+}
</script>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
Index: catalogue/catalogue_searchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_searchresults.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- catalogue/catalogue_searchresults.tmpl 11 Sep 2006 17:41:55 -0000 1.1
+++ catalogue/catalogue_searchresults.tmpl 27 Sep 2006 21:40:47 -0000 1.2
@@ -1,8 +1,11 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Simple Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!--TMPL_IF NAME="facets_loop"-->
+<!-- TMPL_INCLUDE NAME="intranet-facets.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
+<!--TMPL_ELSE-->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
-
+<!--/TMPL_IF-->
<script language="JavaScript" type="text/javascript">
var no_biblios_selected = "Select one or more documents to add to your virtual shelves.";
@@ -53,7 +56,7 @@
<h1>Catalogue search</h1>
-<!-- TMPL_ELSE -->
+
<!-- TMPL_LOOP NAME="searchdesc" -->
You searched:
<div style="color:green;">|
@@ -133,7 +136,7 @@
<th>Publisher</th>
<th>©</th>
- <th align="left"> <a href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&reorder=lcsort,2 ">â–¼</a>LC <a href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&reorder=lcsort,1">â–²</a>
+ <th align="left"> <a href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&reorder=local-number,2 ">â–¼</a>LC <a href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&reorder=local-number,1">â–²</a>
<th>Availability</th>
<th> </th>
</tr>
@@ -224,12 +227,11 @@
</div>
<br>
-<div align="center">Results <b><!-- TMPL_VAR NAME="startfrom" --></b> - <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.</div>
+<div align="center">Results <b><!-- TMPL_VAR NAME="beginning" --></b> - <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.</div>
<!-- TMPL_ELSE -->
<div align="center">0 records <br></div>
<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-<div align="center"><a class="transparent" href="catalogue-search.pl">New search</a></div>
+<div align="center"><a class="transparent" href="catalogue-search.pl">New search</a></div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- circ/circulation.tmpl 11 Sep 2006 17:41:55 -0000 1.7
+++ circ/circulation.tmpl 27 Sep 2006 21:40:47 -0000 1.8
@@ -1,7 +1,7 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation<!-- TMPL_IF Name="borrowernumber" -->: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation<!-- TMPL_IF Name="borrowernumber" -->: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-<h1>Circulation: Issues <!-- TMPL_VAR NAME="today" --></h1></div>
+<h1>Circulation: Issues <!-- TMPL_VAR NAME="today" --></h1>
Index: circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- circ/returns.tmpl 11 Sep 2006 17:41:55 -0000 1.5
+++ circ/returns.tmpl 27 Sep 2006 21:40:47 -0000 1.6
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
<!-- TMPL_IF Name="found" -->
Index: members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- members/moremember.tmpl 24 Aug 2006 15:19:36 -0000 1.13
+++ members/moremember.tmpl 27 Sep 2006 21:40:47 -0000 1.14
@@ -205,7 +205,7 @@
<tr>
<!-- /TMPL_IF -->
<td>
- <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
+ <a href="/cgi-bin/koha/reserve/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
<!-- TMPL_IF name="volumeddesc" -->
<!-- TMPL_VAR NAME="volumeddesc" -->
<!-- TMPL_VAR NAME="itemtype" -->
Index: tools/tools-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tools/tools-home.tmpl 11 Aug 2006 16:33:01 -0000 1.1
+++ tools/tools-home.tmpl 27 Sep 2006 21:40:47 -0000 1.2
@@ -7,6 +7,10 @@
<table>
<caption>Various tools</caption>
+ <tr>
+ <th><a href="/cgi-bin/koha/z3950/zebraqueue_windows_start.pl">ZEBRA queue starter--for Windows</a></th>
+ <td> Starts Zebra queue if stopped or system restarted. ZEBRA queue is required for the system to update ZEBRA</td>
+ </tr>
<tr>
<th><a href="/cgi-bin/koha/tools/barcodes.pl">Barcode generator</a></th>
<td>Generate your barcodes</td>
@@ -35,6 +39,9 @@
<th><a href="/cgi-bin/koha/tools/overduerules.pl">overdue rules</a></th>
<td>Rules for overdue books</td>
</tr>
+<th><a href="/cgi-bin/koha/barcodes/cbarcodes.pl">Membership cards</a></th>
+ <td>create membership cards from member cardnumbers
+ </td>
</table>
Index: export/marc.tmpl
===================================================================
RCS file: export/marc.tmpl
diff -N export/marc.tmpl
--- export/marc.tmpl 22 Jul 2005 16:31:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
-
-<h1>MARC Export</h1>
-<h4>Export in MARC format the following biblios:</h4>
-<form method="post">
-<p>From biblio number: <input type="text" name="start_bib" />
-to biblio number: <input type="text" name="end_bib" /></p>
-<p>(leave blank to export every biblio)</p>
-<input type="hidden" name="op" value="export" />
-<input type="submit" value="Export" />
-</form>
-<p>Note : the items are NOT exported by this tool</p>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: import/breeding.tmpl
===================================================================
RCS file: import/breeding.tmpl
diff -N import/breeding.tmpl
--- import/breeding.tmpl 22 Jul 2005 16:31:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<h1>MARC acquisition system</h1>
-<h4>Import into the reservoir</h4>
-
-<!-- TMPL_IF name="uploadmarc" -->
-<p>Import results :</p>
-<ul>
- <li><!-- TMPL_VAR name="imported" --> imported records</li>
- <li><!-- TMPL_VAR name="alreadyindb" --> not imported because already in catalog</li>
- <li><!-- TMPL_VAR name="alreadyinfarm" --> not imported because already in the reservoir</li>
- <li><!-- TMPL_VAR name="notmarcrecord" --> not imported because they seem not to be in MARC format (or ISBN/ISSN missing) !</li>
- <li><!-- TMPL_VAR name="total" --> records parsed</li>
- <li><a href="/cgi-bin/koha/admin-home.pl">Back</a></li>
-</ul>
-<!-- TMPL_ELSE -->
-<ul>
- <li>Select a file to import into the reservoir. It will be parsed, and for each ISBN found, a new baby will be created in the reservoir.</li>
- <li>If an ISBN already exists in the reservoir, you can choose whether to ignore the new one or overwrite the old one.</li>
- <li>You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!</li>
- <li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
-</ul>
-<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
-<table>
- <tr>
- <th scope="row"><label for="uploadmarc">Select the file to import: </label></th>
- <td>
- <input type="file" id="uploadmarc" name="uploadmarc" /><br />
- </td>
- </tr>
- <tr>
- <th scope="row"><label for="filename">Name of this import: </label></th>
- <td>
- <input type="text" id="filename" name="filename" />
- </td>
- </tr>
- <tr>
- <th scope="row"><label for="syntax">Character encoding: </label></th>
- <td>
- <select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
- </td>
- </tr>
- <tr>
- <th scope="row" rowspan="2">If ISBN is already in the reservoir: </th>
- <td><input type="radio" name="overwrite_biblio" value="0" checked="checked" />Ignore this one, keep the existing one</td></tr>
-<tr><td>
- <input type="radio" name="overwrite_biblio" value="1" />Overwrite the existing one with this</td>
- </tr>
-</table><input type="submit" value="Import" />
-</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
More information about the Koha-cvs
mailing list