Update of /var/cvs/speeltuin/mihxil/wiki/wiki/edit
In directory james.mmbase.org:/tmp/cvs-serv12784/edit
Modified Files:
edit.js index.jspx q.css
Added Files:
related.li.jspx
Log Message:
See also: http://cvs.mmbase.org/viewcvs/speeltuin/mihxil/wiki/wiki/edit
related.li.jspx is new
Index: edit.js
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/edit.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edit.js 26 Feb 2008 21:54:27 -0000 1.2
+++ edit.js 12 Mar 2008 15:42:51 -0000 1.3
@@ -7,15 +7,20 @@
validator.prefetchNodeManager("xmlnews");
validator.setup(window);
- $(window).bind("resize", function() {
+ var resizer = function() {
+ var minHeight = $("div#title").height() + $("div#commit").height();
$("div#main").width($(window).width() - $("div#relations").width());
- $("div#main").height($(window).height());
- $("div#relations").height($(window).height());
- });
+ $("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);
- $("div#relations").height($(window).height());
- $("div#main").width(width * 2 / 3);
+ resizer();
$("div#relations").resizable({
handles: "w",
resize: function(e) {
Index: index.jspx
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/index.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- index.jspx 26 Feb 2008 21:54:27 -0000 1.2
+++ index.jspx 12 Mar 2008 15:42:51 -0000 1.3
@@ -1,5 +1,6 @@
<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">
@@ -18,6 +19,7 @@
<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.resizable.js"></script>
<!--
<script type="text/javascript" src="${jq}ui.accordion.js"> </script>
@@ -27,10 +29,22 @@
<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>
<mm:import externid="objectnumber" />
- <mm:node referid="objectnumber">
+ <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">
+ <mm:form id="transaction" page=".">
+ <mm:node referid="objectnumber" commitonclose="false">
+
+ <input type="hidden" name="objectnumber" value="${_node}" />
<table>
<mm:fieldlist type="edit">
<tr>
@@ -46,60 +60,36 @@
</table>
<input type="submit" name="submit" id="submit" />
<hr />
- <mm:link page=".." referids="objectnumber">
+ <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:node>
</mm:form>
</div>
<div id="relations">
+ <mm:node referid="objectnumber" commitonclose="false">
+
<mm:form id="transaction">
<ul>
- <mm:context>
- <li>
- <a class="toggle">Urls</a>
- <div>
- <form>
- <mm:relatednodescontainer role="idrel" type="urls"
id="current" />
- <mm:listnodescontainer type="urls" id="repository" />
- <mm-u:relate repository="${repository}"
current="${current}">
- <jsp:attribute name="n">
- <mm:field name="number" />
- </jsp:attribute>
- <jsp:attribute name="relate">
- <mm:createrelation source="source"
destination="destination" role="related" />
- </jsp:attribute>
- </mm-u:relate>
- </form>
- </div>
- </li>
- </mm:context>
- <mm:context>
- <li>
- <a class="toggle">Images</a>
- <div>
- <mm:relatednodescontainer role="idrel" type="images"
id="current" />
- <mm:listnodescontainer type="images" id="repository" />
- <mm-u:relate repository="${repository}"
current="${current}">
- <jsp:attribute name="n">
- <mm:field name="number" />
- </jsp:attribute>
- <jsp:attribute name="relate">
- <mm:createrelation source="source"
destination="destination" role="related" />
- </jsp:attribute>
- </mm-u:relate>
- </div>
- </li>
- </mm:context>
+ <c:forTokens items="urls,images" delims="," var="type" >
+ <mm:include page="related.li.jspx" referids="type" />
+ </c:forTokens>
</ul>
</mm:form>
+ </mm:node>
</div>
- <!--
<div id="commit">
<mm:form id="transaction">
<mm:valid>
<mm:import externid="submit" />
<mm:present referid="submit">
- <h1>Committing</h1>
+ <h1>Committing ${_} for ${transaction.cloudVar}</h1>
<mm:commit />
</mm:present>
</mm:valid>
@@ -107,11 +97,9 @@
</div>
<div id="title">
<mm:node referid="objectnumber">
- <mm:field name="number" />: <mm:nodeinfo type="gui" />
+ <mm:field name="number" />: <mm:nodeinfo type="gui" /> : v
${_node.version}
</mm:node>
</div>
- -->
- </mm:node>
</body>
</mm:cloud>
Index: q.css
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/q.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- q.css 26 Feb 2008 21:54:27 -0000 1.2
+++ q.css 12 Mar 2008 15:42:51 -0000 1.3
@@ -3,18 +3,37 @@
padding: 0 0 0 0;
}
+h1.error {
+ color: red;
+ background-color: yellow;
+ z-index: 100;
+ position: absolute;
+ top: 0;
+}
+
div#title {
+ top: 0px;
+ height: 30px;
width: 100%;
- background-color: yellow;
+ background-color: #ffa;
+}
+div#commit {
+ position: absolute;
+ bottom: 0px;
+ height: 30px;
+ width: 100%;
+ background-color: #ffa;
}
div#main {
position: absolute;
left: 0px;
+ top: 30px;
}
div#relations {
- right: 0px;
position: absolute;
+ right: 0px;
+ top: 30px;
background-color: #bbb;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
