Author: xlawrence
Date: Fri Jan 18 17:38:17 2008
New Revision: 65
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D65&repname=3D=
corporate_portal_templates_v3
Log:
Start using the :include tag in the templates.
added a custom_box_type.jsp file
Added:
trunk/src/jsp/common/box/custom_box_types.jsp
Removed:
trunk/src/jsp/common/box/rssBoxDisplay.jsp
Modified:
trunk/src/java/jahiatemplates/default_v3_lang.properties
trunk/src/java/jahiatemplates/default_v3_lang_en.properties
trunk/src/java/jahiatemplates/default_v3_lang_fr.properties
trunk/src/jsp/common/box/box_dispatcher.jsp
trunk/src/jsp/common/box/box_layoutmanager_dispatcher.jsp
trunk/src/jsp/common/declarations.jspf
trunk/src/jsp/content.jsp
trunk/src/jsp/home.jsp
trunk/src/jsp/layoutmanager.jsp
trunk/src/jsp/templates.xml
Modified: trunk/src/java/jahiatemplates/default_v3_lang.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/default_v3_lang.properties&rev=3D65&repname=3Dcorporate_portal_tem=
plates_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/java/jahiatemplates/default_v3_lang.properties (original)
+++ trunk/src/java/jahiatemplates/default_v3_lang.properties Fri Jan 18 17:=
38:17 2008
@@ -101,8 +101,6 @@
users =3D Users
groups =3D Groups
lastNews =3D Last News
-rss =3D RSS
-
=
boxContainer =3D Box containers
add.boxContainers =3D Add a box
@@ -171,14 +169,6 @@
update.webapp =3D Update portlet
delete.webapp =3D Delete portlet
=
-boxContainer.rssContainer =3D RSS feeds
-boxContainer.rssContainer.title =3D RSS title
-boxContainer.rssContainer.url =3D RSS url
-add.rss =3D Add a RSS feed
-update.rsss =3D Settings
-update.rss =3D Update RSS feed
-delete.rss =3D Delete RSS feed
-
boxContainer.usersContainer =3D Users
boxContainer.usersContainer.query =3D Query
boxContainer.usersContainer.displayLimit =3D Display limit
Modified: trunk/src/java/jahiatemplates/default_v3_lang_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/default_v3_lang_en.properties&rev=3D65&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/java/jahiatemplates/default_v3_lang_en.properties (original)
+++ trunk/src/java/jahiatemplates/default_v3_lang_en.properties Fri Jan 18 =
17:38:17 2008
@@ -100,7 +100,6 @@
users =3D Users
groups =3D Groups
lastNews =3D Last News
-rss =3D RSS
=
boxContainer =3D Box containers
add.boxContainers =3D Add a box
@@ -169,14 +168,6 @@
update.webapp =3D Update portlet
delete.webapp =3D Delete portlet
=
-boxContainer.rssContainer =3D RSS feeds
-boxContainer.rssContainer.title =3D RSS title
-boxContainer.rssContainer.url =3D RSS url
-add.rss =3D Add a RSS feed
-update.rsss =3D Settings
-update.rss =3D Update RSS feed
-delete.rss =3D Delete RSS feed
-
boxContainer.usersContainer =3D Users
boxContainer.usersContainer.query =3D Query
boxContainer.usersContainer.displayLimit =3D Display limit
Modified: trunk/src/java/jahiatemplates/default_v3_lang_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/default_v3_lang_fr.properties&rev=3D65&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/java/jahiatemplates/default_v3_lang_fr.properties (original)
+++ trunk/src/java/jahiatemplates/default_v3_lang_fr.properties Fri Jan 18 =
17:38:17 2008
@@ -524,7 +524,6 @@
users =3D Utilisateurs
groups =3D Groupes d'utilisateurs
lastNews =3D Derni=C3=A8res nouvelles
-rss =3D RSS
=
boxContainer =3D Conteneur de bo=C3=AEtes
add.boxContainers =3D Ajouter une bo=C3=AEte
@@ -593,14 +592,6 @@
update.webapp =3D Modifier une portlet
delete.webapp =3D Supprimer une portlet
=
-boxContainer.rssContainer =3D Feeds RSS
-boxContainer.rssContainer.title =3D Titre
-boxContainer.rssContainer.url =3D URL
-add.rss =3D Ajouter un feed RSS
-update.rsss =3D Options
-update.rss =3D Modifier un feed RSS
-delete.rss =3D Supprimer un feed RSS
-
boxContainer.usersContainer =3D Utilisateurs
boxContainer.usersContainer.query =3D Requ=C3=AAte
boxContainer.usersContainer.displayLimit =3D Limite d'affichage
Modified: trunk/src/jsp/common/box/box_dispatcher.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/box_dispatcher.jsp&rev=3D65&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_dispatcher.jsp (original)
+++ trunk/src/jsp/common/box/box_dispatcher.jsp Fri Jan 18 17:38:17 2008
@@ -23,27 +23,8 @@
<!-- Let us declare the default Jahia boxes so we can use them -->
<jahia-components:declare-default-boxes id=3D"${param.name}_${param.id}" b=
undleKey=3D"DEFAULT_V3_LANG"/>
=
-<!-- 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"DEFAULT_V3_LANG">
- <content:declareContainer>
- <content:declareField name=3D"boxRssTitle"
- title=3D"Title"
- type=3D"SmallText"
- titleKey=3D"boxContainer.rssContainer.title"
- bundleKey=3D"DEFAULT_V3_LANG"
- />
- <content:declareField name=3D"boxRssUrl"
- title=3D"RSS Url"
- type=3D"SmallText"
- titleKey=3D"boxContainer.rssContainer.url"
- bundleKey=3D"DEFAULT_V3_LANG"
- />
- </content:declareContainer>
-</jahia-components:declare-box>
+<!-- Let us include the custom_box_types.jsp where all custom box types sh=
ould be defined -->
+<jahiaHtml:include page=3D"common/box/custom_box_types.jsp" />
=
<!-- Let us declare the main box list that will contain all the different =
boxes we want -->
<jahia-components:declare-box-list name=3D"${param.name}_${param.id}"
Modified: trunk/src/jsp/common/box/box_layoutmanager_dispatcher.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/box_layoutmanager_dispatcher.jsp&rev=3D65&repname=3Dcorporate_portal_te=
mplates_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_dispatcher.jsp (original)
+++ trunk/src/jsp/common/box/box_layoutmanager_dispatcher.jsp Fri Jan 18 17=
:38:17 2008
@@ -23,20 +23,8 @@
<!-- Let us declare the default Jahia boxes so we can use them -->
<jahia-components:declare-default-boxes id=3D"${param.name}_${param.id}"/>
=
-<!-- 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">
- <content:declareContainer>
- <content:declareField name=3D"title"
- title=3D"Title"
- type=3D"SmallText"
- />
- <content:declareField name=3D"rssUrl"
- title=3D"RSS Url"
- type=3D"SmallText"
- />
- </content:declareContainer>
-</jahia-components:declare-box>
+<!-- Let us include the custom_box_types.jsp where all custom box types sh=
ould be defined -->
+<jahiaHtml:include page=3D"common/box/custom_box_types.jsp" />
=
<!-- Let us declare the main box list that will contain all the different =
boxes we want -->
<jahia-components:declare-box-list name=3D"${param.name}_${param.id}"
Added: trunk/src/jsp/common/box/custom_box_types.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
common/box/custom_box_types.jsp&rev=3D65&repname=3Dcorporate_portal_templat=
es_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 (added)
+++ trunk/src/jsp/common/box/custom_box_types.jsp Fri Jan 18 17:38:17 2008
@@ -0,0 +1,20 @@
+<%--
+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.
+--%>
+
+
+<!-- Leave this file empty so it can be extended in sub template sets usin=
g the jahia-include tag -->
\ No newline at end of file
Modified: trunk/src/jsp/common/declarations.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
declarations.jspf&rev=3D65&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 18 17:38:17 2008
@@ -123,30 +123,4 @@
}
return name;
}
-
- /**
- * Remove all html tags
- * @param str Input string (html code).
- * @return Output string
- */
- public String removeTags(String str)
- throws JahiaException {
- if (str =3D=3D null) {
- return "";
- }
- StringBuffer result =3D new StringBuffer(str.length());
- int startIndex =3D 0;
- int i =3D str.indexOf("<");
- while (i !=3D -1) {
- result.append(str.substring(startIndex, i));
- i =3D str.indexOf(">", i);
- if (i !=3D -1) {
- startIndex =3D i + 1;
- }
- i =3D str.indexOf("<", startIndex);
- }
- str =3D result.append(str.substring(startIndex, str.length())).toS=
tring();
- return str;
- }
-
%>
\ No newline at end of file
Modified: trunk/src/jsp/content.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/content=
.jsp&rev=3D65&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/content.jsp (original)
+++ trunk/src/jsp/content.jsp Fri Jan 18 17:38:17 2008
@@ -30,10 +30,10 @@
<!-- left navigation menu (end) -->
=
<!-- left box (start) -->
- <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
- <jsp:param name=3D"name" value=3D"left_box_list"/>
- <jsp:param name=3D"id" value=3D"1"/>
- </jsp:include>
+ <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:param name=3D"name" value=3D"left_box_list"/>
+ <jahiaHtml:param name=3D"id" value=3D"1"/>
+ </jahiaHtml:include>
<!-- left box (end) -->
</div>
<div id=3D"column-main">
@@ -41,10 +41,10 @@
<jahia-components:currentPagePath maxchar=3D"40"/>
</div>
<!-- main column (start) -->
- <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
- <jsp:param name=3D"name" value=3D"main_box_list"/>
- <jsp:param name=3D"id" value=3D"1"/>
- </jsp:include>
+ <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:param name=3D"name" value=3D"main_box_list"/>
+ <jahiaHtml:param name=3D"id" value=3D"1"/>
+ </jahiaHtml:include>
<!-- main column (end) -->
</div>
<div id=3D"main-bottom"></div>
Modified: trunk/src/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/home.js=
p&rev=3D65&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 18 17:38:17 2008
@@ -24,18 +24,18 @@
kind=3D"topTabs"/>
<div id=3D"column-left"> =
<!-- left box (start) -->
- <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
- <jsp:param name=3D"name" value=3D"left_box_list"/>
- <jsp:param name=3D"id" value=3D"1"/>
- </jsp:include>
+ <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:param name=3D"name" value=3D"left_box_list"/>
+ <jahiaHtml:param name=3D"id" value=3D"1"/>
+ </jahiaHtml:include>
<!-- left box (end) -->
</div>
<div id=3D"column-main" class=3D"home">
<!-- main column (start) -->
- <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
- <jsp:param name=3D"name" value=3D"main_box_list"/>
- <jsp:param name=3D"id" value=3D"1"/>
- </jsp:include>
+ <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:param name=3D"name" value=3D"main_box_list"/>
+ <jahiaHtml:param name=3D"id" value=3D"1"/>
+ </jahiaHtml:include>
<!-- main column (end) -->
</div>
<div id=3D"main-bottom"></div>
Modified: trunk/src/jsp/layoutmanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/layoutm=
anager.jsp&rev=3D65&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/layoutmanager.jsp (original)
+++ trunk/src/jsp/layoutmanager.jsp Fri Jan 18 17:38:17 2008
@@ -25,18 +25,18 @@
=
<div id=3D"column-left" style=3D"display:none"> =
<!-- left box (start) -->
- <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
- <jsp:param name=3D"name" value=3D"left_box_list"/>
- <jsp:param name=3D"id" value=3D"1"/>
- </jsp:include>
+ <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:param name=3D"name" value=3D"left_box_list"/>
+ <jahiaHtml:param name=3D"id" value=3D"1"/>
+ </jahiaHtml:include>
<!-- left box (end) -->
</div>
<div id=3D"column-full">
<!-- main column (start) -->
- <jsp:include page=3D"common/box/box_layoutmanager_dispatcher.jsp" =
flush=3D"true">
- <jsp:param name=3D"name" value=3D"main_box_list"/>
- <jsp:param name=3D"id" value=3D"1"/>
- </jsp:include>
+ <jahiaHtml:include page=3D"common/box/box_layoutmanager_dispatcher=
.jsp">
+ <jahiaHtml:param name=3D"name" value=3D"main_box_list"/>
+ <jahiaHtml:param name=3D"id" value=3D"1"/>
+ </jahiaHtml:include>
<!-- main column (end) -->
</div>
<div id=3D"main-bottom"></div>
Modified: trunk/src/jsp/templates.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/templat=
es.xml&rev=3D65&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 18 17:38:17 2008
@@ -3,9 +3,13 @@
<package-name>Default V3</package-name>
<root-folder>default_v3</root-folder>
<classes-file>default_v3_jahiatemplates.jar</classes-file>
- <provider>http://www.jahia.com</provider>
+ <provider>http://www.jahia.org</provider>
<thumbnail>images/default_v3_tn.gif</thumbnail>
<resource-bundle>jahiatemplates.default_v3_lang</resource-bundle>
+ <common-pages>
+ <my-settings>mysettings.jsp</my-settings>
+ <search-results>searchresults.jsp</search-results>
+ </common-pages>
<templates default=3D"Content" homepage=3D"Home">
<template name=3D"Content" display-name=3D"Content" filename=3D"co=
ntent.jsp"/>
<template name=3D"Home" display-name=3D"Home" filename=3D"home.jsp=
"/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
