[Openutils-svn] SF.net SVN: openutils:[4473] magnoliamodules/trunk

[<fg...@us...>]

Revision: 4473
          http://openutils.svn.sourceforge.net/openutils/?rev=4473&view=rev
Author:   fgiust
Date:     2013-12-08 19:52:03 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
cleanup sample templates

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 19:52:03 UTC (rev 4473)
@@ -189,11 +189,13 @@
       <artifactId>openutils-mgnlstruts11</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
+    <!--
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
+    -->
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	2013-12-08 19:52:03 UTC (rev 4473)
@@ -52,7 +52,7 @@
     <priority value="INFO" />
   </category>
   <category name="it.openutils.mgnlutils.el">
-    <priority value="DEBUG" />
+    <priority value="INFO" />
   </category>
   <root>
     <priority value="ALL" />

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -1,61 +1,64 @@
 <jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
-  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
-  xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mcmenu="mgnlcontextmenu">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <jsp:directive.page import="info.magnolia.cms.core.ItemType" />
   <jsp:directive.page import="info.magnolia.cms.beans.config.ContentRepository" />
   <jsp:directive.page import="net.sourceforge.openutils.mgnlcriteria.jcr.query.*" />
   <jsp:directive.page import="net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.*" />
-  <jsp:text>
-    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
-  </jsp:text>
+<![CDATA[
+<!DOCTYPE html>
+]]>
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>${actpage.title}</title>
-      <cms:links />
+      <title>${content.title}</title>
+      <link rel="stylesheet" type="text/css"
+        href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+      <cms:init />
     </head>
     <body>
-      <cms:mainBar />
-      <h1>${actpage.title}</h1>
-      <p>Steps for testing this sample:</p>
-      <ol>
-        <li>
+      <div id="main" class="container">
+        <h1>${content.title}</h1>
+        <p>Steps for testing this sample:</p>
+        <ol>
+          <li>
           <![CDATA[make sure that AclSearchIndex has been enabled in]]>
           <![CDATA[ /magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml]]>
-        </li>
-        <li>
+          </li>
+          <li>
           <![CDATA[login as superuser and enter this page: all pets should be displayed]]>
-        </li>
-        <li>
+          </li>
+          <li>
           <![CDATA[login as criteria-dogsexcluded/criteria and enter this page: dogs should not be displayed]]>
-        </li>
-        <li>
+          </li>
+          <li>
           <![CDATA[login as criteria-dogsonly/criteria and enter this page: only dogs should be displayed]]>
-        </li>
-      </ol>
-      <br />
-
-      <jsp:scriptlet><![CDATA[
+          </li>
+        </ol>
+        <br />
+        <jsp:scriptlet><![CDATA[
 Criteria criteria = JCRCriteriaFactory
   .createCriteria()
-  .setWorkspace(RepositoryConstants.WEBSITE)
+  .setWorkspace(info.magnolia.repository.RepositoryConstants.WEBSITE)
   .setBasePath("/Criteria/pets")
-  .add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT.getSystemName()))
+  .add(Restrictions.eq("@jcr:primaryType", "mgnl:page"))
   .addOrder(Order.asc("@birthDate"));
 
 AdvancedResult result = criteria.execute();
 ResultIterator<AdvancedResultItem> iterator = result.getItems();
 pageContext.setAttribute("iterator", iterator);
 ]]>
