Author: xlawrence
Date: Fri Jan 25 15:33:11 2008
New Revision: 75

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D75&repname=3D=
corporate_portal_templates_v3
Log:
added news templates
added missing <%@ page language=3D"java" contentType=3D"text/html; UTF-8" %=
> instructions

Added:
    trunk/src/jsp/common/news/
    trunk/src/jsp/common/news/newsDefinitions.jspf
    trunk/src/jsp/common/news/newsDisplay.jsp
    trunk/src/jsp/news.jsp
Modified:
    trunk/src/jsp/common/box/box_layoutmanager.jsp
    trunk/src/jsp/common/box/custom_box_types.jsp
    trunk/src/jsp/common/box/filesBoxDisplay.jsp
    trunk/src/jsp/common/box/groupsBoxDisplay.jsp
    trunk/src/jsp/common/box/lastNewsBoxDisplay.jsp
    trunk/src/jsp/common/box/linksBoxDisplay.jsp
    trunk/src/jsp/common/box/maincontentsBoxDisplay.jsp
    trunk/src/jsp/common/box/newsBoxDisplay.jsp
    trunk/src/jsp/common/box/pagesBoxDisplay.jsp
    trunk/src/jsp/common/box/usersBoxDisplay.jsp
    trunk/src/jsp/common/box/webappsBoxDisplay.jsp
    trunk/src/jsp/common/declarations.jspf
    trunk/src/jsp/common/header.jspf
    trunk/src/jsp/double.jsp
    trunk/src/jsp/faq.jsp
    trunk/src/jsp/home.jsp
    trunk/src/jsp/simple.jsp
    trunk/src/jsp/templates.xml

Modified: trunk/src/jsp/common/box/box_layoutmanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/box_layoutmanager.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/box_layoutmanager.jsp (original)
+++ trunk/src/jsp/common/box/box_layoutmanager.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/custom_box_types.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/custom_box_types.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/custom_box_types.jsp (original)
+++ trunk/src/jsp/common/box/custom_box_types.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/filesBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/filesBoxDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/filesBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/filesBoxDisplay.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/groupsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/groupsBoxDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/groupsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/groupsBoxDisplay.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/lastNewsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/lastNewsBoxDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/lastNewsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/lastNewsBoxDisplay.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/linksBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/linksBoxDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/linksBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/linksBoxDisplay.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/maincontentsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/maincontentsBoxDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_template=
s_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/maincontentsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/maincontentsBoxDisplay.jsp Fri Jan 25 15:33:11=
 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/newsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/newsBoxDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/newsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/newsBoxDisplay.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/pagesBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/pagesBoxDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/pagesBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/pagesBoxDisplay.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/usersBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/usersBoxDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/usersBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/usersBoxDisplay.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/box/webappsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/webappsBoxDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/webappsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/webappsBoxDisplay.jsp Fri Jan 25 15:33:11 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
 <%--
 Copyright 2002-2008 Jahia Ltd
 =


Modified: trunk/src/jsp/common/declarations.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
declarations.jspf&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/declarations.jspf (original)
+++ trunk/src/jsp/common/declarations.jspf Fri Jan 25 15:33:11 2008
@@ -15,64 +15,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-<%@ page import=3D"java.io.IOException,
-                 javax.servlet.jsp.PageContext,
-                 java.io.InputStream,
-                 java.lang.*,
-                 java.security.Principal,
-                 java.text.SimpleDateFormat,
-                 java.util.*,
-                 javax.servlet.*,
-                 org.compassframework.core.*,
-                 org.jahia.bin.Jahia,
-                 org.jahia.content.*,
-                 org.jahia.data.*,
-                 org.jahia.data.beans.*,
-                 org.jahia.data.containers.*,
-                 org.jahia.data.fields.*,
-                 org.jahia.data.files.*,
-                 org.jahia.data.search.*,
-                 org.jahia.data.viewhelper.sitemap.*,
-                 org.jahia.engines.mysettings.MySettingsEngine,
-                 org.jahia.engines.search.*,
-                 org.jahia.services.usermanager.*,
-                 org.jahia.exceptions.*,
-                 org.jahia.gui.*,
-                 org.jahia.params.*,
-                 org.jahia.registries.ServicesRegistry,
-                 org.jahia.resourcebundle.*,
-                 org.jahia.security.license.*,
-                 org.jahia.services.*,
-                 org.jahia.services.categories.*,
-                 org.jahia.services.containers.*,
-                 org.jahia.services.fields.*,
-                 org.jahia.services.pages.*,
-                 org.jahia.services.search.*,
-                 org.jahia.services.search.slide.*,
-                 org.jahia.services.search.savedsearch.*,
-                 org.jahia.services.sites.*,
-                 org.jahia.services.usermanager.*,
-                 org.jahia.services.version.*,
-                 org.jahia.services.webdav.*,
-                 org.jahia.services.workflow.*,
-                 org.jahia.utils.*,
-                 org.jahia.utils.fileparsers.CharsetDetection,
-                 org.apache.commons.lang.StringUtils,
-                 org.apache.slide.common.UriPath,
-                 org.apache.slide.common.PropertyName,
-                 org.apache.slide.webdav.util.URLUtil,
-                 org.apache.lucene.queryParser.QueryParser,
-                 org.jahia.taglibs.esi.JesiConst,
-                 org.jahia.taglibs.ajax.ComplexTreeInclude,
-                 org.jahia.ajax.usersession.userSettings,
-                 org.jahia.services.acl.JahiaACLManagerService,
-                 org.jahia.services.acl.JahiaBaseACL,
-                 org.jahia.settings.SettingsBean,
-                 org.jahia.security.license.LicenseActionChecker,
-                 org.jahia.services.categories.Category,
-                 org.jahia.services.pages.JahiaPage,
-                 org.jahia.taglibs.esi.JesiFragmentTag,
-                 org.jahia.services.esi.EsiSOAPInvalidatorService" %>
+<%@ page import=3D"org.jahia.engines.mysettings.MySettingsEngine" %>
+<%@ page import=3D"org.jahia.exceptions.JahiaException" %>
+<%@ page import=3D"org.jahia.resourcebundle.ResourceBundleMarker" %>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
 <%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %>
 <%@ taglib uri=3D"/WEB-INF/etc/struts/struts-html" prefix=3D"html" %>
 <%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>

