projects
/
koha-ffzg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
397688c
)
synch'ing with 2.2
author
tipaul
<tipaul>
Mon, 7 Mar 2005 08:55:29 +0000
(08:55 +0000)
committer
tipaul
<tipaul>
Mon, 7 Mar 2005 08:55:29 +0000
(08:55 +0000)
C4/AuthoritiesMarc.pm
patch
|
blob
|
history
C4/Biblio.pm
patch
|
blob
|
history
C4/SearchMarc.pm
patch
|
blob
|
history
koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
patch
|
blob
|
history
koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
patch
|
blob
|
history
diff --git
a/C4/AuthoritiesMarc.pm
b/C4/AuthoritiesMarc.pm
index
fd1a20f
..
00d57b0
100644
(file)
--- a/
C4/AuthoritiesMarc.pm
+++ b/
C4/AuthoritiesMarc.pm
@@
-858,8
+858,8
@@
Paul POULAIN paul.poulain@free.fr
# $Id$
# $Log$
# $Id$
# $Log$
-# Revision 1.1
0 2005/03/01 13:40:48
tipaul
-#
merging 2.2 branch with head. Sorry for not making it before, many many commits done here
+# Revision 1.1
1 2005/03/07 08:55:29
tipaul
+#
synch'ing with 2.2
#
# Revision 1.9.2.2 2005/02/28 14:03:13 tipaul
# * adding search on "main entry" (ie $a subfield) on a given authority (the "search everywhere" field is still here).
#
# Revision 1.9.2.2 2005/02/28 14:03:13 tipaul
# * adding search on "main entry" (ie $a subfield) on a given authority (the "search everywhere" field is still here).
diff --git
a/C4/Biblio.pm
b/C4/Biblio.pm
index
125fdd7
..
f870afe
100644
(file)
--- a/
C4/Biblio.pm
+++ b/
C4/Biblio.pm
@@
-2653,8
+2653,8
@@
Paul POULAIN paul.poulain@free.fr
# $Id$
# $Log$
# $Id$
# $Log$
-# Revision 1.11
6 2005/03/01 13:40:48
tipaul
-#
merging 2.2 branch with head. Sorry for not making it before, many many commits done here
+# Revision 1.11
7 2005/03/07 08:55:29
tipaul
+#
synch'ing with 2.2
#
# Revision 1.115.2.5 2005/02/24 13:54:04 tipaul
# exporting MARCdelsubfield sub. It's used in authority merging.
#
# Revision 1.115.2.5 2005/02/24 13:54:04 tipaul
# exporting MARCdelsubfield sub. It's used in authority merging.
diff --git
a/C4/SearchMarc.pm
b/C4/SearchMarc.pm
index
a033c66
..
c3b81b1
100644
(file)
--- a/
C4/SearchMarc.pm
+++ b/
C4/SearchMarc.pm
@@
-165,7
+165,7
@@
$marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrievi
=cut
sub catalogsearch {
=cut
sub catalogsearch {
- my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby
, $desc_or_asc
) = @_;
+ my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_;
# build the sql request. She will look like :
# select m1.bibid
# from marc_subfield_table as m1, marc_subfield_table as m2
# build the sql request. She will look like :
# select m1.bibid
# from marc_subfield_table as m1, marc_subfield_table as m2
diff --git
a/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
b/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
index
e20e96d
..
b6f1fa3
100644
(file)
--- a/
koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
+++ b/
koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
@@
-113,8
+113,7
@@
<input type="hidden" name="operator" value="<=" />
<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
</p>
<input type="hidden" name="operator" value="<=" />
<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
</p>
- <p>
- <label class="label20">Results per page :</label>
+ <p>Results per page :
<select name="resultsperpage" size="1">
<option value="20">20</option>
<option value="50">50</option>
<select name="resultsperpage" size="1">
<option value="20">20</option>
<option value="50">50</option>
@@
-132,13
+131,6
@@
<option value="biblio.timestamp desc">Acquisition date</option>
</select>
</p>
<option value="biblio.timestamp desc">Acquisition date</option>
</select>
</p>
- <p>
- <label class="label20">Order :</label>
- <select name="desc_or_asc" size="1">
- <option value="ASC">Ascending</option>
- <option value="DESC">Descending</option>
- </select>
- </p>
</div>
<p>
<input type="submit" value="Start search" class="button catalogue" />
</div>
<p>
<input type="submit" value="Start search" class="button catalogue" />
diff --git
a/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
b/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
index
a1bc804
..
058c844
100644
(file)
--- a/
koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
+++ b/
koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
@@
-75,7
+75,7
@@
since <b><!-- TMPl_VAR name="startdate" --></b>
</p>
<p><!-- TMPL_VAR name="notes" --></p>
since <b><!-- TMPl_VAR name="startdate" --></b>
</p>
<p><!-- TMPL_VAR name="notes" --></p>
- <!-- TMPL_IF name="opacnote
s
" -->
+ <!-- TMPL_IF name="opacnote" -->
<h2 class="catalogue">Issues summary</h2>
<p>
<!-- TMPL_VAR name="opacnote" -->
<h2 class="catalogue">Issues summary</h2>
<p>
<!-- TMPL_VAR name="opacnote" -->