Update of /var/cvs/speeltuin/mihxil/wiki/wiki/edit
In directory james.mmbase.org:/tmp/cvs-serv3367
Modified Files:
edit.js index.jspx preview.jspx q.css related.li.jspx
Added Files:
relate.test.jspx
Log Message:
See also: http://cvs.mmbase.org/viewcvs/speeltuin/mihxil/wiki/wiki/edit
relate.test.jspx is new
Index: edit.js
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/edit.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edit.js 13 Mar 2008 09:45:19 -0000 1.4
+++ edit.js 19 Mar 2008 14:00:57 -0000 1.5
@@ -36,14 +36,16 @@
$("div#preview").draggable({handle: ">h1"});
$("div#preview > a").click(function() {
var params = {};
- $("form#transaction").find("[EMAIL PROTECTED], [EMAIL
PROTECTED]'text'], [EMAIL PROTECTED]'hidden'], [EMAIL PROTECTED]'password'],
[EMAIL PROTECTED], textarea").each(function() {
- params[ this.name || this.id || this.parentNode.name ||
this.parentNode.id ] = this.value; });
+ params['objectnumber'] = this.id.substring(7);
+ $("form#transaction").find("[EMAIL PROTECTED], [EMAIL
PROTECTED]'text'], [EMAIL PROTECTED]'hidden'], [EMAIL PROTECTED]'password'],
[EMAIL PROTECTED], textarea")
+ .each(function() {
+ params[ this.name || this.id || this.parentNode.name ||
this.parentNode.id ] = this.value;
+ });
$.post("preview.jspx", params, function(data, textStatus) {
- console.log(this);
- console.log(data.documentElement);
$("div#preview > div").replaceWith(data.documentElement);
});
//$("div#preview > div").load("preview.jspx", null, function() { })
+ return false;
});
});
Index: index.jspx
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/index.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- index.jspx 13 Mar 2008 09:45:19 -0000 1.4
+++ index.jspx 19 Mar 2008 14:00:57 -0000 1.5
@@ -1,15 +1,18 @@
-<html xmlns="http://www.w3.org/1999/xhtml";
+<?xml version="1.0" ?>
+<html
+ xmlns="http://www.w3.org/1999/xhtml";
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:mm-u="urn:jsptagdir:/WEB-INF/tags/mm/u"
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
lang="en">
- <jsp:directive.page buffer="10000kb" />
-
+ <jsp:directive.page buffer="2000kb" />
<mm:content type="application/xhtml+xml"
postprocessor="none"
language="nl" expires="0">
+
<mm:cloud rank="basic user">
+
<mm:param name="org.mmbase.xml-mode" value="wiki" />
@@ -19,16 +22,15 @@
<script src="${jq}jquery-1.2.3.min.js"><jsp:text> </jsp:text></script>
<script src="${jq}jquery.dimensions.js"><jsp:text> </jsp:text></script>
<script src="${jq}ui.mouse.js"><jsp:text> </jsp:text></script>
-
<script src="${jq}ui.resizable.js"></script>
<script src="${jq}ui.draggable.js"><jsp:text> </jsp:text></script>
<script src="${jq}ui.draggable.ext.js"><jsp:text> </jsp:text></script>
<jsp:directive.include file="/mmbase/validation/javascript.jspxf" />
<script language="javascript" src="edit.js"><jsp:text>
</jsp:text></script>
+ <link rel="stylesheet" type="text/css"
href="${mm:link('/mmbase/taglib/page.css.jsp')}" />
<link rel="stylesheet" type="text/css" href="q.css" />
</head>
<body>
-
<mm:haspage page="/mmbase/jquery/jquery-1.2.3.min.js" inverse="true">
<h1 class="error">You need to have jquery installed in
/mmbase/jquery!</h1>
</mm:haspage>
@@ -40,7 +42,7 @@
</mm:compare>
<div id="main">
- <mm:form id="transaction" page=".">
+ <mm:form id="transaction" page="." commitonclose="false">
<mm:node id="objectnumber" referid="objectnumber"
commitonclose="false">
<input type="hidden" name="objectnumber" value="${_node}" />
@@ -57,33 +59,29 @@
</tr>
</mm:fieldlist>
</table>
+
<input type="submit" name="submit" id="submit" value="submit" />
<input type="submit" name="cancel" id="cancel" value="cancel" />
+ <input type="text" name="comments" value="Beschrijf uw
verandering hier" />
<hr />
- <mm:link page=".." referids="[EMAIL PROTECTED]">
- <mm:param name="expires">0</mm:param>
- <a href="${_}">back</a>
- </mm:link>
- <jsp:text> | </jsp:text>
<mm:link page="../versions" referids="[EMAIL PROTECTED]">
<mm:param name="expires">0</mm:param>
<a href="${_}">versions</a>
</mm:link>
- <mm:write session="node" referid="_node" />
</mm:node>
</mm:form>
</div>
<div id="preview">
<h1>Preview</h1>
- <a>reload</a>
+ <a id="reload_${objectnumber}">reload</a>
<div>
- <mm:include page="preview.jspx" />
+ <mm:include page="preview.jspx" referids="objectnumber" />
</div>
</div>
<div id="relations">
<mm:node referid="objectnumber" commitonclose="false">
- <mm:form id="transaction">
+ <mm:form name="transaction">
<ul>
<c:forTokens items="urls,images" delims="," var="type" >
<mm:include page="related.li.jspx" referids="type" />
@@ -93,17 +91,24 @@
</mm:node>
</div>
<div id="commit">
- <mm:form id="transaction">
+ <mm:form id="transaction" mode="validate">
<mm:import externid="cancel" />
<mm:present referid="cancel">
<mm:cancel />
- <mm:write session="node" value="" />
<mm:log>Canceling transaction ${transaction}</mm:log>
- <mm:redirect referids="objectnumber" />
+ <mm:redirect page=".." referids="objectnumber">
+ <mm:param name="expires">0</mm:param>
+ </mm:redirect>
</mm:present>
+ <mm:log>0</mm:log>
<mm:valid>
+ <mm:log>a</mm:log>
<mm:import externid="submit" />
+ <mm:log>b</mm:log>
<mm:present referid="submit">
+ <mm:log>c</mm:log>
+ <mm:import externid="comments" />
+ <mm:param name="org.mmbase.versioning.comments"
referid="comments" />
<h1>Committing ${_} for ${transaction.cloudVar}</h1>
<mm:commit />
</mm:present>
Index: preview.jspx
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/preview.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- preview.jspx 13 Mar 2008 09:45:19 -0000 1.1
+++ preview.jspx 19 Mar 2008 14:00:57 -0000 1.2
@@ -1,19 +1,26 @@
-<div xmlns="http://www.w3.org/1999/xhtml"; xml:lang="nl"
+<div xmlns="http://www.w3.org/1999/xhtml";
+ xml:lang="nl"
xmlns:rich="http://www.mmbase.org/tags/mm/rich";
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";>
+ <mm:content expires="0" type="text/xml">
<jsp:output omit-xml-declaration="true" />
- <mm:import externid="node" from="session" />
-
- <mm:node referid="node" commitonclose="false">
- <mm:fieldlist type="edit" id="transaction">
+ <mm:import externid="objectnumber" required="true"/>
+ <mm:cloud rank="basic user" jspvar="cloud">
+ <mm:form id="transaction" mode="validate">
+ <mm:node referid="objectnumber" commitonclose="false">
+ <mm:fieldlist type="edit">
<mm:fieldinfo type="useinput" />
</mm:fieldlist>
<h1><mm:field name="title" /></h1>
+ <p><jsp:expression>cloud</jsp:expression> <mm:time time="now" /></p>
<h2><mm:field name="subtitle" /></h2>
<mm:field name="intro" escape="p" />
<rich:body />
</mm:node>
+ </mm:form>
+ </mm:cloud>
+ </mm:content>
</div>
Index: q.css
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/q.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- q.css 13 Mar 2008 09:45:19 -0000 1.4
+++ q.css 19 Mar 2008 14:00:57 -0000 1.5
@@ -74,3 +74,17 @@
div#preview > a {
float: right;
}
+
+
+.mm_related {
+ width: 100%;
+ background-color: #eee;
+}
+.mm_related table {
+ width: 100%;
+ background-color: #fff;
+}
+.mm_related .fields {
+ display: none;
+}
+
Index: related.li.jspx
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/related.li.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- related.li.jspx 12 Mar 2008 15:42:51 -0000 1.1
+++ related.li.jspx 19 Mar 2008 14:00:57 -0000 1.2
@@ -1,8 +1,8 @@
+<?xml version="1.0" ?>
<li xmlns="http://www.w3.org/1999/xhtml";
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm-u="urn:jsptagdir:/WEB-INF/tags/mm/u"
- xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
- >
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";>
<jsp:output omit-xml-declaration="yes" />
<mm:import externid="type" required="true" />
<a class="toggle">
@@ -12,6 +12,7 @@
<form>
<mm:relatednodescontainer role="idrel" type="${type}" id="current" />
<mm:listnodescontainer type="${type}" id="repository" />
+
<mm-u:relate repository="${repository}" current="${current}">
<jsp:attribute name="n">
<mm:field name="number" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
