Update of /var/cvs/applications/searchrelate/mmbase/searchrelate
In directory james.mmbase.org:/tmp/cvs-serv31270
Modified Files:
Searcher.js.jsp page.jspx
Log Message:
changed html a bit, added max on number of batches
See also:
http://cvs.mmbase.org/viewcvs/applications/searchrelate/mmbase/searchrelate
Index: Searcher.js.jsp
===================================================================
RCS file:
/var/cvs/applications/searchrelate/mmbase/searchrelate/Searcher.js.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Searcher.js.jsp 8 Apr 2008 09:24:01 -0000 1.13
+++ Searcher.js.jsp 8 Apr 2008 12:56:19 -0000 1.14
@@ -11,7 +11,7 @@
*
* @author Michiel Meeuwissen
- * @version $Id: Searcher.js.jsp,v 1.13 2008/04/08 09:24:01 michiel Exp $
+ * @version $Id: Searcher.js.jsp,v 1.14 2008/04/08 12:56:19 michiel Exp $
*/
$(document).ready(function(){
@@ -22,7 +22,7 @@
function MMBaseLogger(area) {
- this.logEnabled = true;
+ this.logEnabled = false;
/*this.traceEnabled = false;*/
this.logarea = area;
}
@@ -163,7 +163,7 @@
this.unrelated[number] = null;
// Set up HTML
- var current = $(el).parents("div.mm_related").find("div.mm_relate_current
table.searchresult tbody");
+ var current = $(this.div).find("div.mm_relate_current div.searchresult
table tbody");
this.logger.debug(current[0]);
current.append(el);
@@ -253,7 +253,7 @@
}
var searchAnchor = $(el).parents(".searchable").find("a.search")[0];
var id = searchAnchor.href.substring(searchAnchor.href.indexOf("#") + 1);
- var rep = $(this.div).find("div.searchresult")[0]
+ var rep = $(el).parents(".searchable").find("div.searchresult")[0]
var url = "${mm:link('/mmbase/searchrelate/page.jspx')}";
var params = {id: id, offset: offset, search: this.value, pagesize:
this.pagesize};
@@ -291,9 +291,9 @@
if (this.relater != null && this.type == "current") {
this.logger.debug("adding newly related");
this.logger.debug(this.relater.related);
- this.logger.debug("Appending related " +
$(rep).find("table.searchresult tbody")[0]);
+ this.logger.debug("Appending related " + $(rep).find("table tbody")[0]);
$.each(this.relater.related, function(key, value) {
- $(rep).find("table.searchresult tbody").append(value);
+ $(rep).find("table tbody").append(value);
});
}
}
@@ -314,7 +314,7 @@
MMBaseSearcher.prototype.resetTrClasses = function() {
var i = 0;
- $(this.div).find("table.searchresult tbody tr").each(function() {
+ $(this.div).find("div.searchresult table tbody tr").each(function() {
$(this).removeClass("odd");
$(this).removeClass("even");
$(this).addClass(i % 2 == 0 ? "even" : "odd");
Index: page.jspx
===================================================================
RCS file: /var/cvs/applications/searchrelate/mmbase/searchrelate/page.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- page.jspx 8 Apr 2008 09:24:01 -0000 1.4
+++ page.jspx 8 Apr 2008 12:56:19 -0000 1.5
@@ -9,6 +9,7 @@
<mm:import externid="id" required="true" />
<mm:import externid="search" />
<mm:import externid="pagesize">10</mm:import>
+ <mm:import externid="maxpages">20</mm:import>
<mm:import from="session" externid="${id}" id="query" required="true" />
<mm:import externid="offset" vartype="integer">0</mm:import>
<mm:listnodescontainer id="b" clone="query">
@@ -37,14 +38,24 @@
<tfoot>
<tr>
<td colspan="${colcount + 2}">
- <mm:previousbatches>
+ <mm:previousbatches maxtotal="${maxpages}" indexoffset="1">
+ <mm:first>
+ <mm:index>
+ <mm:compare value="1" inverse="true">...</mm:compare>
+ </mm:index>
+ </mm:first>
<a class="navigate" href="${'#'}${id}_${_}"
name="${_}"><mm:index /></a>
<jsp:text>, </jsp:text>
</mm:previousbatches>
- <mm:index />
- <mm:nextbatches>
+ <mm:index offset="1" />
+ <mm:nextbatches maxtotal="${maxpages}" indexoffset="1">
<jsp:text>, </jsp:text>
<a class="navigate" href="${'#'}${id}_${_}"
name="${_}"><mm:index /></a>
+ <mm:last>
+ <mm:index>
+ <mm:compare value="${maxpages}">...</mm:compare>
+ </mm:index>
+ </mm:last>
</mm:nextbatches>
</td>
</tr>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
