Author: michiel
Date: 2010-05-11 19:28:42 +0200 (Tue, 11 May 2010)
New Revision: 42133
Modified:
speeltuin/mihxil/simple/
speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/log/log4j.xml
speeltuin/mihxil/simple/src/main/webapp/index.jspx
speeltuin/mihxil/simple/src/main/webapp/script.js
speeltuin/mihxil/simple/src/main/webapp/style.css
speeltuin/mihxil/simple/wget/
Log:
various details
Property changes on: speeltuin/mihxil/simple
___________________________________________________________________
Name: svn:ignore
- data
jetty.log
+ data
jetty.log
target
Modified:
speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
===================================================================
--- speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
2010-05-11 17:01:07 UTC (rev 42132)
+++ speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
2010-05-11 17:28:42 UTC (rev 42133)
@@ -24,7 +24,7 @@
*
* @author Michiel Meeuwissen
- * @version $Id: MyNewsUrlConverter.java 40150 2009-12-08 14:06:29Z michiel $
+ * @version $Id$
* @since MMBase-1.9
*/
public class SimpleUrlConverter implements UrlConverter {
Property changes on:
speeltuin/mihxil/simple/src/main/java/org/meeuw/SimpleUrlConverter.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/log/log4j.xml
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/log/log4j.xml
2010-05-11 17:01:07 UTC (rev 42132)
+++ speeltuin/mihxil/simple/src/main/webapp/WEB-INF/config/log/log4j.xml
2010-05-11 17:28:42 UTC (rev 42133)
@@ -23,7 +23,7 @@
</appender>
<logger name="org.mmbase.PAGE" additivity="false">
- <level class="&mmlevel;" value ="service" />
+ <level class="&mmlevel;" value ="info" />
<appender-ref ref="pagedebug" />
</logger>
Modified: speeltuin/mihxil/simple/src/main/webapp/index.jspx
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/index.jspx 2010-05-11 17:01:07 UTC
(rev 42132)
+++ speeltuin/mihxil/simple/src/main/webapp/index.jspx 2010-05-11 17:28:42 UTC
(rev 42133)
@@ -11,7 +11,7 @@
<mm:import externid="edit" />
<mm:content expires="${empty edit ? '' : '0'}"
- type="application/xhtml+xml"
+ type="text/html"
unacceptable="CRIPPLE"
postprocessor="none" language="nl">
Modified: speeltuin/mihxil/simple/src/main/webapp/script.js
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/script.js 2010-05-11 17:01:07 UTC
(rev 42132)
+++ speeltuin/mihxil/simple/src/main/webapp/script.js 2010-05-11 17:28:42 UTC
(rev 42133)
@@ -1,24 +1,25 @@
-$(function() {
- var resize = function() {
- $(".container").height($(window).height() - 15);
- var maxWidth = $(".container").width();
- console.log(maxWidth);
- $(".content").height($(".container").height() - $("#menu").height() -
$(".footer").height());
- var width = maxWidth - $(".intro").width();
- console.log($(".intro").width());
+$(window).ready(
+ function() {
+ var resize =
+ function() {
+ var height = $(window).height() - 15;
+ $(".container").height(height);
+ var maxWidth = $(".container").width();
+ $(".content").height(height - $("#menu").height() -
$(".footer").height());
+ var width = maxWidth - 200;
+ if (width < 200) width = 200;
+ $(".content,#menu").width(width);
+ $(".footer").width($(".container").width());
+ $(".footer").css("top", ($(".content").height() +
$("#menu").height()) + "px");
- if (width < 200) width = 200;
- console.log(width);
- $(".content,#menu").width(width);
- $(".footer").width($(".container").width());
- $(".footer").css("top", ($(".content").height() -
$(".footer").height()) + "px");
+ };
+ $(window).resize(resize);
+ $("#menu li").click(
+ function(ev) {
+ var li = this;
+ document.location.href = $(li).find("a").attr("href");
+ ev.preventDefault();
+ });
+ resize();
- };
- $(window).resize(resize);
- $("#menu li").click(
- function(ev) {
- var li = this;
- document.location.href = $(li).find("a").attr("href");
- ev.preventDefault();
- });
});
\ No newline at end of file
Modified: speeltuin/mihxil/simple/src/main/webapp/style.css
===================================================================
--- speeltuin/mihxil/simple/src/main/webapp/style.css 2010-05-11 17:01:07 UTC
(rev 42132)
+++ speeltuin/mihxil/simple/src/main/webapp/style.css 2010-05-11 17:28:42 UTC
(rev 42133)
@@ -15,7 +15,6 @@
margin-left: auto;
margin-right: auto;
border-top: solid 1px white;
- border-bottom: solid 1px white;
}
@@ -77,10 +76,16 @@
background-color: #ffc722;
}
div.footer {
+ border-top: solid 1px white;
position: absolute;
height: 20px;
background-color: #ffc722;
+ text-align: center;
}
+div.footer p {
+ margin: 0;
+ padding: 0;
+}
a.mm_portal_edit {
position: relative;
Property changes on: speeltuin/mihxil/simple/wget
___________________________________________________________________
Name: svn:ignore
+ .new
simple-webapp
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
