[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/serials ac... [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Mon Oct 30 16:12:34 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/10/30 15:12:34
Modified files:
koha-tmpl/intranet-tmpl/prog/en/serials:
acqui-search-result.tmpl
acqui-search.tmpl
member-search.tmpl
result.tmpl
subscription-add.tmpl
subscription-bib-search.tmpl
Log message:
Minor display error fix. (popup should not have menus.inc...)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3
Patches:
Index: acqui-search-result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- acqui-search-result.tmpl 30 Oct 2006 10:06:17 -0000 1.2.2.1
+++ acqui-search-result.tmpl 30 Oct 2006 15:12:34 -0000 1.2.2.2
@@ -1,6 +1,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Select supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<h1>Supplier Search Results</h1>
<h2>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
+<div class="searchresults">
<table>
<tr>
<th>Book seller</th>
@@ -9,10 +10,11 @@
<!-- TMPL_LOOP name="loop_suppliers" -->
<tr>
<td><!-- TMPL_VAR name="name" --></td>
- <td><a href="#" onclick="javascript:GetIt(<!-- TMPL_VAR name="aqbooksellerid" -->,'<!-- TMPL_VAR name="name" -->')">select</td>
+ <td><a href="#" onclick="javascript:GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,'<!-- TMPL_VAR escape="URL" NAME="name" -->')">Get It !</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
+</div>
<script language="Javascript">
@@ -20,7 +22,7 @@
{
opener.document.f.aqbooksellerid.value = aqbooksellerid;
opener.document.f.aqbooksellername.value = name;
- self.close();
+ window.close();
}
</script>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+
Index: acqui-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- acqui-search.tmpl 30 Oct 2006 10:06:17 -0000 1.2.2.2
+++ acqui-search.tmpl 30 Oct 2006 15:12:34 -0000 1.2.2.3
@@ -6,14 +6,12 @@
{
opener.document.f.aqbooksellerid.value = aqbooksellerid;
opener.document.f.aqbooksellername.value = name;
- self.close();
+ window.close();
}
</script>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
<h1>Search supplier for serial subscription</h1>
<form action="/cgi-bin/koha/serials/acqui-search-result.pl" method=post>
- Supplier name : <input type="text" size="25" name="supplier">
+ <label for="text">Supplier name : </label><input id="text" type="text" size="25" name="supplier">
<input type="submit" class="button serial" value="OK">
</form>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
Index: member-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- member-search.tmpl 20 Jul 2006 03:59:10 -0000 1.3
+++ member-search.tmpl 30 Oct 2006 15:12:34 -0000 1.3.2.1
@@ -1,4 +1,5 @@
-<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member Search: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<script type="text/javascript">
<!--
@@ -21,10 +22,11 @@
</form>
</p>
<!-- TMPL_IF NAME="memberloop" -->
+<div class="searchresults">
<table cellspacing="0" cellpadding="0" border="0" width="480" class="collapse">
-<tr><td class="cell-header">Name</td>
- <td class="cell-header">Location</td>
- <td class="cell-header">Add</td></tr>
+<tr><th class="cell-header">Name</th>
+ <th class="cell-header">Location</th>
+ <th class="cell-header">Add</th></tr>
<!-- TMPL_LOOP NAME="memberloop" -->
<tr><td class="cell"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
<td class="cell"><!-- TMPL_VAR NAME="streetaddress" --></td>
@@ -33,13 +35,14 @@
<!-- /TMPL_LOOP -->
</table></td></tr>
</table>
+</div>
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="member" -->
<p>No results found</p>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<br />
-<p><a href="javascript:self.close()" class="button">Close</a></p>
+<p><a href="javascript:window.close()" class="button">Close</a></p>
</div>
<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
Index: result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- result.tmpl 12 Jul 2006 12:31:32 -0000 1.1
+++ result.tmpl 30 Oct 2006 15:12:34 -0000 1.1.2.1
@@ -1,76 +1,45 @@
- <!-- TMPL_INCLUDE NAME="neutral-top.inc" -->
- <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<div id="mainbloc">
<h1 class="catalogue">Search results</h1>
- <div id="resultnumber">
- <p>
- <!-- TMPL_IF NAME=displayprev -->
- <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
- <img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
- </a>
- <!-- /TMPL_IF -->
- <!-- TMPL_LOOP NAME=numbers -->
- <!-- TMPL_IF NAME=highlight -->
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
- <!-- TMPL_ELSE -->
- <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- <!-- TMPL_IF NAME=displaynext -->
- <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
- <!-- /TMPL_IF -->
- </p>
- <p>
- <!-- TMPL_IF name=total -->
-  <b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
- <!-- TMPL_ELSE -->
-   No results found.<br>
- <!-- /TMPL_IF -->
- </p>
- </div>
- <div id="resultlist">
+<!-- TMPL_IF NAME="total"-->
+<div class="searchresults">
<table>
<tr>
- <th class="catalogue">Summary</th>
- <th class="catalogue"> </th>
+ <th>Title</th>
+ <th>Author</th>
+ <th>publisher</th>
+ <th>Publication year</th>
</tr>
- <!-- TMPL_LOOP name="result" -->
+ <!-- TMPL_LOOP NAME="resultsloop" -->
+ <!-- TMPL_IF NAME="highlight" -->
+ <tr class="highlight">
+ <!-- TMPL_ELSE -->
<tr>
- <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
- <p>
- <p><b><!-- TMPL_VAR NAME="title" --></b></p>
- <p><!-- TMPL_VAR NAME="author" -->
- <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
- <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
- </p>
+ <!-- /TMPL_IF -->
+ <td>
+ <a href="#" onclick="Javascript:GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR escape="URL" NAME="title" -->');" title="Get this one !">
+ <!-- TMPL_VAR NAME="title" -->
+ </a>
+ <br />
+ <small><!-- TMPL_VAR NAME="subtitle" --></small>
+ </td>
+ <td>
+ <!-- TMPL_VAR NAME="author" -->
</td>
- <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
- <a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Get it!</a>
+ <td>
+ <!-- TMPL_VAR NAME="publishercode" -->
+ </td>
+ <td>
+ <!-- TMPL_VAR NAME="publicationyear" -->
</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
- </div>
- <div id="resultnumber">
- <p>
- <!-- TMPL_IF NAME=displayprev -->
- <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
- <!-- /TMPL_IF -->
- <!-- TMPL_LOOP NAME=numbers -->
- <!-- TMPL_IF NAME=highlight -->
- <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
- <!-- TMPL_ELSE -->
- <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- <!-- TMPL_IF NAME=displaynext -->
- <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
- <!-- /TMPL_IF -->
- </p>
- </div>
+</div>
+<!-- TMPL_ELSE -->
+No result found for <b><!-- TMPL_VAR NAME="query" --></b>
+<!-- /TMPL_IF-->
</div>
@@ -78,8 +47,11 @@
function GetIt(bibno,title)
{
+ title = title.replace(/\?/,"\?");
+ title = title.replace(/"/,"\"");
+ title = title.replace(/'/,"\'");
opener.document.f.biblionumber.value = bibno;
opener.document.f.title.value = title;
- self.close();
+ window.close();
}
</script>
\ No newline at end of file
Index: subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- subscription-add.tmpl 30 Oct 2006 10:06:17 -0000 1.3.2.3
+++ subscription-add.tmpl 30 Oct 2006 15:12:34 -0000 1.3.2.4
@@ -963,17 +963,17 @@
function Plugin(f)
{
- window.open('subscription-bib-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
+ window.open('subscription-bib-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
}
function FindAcqui(f)
{
- window.open('acqui-search.pl','FindASupplier','width=500,height=400,toolbar=no,scrollbars=yes');
+ window.open('acqui-search.pl','FindASupplier','width=800,height=400,toolbar=no,scrollbars=yes');
}
function Find_ISSN(f)
{
- window.open('issn-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
+ window.open('issn-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
}
Index: subscription-bib-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- subscription-bib-search.tmpl 30 Oct 2006 10:06:17 -0000 1.2.2.2
+++ subscription-bib-search.tmpl 30 Oct 2006 15:12:34 -0000 1.2.2.3
@@ -1,70 +1,10 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<h1>Catalogue search</h1>
-<h2>Search on</h2>
<form name="f" action="/cgi-bin/koha/serials/subscription-bib-search.pl" method="post">
- <input type="hidden" name="op" value="do_search">
- <input type="hidden" name="type" value="intranet">
- <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
- <p>
- <label>Keyword</label>
- <input type="hidden" name="marclist" value="">
- <input type="hidden" name="and_or" value="and">
- <input type="hidden" name="excluding" value="">
- <input type="hidden" name="operator" value="contains">
- <input type="text" name="value">
- </p>
- <p>
- <label>Itemtype</label>
- <select name="value">
- <!-- TMPL_LOOP name="itemtypeloop" -->
- <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
- <!-- /TMPL_LOOP -->
- </select>
- <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="category" -->">
- <input type="hidden" name="marclist" value="">
- <input type="hidden" name="and_or" value="and">
- <input type="hidden" name="excluding" value="">
- <input type="hidden" name="operator" value="=">
- <input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
- </p>
- <p>Results per page :
- <select align="right" name="resultsperpage" size="1">
- <option value="20">20</option>
- <option value="50">50</option>
- <option value="100">100</option>
- </select>
- Ordered by
- <select name="orderby" size="1">
- <option value="biblio.title">Title</option>
- <option value="biblio.author">Author</option>
- <option value="biblioitems.dewey">Dewey</option>
- <option value="biblioitems.publicationyear">Publication Year</option>
- <option value="biblioitems.publishercode">Publisher</option>
- </select>
- </p>
- <p>
- <input type="submit" value="Start search" class="button catalogue">
- <a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a>
- </p>
+ <input type="hidden" name="op" value="do_search" />
+ <input type="hidden" name="type" value="intranet" />
+ <label for="q">Keyword</label>
+ <input type="text" id="q" name="q" />
+ <input type="submit" value="Search" />
</form>
-
-<script language="Javascript" type="text/javascript">
-function AddStatement() {
-
- document.forms['f'].op.value="AddStatement";
- document.f.submit();
-}
-
-function PopupSuggestion() {
- var strQuery="";
- for (i=0 ; i<document.f.marclist.length ; i++) {
- if (document.f.value[i].value.length>0) {
- strQuery += " "+document.f.value[i].value;
- }
- }
- newin=window.open("suggest.pl?Q="+strQuery,"Suggestions",'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
More information about the Koha-cvs
mailing list