Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo
In directory
james.mmbase.org:/tmp/cvs-serv27852/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo
Modified Files:
1_column_layout.jsp 2_column_layout_right.jsp
3_column_layout.jsp landingspage_layout.jsp
2_column_layout.jsp sitemap_layout.jsp
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: 1_column_layout.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/1_column_layout.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- 1_column_layout.jsp 30 Nov 2007 14:59:28 -0000 1.5
+++ 1_column_layout.jsp 28 Jan 2008 21:24:11 -0000 1.6
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<mm:content type="text/html" encoding="UTF-8">
<cmsc:location var="cur" sitevar="site" />
<html xmlns="http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
<cmsc:screen>
<head>
- <title><cmsc:title /></title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <cmsc:headercontent dublin="true" />
- <link rel="icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <link rel="shortcut icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <cmsc:insert-stylesheet var="stylesheet" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl.css'/>" media="screen,projection,print" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/1column.css'/>" media="screen,projection,print" />
- <c:forEach var="style" items="${stylesheet}">
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
- </c:forEach>
- <!--[if IE]>
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl_ie.css'/>" media="screen,projection,print" />
- <![endif]-->
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/print.css'/>" media="print" />
- <cmscf:editresources />
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+ <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/1column.css'/>" media="screen,projection,print" />
</head>
<body>
<h1 class="hidden"><cmsc:title /></h1>
Index: 2_column_layout_right.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/2_column_layout_right.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- 2_column_layout_right.jsp 30 Nov 2007 14:59:28 -0000 1.4
+++ 2_column_layout_right.jsp 28 Jan 2008 21:24:11 -0000 1.5
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<mm:content type="text/html" encoding="UTF-8">
<cmsc:location var="cur" sitevar="site" />
<html xmlns="http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
<cmsc:screen>
<head>
- <title><cmsc:title /></title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <cmsc:headercontent dublin="true" />
- <link rel="icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <link rel="shortcut icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <cmsc:insert-stylesheet var="stylesheet" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl.css'/>" media="screen,projection,print" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/2columnright.css'/>" media="screen,projection,print" />
- <c:forEach var="style" items="${stylesheet}">
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
- </c:forEach>
- <!--[if IE]>
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl_ie.css'/>" media="screen,projection,print" />
- <![endif]-->
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/print.css'/>" media="print" />
- <cmscf:editresources />
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+ <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/2columnright.css'/>" media="screen,projection,print" />
</head>
<body>
<h1 class="hidden"><cmsc:title /></h1>
Index: 3_column_layout.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/3_column_layout.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 3_column_layout.jsp 30 Nov 2007 14:59:28 -0000 1.3
+++ 3_column_layout.jsp 28 Jan 2008 21:24:11 -0000 1.4
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<mm:content type="text/html" encoding="UTF-8">
<cmsc:location var="cur" sitevar="site" />
<html xmlns="http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
<cmsc:screen>
<head>
- <title><cmsc:title /></title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <cmsc:headercontent dublin="true" />
- <link rel="icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <link rel="shortcut icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <cmsc:insert-stylesheet var="stylesheet" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl.css'/>" media="screen,projection,print" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/3column.css'/>" media="screen,projection,print" />
- <c:forEach var="style" items="${stylesheet}">
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
- </c:forEach>
- <!--[if IE]>
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl_ie.css'/>" media="screen,projection,print" />
- <![endif]-->
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/print.css'/>" media="print" />
- <cmscf:editresources />
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+ <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/3column.css'/>" media="screen,projection,print" />
</head>
<body>
<h1 class="hidden"><cmsc:title /></h1>
Index: landingspage_layout.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/landingspage_layout.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- landingspage_layout.jsp 30 Nov 2007 14:59:28 -0000 1.3
+++ landingspage_layout.jsp 28 Jan 2008 21:24:11 -0000 1.4
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<mm:content type="text/html" encoding="UTF-8">
<cmsc:location var="cur" sitevar="site" />
<html xmlns="http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
<cmsc:screen>
<head>
- <title><cmsc:title /></title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <cmsc:headercontent dublin="true" />
- <link rel="icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <link rel="shortcut icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <cmsc:insert-stylesheet var="stylesheet" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl.css'/>" media="screen,projection,print" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/landingpage.css'/>" media="screen,projection,print" />
- <c:forEach var="style" items="${stylesheet}">
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
- </c:forEach>
- <!--[if IE]>
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl_ie.css'/>" media="screen,projection,print" />
- <![endif]-->
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/print.css'/>" media="print" />
- <cmscf:editresources />
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+ <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/landingpage.css'/>" media="screen,projection,print" />
</head>
<body>
<div id="holder">
Index: 2_column_layout.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/2_column_layout.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 2_column_layout.jsp 30 Nov 2007 14:59:28 -0000 1.3
+++ 2_column_layout.jsp 28 Jan 2008 21:24:11 -0000 1.4
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<mm:content type="text/html" encoding="UTF-8">
<cmsc:location var="cur" sitevar="site" />
<html xmlns="http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
<cmsc:screen>
<head>
- <title><cmsc:title /></title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <cmsc:headercontent dublin="true" />
- <link rel="icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <link rel="shortcut icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <cmsc:insert-stylesheet var="stylesheet" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl.css'/>" media="screen,projection,print" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/2column.css'/>" media="screen,projection,print" />
- <c:forEach var="style" items="${stylesheet}">
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
- </c:forEach>
- <!--[if IE]>
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl_ie.css'/>" media="screen,projection,print" />
- <![endif]-->
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/print.css'/>" media="print" />
- <cmscf:editresources />
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+ <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/2column.css'/>" media="screen,projection,print" />
</head>
<body>
<h1 class="hidden"><cmsc:title /></h1>
Index: sitemap_layout.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/sitemap_layout.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- sitemap_layout.jsp 30 Nov 2007 14:59:28 -0000 1.3
+++ sitemap_layout.jsp 28 Jan 2008 21:24:11 -0000 1.4
@@ -1,27 +1,12 @@
-<[EMAIL PROTECTED] file="includes/taglibs.jsp"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<[EMAIL PROTECTED] file="includes/taglibs.jsp"
+%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<mm:content type="text/html" encoding="UTF-8">
<cmsc:location var="cur" sitevar="site" />
<html xmlns="http://www.w3.org/1999/xhtml"; lang="${site.language}"
xml:lang="${site.language}">
<cmsc:screen>
<head>
- <title><cmsc:title /></title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <cmsc:headercontent dublin="true" />
- <link rel="icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <link rel="shortcut icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <cmsc:insert-stylesheet var="stylesheet" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl.css'/>" media="screen,projection,print" />
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/sitemap.css'/>" media="screen,projection,print" />
- <c:forEach var="style" items="${stylesheet}">
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
- </c:forEach>
- <!--[if IE]>
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl_ie.css'/>" media="screen,projection,print" />
- <![endif]-->
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/print.css'/>" media="print" />
- <cmscf:editresources />
<[EMAIL PROTECTED] file="includes/header.jsp"%>
+ <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/sitemap.css'/>" media="screen,projection,print" />
</head>
<body>
<div id="holder">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
