Update of
/var/cvs/contributions/CMSContainer_Demo/www.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/cmsc.org
In directory
james.mmbase.org:/tmp/cvs-serv32456/www.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/cmsc.org
Modified Files:
Tag: b1_5
tweekolommen.jsp driekolommen.jsp
Log Message:
CMSC-978 - Use newest Google Analytics code in cmsc:google-analytics tag;
better put the UA-code in the system properties
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/www.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/cmsc.org
See also: http://www.mmbase.org/jira/browse/CMSC-978
Index: tweekolommen.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Demo/www.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/cmsc.org/tweekolommen.jsp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- tweekolommen.jsp 24 Jun 2008 19:53:27 -0000 1.4
+++ tweekolommen.jsp 5 Feb 2009 14:28:58 -0000 1.4.2.1
@@ -2,13 +2,10 @@
%><%...@taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"
%><%...@taglib uri="http://finalist.com/cmsc"; prefix="cmsc"
%><%...@taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%>
-<%@ taglib tagdir="/WEB-INF/tags/" prefix="cmscf" %>
-
-<mm:content type="text/html" encoding="UTF-8">
+%><%@ taglib tagdir="/WEB-INF/tags/" prefix="cmscf"
+%><mm:content type="text/html" encoding="UTF-8">
<cmsc:location var="cur" sitevar="site" />
<cmsc:screen>
-
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>
@@ -28,11 +25,11 @@
<script src="<cmsc:staticurl page='/js/start.js' />"
type="text/javascript"></script>
<script src="<cmsc:staticurl page='/js/nav.js' />"
type="text/javascript"></script>
- <cmsc:google-analytics account="UA-1766626-1" />
+ <cmsc:google-analytics />
<cmscf:editresources />
</head>
- <body>
+<body>
<div id="houder">
<div id="header">
<cmsc:insert-portlet layoutid="header" />
@@ -61,7 +58,7 @@
<cmsc:insert-portlet layoutid="footer" />
</div>
</div><!-- /#houder -->
- </body>
+</body>
</html>
</cmsc:screen>
</mm:content>
\ No newline at end of file
Index: driekolommen.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Demo/www.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/cmsc.org/driekolommen.jsp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- driekolommen.jsp 24 Jun 2008 19:53:27 -0000 1.4
+++ driekolommen.jsp 5 Feb 2009 14:28:58 -0000 1.4.2.1
@@ -2,13 +2,10 @@
%><%...@taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c"
%><%...@taglib uri="http://finalist.com/cmsc"; prefix="cmsc"
%><%...@taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%>
-<%@ taglib tagdir="/WEB-INF/tags/" prefix="cmscf" %>
-
-<mm:content type="text/html" encoding="UTF-8">
+%><%@ taglib tagdir="/WEB-INF/tags/" prefix="cmscf"
+%><mm:content type="text/html" encoding="UTF-8">
<cmsc:location var="cur" sitevar="site" />
<cmsc:screen>
-
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>
@@ -28,7 +25,7 @@
<script src="<cmsc:staticurl page='/js/start.js' />"
type="text/javascript"></script>
<script src="<cmsc:staticurl page='/js/nav.js' />"
type="text/javascript"></script>
- <cmsc:google-analytics account="UA-1766626-1" />
+ <cmsc:google-analytics />
<cmscf:editresources />
</head>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
