improvements to query_desc and limit_desc
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
parent
4075926730
commit
c9dabd5d22
|
|
@ -899,14 +899,14 @@ sub buildQuery {
|
|||
$limit_desc .=" or " if $group_OR_limits;
|
||||
$group_OR_limits .= "$this_limit";
|
||||
$limit_cgi .="&limit=$this_limit";
|
||||
$limit_desc .= "$this_limit";
|
||||
$limit_desc .= " $this_limit";
|
||||
}
|
||||
# regular old limits
|
||||
else {
|
||||
$limit .= " and " if $limit || $query;
|
||||
$limit .= "$this_limit";
|
||||
$limit_cgi .="&limit=$this_limit";
|
||||
$limit_desc .=" and $this_limit";
|
||||
$limit_desc .=" $this_limit";
|
||||
}
|
||||
}
|
||||
if ($group_OR_limits) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
|
||||
<title>Koha › Catalog › <!-- TMPL_IF NAME="searchdesc" -->Results of Search for '<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->'<!-- TMPL_ELSE -->You did not specify any search criteria<!-- /TMPL_IF --></title>
|
||||
<title>Koha › Catalog › <!-- TMPL_IF NAME="searchdesc" -->Results of Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): '<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF --><!-- TMPL_ELSE -->You did not specify any search criteria<!-- /TMPL_IF --></title>
|
||||
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
|
||||
<!-- TMPL_IF NAME="AmazonContent" --><script type="text/javascript">
|
||||
//<![CDATA[
|
||||
|
|
@ -33,7 +33,7 @@ $(window).load(function() {
|
|||
<!-- TMPL_INCLUDE NAME="header.inc" -->
|
||||
<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
|
||||
|
||||
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a> › Search for <i><!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" --></i></div>
|
||||
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a> › Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): '<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF --></div>
|
||||
|
||||
<div id="doc3" class="yui-t1">
|
||||
|
||||
|
|
@ -73,14 +73,14 @@ $(window).load(function() {
|
|||
<!-- RESORT END -->
|
||||
</form>
|
||||
<h3>
|
||||
<!-- TMPL_VAR NAME="total" --> results found for '<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->'
|
||||
<!-- TMPL_VAR NAME="total" --> result(s) found <!-- TMPL_IF NAME="query_desc" -->for <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="query_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="limit_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="LibraryName" --> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog<!-- /TMPL_IF -->.
|
||||
</h3></div>
|
||||
<!-- TMPL_IF NAME="stopwords_removed" --><div><p class="tip">Ignored the following common words: "<!-- TMPL_VAR NAME="stopwords_removed" -->"<p></div><!-- /TMPL_IF -->
|
||||
<!-- TMPL_ELSE -->
|
||||
<!-- TMPL_IF NAME="searchdesc" -->
|
||||
<h3>No results found</h3>
|
||||
<p>
|
||||
No results match your search for <span style="font-weight: bold;">“<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->”</span> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
|
||||
No results match your search <!-- TMPL_IF NAME="query_desc" -->for <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="query_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="limit_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="LibraryName" --> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog<!-- /TMPL_IF -->.
|
||||
</p>
|
||||
<!-- TMPL_ELSE -->
|
||||
<h3>No results found</h3>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
|
||||
<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog ›
|
||||
<!-- TMPL_IF NAME="searchdesc" -->
|
||||
Results of Search for '<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->'
|
||||
Results of Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): '<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF -->
|
||||
<!-- TMPL_ELSE -->
|
||||
You did not specify any search criteria
|
||||
<!-- /TMPL_IF -->
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
|
||||
|
||||
<link rel="alternate" type="application/rss+xml" title="Koha - RSS"
|
||||
href="/cgi-bin/koha/opac-rss.pl?q=<!-- TMPL_VAR name="searchdesc"-->">
|
||||
href="/cgi-bin/koha/opac-rss.pl?q=<!-- TMPL_VAR name="query_cgi"--><!-- TMPL_VAR NAME="limit_cgi" -->">
|
||||
</head>
|
||||
<body>
|
||||
<!--TMPL_INCLUDE NAME="masthead.inc" -->
|
||||
|
|
|
|||
Loading…
Reference in New Issue