Author: michiel
Date: 2010-05-16 18:47:37 +0200 (Sun, 16 May 2010)
New Revision: 42166
Added:
speeltuin/mihxil/simple/src/main/webapp/WEB-INF/tags/
speeltuin/mihxil/simple/src/main/webapp/WEB-INF/tags/image.tagx
Modified:
speeltuin/mihxil/simple/pom.xml
speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/builders/simple/rolerel.xml
speeltuin/mihxil/simple/src/main/webapp/WEB-INF/web.xml
speeltuin/mihxil/simple/src/main/webapp/style.css.jsp
Log:
Modified: speeltuin/mihxil/simple/pom.xml
===================================================================
--- speeltuin/mihxil/simple/pom.xml 2010-05-16 16:46:03 UTC (rev 42165)
+++ speeltuin/mihxil/simple/pom.xml 2010-05-16 16:47:37 UTC (rev 42166)
@@ -44,6 +44,10 @@
<name>java.awt.headless</name>
<value>true</value>
</systemProperty>
+ <systemProperty>
+ <name>jetty.port</name>
+ <value>8083</value>
+ </systemProperty>
</systemProperties>
</configuration>
</plugin>
Modified:
speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
===================================================================
--- speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
2010-05-16 16:46:03 UTC (rev 42165)
+++ speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
2010-05-16 16:47:37 UTC (rev 42166)
@@ -35,6 +35,7 @@
private static CharTransformer trans = new Identifier();
private String nodeManager = "segments";
+ private String postfix = "/";
public SimpleUrlConverter(BasicFramework fw) {
}
@@ -43,6 +44,13 @@
nodeManager = nm;
}
+ /**
+ * Postfix for pages. Defaults to ''. But also '.html' would be a nice
possibility.
+ */
+ public void setPostfix(String pf) {
+ postfix = pf;
+ }
+
@Override
public int getDefaultWeight() {
return 1000;
@@ -77,7 +85,7 @@
if (related.getNode(0).getNumber() == n.getNumber()) {
return new BasicUrl(this, BasicUrlConverter.getUrl("/",
parameters, request, escapeAmps));
} else {
- return new BasicUrl(this, BasicUrlConverter.getUrl("/" +
trans.transform(n.getStringValue("title").toLowerCase()) + ".html", parameters,
request, escapeAmps));
+ return new BasicUrl(this, BasicUrlConverter.getUrl("/" +
trans.transform(n.getStringValue("title").toLowerCase()) + postfix, parameters,
request, escapeAmps));
}
}
} else {
@@ -104,7 +112,7 @@
Cloud cloud =
ContextProvider.getDefaultCloudContext().getCloud("mmbase");
NodeManager nm = cloud.getNodeManager(nodeManager);
NodeQuery q = nm.createQuery();
- String like = StringUtils.removeEnd(p[1], ".html");
+ String like = StringUtils.removeEnd(p[1], postfix);
Constraint cons = Queries.createConstraint(q, "title",
Queries.getOperator("LIKE"), like);
q.setCaseSensitive((FieldConstraint) cons, false);
Queries.addConstraint(q, cons);
Modified:
speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/builders/simple/rolerel.xml
===================================================================
---
speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/builders/simple/rolerel.xml
2010-05-16 16:46:03 UTC (rev 42165)
+++
speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/builders/simple/rolerel.xml
2010-05-16 16:47:37 UTC (rev 42166)
@@ -28,6 +28,7 @@
<maxLength value="255" />
<enumeration>
<entry value="teaser" />
+ <entry value="background" />
</enumeration>
</datatype>
</field>
Added: speeltuin/mihxil/simple/src/main/webapp/WEB-INF/tags/image.tagx
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/WEB-INF/tags/image.tagx
(rev 0)
+++ speeltuin/mihxil/simple/src/main/webapp/WEB-INF/tags/image.tagx
2010-05-16 16:47:37 UTC (rev 42166)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jsp:root
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
+ version="2.0"
+ >
+ <jsp:directive.tag
+ description="bla bla"
+ />
+
+ <jsp:directive.attribute name="role" type="java.lang.String"
required="true" />
+
+ <mm:relatednodescontainer type="images" role="role">
+ <mm:constraint field="role.role" value="${role}" />
+ <mm:relatednodes max="1">
+ <jsp:doBody />
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
+</jsp:root>
\ No newline at end of file
Modified: speeltuin/mihxil/simple/src/main/webapp/WEB-INF/web.xml
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/WEB-INF/web.xml 2010-05-16
16:46:03 UTC (rev 42165)
+++ speeltuin/mihxil/simple/src/main/webapp/WEB-INF/web.xml 2010-05-16
16:47:37 UTC (rev 42166)
@@ -182,6 +182,12 @@
<env-entry-value>simpleremotecontext</env-entry-value>
</env-entry>
+ <env-entry>
+ <env-entry-name>mmbase-builders/images/MaxArea</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>2000000</env-entry-value>
+ </env-entry>
+
<resource-ref>
<description>
Datasource for the MMBase Database. This datasource must be
Modified: speeltuin/mihxil/simple/src/main/webapp/style.css.jsp
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/style.css.jsp 2010-05-16
16:46:03 UTC (rev 42165)
+++ speeltuin/mihxil/simple/src/main/webapp/style.css.jsp 2010-05-16
16:47:37 UTC (rev 42166)
@@ -1,5 +1,6 @@
/* -*- mode: css -*- */
<%...@taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
+%><%...@taglib tagdir="/WEB-INF/tags" prefix="simple"
%><%...@page session="false" %><mm:content expires="0" type="text/css">
<mm:cloud>
<mm:import id="width" vartype="integer">1000</mm:import>
@@ -11,15 +12,20 @@
<mm:import id="menuitem_margin" vartype="integer">20</mm:import>
<mm:import id="menuitem_width" vartype="integer">${(width - intro_width -
menumargin * 2 - menuitem_margin * 3) / 4}</mm:import>
<mm:import id="radius" vartype="integer">20</mm:import>
+<mm:node number="${initParam.startnode}">
-
html {
background-color: #ffa500;
color: #333;
font-family: Arial;
margin: 0;
padding: 0;
+ <simple:image role="background">
+ background-image: url(<mm:image
template="s(300)+colorspace(Gray)+fill(rgba(255, 165, 0, 0.5))+draw(rectangle
0,0,1000,1000)" />);
+ </simple:image>
+ background-repeat: no-repeat;
+ background-position: left center;
}
body {
margin-top: 8px;
@@ -128,10 +134,8 @@
margin-right: 20px;
}
-<mm:node number="${initParam.startnode}">
- <mm:relatednodescontainer type="images" role="role">
- <mm:constraint field="role.role" value="teaser" />
- <mm:relatednodes>
+<simple:image role="teaser">
+
div.intro h1 {
display: block;
left: 0px;
@@ -150,18 +154,15 @@
div.intro .head {
background-image: url(<mm:image template="f(png)+s(${intro_width -
40})+gravity(Center)+crop(${intro_width - 40}x${menuitem_height -
menuitem_margintop}+0+0)+fill(rgba(255,255,255,0.6))+draw(rectangle
0,${menuitem_height - menuitem_margintop -
30},${intro_width-40},${menuitem_height - menuitem_margintop})" />);
}
- </mm:relatednodes>
- </mm:relatednodescontainer>
+</simple:image>
<mm:import
id="menutemplate">f(png)+s(${menuitem_width})+gravity(Center)+crop(${menuitem_width}x${menuitem_height
- menuitem_margintop}+0+0)</mm:import>
<mm:import id="menutemplate2">fill(rgba(255,255,255,0.6))+draw(rectangle
0,${menuitem_height - menuitem_margintop -
30},${menuitem_width},${menuitem_height - menuitem_margintop})</mm:import>
<mm:relatednodescontainer role="index" type="segments">
<mm:sortorder field="index.pos" />
<mm:relatednodes id="segment">
- <mm:relatednodescontainer type="images" role="role">
- <mm:constraint field="role.role" value="teaser" />
- <mm:relatednodes>
- li#menu${segment} {
+ <simple:image role="teaser">
+ li#menu${segment} {
background-image: url(<mm:image
template="${menutemplate}+blur(10x3)+${menutemplate2}"/>);
}
@@ -169,11 +170,9 @@
li#menu${segment}.hover {
background-image: url(<mm:image
template="${menutemplate}+${menutemplate2}" />);
}
- </mm:relatednodes>
- </mm:relatednodescontainer>
+ </simple:image>
</mm:relatednodes>
</mm:relatednodescontainer>
-</mm:node>
div#menu a {
text-transform: uppercase;
@@ -229,5 +228,6 @@
border: none;
margin-right: 1ex;
}
+</mm:node>
</mm:cloud>
-</mm:content>
\ No newline at end of file
+</mm:content>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