Modified: trunk/src/jsp/common/header.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
header.jspf&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/header.jspf (original)
+++ trunk/src/jsp/common/header.jspf Fri Jan 25 15:33:11 2008
@@ -1,3 +1,7 @@
+<%@ page import=3D"org.jahia.data.JahiaData" %>
+<%@ page import=3D"org.jahia.engines.mysettings.MySettingsEngine" %>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
+<%@ page import=3D"org.jahia.utils.JahiaTools" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%--
 Copyright 2002-2008 Jahia Ltd

Added: trunk/src/jsp/common/news/newsDefinitions.jspf
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
common/news/newsDefinitions.jspf&rev=3D75&repname=3Dcorporate_portal_templa=
tes_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/news/newsDefinitions.jspf (added)
+++ trunk/src/jsp/common/news/newsDefinitions.jspf Fri Jan 25 15:33:11 2008
@@ -0,0 +1,57 @@
+<%--
+Copyright 2002-2008 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ include file=3D"../declarations.jspf" %>
+<content:declareContainerList
+        name=3D"newsList"
+        title=3D"News"
+        titleKey=3D"news"
+        bundleKey=3D"DEFAULT_V3_LANG"
+        aliasNames=3D"newsList">
+    <content:declareContainer>
+        <content:declareField name=3D"newsTitle"
+                              title=3D"Title"
+                              type=3D"SmallText"
+                              titleKey=3D"boxContainer.newsContainer.title"
+                              bundleKey=3D"DEFAULT_V3_LANG"
+                              aliasNames=3D"newsTitle"
+                />
+        <content:declareField name=3D"newsDesc"
+                              title=3D"Description"
+                              type=3D"BigText"
+                              titleKey=3D"boxContainer.newsContainer.descr=
iption"
+                              bundleKey=3D"DEFAULT_V3_LANG"
+                              aliasNames=3D"newsDescription"
+                />
+        <content:declareField name=3D"newsLink"
+                              title=3D"Link"
+                              type=3D"Page"
+                              value=3D"<jahia_linkonly>"
+                              titleKey=3D"boxContainer.newsContainer.link"
+                              bundleKey=3D"DEFAULT_V3_LANG"
+                              aliasNames=3D"newsLink"
+                />
+        <content:declareField name=3D"newsDate"
+                              title=3D"Date"
+                              type=3D"Date"
+                              value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]=
>now"
+                              titleKey=3D"boxContainer.newsContainer.date"
+                              bundleKey=3D"DEFAULT_V3_LANG"
+                              aliasNames=3D"newsDate"
+                />
+    </content:declareContainer>
+</content:declareContainerList>
\ No newline at end of file