-      </jsp:scriptlet>
-      <p>Pets results:</p>
-      <ul>
-        <c:forEach var="item" items="${iterator}">
-          <li>${item.handle} (${item.title})</li>
-        </c:forEach>
-      </ul>
+        </jsp:scriptlet>
+        <p>Pets results:</p>
+        <ul>
+          <c:forEach var="item" items="${iterator}">
+            <li>${item.handle} (${item.title})</li>
+          </c:forEach>
+        </ul>
+      </div>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
       <title> ${content.title}
       </title>
       <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <style>
     <![CDATA[
       code { display: block}
@@ -50,11 +51,11 @@
             <tr>
               <th>class
               </th>
-              <td>${node.class.name}
+              <td>${node['class'].name}
               </td>
-              <td>${contentMap.class.name }
+              <td>${contentMap['class'].name }
               </td>
-              <td>${oldcontent.class.name}
+              <td>${oldcontent['class'].name}
               </td>
             </tr>
             <tr>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -13,12 +13,12 @@
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>${actpage.title}</title>
+      <title>${content.title}</title>
       <cms:links />
     </head>
     <body>
       <cms:mainBar />
-      <h1>${actpage.title}</h1>
+      <h1>${content.title}</h1>
       <p>Steps for testing this sample:</p>
       <ol>
         <li>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
       <title> ${content.title}
       </title>
       <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <style>
     <![CDATA[
       code { display: block}

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -15,6 +15,7 @@
       ${contextmenu:links()}
       <cms:init />
       <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <!-- samples css/js -->
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
     [@cms.init /]
     
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     
     <!-- samples css/js -->
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
     <title>${content.title!}</title>
     [@cms.init /]
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/controls/samples/css/contextmenu-samples.css" />
   </head>
   <body>

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -4,20 +4,21 @@
   xmlns:lmsfn="urn:jsptld:lms-fn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <jsp:text>
-    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
+    <![CDATA[<!DOCTYPE html> ]]>
   </jsp:text>
   <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>${actpage.title}</title>
+      <title>${content.title}</title>
       <cms:init />
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     </head>
     <body>
       <div id="main" class="container">
         <div id="header">
-          <h1>${actpage.title}</h1>
+          <h1>${content.title}</h1>
         </div>
         <p>Click on a course in the list below. It opens a popup with the course inside</p>
         <ul>

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -4,20 +4,21 @@
   xmlns:lmsfn="urn:jsptld:lms-fn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <jsp:text>
-    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
+    <![CDATA[<!DOCTYPE html> ]]>
   </jsp:text>
   <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>${actpage.title}</title>
+      <title>${content.title}</title>
       <cms:init />
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     </head>
     <body>
       <div id="main" class="container">
         <div id="header">
-          <h1>${actpage.title}</h1>
+          <h1>${content.title}</h1>
           <p>Welcome to Magnolia LMS Module sample page.</p>
           <p>The sample course repository is structured as:</p>
         </div>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
     <title>${content.title}</title>
     [@cms.init /]
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/media-samples.css" />
   </head>
   <body>

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
     <title>${content.title!}</title>
     [@cms.init /]
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/rules/css/rules-samples.css" />
   </head>
   <body>

Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -1,19 +1,24 @@
 <jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
-  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:mu="mgnlutils"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags/openutils">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
-  <jsp:text>
-    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
-  </jsp:text>
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<![CDATA[
+<!DOCTYPE html>
+]]>
+  <html>
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>${content.title}</title>
+      <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <cms:init />
     </head>
     <body>
-      <h1>${content.title}</h1>
-      <cms:area name="main" />
+      <div id="main" class="container">
+        <h1>${content.title}</h1>
+        <cms:area name="main" />
+      </div>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -1,19 +1,25 @@
 <jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
-  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:mu="mgnlutils"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags/openutils">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
-  <jsp:text>
-    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
-  </jsp:text>
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<![CDATA[
+<!DOCTYPE html>
+]]>
+  <html>
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>${content.title}</title>
+      <link rel="stylesheet" type="text/css"
+        href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <cms:init />
     </head>
     <body>
-      <h1>${content.title}</h1>
-      <cms:area name="main" />
+      <div id="main" class="container">
+        <h1>${content.title}</h1>
+        <cms:area name="main" />
+      </div>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
       <title>${content.title}</title>
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/tagcloud/samples/css/tagcloud-samples.css" />
     </head>

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
       <title> ${content.title}
       </title>
       <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <style>
     <![CDATA[
       code { display: block}
@@ -27,6 +28,10 @@
         <c:set var="oldcontent" value="${state.currentContent}" />
         <c:set var="contentMap" value="${content}" />
         <c:set var="node" value="${oldcontent.JCRNode}" />
+        <p>
+        You can now use javax.jcr.Node objects directly into jsps. Also ContentMap or old Content and NodeMapWrapper are
+        handled, so you can use the same set of properties for any of them.
+        </p>
         <table class="table table-striped table-bordered table-hover">
           <thead>
             <tr>
@@ -50,11 +55,11 @@
             <tr>
               <th>class
               </th>
-              <td>${node.class.name}
+              <td>${node['class'].name}
               </td>
-              <td>${contentMap.class.name }
+              <td>${contentMap['class'].name }
               </td>
-              <td>${oldcontent.class.name}
+              <td>${oldcontent['class'].name}
               </td>
             </tr>
             <tr>

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
     <title> ${content.title}
     </title>
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <style>
     <![CDATA[
       code { display: block}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.