Update of /var/cvs/speeltuin/mihxil/wiki/wiki/edit
In directory james.mmbase.org:/tmp/cvs-serv6470/wiki/edit
Modified Files:
edit.js index.jspx q.css
Log Message:
dropped extjs and tried simpler with jquery
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edit.js 26 Feb 2008 18:32:37 -0000 1.1
+++ edit.js 26 Feb 2008 21:54:27 -0000 1.2
@@ -1,5 +1,5 @@
-Ext.onReady(function(){
+$(document).ready(function(){
var validator = new MMBaseValidator();
validator.validateHook = function(valid) {
document.getElementById('submit').disabled = ! valid;
@@ -7,34 +7,24 @@
validator.prefetchNodeManager("xmlnews");
validator.setup(window);
- Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
+ $(window).bind("resize", function() {
+ $("div#main").width($(window).width() - $("div#relations").width());
+ $("div#main").height($(window).height());
+ $("div#relations").height($(window).height());
+ });
+ var width = $(window).width();
+ $("div#relations").width(width * 1 / 3);
+ $("div#relations").height($(window).height());
+ $("div#main").width(width * 2 / 3);
+ $("div#relations").resizable({
+ handles: "w",
+ resize: function(e) {
+ $("div#main").width($(window).width() - $("div#relations").width());
- var viewport = new Ext.Viewport({
- layout:'border',
- items:[
- {
- region: 'north',
- contentEl: 'title',
- autoHeight: true
- },
- {
- region: 'center',
- contentEl: 'main',
- autoScroll: true
- },
- {
- region: 'east',
- title: 'Relations',
- split:true,
- collapsible: true,
- contentEl: 'relations'
- },
- {
- region: 'south',
- collapsible: true,
- contentEl: 'commit'
}
- ]
});
-
+ $("div#relations ul > li > div").slideUp("fast");
+ $("div#relations ul > li > a").click(function(e) {
+ $(e.target).parent().children("div").slideToggle("fast");
+ });
});
Index: index.jspx
===================================================================
RCS file: /var/cvs/speeltuin/mihxil/wiki/wiki/edit/index.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- index.jspx 26 Feb 2008 18:32:37 -0000 1.1
+++ index.jspx 26 Feb 2008 21:54:27 -0000 1.2
@@ -1,5 +1,6 @@
<html 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";
lang="en">
<jsp:directive.page buffer="10000kb" />
@@ -12,27 +13,24 @@
<head>
- <mm:link page="/mmbase/extjs/adapter/ext/ext-base.js">
- <script type="text/javascript" src="${_}"><jsp:text>
</jsp:text></script>
- </mm:link>
- <mm:link page="/mmbase/extjs/ext-all.js">
- <script type="text/javascript" src="${_}"><jsp:text>
</jsp:text></script>
- </mm:link>
+ <mm:import id="jq"><mm:url page="/mmbase/jquery/" /></mm:import>
+
+ <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>
+ -->
<jsp:directive.include file="/mmbase/validation/javascript.jspxf" />
<script language="javascript" src="edit.js"><jsp:text>
</jsp:text></script>
- <mm:link page="/mmbase/extjs/resources/css/ext-all.css">
- <link rel="stylesheet" type="text/css" href="${_}" />
- </mm:link>
- <mm:link page="/mmbase/extjs/adapter/css/ext-base.css">
- <script type="text/javascript" src="${_}"><jsp:text>
</jsp:text></script>
- </mm:link>
+ <link rel="stylesheet" type="text/css" href="q.css" />
</head>
<body>
<mm:import externid="objectnumber" />
<mm:node referid="objectnumber">
<div id="main">
<mm:form id="transaction">
-
<table>
<mm:fieldlist type="edit">
<tr>
@@ -56,24 +54,46 @@
<div id="relations">
<mm:form id="transaction">
<ul>
- <mm:listrelations role="idrel">
- <li id="${_node}">
- <table>
- <mm:fieldlist fields="id,class">
- <tr>
- <td><mm:fieldinfo type="guiname" /></td>
- <td><mm:fieldinfo type="input" /></td>
- </tr>
- </mm:fieldlist>
- </table>
- <mm:relatednode>
- <mm:nodeinfo type="gui" />
- </mm:relatednode>
+ <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:listrelations>
+ </mm:context>
</ul>
</mm:form>
</div>
+ <!--
<div id="commit">
<mm:form id="transaction">
<mm:valid>
@@ -90,6 +110,7 @@
<mm:field name="number" />: <mm:nodeinfo type="gui" />
</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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- q.css 26 Feb 2008 18:32:37 -0000 1.1
+++ q.css 26 Feb 2008 21:54:27 -0000 1.2
@@ -15,5 +15,22 @@
div#relations {
right: 0px;
position: absolute;
- background-color: #eee;
+ background-color: #bbb;
+}
+
+div#relations ul {
+ list-style-type: none;
+ padding-left: 1ex;
+ margin-top: 0px;
+}
+
+div#relations ul li {
+ margin: 0;
+}
+div#relations ul li a.toggle {
+ background-color: #ddd;
+ display: block;
+ border-bottom: 1px solid black;
+ width: 100%;
+ margin: 0;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
