Update of /var/cvs/applications/searchrelate/mmbase/searchrelate
In directory james.mmbase.org:/tmp/cvs-serv28053
Modified Files:
Searcher.js.jsp page.css.jsp page.jspx
Log Message:
started on unrelate functionality, some details
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Searcher.js.jsp 8 Apr 2008 08:48:28 -0000 1.12
+++ Searcher.js.jsp 8 Apr 2008 09:24:01 -0000 1.13
@@ -11,7 +11,7 @@
*
* @author Michiel Meeuwissen
- * @version $Id: Searcher.js.jsp,v 1.12 2008/04/08 08:48:28 michiel Exp $
+ * @version $Id: Searcher.js.jsp,v 1.13 2008/04/08 09:24:01 michiel Exp $
*/
$(document).ready(function(){
@@ -22,7 +22,7 @@
function MMBaseLogger(area) {
- this.logEnabled = false;
+ this.logEnabled = true;
/*this.traceEnabled = false;*/
this.logarea = area;
}
@@ -118,23 +118,6 @@
}
-/**
- * Moves a node from the list of related nodes to the 'unrelated' repository.
- */
-MMBaseRelater.prototype.unrelate = function(el) {
- var number = $(el).find("td.node.number")[0].textContent;
- if (typeof(this.related[number]) == "undefined") {
- this.unrelated[number] = el;
- }
- this.related[number] = null;
- $(el).parents("div.mm_related").find("table.searchresult
tbody").append(el);
- $(el).unbind();
- var searcher = this;
- $(el).click(function() {
- searcher.relate(this)
- });
-}
-
MMBaseRelater.prototype.getNumbers = function(map) {
var numbers = "";
@@ -157,6 +140,13 @@
return false;
})});
}
+ if (type == "current") {
+ $(rep).find("tr.click").each(function() {
+ $(this).click(function() {
+ self.unrelate(this);
+ return false;
+ })});
+ }
}
/**
* Moves a node from the 'unrelated' repository to the list of related nodes.
@@ -164,28 +154,69 @@
MMBaseRelater.prototype.relate = function(el) {
var number = $(el).find("td.node.number")[0].textContent;
- $(el).addClass("new");
+ // Set up data
if (typeof(this.unrelated[number]) == "undefined") {
this.related[number] = el;
}
this.logger.debug("Found number to relate " + number + "+" +
this.getNumbers(this.related));
this.unrelated[number] = null;
+ // Set up HTML
var current = $(el).parents("div.mm_related").find("div.mm_relate_current
table.searchresult tbody");
this.logger.debug(current[0]);
- $(el).parents("div.mm_related").find("div.mm_relate_current
table.searchresult tbody").append(el);
+ current.append(el);
-
$(el).parents("div.mm_related").find("div.mm_relate_current")[0].searcher.resetTrClasses();
-
$(el).parents("div.mm_related").find("div.mm_relate_repository")[0].searcher.resetTrClasses();
+ // Classes
+ $(el).removeClass("removed");
+ $(el).addClass("new");
+ this.resetTrClasses();
+
+ // Events
$(el).unbind();
- var searcher = this;
+ var self = this;
$(el).click(function() {
- searcher.unrelate(this);
+ self.unrelate(this);
});
}
+MMBaseRelater.prototype.resetTrClasses = function() {
+ $(this.div).find("div.mm_relate_current")[0].searcher.resetTrClasses();
+ $(this.div).find("div.mm_relate_repository")[0].searcher.resetTrClasses();
+
+}
+
+
+/**
+ * Moves a node from the list of related nodes to the 'unrelated' repository.
+ */
+MMBaseRelater.prototype.unrelate = function(el) {
+ var number = $(el).find("td.node.number")[0].textContent;
+
+ // Set up data
+ if (typeof(this.related[number]) == "undefined") {
+ this.unrelated[number] = el;
+ }
+ this.related[number] = null;
+
+ // Set up HTML
+ var repository =
$(el).parents("div.mm_related").find("div.mm_relate_repository
table.searchresult tbody");
+ repository.append(el);
+
+ // Classes
+ $(el).removeClass("new");
+ $(el).addClass("removed");
+ this.resetTrClasses();
+
+ // Events
+ $(el).unbind();
+ var searcher = this;
+ $(el).click(function() {
+ searcher.relate(this)
+ });
+}
+
@@ -220,9 +251,9 @@
this.searchResults = {};
this.value = newSearch;
}
- var searchAnchor = $(el).parents(".searchable").find("> a.search")[0];
+ var searchAnchor = $(el).parents(".searchable").find("a.search")[0];
var id = searchAnchor.href.substring(searchAnchor.href.indexOf("#") + 1);
- var rep = $(this.div).find("> div")[0]
+ var rep = $(this.div).find("div.searchresult")[0]
var url = "${mm:link('/mmbase/searchrelate/page.jspx')}";
var params = {id: id, offset: offset, search: this.value, pagesize:
this.pagesize};
Index: page.css.jsp
===================================================================
RCS file: /var/cvs/applications/searchrelate/mmbase/searchrelate/page.css.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- page.css.jsp 8 Apr 2008 08:48:28 -0000 1.3
+++ page.css.jsp 8 Apr 2008 09:24:01 -0000 1.4
@@ -1,8 +1,20 @@
-// -*- css -*-
+/* -*- css -*- */
<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
%><mm:content expires="0" type="text/css">
-.searchresult {
+.searchable h1 {
+ background-color: #eee;
+ font-weight: bold;
+ font-size: normal;
+ margin-bottom: 0px;
+ border: solid 1px #000;
+}
+.searchable .searchform {
+ width: 100%;
+ border: solid 1px #000;
+}
+
+.searchresult table {
border: solid 1px #000;
}
.searchresult thead tr,
@@ -24,6 +36,13 @@
background-color: #efe;
}
+.searchresult tbody tr.even.removed {
+ background-color: #edd;
+}
+.searchresult tbody tr.odd.removed {
+ background-color: #fee;
+}
+
.searchresult tbody tr:hover {
cursor: pointer;
}
Index: page.jspx
===================================================================
RCS file: /var/cvs/applications/searchrelate/mmbase/searchrelate/page.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- page.jspx 7 Apr 2008 16:36:42 -0000 1.3
+++ page.jspx 8 Apr 2008 09:24:01 -0000 1.4
@@ -1,4 +1,5 @@
<div
+ class="searchresult"
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
@@ -22,7 +23,7 @@
</c:if>
<mm:maxnumber value="${pagesize}" />
<mm:offset value="${offset}" />
- <table class="searchresult" summary="Search results for ${search}">
+ <table summary="Search results for ${search}">
<thead>
<tr>
<th class="node number">#</th>
@@ -58,7 +59,10 @@
<mm:nodeinfo type="gui" />
</td>
<mm:fieldlist type="list">
- <td class="fields /${_field.name}/"><mm:fieldinfo
type="guivalue" /></td>
+ <mm:fieldinfo type="name">
+ <td class="fields ${_}"><mm:fieldinfo type="guivalue" />
+ </td>
+ </mm:fieldinfo>
</mm:fieldlist>
</tr>
</mm:listnodes>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