Added: trunk/src/jsp/common/news/newsDisplay.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
common/news/newsDisplay.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/news/newsDisplay.jsp (added)
+++ trunk/src/jsp/common/news/newsDisplay.jsp Fri Jan 25 15:33:11 2008
@@ -0,0 +1,85 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
+<%--
+Copyright 2002-2008 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ include file=3D"newsDefinitions.jspf" %>
+
+<content:containerList name=3D"newsList" id=3D"newsCl" windowSize=3D"10">
+    <content:containerQuery contentDefinitionNames=3D"newsList">
+        <content:order propertyName=3D"newsDate" order=3D"desc"/>
+    </content:containerQuery>
+
+    <content:cListPaginationCurrentPageScrollingValue valueOnly=3D"false"/>
+
+    <content:jahiaPageForm name=3D"pageForm_newsCl" method=3D"post">
+        <content:previousWindowButton title=3D"&lt;&lt; Previous"
+                                      titleKey=3D"previous"
+                                      method=3D"post"
+                                      formName=3D"pageForm_newsCl"/>
+        <content:cListPaginationCurrentPageScrollingValue valueOnly=3D"fal=
se"/>
+        <content:cListPagination nbStepPerPage=3D"10">
+            <content:cListPaginationPreviousRangeOfPages method=3D"post"
+                                                         formName=3D"pageF=
orm_newsCl" title=3D"..."/>
+            <content:ifCListPaginationCurrentPage><strong></content:ifCLis=
tPaginationCurrentPage>
+            <content:cListPaginationPageUrl method=3D"post"
+                                            formName=3D"pageForm_newsCl"/>
+            <content:ifCListPaginationCurrentPage></strong></content:ifCLi=
stPaginationCurrentPage>
+            <content:cListPaginationNextRangeOfPages method=3D"post"
+                                                     formName=3D"pageForm_=
newsCl" title=3D"..."/>
+        </content:cListPagination>
+        <content:nextWindowButton title=3D"Next &gt;&gt;" method=3D"post"
+                                  titleKey=3D"next"
+                                  formName=3D"pageForm_newsCl"/>
+    </content:jahiaPageForm>
+
+    <dl class=3D"news">
+        <content:container id=3D"newsContainer">
+            <content:pageField name=3D'newsLink' valueId=3D"link"/>
+            <content:dateField name=3D'newsDate' valueId=3D"newsDate" disp=
lay=3D"false"/>
+            <fmt:parseDate var=3D"theDate" value=3D"${newsDate}" pattern=
=3D"dd.MM.yyyy / hh:mm" timeZone=3D"z+2"
+                           scope=3D"request"/>
+            <fmt:formatDate var=3D"ddMMyyyy" value=3D"${theDate}" pattern=
=3D"MMMM, dd yyyy" scope=3D"request"/>
+            <fmt:formatDate var=3D"MM" value=3D"${theDate}" pattern=3D"MMM=
" scope=3D"request"/>
+            <fmt:formatDate var=3D"dd" value=3D"${theDate}" pattern=3D"dd"=
 scope=3D"request"/>
+
+            <dt>
+            <div class=3D"month">${fn:substring(MM, 0, 3)}</div>
+            <div class=3D"day"><c:out value=3D"${dd}" escapeXml=3D"false"/=
></div>
+            </dt>
+            <dd>
+                <jahiaHtml:actionMenu name=3D"newsContainer" resourceBundl=
e=3D"jahiatemplates.default_v3_lang"
+                                      useFieldSet=3D"true"
+                                      namePostFix=3D".news">
+                    <h4>
+                        <c:if test=3D"${!empty link}">
+                        <a href=3D"<c:out value=3D"${link.url}" escapeXml=
=3D"false"/>">
+                            </c:if>
+                            <content:textField name=3D"newsTitle" display=
=3D"true" diffActive=3D"true" defaultValue=3D""/></a>
+                    </h4>
+
+                    <div class=3D"low">posted on <c:out value=3D"${ddMMyyy=
y}" escapeXml=3D"false"/></div>
+                    <p>
+                        <content:textField name=3D"newsDesc" defaultValue=
=3D"" diffActive=3D"true"/>
+                    </p>
+                </jahiaHtml:actionMenu>
+            </dd>
+        </content:container>
+    </dl>
+    <jahiaHtml:actionMenu name=3D"newsCl" namePostFix=3D".news" resourceBu=
ndle=3D"jahiatemplates.default_v3_lang"
+                          useFieldSet=3D"false" labelKey=3D"add.news">
+    </jahiaHtml:actionMenu>
+</content:containerList>
\ No newline at end of file

Modified: trunk/src/jsp/double.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/double.=
jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/double.jsp (original)
+++ trunk/src/jsp/double.jsp Fri Jan 25 15:33:11 2008
@@ -20,14 +20,12 @@
 <%@ include file=3D"common/header.jspf" %>
 =

 <div id=3D"main">
-    <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"
-                              kind=3D"topTabs"/>
+    <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"=
 kind=3D"topTabs"/>
     <div id=3D"column-left">
         <%@ include file=3D"common/page_image.jspf" %>
 =

         <!-- left navigation menu (start) -->
-        <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang"
-                                  kind=3D"sideMenu" startLevel=3D"2"/>
+        <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang" kind=3D"sideMenu" startLevel=3D"2"/>
         <!-- left navigation menu (end) -->
 =

         <!-- left box (start) -->

