Author: michiel
Date: 2010-05-15 17:36:34 +0200 (Sat, 15 May 2010)
New Revision: 42156
Modified:
speeltuin/mihxil/simple/src/main/webapp/WEB-INF/web.xml
speeltuin/mihxil/simple/src/main/webapp/edit/index.jspx
speeltuin/mihxil/simple/src/main/webapp/index.jspx
speeltuin/mihxil/simple/src/main/webapp/script.js
speeltuin/mihxil/simple/src/main/webapp/style.css.jsp
speeltuin/mihxil/simple/wget/Makefile
Log:
Modified: speeltuin/mihxil/simple/src/main/webapp/WEB-INF/web.xml
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/WEB-INF/web.xml 2010-05-15
10:34:24 UTC (rev 42155)
+++ speeltuin/mihxil/simple/src/main/webapp/WEB-INF/web.xml 2010-05-15
15:36:34 UTC (rev 42156)
@@ -9,7 +9,6 @@
<display-name>Simple distro</display-name>
-
<context-param>
<param-name>copyright</param-name>
<param-value>Michiel Meeuwissen</param-value>
@@ -26,10 +25,15 @@
<context-param>
<param-name>google_analytics</param-name>
- <param-value>UA-1306697-1</param-value>
+ <param-value>UA-1306697-3</param-value>
</context-param>
<context-param>
+ <param-name>language</param-name>
+ <param-value>nl</param-value>
+ </context-param>
+
+ <context-param>
<param-name>mmbase.taglib.eval_body_include</param-name>
<param-value>true</param-value>
</context-param>
@@ -38,7 +42,7 @@
<context-param>
<param-name>mmbase.defaultRelationStepDirection</param-name>
- <param-value>DESTINATION</param-value> <!-- Defaults to BOTH in MMBase lt
1.9.4 or this context-param is missing -->
+ <param-value>DESTINATION</param-value>
</context-param>
<context-param>
@@ -68,60 +72,41 @@
<listener>
- <!--
- Used by file servlet to detect which file can be deleted again
- Sometimes files ar ecreate for a certain user only.
- -->
<listener-class>org.mmbase.servlet.FileServletSessionListener</listener-class>
</listener>
- <listener>
- <listener-class>org.mmbase.bridge.mock.MockSetup</listener-class>
- </listener>
-
-
- <!-- The base MMBase servlet informs about the current MMBase version -->
<servlet>
<servlet-name>version</servlet-name>
<servlet-class>org.mmbase.servlet.MMBaseServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
- <!-- The MMBase image serving servlet. -->
<servlet>
<servlet-name>images</servlet-name>
<servlet-class>org.mmbase.servlet.ImageServlet</servlet-class>
<init-param>
- <!-- Expire time of original images. Cached images never expire. -->
<param-name>expire</param-name>
- <!-- 10 minutes (default is one hour)-->
<param-value>600</param-value>
</init-param>
<init-param>
- <!-- Whether to accepts image conversion on the URL -->
<param-name>convert</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
- <!-- Field of image node to use for 'last modified' -->
<param-name>lastmodifiedfield</param-name>
<param-value></param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
- <!-- The MMBase attachment serving servlet. -->
<servlet>
<servlet-name>attachments</servlet-name>
<servlet-class>org.mmbase.servlet.AttachmentServlet</servlet-class>
<init-param>
- <!-- Expire time of original images. Cached images never expire. -->
<param-name>expire</param-name>
- <!-- 10 minutes (default is one hour)-->
<param-value>600</param-value>
</init-param>
<init-param>
- <!-- Field of attachment node to use for 'last modified' -->
<param-name>lastmodifiedfield</param-name>
<param-value></param-value>
</init-param>
@@ -165,13 +150,9 @@
</servlet-mapping>
-
<welcome-file-list>
<welcome-file>index.jspx</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
- <welcome-file>index.shtml</welcome-file>
</welcome-file-list>
<error-page>
@@ -198,7 +179,7 @@
<env-entry>
<env-entry-name>mmbase/rmmci/bindname</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>exampleremotecontext</env-entry-value>
+ <env-entry-value>simpleremotecontext</env-entry-value>
</env-entry>
<resource-ref>
@@ -212,7 +193,6 @@
<res-auth>Container</res-auth>
</resource-ref>
- <!-- email app is installed, so mail could be sent -->
<resource-ref>
<description>
Mail resource for MMBase.
Modified: speeltuin/mihxil/simple/src/main/webapp/edit/index.jspx
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/edit/index.jspx 2010-05-15
10:34:24 UTC (rev 42155)
+++ speeltuin/mihxil/simple/src/main/webapp/edit/index.jspx 2010-05-15
15:36:34 UTC (rev 42156)
@@ -7,7 +7,9 @@
<jsp:directive.page session="true" />
<mm:cloud rank="basic user">
<mm:import externid="n" />
- <mm:include page="/mmbase/kupu/mmbase/" referids="n...@objectnumber"/>
+ <mm:include page="/mmbase/kupu/mmbase/" referids="n...@objectnumber">
+ <mm:param name="rich_language">${initParam.language}</mm:param>
+ </mm:include>
</mm:cloud>
</jsp:root>
Modified: speeltuin/mihxil/simple/src/main/webapp/index.jspx
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/index.jspx 2010-05-15 10:34:24 UTC
(rev 42155)
+++ speeltuin/mihxil/simple/src/main/webapp/index.jspx 2010-05-15 15:36:34 UTC
(rev 42156)
@@ -14,7 +14,7 @@
expires="${empty edit ? '' : '0'}"
type="text/html"
unacceptable="CRIPPLE"
- postprocessor="none" language="nl">
+ postprocessor="none" language="${initParam.language}">
<mm:cloud>
<mm:node number="${initParam.startnode}" id="start">
@@ -25,7 +25,7 @@
</mm:relatednodes>
</mm:relatednodescontainer>
<mm:node referid="n">
- <html xmlns="http://www.w3.org/1999/xhtml"; lang="nl" xml:lang="nl">
+ <html xmlns="http://www.w3.org/1999/xhtml";
lang="${initParam.language}" xml:lang="${initParam.language}">
<head>
<title><mm:field name="title" /> - <mm:field node="start"
name="title" /></title>
<mm:include page="/mmbase/jquery/jquery.jspx" />
@@ -66,9 +66,6 @@
<mm:link page="/mmbase/kupu/mmbase">
<meta content="${_}" name="org.mmbase.portal.editordir" />
</mm:link>
- <!-- conflicts with corner scripts
- <script type="text/javascript"
src="http://s7.addthis.com/js/250/addthis_widget.js#username=mihxil";><jsp:text>
</jsp:text></script>
- -->
</head>
<body>
<div class="container">
Modified: speeltuin/mihxil/simple/src/main/webapp/script.js
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/script.js 2010-05-15 10:34:24 UTC
(rev 42155)
+++ speeltuin/mihxil/simple/src/main/webapp/script.js 2010-05-15 15:36:34 UTC
(rev 42156)
@@ -45,22 +45,21 @@
});
$(window).load(
function() {
- $(".intro").bg(20);
- $("#menu").bg([20,20,0,0]);
- // $(".content").bg([0,0,20,20]);
-
var resize =
function() {
- var height = $(window).height() - 17;
+ var height = $(window).height() - 9;
var minHeight = $(".intro").height() + $(".footer").height();
if (height < minHeight) {
height = minHeight;
}
$(".container").height(height);
var maxWidth = $(".container").width();
+ var neededMenuHeight = $("#menu ul
li:last-child").position().top +$("#menu ul li:last-child").height();
+ $("#menu").height(neededMenuHeight);
+ $(".content").css("top", neededMenuHeight + "px");
$(".content").height(height - $("#menu").height() -
$(".footer").height());
var width = maxWidth - 200;
- if (width < 800) width = 800;
+ if (width < 430) width = 430;
$(".content,#menu").width(width);
$(".footer").width($(".container").width());
$(".footer").css("top", ($(".content").height() +
$("#menu").height()) + "px");
@@ -69,6 +68,8 @@
$(window).resize(resize);
resize();
+ $(".intro").bg(20);
+ $("#menu").bg([20,20,0,0]);
var urchin = $("head meta[name=com.google.urchin]").attr("content");
try {
Modified: speeltuin/mihxil/simple/src/main/webapp/style.css.jsp
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/style.css.jsp 2010-05-15
10:34:24 UTC (rev 42155)
+++ speeltuin/mihxil/simple/src/main/webapp/style.css.jsp 2010-05-15
15:36:34 UTC (rev 42156)
@@ -21,6 +21,12 @@
margin: 0;
padding: 0;
}
+body {
+ margin-top: 8px;
+ margin-left: 2px;
+ margin-right: 2px;
+ margin-bottom: 0;
+}
.container {
top: 0px;
@@ -91,12 +97,13 @@
display: block;
padding: 0;
margin-top: ${menuitem_margintop}px;
+ margin-bottom: 0px;
}
div#menu ul li {
display: block;
float: left;
margin-right: ${menuitem_margin}px;
- background-color: black;
+ background-color: #aaa;
text-align: center;
cursor: pointer;
width: ${menuitem_width}px;
@@ -141,11 +148,13 @@
}
div.intro .head {
- background-image: url(<mm:image template="f(png)+s(${intro_width -
40})+fill(rgba(255,255,255,0.8))+draw(rectangle 0,${menuitem_height -
menuitem_margintop - 30},${intro_width-40},${menuitem_height -
menuitem_margintop})" />);
+ 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>
+<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">
@@ -153,12 +162,12 @@
<mm:constraint field="role.role" value="teaser" />
<mm:relatednodes>
li#menu${segment} {
- background-image: url(<mm:image
template="f(png)+s(${menuitem_width})+blur(10,
3)+fill(rgba(255,255,255,0.6))+draw(rectangle 0,${menuitem_height -
menuitem_margintop - 30},${menuitem_width},${menuitem_height -
menuitem_margintop})" />);
+ background-image: url(<mm:image template="${menutemplate}+blur(10,
3)+${menutemplate2}"/>);
}
li#menu${segment}.active,
li#menu${segment}.hover {
- background-image: url(<mm:image
template="f(png)+s(${menuitem_width})+fill(rgba(255,255,255,0.6))+draw(rectangle
0,${menuitem_height - menuitem_margintop -
30},${menuitem_width},${menuitem_height - menuitem_margintop})" />);
+ background-image: url(<mm:image
template="${menutemplate}+${menutemplate2}" />);
}
</mm:relatednodes>
</mm:relatednodescontainer>
Modified: speeltuin/mihxil/simple/wget/Makefile
===================================================================
--- speeltuin/mihxil/simple/wget/Makefile 2010-05-15 10:34:24 UTC (rev
42155)
+++ speeltuin/mihxil/simple/wget/Makefile 2010-05-15 15:36:34 UTC (rev
42156)
@@ -3,7 +3,7 @@
simple-webapp/index.html:
wget -r -k -nH --adjust-extension http://localhost:8080/simple-webapp/
- bash -c 'for i in `find simple-webapp -name "*.html"`; do xmllint
--nsclean Xb --format $$i > $$i.new ; mv $$i.new $$i ; done'
+ bash -c 'for i in `find simple-webapp -name "*.html"`; do xmllint
--nsclean --format $$i > $$i.new ; mv $$i.new $$i ; done'
upload: simple-webapp/index.html
(cd simple-webapp ; tar zcf es.tgz *)
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
