Update of /var/cvs/speeltuin/mihxil/wiki/wiki/edit
In directory james.mmbase.org:/tmp/cvs-serv13354/wiki/edit
Modified Files:
edit.js index.jspx preview.jspx
Log Message:
See also: http://cvs.mmbase.org/viewcvs/speeltuin/mihxil/wiki/wiki/edit
Index: edit.js
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/edit.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- edit.js 19 Mar 2008 14:00:57 -0000 1.5
+++ edit.js 25 Mar 2008 16:51:19 -0000 1.6
@@ -1,26 +1,35 @@
$(document).ready(function(){
+ {
+ // Set up validator, this marks input fields as incorrect and adds
error-message if so.
var validator = new MMBaseValidator();
validator.validateHook = function(valid) {
+ // if invalid, then you can't submit the form
document.getElementById('submit').disabled = ! valid;
}
+ // avoid some ajax, by fetching the information for all of the fields
of this node manager in one go
validator.prefetchNodeManager("wikiobjects");
validator.setup(window);
+ }
+
+ {
+ // The size of some of the areas are determined by js.
var resizer = function() {
var minHeight = $("div#title").height() + $("div#commit").height();
$("div#main").width($(window).width() - $("div#relations").width());
$("div#main").height($(window).height() - minHeight);
$("div#relations").height($(window).height() - minHeight);
$("div#relations").offset().right = 0;
-
}
-
$(window).bind("resize", resizer);
-
var width = $(window).width();
$("div#relations").width(width * 1 / 3);
resizer();
+ }
+
+ {
+ // Dynamic stuff from the #relations frame
$("div#relations").resizable({
handles: "w",
resize: function(e) {
@@ -32,20 +41,35 @@
$("div#relations ul > li > a.toggle").click(function(e) {
$(e.target).parent().children("div").slideToggle("fast");
});
+ }
+ {
+ // Dynamic sstuff from the #preview frame
$("div#preview").draggable({handle: ">h1"});
+
$("div#preview > a").click(function() {
+ // actual reloading or preview happens here\
var params = {};
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) {
$("div#preview > div").replaceWith(data.documentElement);
});
//$("div#preview > div").load("preview.jspx", null, function() { })
return false;
});
+ }
+
+ $("body").find("#submitTest").each(function() {
+ $(this).click(function() {
+ $("body").find(".mm_related a.search").each(function() {
+ this.searcher.commit();
+ });
+ return false;
+
+ });
+ });
});
Index: index.jspx
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/index.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- index.jspx 19 Mar 2008 14:00:57 -0000 1.5
+++ index.jspx 25 Mar 2008 16:51:19 -0000 1.6
@@ -4,6 +4,7 @@
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:fn="http://java.sun.com/jsp/jstl/functions";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
lang="en">
<jsp:directive.page buffer="2000kb" />
@@ -11,7 +12,7 @@
postprocessor="none"
language="nl" expires="0">
- <mm:cloud rank="basic user">
+ <mm:cloud rank="basic user" jspvar="cloud">
<mm:param name="org.mmbase.xml-mode" value="wiki" />
@@ -34,17 +35,16 @@
<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>
+
<mm:import externid="objectnumber" />
+
+ <div id="main">
+ <mm:form id="transaction" page="." commitonclose="false">
<mm:compare referid="objectnumber" value="new">
<mm:remove referid="objectnumber" />
<mm:createnode type="wikiobjects" id="objectnumber" />
-
</mm:compare>
-
- <div id="main">
- <mm:form id="transaction" page="." commitonclose="false">
- <mm:node id="objectnumber" referid="objectnumber"
commitonclose="false">
-
+ <mm:node id="objectnumber" referid="objectnumber"
commitonclose="false" jspvar="node">
<input type="hidden" name="objectnumber" value="${_node}" />
<table>
<mm:fieldlist type="edit">
@@ -61,6 +61,7 @@
</table>
<input type="submit" name="submit" id="submit" value="submit" />
+ <span id="submitTest">submitTest</span>
<input type="submit" name="cancel" id="cancel" value="cancel" />
<input type="text" name="comments" value="Beschrijf uw
verandering hier" />
<hr />
@@ -83,7 +84,7 @@
<mm:form name="transaction">
<ul>
- <c:forTokens items="urls,images" delims="," var="type" >
+ <c:forTokens items="urls" delims="," var="type" >
<mm:include page="related.li.jspx" referids="type" />
</c:forTokens>
</ul>
@@ -95,7 +96,7 @@
<mm:import externid="cancel" />
<mm:present referid="cancel">
<mm:cancel />
- <mm:log>Canceling transaction ${transaction}</mm:log>
+ <mm:log>Canceling transaction ${transaction.cloudVar}</mm:log>
<mm:redirect page=".." referids="objectnumber">
<mm:param name="expires">0</mm:param>
</mm:redirect>
@@ -116,8 +117,8 @@
</mm:form>
</div>
<div id="title">
- <mm:node referid="objectnumber" commitonclose="false">
- <mm:field name="number" />: <mm:nodeinfo type="gui" /> : v.
${_node.version}
+ <mm:node referid="objectnumber" commitonclose="false"
jspvar="node">
+ <mm:field name="number" />: <mm:nodeinfo type="gui" /> : v.
${_node.version} : <jsp:expression>node.getCloud()</jsp:expression>
</mm:node>
</div>
</body>
Index: preview.jspx
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/preview.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- preview.jspx 19 Mar 2008 14:00:57 -0000 1.2
+++ preview.jspx 25 Mar 2008 16:51:19 -0000 1.3
@@ -6,14 +6,14 @@
<mm:content expires="0" type="text/xml">
<jsp:output omit-xml-declaration="true" />
<mm:import externid="objectnumber" required="true"/>
- <mm:cloud rank="basic user" jspvar="cloud">
- <mm:form id="transaction" mode="validate">
+ <mm:cloud method="asis">
+
+ <mm:form id="transaction" mode="transaction">
<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" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