Modified: trunk/src/jsp/faq.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/faq.jsp=
&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/faq.jsp (original)
+++ trunk/src/jsp/faq.jsp Fri Jan 25 15:33:11 2008
@@ -20,14 +20,12 @@
 <%@ include file=3D"common/header.jspf" %>
 =

 <div id=3D"main">
-    <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"
-                              kind=3D"topTabs"/>
+    <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"=
 kind=3D"topTabs"/>
     <div id=3D"column-left">
         <%@ include file=3D"common/page_image.jspf" %>
 =

         <!-- left navigation menu (start) -->
-        <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang"
-                                  kind=3D"sideMenu" startLevel=3D"2"/>
+        <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang" kind=3D"sideMenu" startLevel=3D"2"/>
         <!-- left navigation menu (end) -->
 =

         <!-- left box (start) -->

Modified: trunk/src/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/home.js=
p&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/home.jsp (original)
+++ trunk/src/jsp/home.jsp Fri Jan 25 15:33:11 2008
@@ -21,8 +21,7 @@
 <%@ include file=3D"common/pub.jspf" %>
 =

 <div id=3D"main">
-       <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"
-                                                       kind=3D"topTabs"/>
+       <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang" =
kind=3D"topTabs"/>
     <div id=3D"column-left">      =

         <!-- left box (start) -->
         <jahiaHtml:include page=3D"common/box/box.jsp">

Added: trunk/src/jsp/news.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
news.jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/news.jsp (added)
+++ trunk/src/jsp/news.jsp Fri Jan 25 15:33:11 2008
@@ -0,0 +1,46 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
+<%--
+Copyright 2002-2008 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ include file=3D"common/declarations.jspf" %>
+<%@ include file=3D"common/header.jspf" %>
+
+<div id=3D"main">
+    <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"=
 kind=3D"topTabs"/>
+    <div id=3D"column-left">
+        <%@ include file=3D"common/page_image.jspf" %>
+
+        <!-- left navigation menu (start) -->
+        <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang" kind=3D"sideMenu" startLevel=3D"2"/>
+        <!-- left navigation menu (end) -->
+
+        <!-- left box (start) -->
+        <jahiaHtml:include page=3D"common/box/box.jsp">
+            <jahiaHtml:param name=3D"name" value=3D"left_box_list_1"/>
+            <jahiaHtml:param name=3D"authorizedTypes" value=3D"<jahia_defa=
ult_boxes>"/>
+        </jahiaHtml:include>
+        <!-- left box (end) -->
+    </div>
+    <div id=3D"column-main">
+        <div id=3D"pagePath">
+            <jahia-components:currentPagePath maxchar=3D"40"/>
+        </div>
+        <jahiaHtml:include page=3D"common/news/newsDisplay.jsp"/>
+    </div>
+    <div id=3D"main-bottom"></div>
+</div>
+<%@ include file=3D"common/footer.jspf" %>
\ No newline at end of file

Modified: trunk/src/jsp/simple.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/simple.=
jsp&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/simple.jsp (original)
+++ trunk/src/jsp/simple.jsp Fri Jan 25 15:33:11 2008
@@ -20,14 +20,12 @@
 <%@ include file=3D"common/header.jspf" %>
 =

 <div id=3D"main">
-    <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"
-                              kind=3D"topTabs"/>
+    <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"=
 kind=3D"topTabs"/>
     <div id=3D"column-left">
         <%@ include file=3D"common/page_image.jspf" %>
 =

         <!-- left navigation menu (start) -->
-        <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang"
-                                  kind=3D"sideMenu" startLevel=3D"2"/>
+        <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang" kind=3D"sideMenu" startLevel=3D"2"/>
         <!-- left navigation menu (end) -->
 =

         <!-- left box (start) -->

Modified: trunk/src/jsp/templates.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/templat=
es.xml&rev=3D75&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/templates.xml (original)
+++ trunk/src/jsp/templates.xml Fri Jan 25 15:33:11 2008
@@ -16,6 +16,7 @@
         <template name=3D"Double" display-name=3D"Double" filename=3D"doub=
le.jsp"/>
         <template name=3D"Home" display-name=3D"Home" filename=3D"home.jsp=
"/>
         <template name=3D"FAQ" display-name=3D"FAQ" filename=3D"faq.jsp"/>
+        <template name=3D"news" display-name=3D"News" filename=3D"news.jsp=
"/>
         <template name=3D"Layoutmanager" display-name=3D"Layout manager" f=
ilename=3D"layoutmanager.jsp"/>
         <template name=3D"Fullscreenbox" display-name=3D"Full Screen Box" =
filename=3D"fullscreenbox.jsp"/>
     </templates>

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to