Update of /var/cvs/speeltuin/mihxil/wiki/wiki/edit
In directory james.mmbase.org:/tmp/cvs-serv31214/edit
Modified Files:
edit.js index.jspx q.css
Added Files:
preview.jspx
Log Message:
started on a preview screen
See also: http://cvs.mmbase.org/viewcvs/speeltuin/mihxil/wiki/wiki/edit
preview.jspx is new
Index: edit.js
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/edit.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edit.js 12 Mar 2008 15:42:51 -0000 1.3
+++ edit.js 13 Mar 2008 09:45:19 -0000 1.4
@@ -4,7 +4,7 @@
validator.validateHook = function(valid) {
document.getElementById('submit').disabled = ! valid;
}
- validator.prefetchNodeManager("xmlnews");
+ validator.prefetchNodeManager("wikiobjects");
validator.setup(window);
var resizer = function() {
@@ -29,7 +29,21 @@
}
});
$("div#relations ul > li > div").slideUp("fast");
- $("div#relations ul > li > a").click(function(e) {
+ $("div#relations ul > li > a.toggle").click(function(e) {
$(e.target).parent().children("div").slideToggle("fast");
});
+
+ $("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; });
+
+ $.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() { })
+ });
});
Index: index.jspx
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/index.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- index.jspx 12 Mar 2008 15:42:51 -0000 1.3
+++ index.jspx 13 Mar 2008 09:45:19 -0000 1.4
@@ -18,12 +18,11 @@
<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"></script>
+ <script src="${jq}ui.mouse.js"><jsp:text> </jsp:text></script>
<script src="${jq}ui.resizable.js"></script>
- <!--
- <script type="text/javascript" src="${jq}ui.accordion.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="q.css" />
@@ -42,7 +41,7 @@
<div id="main">
<mm:form id="transaction" page=".">
- <mm:node referid="objectnumber" commitonclose="false">
+ <mm:node id="objectnumber" referid="objectnumber"
commitonclose="false">
<input type="hidden" name="objectnumber" value="${_node}" />
<table>
@@ -58,7 +57,8 @@
</tr>
</mm:fieldlist>
</table>
- <input type="submit" name="submit" id="submit" />
+ <input type="submit" name="submit" id="submit" value="submit" />
+ <input type="submit" name="cancel" id="cancel" value="cancel" />
<hr />
<mm:link page=".." referids="[EMAIL PROTECTED]">
<mm:param name="expires">0</mm:param>
@@ -69,9 +69,17 @@
<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>
+ <div>
+ <mm:include page="preview.jspx" />
+ </div>
+ </div>
<div id="relations">
<mm:node referid="objectnumber" commitonclose="false">
@@ -86,6 +94,13 @@
</div>
<div id="commit">
<mm:form id="transaction">
+ <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:present>
<mm:valid>
<mm:import externid="submit" />
<mm:present referid="submit">
@@ -96,8 +111,8 @@
</mm:form>
</div>
<div id="title">
- <mm:node referid="objectnumber">
- <mm:field name="number" />: <mm:nodeinfo type="gui" /> : v
${_node.version}
+ <mm:node referid="objectnumber" commitonclose="false">
+ <mm:field name="number" />: <mm:nodeinfo type="gui" /> : v.
${_node.version}
</mm:node>
</div>
</body>
Index: q.css
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/q.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- q.css 12 Mar 2008 15:42:51 -0000 1.3
+++ q.css 13 Mar 2008 09:45:19 -0000 1.4
@@ -53,3 +53,24 @@
width: 100%;
margin: 0;
}
+
+div#preview {
+ background-color: #eee;
+ width: 20%;
+ height: 30%;
+ z-index: 100;
+ overflow: auto;
+ position: absolute;
+ right: 0;
+ bottom: 0;
+}
+div#preview > h1 {
+ margin: 0 0 0 0;
+ font-size: 10pt;
+ border-bottom: solid black 1px;
+ background-color: blue;
+ color: white;
+}
+div#preview > a {
+ float: right;
+}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
