Update of /var/cvs/applications/richtext/blocks/wiki
In directory james.mmbase.org:/tmp/cvs-serv5896
Modified Files:
Wiki.js edit.jspx related.li.jspx
Added Files:
relations.css
Removed Files:
wiki.js
Log Message:
See also: http://cvs.mmbase.org/viewcvs/applications/richtext/blocks/wiki
relations.css is new
Index: Wiki.js
===================================================================
RCS file: /var/cvs/applications/richtext/blocks/wiki/Wiki.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Wiki.js 26 Aug 2008 14:02:24 -0000 1.1
+++ Wiki.js 29 Sep 2008 10:04:59 -0000 1.2
@@ -1,3 +1,10 @@
+/**
+ * Javascript for wiki-areas.
+ * - arrange a preview for the mantioned object below the cursor
+ * - arrange that search/related tool pastes the found object in understood
wiki-syntax into the current
+ * wiki area
+ */
+
function MMWiki(div) {
this.div = div;
@@ -152,10 +159,27 @@
});
}
+MMWiki.prototype.setupTabs = function() {
+ // set up the tabs
+ $("div.relations.tabs ul > li:first > a.toggle").addClass("current");
+ $("div.relations.tabs ul > li:gt(0) > div").hide();
+
+ $("div.relations.tabs ul > li > a.toggle").click(function(e) {
+ $("div.relations.tabs ul > li > div").hide();
+ $("div.relations.tabs ul > li > a.toggle").removeClass("current");
+ $(e.target).parent().children("div").show();
+ $(e.target).addClass("current");
+ });
+}
+
MMWiki.prototype.ready = function() {
this.findMmxfFields();
this.setupRelateCallBack();
+ this.setupTabs();
}
+
+
+
$(document).ready(function() {
$("body").find("div.mm_related").each(function() {
var wiki = new MMWiki(this);
Index: edit.jspx
===================================================================
RCS file: /var/cvs/applications/richtext/blocks/wiki/edit.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edit.jspx 26 Aug 2008 14:02:25 -0000 1.4
+++ edit.jspx 29 Sep 2008 10:04:59 -0000 1.5
@@ -7,8 +7,9 @@
class="mm_c c_wiki b_edit ${requestScope['org.mmbase.componentClassName']}"
id="${requestScope['org.mmbase.componentId']}">
<jsp:output omit-xml-declaration="true" />
- <mm:import externid="n" required="true" />
+ <mm:import externid="n" required="true" />
+ <mm:import externid="relationsClass" />
<mm:cloud method="asis" jspvar="cloud">
@@ -26,7 +27,7 @@
<mm:node number="${n}">
- <div id="main">
+ <div class="main">
<input type="hidden" name="n" value="${_node}" />
<mm:nodeinfo type="type" write="false" id="type" />
@@ -78,8 +79,7 @@
</div>
-->
- <div id="relations">
-
+ <div class="relations ${relationsClass}">
<ul class="idrels">
<c:forTokens items="${mm:managerProperty(type, 'wiki_idrelated')}"
delims="," var="relatedtype" >
<mm:include page="related.li.jspx" referids="[EMAIL PROTECTED]"
/>
@@ -87,7 +87,7 @@
</ul>
</div>
- <div id="commit">
+ <div class="commit">
<mm:import externid="cancel" />
<mm:present referid="cancel">
<mm:cancel />
@@ -103,7 +103,7 @@
<mm:param name="org.mmbase.versioning.comments"
referid="comments" />
<h1>Committing ${_} for ${transaction.cloudVar}</h1>
<mm:commit />
- <mm:redirect referids="o" />
+ <mm:redirect referids="n" />
</mm:present>
</mm:valid>
<mm:valid inverse="true">
@@ -112,7 +112,7 @@
</mm:valid>
</div>
- <div id="title">
+ <div class="title">
<mm:field name="number" />: <mm:nodeinfo type="gui" />
<mm:hasfield name="version">: v. ${_node.version}</mm:hasfield>
</div>
Index: related.li.jspx
===================================================================
RCS file: /var/cvs/applications/richtext/blocks/wiki/related.li.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- related.li.jspx 25 Apr 2008 22:30:21 -0000 1.1
+++ related.li.jspx 29 Sep 2008 10:04:59 -0000 1.2
@@ -5,17 +5,13 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";>
<jsp:output omit-xml-declaration="yes" />
<!--
-
xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/"
-
-
-
-->
<mm:import externid="type" required="true" />
<a class="toggle">
<mm:nodeinfo nodetype="${type}" type="guinodemanager" />
</a>
- <div>
+ <div class="related_li">
<mm:listnodescontainer type="${type}" id="repository">
<mm:sortorder field="number" direction="down" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
