Author: xlawrence
Date: Fri Jan 18 17:49:19 2008
New Revision: 23
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D23&repname=3D=
doc_templates
Log:
Added a template in order to use the box_dispatcher from the v3 templates
Added:
branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter3/
branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter3/usingBoxes.jsp
branches/JAHIA-INCLUDE-BRANCH/src/jsp/common/box/
branches/JAHIA-INCLUDE-BRANCH/src/jsp/common/box/custom_box_types.jsp
branches/JAHIA-INCLUDE-BRANCH/src/jsp/common/box/rssBoxDisplay.jsp
Modified:
branches/JAHIA-INCLUDE-BRANCH/src/java/jahiatemplates/Doc_templates.pro=
perties
branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter1/taglib/declarations.inc
branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter2/allfields/workarea.jsp
branches/JAHIA-INCLUDE-BRANCH/src/jsp/templates.xml
Modified: branches/JAHIA-INCLUDE-BRANCH/src/java/jahiatemplates/Doc_templat=
es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-BRANCH/src/java/jahiatemplates/Doc_templates.properties&rev=3D23&repname=
=3Ddoc_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-BRANCH/src/java/jahiatemplates/Doc_templates.pro=
perties (original)
+++ branches/JAHIA-INCLUDE-BRANCH/src/java/jahiatemplates/Doc_templates.pro=
perties Fri Jan 18 17:49:19 2008
@@ -120,3 +120,13 @@
location.002 =3D Paris / France
location.003 =3D Washington / USA
location.004 =3D Klagenfurt / Austria
+
+
+rss =3D RSS
+boxContainer.rssContainer =3D RSS feeds
+boxContainer.rssContainer.title =3D RSS title
+boxContainer.rssContainer.url =3D RSS url
+add.rsss =3D Add a RSS feed
+update.rsss =3D Settings
+update.rss =3D Update RSS feed
+delete.rss =3D Delete RSS feed
Modified: branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter1/taglib/declaration=
s.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-BRANCH/src/jsp/chapter1/taglib/declarations.inc&rev=3D23&repname=3Ddoc_te=
mplates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter1/taglib/declarations.inc =
(original)
+++ branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter1/taglib/declarations.inc =
Fri Jan 18 17:49:19 2008
@@ -16,13 +16,19 @@
<%@ page import=3D"org.jahia.services.pages.*" %>
<%@ page import=3D"org.jahia.services.usermanager.*" %>
<%@ page import=3D"org.jahia.services.version.*" %>
-
<%@ 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" %>
<%@ taglib uri=3D"/WEB-INF/etc/taglibs/jstl/c" prefix=3D"c" %>
+<%@ taglib uri=3D"/WEB-INF/etc/taglibs/jstl/fn" prefix=3D"fn" %>
<%@ taglib uri=3D"/WEB-INF/etc/taglibs/jstl/fmt" prefix=3D"fmt" %>
+<%@ taglib uri=3D"/WEB-INF/etc/taglibs/pager-taglib" prefix=3D"pg" %>
+<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
<%@ taglib uri=3D"jahiaHtmlLib" prefix=3D"jahiaHtml" %>
+<%@ taglib uri=3D"jahiaComponentsLib" prefix=3D"jahia-components" %>
<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
+<%@ taglib uri=3D"http://displaytag.sf.net"; prefix=3D"display" %>
+<%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
=
<fmt:setBundle basename=3D"jahiatemplates.Doc_templates"/>
=
Modified: branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter2/allfields/workarea=
.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-BRANCH/src/jsp/chapter2/allfields/workarea.jsp&rev=3D23&repname=3Ddoc_tem=
plates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter2/allfields/workarea.jsp (=
original)
+++ branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter2/allfields/workarea.jsp F=
ri Jan 18 17:49:19 2008
@@ -1,4 +1,4 @@
-<%@ include file=3D"..\..\chapter1\taglib\declarations.inc"%>
+<%@ include file=3D"../../chapter1/taglib/declarations.inc"%>
<%
String fieldSuffix =3D ""; =
%>
Added: branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter3/usingBoxes.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-BRANCH/src/jsp/chapter3/usingBoxes.jsp&rev=3D23&repname=3Ddoc_temp=
lates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter3/usingBoxes.jsp (added)
+++ branches/JAHIA-INCLUDE-BRANCH/src/jsp/chapter3/usingBoxes.jsp Fri Jan 1=
8 17:49:19 2008
@@ -0,0 +1,57 @@
+<%@ page language=3D"java" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns=3D"http://www.w3.org/1999/xhtml";>
+<head>
+ <%@ include file=3D"../chapter1/taglib/declarations.inc" %>
+ <%@ include file=3D"../chapter1/taglib/top.inc" %>
+ <title>${fn:escapeXml(currentPage.title)}</title>
+ <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-=
8"/>
+</head>
+<body>
+<c:if test=3D"${currentRequest.logged}">
+ <div id=3D"topadminbar">
+ <jsp:include page=3D"/jsp/jahia/topbar/topmenu.jsp" flush=3D"true"=
/>
+ <jsp:include page=3D"/jsp/jahia/topbar/operationbuttons.jsp" flush=
=3D"true"/>
+ </div>
+</c:if>
+<div class=3D"main">
+ <div class=3D"header">
+ <a href=3D"${currentSite.homePage.url}"><img
+ src=3D"<content:contextURL/>/../common/img/logo.gif" alt=
=3D"Home" width=3D"150" height=3D"40" border=3D"0"/></a>
+ </div>
+ <div id=3D"content">
+ <div id=3D"contentLeft">
+ <div id=3D"navigation">
+ <%@ include file=3D"../chapter1/taglib/leftmenu.inc" %>
+ </div>
+ </div>
+ <div id=3D"contentMiddleAndRight">
+ <div class=3D"mainContent">
+ <div class=3D"commonDesc">
+ <content:currentPagePath separator=3D' > ' maxchar=
=3D'40'/>
+ <%@ include file=3D"../chapter1/taglib/pagetitle.inc" =
%>
+
+ <jahiaHtml:include page=3D"common/box/box_dispatcher.j=
sp">
+ <jahiaHtml:param name=3D"name" value=3D"main_box_l=
ist"/>
+ <jahiaHtml:param name=3D"id" value=3D"1"/>
+ </jahiaHtml:include>
+
+ </div>
+
+ <c:if test=3D"${!empty param.workAreaJSP}">
+ <div class=3D"embeddedPart">
+ <jsp:include page=3D'${param.workAreaJSP}' flush=
=3D'true'/>
+ </div>
+ </c:if>
+
+ <div class=3D"footer">
+ <%@ include file=3D"../chapter1/taglib/bottom.inc" %>
+ <content:logButton logoutTitle=3D''/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+</body>
+</html>
Added: branches/JAHIA-INCLUDE-BRANCH/src/jsp/common/box/custom_box_types.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-BRANCH/src/jsp/common/box/custom_box_types.jsp&rev=3D23&repname=3D=
doc_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-BRANCH/src/jsp/common/box/custom_box_types.jsp (=
added)
+++ branches/JAHIA-INCLUDE-BRANCH/src/jsp/common/box/custom_box_types.jsp F=
ri Jan 18 17:49:19 2008
@@ -0,0 +1,40 @@
+<%--
+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"../../chapter1/taglib/declarations.inc" %>
+
+<!-- Let us declare a custom box that is not part of the Jahia default box=
es -->
+<jahia-components:declare-box type=3D"rss"
+ id=3D"${param.name}_${param.id}"
+ view=3D"common/box/rssBoxDisplay.jsp"
+ title=3D"RSS box"
+ bundleKey=3D"DOC_TEMPLATES">
+ <content:declareContainer>
+ <content:declareField name=3D"boxRssTitle"
+ title=3D"Title"
+ type=3D"SmallText"
+ titleKey=3D"boxContainer.rssContainer.title"
+ bundleKey=3D"DOC_TEMPLATES"
+ />
+ <content:declareField name=3D"boxRssUrl"
+ title=3D"RSS Url"
+ type=3D"SmallText"
+ titleKey=3D"boxContainer.rssContainer.url"
+ bundleKey=3D"DOC_TEMPLATES"
+ />
+ </content:declareContainer>
+</jahia-components:declare-box>
\ No newline at end of file
Added: branches/JAHIA-INCLUDE-BRANCH/src/jsp/common/box/rssBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-BRANCH/src/jsp/common/box/rssBoxDisplay.jsp&rev=3D23&repname=3Ddoc=
_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-BRANCH/src/jsp/common/box/rssBoxDisplay.jsp (add=
ed)
+++ branches/JAHIA-INCLUDE-BRANCH/src/jsp/common/box/rssBoxDisplay.jsp Fri =
Jan 18 17:49:19 2008
@@ -0,0 +1,31 @@
+<%--
+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"../../chapter1/taglib/declarations.inc" %>
+<content:containerList name=3D"rss${boxID}" id=3D"rss" parentContainerName=
=3D"boxContainer">
+ <content:container id=3D"rssContainer">
+ <jahiaHtml:actionMenu name=3D"rssContainer" resourceBundle=3D"jahi=
atemplates.Doc_templates" useFieldSet=3D"true"
+ namePostFix=3D".rss">
+ <content:textField name=3D'boxRssTitle' defaultValue=3D"N/A" d=
iffActive=3D"true"/><br/>
+ <content:textField name=3D'boxRssUrl' defaultValue=3D"N/A" dif=
fActive=3D"true"/><br/>
+ </jahiaHtml:actionMenu>
+ </content:container>
+ <jahiaHtml:actionMenu name=3D"rss" namePostFix=3D".rsss"
+ resourceBundle=3D"jahiatemplates.Doc_templates" =
useFieldSet=3D"false"
+ labelKey=3D"add.rsss">
+ </jahiaHtml:actionMenu>
+</content:containerList>
\ No newline at end of file
Modified: branches/JAHIA-INCLUDE-BRANCH/src/jsp/templates.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-BRANCH/src/jsp/templates.xml&rev=3D23&repname=3Ddoc_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-BRANCH/src/jsp/templates.xml (original)
+++ branches/JAHIA-INCLUDE-BRANCH/src/jsp/templates.xml Fri Jan 18 17:49:19=
2008
@@ -1,48 +1,23 @@
-<?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>
-<tpml>
- <parameter name=3D"package-name">Doc templates</parameter>
- <parameter name=3D"root-folder">doc_templates</parameter>
- <parameter name=3D"classes-file">doc_templates.jar</parameter>
- <parameter name=3D"provider">http://www.jahia.org</parameter>
- <parameter name=3D"thumbnail"></parameter>
- <template browsable=3D"1" visible=3D"1" homepage=3D"1">
- <parameter name=3D"name">Simple-Taglib</parameter>
- <parameter
name=3D"filename">chapter1/template_taglib.jsp</parameter>
- <parameter name=3D"display-name">Simple (Taglib)</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Simple-Scriptlet</parameter>
- <parameter
name=3D"filename">chapter1/template_scriptlet.jsp</parameter>
- <parameter name=3D"display-name">Simple (Scriptlet)</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Simple-EL-JSTL)</parameter>
- <parameter
name=3D"filename">chapter1/template_el-jstl.jsp</parameter>
- <parameter name=3D"display-name">Simple (EL &
JSTL)</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Simple-JavaBean</parameter>
- <parameter
name=3D"filename">chapter1/template_javabean.jsp</parameter>
- <parameter name=3D"display-name">Simple (JavaBean)</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">All fields</parameter>
- <parameter name=3D"filename">chapter2/allfields.jsp</parameter>
- <parameter name=3D"display-name">All fields (cont &
subcont)</parame=
ter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">All fields twice</parameter>
- <parameter
name=3D"filename">chapter2/allfieldstwice.jsp</parameter>
- <parameter name=3D"display-name">All fields twice (cont &
subcont)</=
parameter>
- </template> =
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Container types</parameter>
- <parameter name=3D"filename">chapter2/conttype.jsp</parameter>
- <parameter name=3D"display-name">Container types (cont &
subcont)</p=
arameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Default values</parameter>
- <parameter
name=3D"filename">chapter2/defaultvalues.jsp</parameter>
- <parameter name=3D"display-name">Default values</parameter>
- </template> =
-</tpml>
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<template-set xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"; xmln=
s=3D"http://www.jahia.net/jahia/templates";
+ xsi:schemaLocation=3D"http://www.jahia.net/jahia/templates h=
ttp://www.jahia.net/shemas/templates_2_0.xsd">
+ <package-name>Doc templates</package-name>
+ <extends>Default V3</extends>
+ <root-folder>doc_templates</root-folder>
+ <classes-file>doc_templates.jar</classes-file>
+ <provider>http://www.jahia.org</provider>
+ <resource-bundle>jahiatemplates.Doc_templates</resource-bundle>
+ <templates default=3D"Simple-Taglib" homepage=3D"Simple-Taglib">
+ <template name=3D"Simple-Taglib" display-name=3D"Simple (Taglib)" =
filename=3D"chapter1/template_taglib.jsp"/>
+ <template name=3D"Simple-Scriptlet" display-name=3D"Simple (Script=
let)" filename=3D"chapter1/template_scriptlet.jsp"/>
+ <template name=3D"Simple-EL-JSTL" display-name=3D"Simple (EL-JSTL)=
" filename=3D"chapter1/template_el-jstl.jsp"/>
+ <template name=3D"Simple-JavaBean" display-name=3D"Simple (JavaBea=
n)" filename=3D"chapter1/template_javabean.jsp"/>
+ <template name=3D"All fields" display-name=3D"All fields (cont &am=
p; subcont)" filename=3D"chapter2/allfields.jsp"/>
+ <template name=3D"All fields twice" display-name=3D"All fields twi=
ce (cont & subcont)"
+ filename=3D"chapter2/allfieldstwice.jsp"/>
+ <template name=3D"Container types" display-name=3D"Container types=
(cont & subcont)"
+ filename=3D"chapter2/conttype.jsp"/>
+ <template name=3D"Default values" display-name=3D"Default values" =
filename=3D"chapter2/defaultvalues.jsp"/>
+ <template name=3D"Using Boxes" display-name=3D"Using Boxes (inheri=
tance)" filename=3D"chapter3/usingBoxes.jsp"/>
+ </templates>
+</template-set>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
