Author: michiel
Date: 2010-03-25 18:34:32 +0100 (Thu, 25 Mar 2010)
New Revision: 41620
Added:
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/documentation.jspx
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/index.jspx
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/index.jspx
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/mmbase/
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/mmbase/portal
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/vpro/page/
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/vpro/page/index.jsp
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/vpro/page/page.jsp
Removed:
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/index.jspx
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/page.jspx
Modified:
speeltuin/mihxil/portal/trunk/src/main/webapp/mmbase/portal/portal.css.jsp
speeltuin/mihxil/portal/trunk/test-webapp/jetty-env.xml
speeltuin/mihxil/portal/trunk/test-webapp/pom.xml
Log:
some work on the test-webapp
Modified:
speeltuin/mihxil/portal/trunk/src/main/webapp/mmbase/portal/portal.css.jsp
===================================================================
--- speeltuin/mihxil/portal/trunk/src/main/webapp/mmbase/portal/portal.css.jsp
2010-03-25 17:33:34 UTC (rev 41619)
+++ speeltuin/mihxil/portal/trunk/src/main/webapp/mmbase/portal/portal.css.jsp
2010-03-25 17:34:32 UTC (rev 41620)
@@ -9,7 +9,11 @@
<mm:import externid="width" vartype="integer">300</mm:import>
<mm:import externid="cols" vartype="integer">4</mm:import>
<mm:import externid="rows" vartype="integer">3</mm:import>
+<mm:import externid="borderx" vartype="integer">0</mm:import>
+<mm:import externid="bordery" vartype="integer">0</mm:import>
+<mm:import externid="absolutepositions" />
+
.mm_portal_content {
position: relative;
width: ${width * cols}px;
@@ -29,17 +33,18 @@
<c:forEach begin="1" end="${cols}" var="i">
.mm_portal_content
.block.width${i} {
- width: ${width * i}px;
+ width: ${width * i - borderx}px;
}
</c:forEach>
<c:forEach begin="1" end="${rows}" var="i">
.mm_portal_content
.block.height${i} {
- height: ${height * i}px;
+ height: ${height * i - bordery}px;
}
</c:forEach>
+<c:if test="${absolutepositions ne 'false'}">
<c:forEach begin="0" end="${cols - 1}" var="i">
.mm_portal_content
.block.x${i} {
@@ -53,6 +58,7 @@
top: ${offsety + height * i}px;
}
</c:forEach>
+</c:if>
a.mm_portal_edit {
position: absolute;
Modified: speeltuin/mihxil/portal/trunk/test-webapp/jetty-env.xml
===================================================================
--- speeltuin/mihxil/portal/trunk/test-webapp/jetty-env.xml 2010-03-25
17:33:34 UTC (rev 41619)
+++ speeltuin/mihxil/portal/trunk/test-webapp/jetty-env.xml 2010-03-25
17:34:32 UTC (rev 41620)
@@ -15,9 +15,9 @@
<Array type="java.lang.String">
<Item>src/main/webapp</Item>
<Item>../src/main/webapp</Item>
- <Item>/home/michiel/mmbase/9/base-webapp/src/main/webapp</Item>
-
<Item>/home/michiel/mmbase/9/base-webapp/target/base-webapp-1.9-servlet25-SNAPSHOT</Item>
-
<Item>/home/michiel/mmbase/9/applications/searchrelate/target/mmbase-searchrelate-1.9-SNAPSHOT</Item>
+ <Item>/Users/michiel/mmbase/9/base-webapp/src/main/webapp</Item>
+
<Item>/Users/michiel/mmbase/9/base-webapp/target/base-webapp-1.9-servlet25-SNAPSHOT</Item>
+
<Item>/Users/michiel/mmbase/9/applications/searchrelate/target/mmbase-searchrelate-1.9-SNAPSHOT</Item>
</Array>
</Arg>
</New>
Modified: speeltuin/mihxil/portal/trunk/test-webapp/pom.xml
===================================================================
--- speeltuin/mihxil/portal/trunk/test-webapp/pom.xml 2010-03-25 17:33:34 UTC
(rev 41619)
+++ speeltuin/mihxil/portal/trunk/test-webapp/pom.xml 2010-03-25 17:34:32 UTC
(rev 41620)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
</parent>
<artifactId>portal-testapp</artifactId>
@@ -45,6 +45,19 @@
<name>com.sun.management.jmxremote</name>
<value>true</value>
</systemProperty>
+ <systemProperty>
+ <!-- Avoids the incredibly silly 'Laucher' in the windowlist of
OSX -->
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </systemProperty>
+ <systemProperty>
+ <!--
+ This may not be very safe, but we use jetty only for developing
+ See:
http://communitymapbuilder.org/display/JETTY/How+to+enable+serving+aliased+files
+ -->
+ <name>org.mortbay.util.FileResource.checkAliases</name>
+ <value>false</value>
+ </systemProperty>
</systemProperties>
</configuration>
<dependencies>
@@ -85,7 +98,7 @@
<dependency>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-portal</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
Copied:
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/documentation.jspx
(from rev 41512,
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/index.jspx)
===================================================================
---
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/documentation.jspx
(rev 0)
+++
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/documentation.jspx
2010-03-25 17:34:32 UTC (rev 41620)
@@ -0,0 +1,77 @@
+<mm:content
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
+ xmlns:mm-srt="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate"
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ expires="0" type="application/xhtml+xml"
+ language="client" postprocessor="none">
+
+ <mm:cloud rank="basic user">
+ <html xmlns="http://www.w3.org/1999/xhtml";
xml:lang="${requestScope['javax.servlet.jsp.jstl.fmt.locale.request']}">
+
+ <head>
+ <mm:link page="/mmbase/searchrelate/page.css.jsp">
+ <link rel="stylesheet" href="${_}" type="text/css" />
+ </mm:link>
+ </head>
+ <body class="home">
+ <mm:import externid="clone" />
+ <mm:present referid="clone">
+ <mm:node number="${clone}">
+ <mm:nodefunction id="newnode" name="clone" />
+ </mm:node>
+ <p>Created node ${newnode}</p>
+ </mm:present>
+
+
+ <table>
+ <mm:listnodes type="pages">
+ <tr>
+ <td>
+ <mm:link page="page.jspx" referids="_n...@node">
+ <a href="${_}">
+ <mm:nodeinfo type="gui" />
+ </a>
+ </mm:link>
+ </td>
+ <td>
+ <mm:field name="online"><mm:fieldinfo type="guivalue"
/></mm:field>
+ </td>
+ <td>
+ <mm:field name="offline"><mm:fieldinfo type="guivalue"
/></mm:field>
+ </td>
+ <td>
+ <mm:link referids="_n...@clone">
+ <a href="${_}">Clone</a>
+ </mm:link>
+ </td>
+ </tr>
+ </mm:listnodes>
+ </table>
+ <mm-sr:search type="pages" create="true" />
+
+ <mm:link page="/page.jspx" id="page" write="false" />
+ <script type="text/javascript">
+ $(document).bind("mmsrRelate", function (e, tr, relater) {
+ document.location = "${page}?node=" + relater.getNumber(tr);
+ });
+ </script>
+ <mm:link page="vpro/">
+ <a href="${_}">VPRO</a>
+ </mm:link>
+
+
+
+ <mm:link page="/mmbase/components/core/model.svg.jsp">
+ <mm:param name="nodemanager">pages</mm:param>
+ <mm:param name="maxdistance">3</mm:param>
+ <object data="${_}" type="image/svg+xml" />
+ </mm:link>
+
+ <mm:component name="portal"
+ block="portal-documentation" />
+
+ </body>
+ </html>
+ </mm:cloud>
+</mm:content>
Added:
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/index.jspx
===================================================================
---
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/index.jspx
(rev 0)
+++
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/index.jspx
2010-03-25 17:34:32 UTC (rev 41620)
@@ -0,0 +1,121 @@
+<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-2.0";
+ xmlns:mm-portal="http://www.mmbase.org/tags/mm/portal";
+ xmlns:mm-portalt="urn:jsptagdir:/WEB-INF/tags/mm/portal"
+ xmlns:os="http://www.opensymphony.com/oscache";
+ expires="0" type="application/xhtml+xml"
+ language="client" postprocessor="none">
+ <mm:import externid="showdate">now</mm:import>
+ <mm:import externid="servletpath" required="true" />
+ <mm:cloud method="http" rank="basic user">
+
+ <mm:import externid="page" />
+ <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">
+ <mm:param name="height">150</mm:param>
+ <mm:param name="width">150</mm:param>
+ <mm:param name="borderx">2</mm:param>
+ <mm:param name="bordery">2</mm:param>
+ <mm:param name="absolutepositions">false</mm:param>
+ <link rel="stylesheet" type="text/css" href="${_}" />
+ </mm:link>
+ <mm:include page="/mmbase/jquery/jquery-ui.jspx" />
+ <mm:link page="/mmbase/jquery/css/jquery-ui-1.7.2.custom.css">
+ <link type="text/css" href="${_}" rel="stylesheet" />
+ </mm:link>
+ <style type="text/css">
+ .mm_portal_content {
+ margin-left: 0px;
+ background-color: yellow;
+
+ }
+ .mm_portal_content .block {
+ float: left;
+ position: static;
+ margin: 0; padding: 0px;
+ border: dashed 1px green;
+ }
+ </style>
+
+ <script type="text/javascript">
+ $(function() {
+ $(".mm_portal_content").sortable();
+ $("select.width").live("change", function() {
+ $(this).closest(".block").removeClass("width1 width2 width3
width4");
+ $(this).closest(".block").addClass("width" + $(this).val());
+ });
+ $("select.height").live("change", function() {
+ $(this).closest(".block").removeClass("height1 height2 height3
height4");
+ $(this).closest(".block").addClass("height" + $(this).val());
+ });
+ });
+ </script>
+
+ </head>
+ <body>
+ <c:choose>
+ <c:when test="${empty page}">
+ <table>
+ <mm-portal:pages path="${path}" online="false">
+ <tr>
+ <td><mm:field name="title" /></td>
+ <td><mm:field name="online"><mm:time format=":SHORT.SHORT"
/></mm:field></td>
+ <td><mm:field name="offline"><mm:time format=":SHORT.SHORT"
/></mm:field></td>
+ <td>
+ <mm:link referids="servletpath,_n...@page">
+ <a href="${_}">${_node}</a>
+ </mm:link>
+ </td>
+ </tr>
+ </mm-portal:pages>
+ </table>
+ </c:when>
+ <c:otherwise>
+ <mm:node number="${page}">
+ <table>
+ <mm:fieldlist type="edit">
+ <tr>
+ <th><mm:fieldinfo type="guiname" /></th>
+ <td>
+ <mm:fieldinfo type="input" />
+ <mm:fieldinfo type="errors" />
+ </td>
+ </tr>
+ </mm:fieldlist>
+ </table>
+ <mm-sr:search type="blocks" implicit="false" />
+ <mm-portal:blocks>
+ <select class="width" name="width">
+ <c:forEach begin="1" end="4" var="w">
+ <mm:option value="${w}"
compare="${blockposrel.width}">${w}</mm:option>
+ </c:forEach>
+ </select>
+ x
+ <select class="height" name="height">
+ <c:forEach begin="1" end="3" var="h">
+ <mm:option value="${h}"
compare="${blockpsorel.height}">${h}</mm:option>
+ </c:forEach>
+ </select>
+ <br />
+ ${blockposrel.number} /
+ ${blockposrel.x} ${blockposrel.y}
+
+ <mm:node referid="block">
+ <mm:field name="name" />
+ <mm:field name="description" />
+ </mm:node>
+ </mm-portal:blocks>
+ </mm:node>
+ </c:otherwise>
+ </c:choose>
+ </body>
+ </html>
+ </mm:cloud>
+</mm:content>
Deleted: speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/index.jspx
===================================================================
--- speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/index.jspx
2010-03-25 17:33:34 UTC (rev 41619)
+++ speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/index.jspx
2010-03-25 17:34:32 UTC (rev 41620)
@@ -1,77 +0,0 @@
-<mm:content
- xmlns:jsp="http://java.sun.com/JSP/Page";
- xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
- xmlns:mm-srt="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate"
- xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
- expires="0" type="application/xhtml+xml"
- language="client" postprocessor="none">
-
- <mm:cloud rank="basic user">
- <html xmlns="http://www.w3.org/1999/xhtml";
xml:lang="${requestScope['javax.servlet.jsp.jstl.fmt.locale.request']}">
-
- <head>
- <mm:link page="/mmbase/searchrelate/page.css.jsp">
- <link rel="stylesheet" href="${_}" type="text/css" />
- </mm:link>
- </head>
- <body class="home">
- <mm:import externid="clone" />
- <mm:present referid="clone">
- <mm:node number="${clone}">
- <mm:nodefunction id="newnode" name="clone" />
- </mm:node>
- <p>Created node ${newnode}</p>
- </mm:present>
-
-
- <table>
- <mm:listnodes type="pages">
- <tr>
- <td>
- <mm:link page="page.jspx" referids="_n...@node">
- <a href="${_}">
- <mm:nodeinfo type="gui" />
- </a>
- </mm:link>
- </td>
- <td>
- <mm:field name="online"><mm:fieldinfo type="guivalue"
/></mm:field>
- </td>
- <td>
- <mm:field name="offline"><mm:fieldinfo type="guivalue"
/></mm:field>
- </td>
- <td>
- <mm:link referids="_n...@clone">
- <a href="${_}">Clone</a>
- </mm:link>
- </td>
- </tr>
- </mm:listnodes>
- </table>
- <mm-sr:search type="pages" create="true" />
-
- <mm:link page="/page.jspx" id="page" write="false" />
- <script type="text/javascript">
- $(document).bind("mmsrRelate", function (e, tr, relater) {
- document.location = "${page}?node=" + relater.getNumber(tr);
- });
- </script>
- <mm:link page="vpro/">
- <a href="${_}">VPRO</a>
- </mm:link>
-
-
-
- <mm:link page="/mmbase/components/core/model.svg.jsp">
- <mm:param name="nodemanager">pages</mm:param>
- <mm:param name="maxdistance">3</mm:param>
- <object data="${_}" type="image/svg+xml" />
- </mm:link>
-
- <mm:component name="portal"
- block="portal-documentation" />
-
- </body>
- </html>
- </mm:cloud>
-</mm:content>
Copied: speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/index.jspx
(from rev 41193,
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/page.jspx)
===================================================================
--- speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/index.jspx
(rev 0)
+++ speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/index.jspx
2010-03-25 17:34:32 UTC (rev 41620)
@@ -0,0 +1,59 @@
+<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-2.0";
+ xmlns:mm-portal="http://www.mmbase.org/tags/mm/portal";
+ xmlns:mm-portalt="urn:jsptagdir:/WEB-INF/tags/mm/portal"
+ xmlns:os="http://www.opensymphony.com/oscache";
+ expires="0" type="application/xhtml+xml"
+ language="client" postprocessor="none">
+ <mm:import externid="showdate">now</mm:import>
+ <c:set var="nologinneeded" value="${empty param.flush and showdate eq
'now'}" />
+ <mm:cloud method="${nologinneeded ? '' : 'http'}" rank="${nologinneeded ?
'anonymous' : 'basic user'}">
+ <mm-portalt:page id="page" date="${showdate}" pathfromrequest="true" />
+
+ <c:if test="${param.flush eq 'all'}">
+ <os:flush group="mmportal-${portalid}" scope="application" />
+ </c:if>
+ <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>
+ <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/">
+ -->
+ <mm:link page="/edit/">
+ <meta content="${_}" name="org.mmbase.portal.editordir" />
+ </mm:link>
+ <mm:include page="/mmbase/jquery/jquery-ui.jspx" />
+ <c:if test="${! empty param.edit}">
+ <mm:link page="/mmbase/portal/portal.js.jsp">
+ <script type="text/javascript" src="${_}"><jsp:text>
</jsp:text></script>
+ <script type="text/javascript">
+ var portal = new MMBasePortal();
+ </script>
+ </mm:link>
+ </c:if>
+ </head>
+ <mm:node referid="page" id="page">
+ <body class="home mm_editor_page mm_ea_servletpath_${_node.path}
mm_ea_showdate_${mm:escape('spaceswallower,url', showdate)}">
+ <h1><mm:field name="title" /></h1>
+ <p>path: ${_node.path}</p>
+ <mm-portal:blocks>
+ <mm:node node="page">
+
+ <mm:component name="${block.component}" block="${block.name}" />
+ </mm:node>
+ </mm-portal:blocks>
+ </body>
+ </mm:node>
+ </html>
+ </mm:cloud>
+</mm:content>
Added: speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/mmbase/portal
===================================================================
--- speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/mmbase/portal
(rev 0)
+++ speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/mmbase/portal
2010-03-25 17:34:32 UTC (rev 41620)
@@ -0,0 +1 @@
+link ../../../../../src/main/webapp/mmbase/portal
\ No newline at end of file
Property changes on:
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/mmbase/portal
___________________________________________________________________
Name: svn:special
+ *
Deleted: speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/page.jspx
===================================================================
--- speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/page.jspx
2010-03-25 17:33:34 UTC (rev 41619)
+++ speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/page.jspx
2010-03-25 17:34:32 UTC (rev 41620)
@@ -1,48 +0,0 @@
-<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-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']}">
-
- <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">
-
- <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>
- </mm:cloud>
-</mm:content>
Added:
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/vpro/page/index.jsp
===================================================================
---
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/vpro/page/index.jsp
(rev 0)
+++
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/vpro/page/index.jsp
2010-03-25 17:34:32 UTC (rev 41620)
@@ -0,0 +1,112 @@
+<%...@page contentType="text/html;charset=UTF8" %><%@ taglib prefix="edit"
tagdir="/WEB-INF/tags/vpro-wizards/"
+%><%@ taglib prefix="tags" tagdir="/WEB-INF/tags"
+%><%@ taglib prefix="form" tagdir="/WEB-INF/tags/vpro-wizards/form"
+%><%@ taglib prefix="list" tagdir="/WEB-INF/tags/vpro-wizards/list"
+%><%@ taglib prefix="mm-portalt" tagdir="/WEB-INF/tags/mm/p"
+%><%@ taglib prefix="related" tagdir="/WEB-INF/tags/vpro-wizards/related"
+%><%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util"
+%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core";
+%><%...@taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
+%><%...@taglib prefix="mm-portal" uri="http://www.mmbase.org/tags/mm/portal";
+%><mm:content expires="0" language="nl">
+<mm:cloud>
+ <form:wizard>
+
+
+ <jsp:attribute name="header" >
+ <style>
+ tr.page:hover td.click {
+ cursor: pointer;
+ }
+ tr.current.offline {
+ background-color: #ffa;
+ }
+ tr.current.online {
+ background-color: #aff;
+ }
+ tr.online {
+ background-color: #afa;
+ }
+ tr.offline {
+ background-color: #faa;
+ }
+ form {
+ display: inline;
+ }
+ </style>
+ <script type="text/javascript">
+ $(function() {
+ $("tr.page td.click").click(function() {
+ var href = $(this).closest("tr").find("td a").attr("href");
+ document.location = href;
+ });
+ });
+ </script>
+ </jsp:attribute>
+ <jsp:body>
+ <mm:cloud method="asis">
+ <mm:import externid="clone" />
+ <mm:present referid="clone">
+ <mm:node number="${clone}">
+ <mm:nodefunction id="newnode" name="clone" />
+ </mm:node>
+ <p>Created node ${newnode}</p>
+ </mm:present>
+ <mm:import externid="delete" />
+ <mm:present referid="delete">
+ <mm:node number="${delete}">
+ <mm:deletenode deleterelations="true" />
+ </mm:node>
+ <p>Deleted node ${delete}</p>
+ </mm:present>
+
+
+ <edit:path node="${_node}" session="sectie_pageoverview"
reset="true" />
+ <edit:sessionpath />
+ <mm:import externid="showdate">tomorrow</mm:import>
+ <select id="showdate" name="showdate">
+ <mm:option value="now" compare="${showdate}">Nu</mm:option>
+ <mm:option value="tohour+1day"
compare="${showdate}">Morgen</mm:option>
+ <mm:option value="tohour+1week" compare="${showdate}">Volgende
week</mm:option>
+ <mm:option value="nextsaturday+7hour"
compare="${showdate}">Zaterdag</mm:option>
+ <mm-portal:pages online="false">
+ <mm:context>
+ <c:if test="${_node.online ne online}">
+ <mm:field name="online" id="online">
+ <mm:time offset="${10 * 60}" format="yyyy-MM-dd'T'HH:mm">
+ <mm:option value="${_}" compare="${showdate}">
+ <mm:time writer="online" offset="${10 * 60}"
format=":LONG.LONG" />
+ </mm:option>
+ </mm:time>
+ </mm:field>
+ </c:if>
+ </mm:context>
+ </mm-portal:pages>
+ <mm:option value="now-1year" compare="${showdate}">Vorig
jaar</mm:option>
+ </select>
+
+ <mm:link page="/">
+ <mm:param name="edit">true</mm:param>
+ <input type="submit" value="Herlaad pagina alsof het deze datum is"
+ onclick="window.parent.location = '${_}' + '&showdate='
+ encodeURIComponent($('select#showdate').val()); return false;" />
+ </mm:link>
+ <c:if test="${showdate ne 'now'}">
+ <p>Nu: <mm:time time="${showdate}" format=":FULL.FULL" /></p>
+ </c:if>
+ <table>
+ <mm-portal:pages online="false">
+ <tr>
+ <td>
+ <mm:link page="edit" referids="_n...@page,showdate">
+ <a href="${_}">Edit ${_node.title} ${_node}</a>
+ </mm:link>
+ </td>
+ </tr>
+ </mm-portal:pages>
+ </table>
+
+ </mm:cloud>
+ </jsp:body>
+ </form:wizard>
+</mm:cloud>
+</mm:content>
Added:
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/vpro/page/page.jsp
===================================================================
---
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/vpro/page/page.jsp
(rev 0)
+++
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/vpro/page/page.jsp
2010-03-25 17:34:32 UTC (rev 41620)
@@ -0,0 +1,52 @@
+<%@ taglib prefix="edit" tagdir="/WEB-INF/tags/vpro-wizards/"
+%><%@ taglib prefix="tags" tagdir="/WEB-INF/tags"
+%><%@ taglib prefix="form" tagdir="/WEB-INF/tags/vpro-wizards/form"
+%><%@ taglib prefix="list" tagdir="/WEB-INF/tags/vpro-wizards/list"
+%><%@ taglib prefix="related" tagdir="/WEB-INF/tags/vpro-wizards/related"
+%><%@ taglib prefix="util" tagdir="/WEB-INF/tags/vpro-wizards/util"
+%><%...@taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
+%><%...@taglib prefix="mm-portal" uri="http://www.mmbase.org/tags/mm/portal";
+%><mm:content expires="0" language="nl">
+<mm:import externid="page" required="true" />
+<mm:import externid="portal" required="true" />
+<mm:import externid="showdate" />
+<form:wizard nodenr="${page}" title="Pagina" >
+ <mm:node id="page" referid="page" />
+
+ <edit:path node="${page}" session="sectie_page" />
+ <edit:sessionpath/>
+
+ <tags:security cloud="${requestScope.requestcloud}"
redirect="/redactie2/geentoegang.jsp"/>
+
+
+ <form:container nodetype="pages">
+ <form:showfield field="number"/>
+ <form:textfield field="title"/>
+ <form:datefield field="online"/>
+ <form:datefield field="offline"/>
+ <%-- doesn't work
+ <form:input field="show"/>
+ --%>
+ </form:container>
+
+ <mm:node number="${page}">
+ <table>
+ <caption>Lay-out</caption>
+ <tr><th>x</th><th>y</th><th>size</th><th colspan="2">content</th></tr>
+ <mm-portal:blocks>
+ <tr>
+
<td>${blockposrel.x}</td><td>${blockposrel.y}</td><td>${blockposrel.width}x${blockposrel.height}</td>
+ <mm:node referid="block">
+ <td><mm:field name="name" /></td>
+ <td><mm:field name="description" /></td>
+ </mm:node>
+ </tr>
+ </mm-portal:blocks>
+ </table>
+ </mm:node>
+ <mm:link page="." referids="portal,showdate?">
+ <a href="${_}">Terug</a>
+ </mm:link>
+
+</form:wizard>
+</mm:content>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
