Author: andre
Date: 2010-07-21 16:47:43 +0200 (Wed, 21 Jul 2010)
New Revision: 42963
Modified:
mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/html.tagx
mmweb/trunk/src/main/webapp/articles.jspx
mmweb/trunk/src/main/webapp/contact.jspx
mmweb/trunk/src/main/webapp/framework.jspx
mmweb/trunk/src/main/webapp/index.jspx
Log:
implementing mynews and developing framework to support both pages (mmsite) and
news (mynews) components
Modified: mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/html.tagx
===================================================================
--- mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/html.tagx 2010-07-21
14:35:30 UTC (rev 42962)
+++ mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/html.tagx 2010-07-21
14:47:43 UTC (rev 42963)
@@ -39,13 +39,13 @@
xml:lang="en"
xmlns="http://www.w3.org/1999/xhtml";>
- <mm:import id="page" externid="n" />
+ <mm:import id="page" externid="n">page_homepage</mm:import>
<mmweb:head>
<jsp:attribute name="title">
<c:choose>
<c:when test="${empty title and !empty page}">
- <mm:node referid="page">
+ <mm:node number="$page">
<mm:hasfield name="title"><mm:field name="title"
/></mm:hasfield>
</mm:node>
</c:when>
@@ -57,12 +57,26 @@
<jsp:invoke fragment="head" />
</c:when>
<c:otherwise>
- <mm:node referid="page">
+ <mm:node number="$page">
<jsp:invoke fragment="head" />
</mm:node>
</c:otherwise>
</c:choose>
</mmweb:head>
+
+ <mm:node number="$page">
+ <mm:nodeinfo type="type" write="false">
+ <c:if test="${_ ne 'pages'}">
+ <mm:import id="page" reset="true">page_homepage</mm:import>
+ </c:if>
+ </mm:nodeinfo>
+ </mm:node>
+ <mm:node number="$page">
+ <mm:nodefunction name="root" referids="_n...@node" set="mmsite">
+ <mm:field name="number" id="root" write="false" />
+ </mm:nodefunction>
+ </mm:node>
+
<body class="${styleClass}">
<div id="head">
<div id="head-inner">
@@ -70,11 +84,6 @@
<a href="${mm:link('/')}"><img
src="${mm:link('/html/style/images/mmbase-logo-sm.png')}" width="48"
height="64" alt="MMBase" /></a>
</h1>
<div id="menu">
- <!-- mm:present referid="page">
- <mm:nodefunction name="root" referids="p...@node"
set="mmsite">
- <mm:import id="roott" reset="true"><mm:field
name="number" /></mm:import>
- </mm:nodefunction>
- </mm:present -->
<mm:node number="pool_mmbase">
<mm:relatednodescontainer type="pages" role="posrel"
searchdirs="destination">
<mm:constraint field="posrel.pos" value="1" value2="10"
operator="BETWEEN" />
@@ -82,7 +91,7 @@
<mm:import externid="n" vartype="integer" />
<ol>
<mm:relatednodes>
- <li class="${n eq _node.number or roott eq
_node.number ? 'selected ' :''}">
+ <li class="${n eq _node.number or root eq
_node.number ? 'selected ' :''}">
<mm:link page="page" referids="_n...@n">
<mm:frameworkparam
name="component">mmsite</mm:frameworkparam>
<a href="${_}"><mm:field name="title" /></a>
@@ -105,58 +114,7 @@
</div>
<div id="wrap">
<div id="wrap-inner">
-
- <div id="submenu">
- <mm:node referid="page" notfound="skip">
- <mm:hasfield name="path">
- <mm:nodefunction name="root" referids="_n...@node"
set="mmsite">
- <mm:relatednodescontainer type="pages" role="posrel"
searchdirs="destination">
- <mm:sortorder field="posrel.pos" direction="UP" />
- <mm:size>
- <mm:isgreaterthan value="0">
- <ol>
- <mm:relatednodes>
- <li class="${page eq _node.number ?
'selected ' :''}">
- <mm:link page="page" referids="_n...@n">
- <mm:frameworkparam
name="component">mmsite</mm:frameworkparam>
- <a href="${_}"><mm:field name="title"
/></a>
- </mm:link>
- </li>
- </mm:relatednodes>
- </ol>
- </mm:isgreaterthan>
- </mm:size>
- </mm:relatednodescontainer>
- </mm:nodefunction>
- </mm:hasfield>
- <mm:hasfield name="path" inverse="true">
- <!-- assume (for now) we're in the contact section -->
- <mm:node number="page_contact">
- <mm:relatednodescontainer type="pages" role="posrel"
searchdirs="destination">
- <mm:sortorder field="posrel.pos" direction="UP" />
- <mm:size>
- <mm:isgreaterthan value="0">
- <ol>
- <mm:relatednodes>
- <li class="${page eq _node.number ?
'selected ' :''}">
- <mm:link page="page" referids="_n...@n">
- <mm:frameworkparam
name="component">mmsite</mm:frameworkparam>
- <a href="${_}"><mm:field name="title"
/></a>
- </mm:link>
- </li>
- </mm:relatednodes>
- </ol>
- </mm:isgreaterthan>
- </mm:size>
- </mm:relatednodescontainer>
- </mm:node>
- </mm:hasfield>
- </mm:node>
- <jsp:text> <!-- empty --> </jsp:text>
- </div>
-
<jsp:invoke fragment="body" />
-
</div>
<div id="footer">
Modified: mmweb/trunk/src/main/webapp/articles.jspx
===================================================================
--- mmweb/trunk/src/main/webapp/articles.jspx 2010-07-21 14:35:30 UTC (rev
42962)
+++ mmweb/trunk/src/main/webapp/articles.jspx 2010-07-21 14:47:43 UTC (rev
42963)
@@ -12,6 +12,9 @@
</jsp:attribute>
<jsp:attribute name="body">
<mm:import id="page" externid="n" />
+
+ <mmweb:submenu page="${page}" />
+
<mm:node referid="page">
<div id="content">
<div>
Modified: mmweb/trunk/src/main/webapp/contact.jspx
===================================================================
--- mmweb/trunk/src/main/webapp/contact.jspx 2010-07-21 14:35:30 UTC (rev
42962)
+++ mmweb/trunk/src/main/webapp/contact.jspx 2010-07-21 14:47:43 UTC (rev
42963)
@@ -12,6 +12,7 @@
</jsp:attribute>
<jsp:attribute name="body">
+ <mmweb:submenu page="${page}" />
<div id="content">
<div>
<h2>Contact</h2>
Modified: mmweb/trunk/src/main/webapp/framework.jspx
===================================================================
--- mmweb/trunk/src/main/webapp/framework.jspx 2010-07-21 14:35:30 UTC (rev
42962)
+++ mmweb/trunk/src/main/webapp/framework.jspx 2010-07-21 14:47:43 UTC (rev
42963)
@@ -5,27 +5,54 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:mmweb="urn:jsptagdir:/WEB-INF/tags/mmweb">
+ <mm:import id="page" externid="n">page_homepage</mm:import>
<mm:import externid="block" required="true" />
<mm:import externid="component">mmweb</mm:import>
- <c:if test="${component eq 'mynews'}">
- <mm:import id="page" reset="true">page_news</mm:import>
- </c:if>
+ <c:choose>
+ <c:when test="${component eq 'mynews' and block eq 'list'}">
+ <c:set var="title" value="News" />
+ </c:when>
+ <c:otherwise>
+ <!-- expand later -->
+ </c:otherwise>
+ </c:choose>
- <mmweb:html styleClass="${block}">
+ <mmweb:html styleClass="${block}" title="${title}">
<jsp:attribute name="head">
<mm:component name="${component}" block="${block}" render="head" />
</jsp:attribute>
<jsp:attribute name="body">
+
+ <c:choose>
+ <c:when test="${component eq 'mynews'}">
+ <mmweb:submenu page="page_news" pparent="page_homepage" />
+ </c:when>
+ <c:otherwise>
+ <mmweb:submenu page="${page}" />
+ </c:otherwise>
+ </c:choose>
+
<div id="content">
<div>
+
<c:choose>
<c:when test="${component eq 'mynews' and block eq 'list'}">
+
+ <mm:import externid="offset"></mm:import>
+ <mm:import externid="max">3</mm:import>
+
<mm:component name="mynews" block="list">
- <mm:param name="max">10</mm:param>
+ <mm:param name="max">${max}</mm:param>
+ <mm:param name="offset">${offset}</mm:param>
</mm:component>
+
+ <mm:import externid="mynews.total" id="total" from="request" />
+ <mm:url id="pageurl" absolute="true" write="false" />
+ <mmweb:pager total="${total}" offset="${offset}" max="${max}"
baseurl="${pageurl}" />
+
</c:when>
<c:otherwise>
<mm:component name="${component}" block="${block}" />
@@ -36,10 +63,22 @@
</div>
<div id="sidebar">
<div>
- Sidebar?
page: ${page}
+ n: ${n}
+ <c:choose>
+ <c:when test="${component eq 'mynews' and block eq 'news'}">
+ <h3>Latest news</h3>
+ <mm:component name="mynews" block="list">
+ <mm:param name="max">3</mm:param>
+ </mm:component>
+ </c:when>
+ <c:otherwise>
+ <p>Eh, nix</p>
+ </c:otherwise>
+ </c:choose>
+
</div>
</div>
</jsp:attribute>
Modified: mmweb/trunk/src/main/webapp/index.jspx
===================================================================
--- mmweb/trunk/src/main/webapp/index.jspx 2010-07-21 14:35:30 UTC (rev
42962)
+++ mmweb/trunk/src/main/webapp/index.jspx 2010-07-21 14:47:43 UTC (rev
42963)
@@ -13,6 +13,8 @@
</jsp:attribute>
<jsp:attribute name="body">
<mm:import id="page" externid="n">page_homepage</mm:import>
+ <div id="submenu"><jsp:text> <!-- empty --> </jsp:text></div>
+
<div id="content">
<div>
@@ -50,7 +52,7 @@
<h3 class="news"><a href="${_}">News</a></h3>
</mm:link>
<mm:component name="mynews" block="list">
- <mm:param name="max">5</mm:param>
+ <mm:param name="max">3</mm:param>
<mm:param name="more">true</mm:param>
</mm:component>
</div>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
