Author: michiel
Date: 2009-12-11 21:52:36 +0100 (Fri, 11 Dec 2009)
New Revision: 40223
Modified:
speeltuin/mihxil/portal/test-webapp/pom.xml
speeltuin/mihxil/portal/test-webapp/src/main/webapp/index.jspx
speeltuin/mihxil/portal/test-webapp/src/main/webapp/page.jspx
Log:
Modified: speeltuin/mihxil/portal/test-webapp/pom.xml
===================================================================
--- speeltuin/mihxil/portal/test-webapp/pom.xml 2009-12-11 20:50:27 UTC (rev
40222)
+++ speeltuin/mihxil/portal/test-webapp/pom.xml 2009-12-11 20:52:36 UTC (rev
40223)
@@ -112,10 +112,18 @@
<dependency>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-vpro-wizards</artifactId>
- <version>${mmbase.version}</version>
+ <version>2.0-SNAPSHOT</version>
<type>war</type>
</dependency>
+
<dependency>
+ <groupId>org.mmbase.jquery</groupId>
+ <artifactId>jquery-ui</artifactId>
+ <version>1.7.2-2</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-vpro-wizards</artifactId>
<version>${mmbase.version}</version>
Modified: speeltuin/mihxil/portal/test-webapp/src/main/webapp/index.jspx
===================================================================
--- speeltuin/mihxil/portal/test-webapp/src/main/webapp/index.jspx
2009-12-11 20:50:27 UTC (rev 40222)
+++ speeltuin/mihxil/portal/test-webapp/src/main/webapp/index.jspx
2009-12-11 20:52:36 UTC (rev 40223)
@@ -1,9 +1,7 @@
<mm:content
xmlns:jsp="http://java.sun.com/JSP/Page";
- xmlns:c="http://java.sun.com/jsp/jstl/core";
- xmlns:fn="http://java.sun.com/jsp/jstl/functions";
xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
- xmlns:mm="http://www.mmbase.org/mmbase-taglib-1.0";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
expires="0" type="application/xhtml+xml"
language="client" postprocessor="none">
Modified: speeltuin/mihxil/portal/test-webapp/src/main/webapp/page.jspx
===================================================================
--- speeltuin/mihxil/portal/test-webapp/src/main/webapp/page.jspx
2009-12-11 20:50:27 UTC (rev 40222)
+++ speeltuin/mihxil/portal/test-webapp/src/main/webapp/page.jspx
2009-12-11 20:52:36 UTC (rev 40223)
@@ -3,45 +3,44 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:fn="http://java.sun.com/jsp/jstl/functions";
xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
- xmlns:mm="http://www.mmbase.org/mmbase-taglib-1.0";
- expires="0" type="application/xhtml+xml"
- language="client" postprocessor="none">
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:mm-portal="http://www.mmbase.org/tags/mm/portal";
+ expires="0" type="application/xhtml+xml"
+ language="client" postprocessor="none">
- <mm:cloud>
- <html xmlns="http://www.w3.org/1999/xhtml";
xml:lang="${requestScope['javax.servlet.jsp.jstl.fmt.locale.request']}">
+ <mm:cloud>
+ <html xmlns="http://www.w3.org/1999/xhtml";
xml:lang="${requestScope['javax.servlet.jsp.jstl.fmt.locale.request']}">
- <head>
- <mm:link page="/mmbase/portal/portal.css.jsp">
- <link rel="stylesheet" type="text/css" href="${_}" />
- </mm:link>
- <script type="text/javascript"
src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js";><jsp:text>
</jsp:text></script>
- <mm:link page="/mmbase/portal/portal.js.jsp">
- <script type="text/javascript" src="${_}"></script>
- <script type="text/javascript">
- var portal = new MMBasePortal();
- </script>
- </mm:link>
- <link type="text/css"
href="http://jqueryui.com/latest/themes/base/ui.all.css"; rel="stylesheet" />
- </head>
- <mm:import externid="node" required="true" />
+ <head>
+ <mm:link page="/mmbase/portal/portal.css.jsp">
+ <link rel="stylesheet" type="text/css" href="${_}" />
+ </mm:link>
+ <mm:link page="/mmbase/jquery/css/jquery-ui-1.7.2.custom.css">
+ <link type="text/css" href="${_}" rel="stylesheet" />
+ </mm:link>
+ <mm:link page="/vpro">
+ <meta content="${_}" name="org.mmbase.portal.editordir" />
+ </mm:link>
+ <mm:include page="/mmbase/jquery/jquery-ui.jspx" />
+ <mm:link page="/mmbase/portal/portal.js.jsp">
+ <script type="text/javascript" src="${_}"></script>
+ <script type="text/javascript">
+ var portal = new MMBasePortal();
+ </script>
+ </mm:link>
+ </head>
+ <mm:import externid="node" required="true" />
- <body class="home">
+ <body class="home">
- <mm:node referid="node" id="page">
- <div class="content">
- <mm:listrelationscontainer type="blocks" role="blockposrel">
- <mm:listrelations id="blockposrel">
- <div class="block x${_node.x} y${_node.y} width${_node.width}
height${_node.height}">
- <mm:relatednode id="block" />
- <mm:node node="page">
- <mm:include
- referids="portal,block,blockposrel"
-
page="/mmbase/components/${block.component}/${block.name}.jspx" />
- </mm:node>
- </div>
- </mm:listrelations>
- </mm:listrelationscontainer>
- </div>
+ <mm:node referid="node" id="page">
+ <mm-portal:blocks>
+ <mm:node node="page">
+ <mm:include
+ referids="portal,block,blockposrel"
+
page="/mmbase/components/${block.component}/${block.name}.jspx" />
+ </mm:node>
+ </mm-portal:blocks>
</mm:node>
</body>
</html>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
