Author: xlawrence
Date: Tue Jan 22 11:33:52 2008
New Revision: 67
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D67&repname=3D=
corporate_portal_templates_v3
Log:
rename box_dispatcher.jsp to box.jsp
rename box/box_layoutmanager_dispatcher.jsp to box_layoutmanager.jsp
fixed webappsBoxDisplay.jsp
Added:
trunk/src/jsp/common/box/box.jsp
trunk/src/jsp/common/box/box_layoutmanager.jsp
Removed:
trunk/src/jsp/common/box/box_dispatcher.jsp
trunk/src/jsp/common/box/box_layoutmanager_dispatcher.jsp
Modified:
trunk/src/jsp/common/box/webappsBoxDisplay.jsp
trunk/src/jsp/double.jsp
trunk/src/jsp/home.jsp
trunk/src/jsp/layoutmanager.jsp
trunk/src/jsp/simple.jsp
Added: trunk/src/jsp/common/box/box.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
common/box/box.jsp&rev=3D67&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.jsp (added)
+++ trunk/src/jsp/common/box/box.jsp Tue Jan 22 11:33:52 2008
@@ -0,0 +1,54 @@
+<%--
+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" %>
+
+<!-- Set up a variable to store the boxID value. This value will be used b=
y the JSP files displaying the boxes -->
+<c:set var=3D"boxID" scope=3D"request" value=3D"${param.name}_${param.id}"=
/>
+
+<!-- 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 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}"
+ title=3D"${param.name}_${param.id}"
+ bundleKey=3D"DEFAULT_V3_LANG"
+ titleKey=3D"boxContainer"
+ authorizedTypes=3D"<jahia_default_boxes=
>,rss"
+ excludedTypes=3D"webapps">
+</jahia-components:declare-box-list>
+
+<!-- Let us now display the main box list with all the different boxes it =
has -->
+<jahia-components:box-list name=3D"${param.name}_${param.id}" id=3D"${para=
m.name}_${param.id}">
+ <jahiaHtml:actionMenu name=3D"${param.name}_${param.id}"
+ resourceBundle=3D"jahiatemplates.default_v3_lang"
+ useFieldSet=3D"true"
+ namePostFix=3D".boxContainers">
+ <content:container id=3D"boxContainer">
+ <jahiaHtml:actionMenu name=3D"boxContainer"
+ resourceBundle=3D"jahiatemplates.default=
_v3_lang"
+ useFieldSet=3D"true"
+ namePostFix=3D".boxContainer">
+ <!-- Let us invoke the box tag so it will dispatch the req=
uest to the correct JSP file used for box display -->
+ <p><jahia-components:box id=3D"${param.name}_${param.id}"/=
></p>
+ </jahiaHtml:actionMenu>
+ </content:container>
+ </jahiaHtml:actionMenu>
+</jahia-components:box-list>
\ No newline at end of file
Added: trunk/src/jsp/common/box/box_layoutmanager.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
common/box/box_layoutmanager.jsp&rev=3D67&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/box/box_layoutmanager.jsp (added)
+++ trunk/src/jsp/common/box/box_layoutmanager.jsp Tue Jan 22 11:33:52 2008
@@ -0,0 +1,53 @@
+<%--
+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" %>
+
+<!-- Set up a variable to store the boxID value. This value will be used b=
y the JSP files displaying the boxes -->
+<c:set var=3D"boxID" scope=3D"request" value=3D"${param.name}_${param.id}"=
/>
+
+<!-- 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 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}"
+ title=3D"${param.name}_${param.id}"
+ authorizedTypes=3D"<jahia_default_boxes=
>,rss"
+ excludedTypes=3D"webapps">
+</jahia-components:declare-box-list>
+
+<!-- Let us now display the main box list with all the different boxes it =
has -->
+<jahia-components:box-list name=3D"${param.name}_${param.id}" id=3D"${para=
m.name}_${param.id}">
+ <jahiaHtml:actionMenu name=3D"${param.name}_${param.id}" resourceBundl=
e=3D"jahiatemplates.default_v3_lang" useFieldSet=3D"true" namePostFix=3D".b=
oxContainerList">
+ <!-- Let us define the layout manager area. This should be compose=
d only by layout manager boxes -->
+ <ajax:layout-manager-area>
+ <content:container id=3D"boxContainer">
+ <content:textField valueId=3D"boxTitle" name=3D"boxTitle" =
defaultValue=3D"" display=3D"" diffActive=3D"true"/>
+ <!-- Let us define the current box as a layout-manager bo=
x.-->
+ <ajax:layout-manager-box id=3D"lm_box_${boxContainer.id}" =
title=3D"${boxTitle}">
+ <jahiaHtml:actionMenu name=3D"boxContainer" resourceBu=
ndle=3D"jahiatemplates.default_v3_lang" useFieldSet=3D"true" namePostFix=3D=
".boxContainerList">
+ <!-- Let us invoke the box tag so it will dispatch=
the request to the correct JSP file used for box display -->
+ <p><jahia-components:box displayTitle=3D"false" id=
=3D"${param.name}_${param.id}"/></p>
+ </jahiaHtml:actionMenu>
+ </ajax:layout-manager-box>
+ </content:container>
+ </ajax:layout-manager-area>
+ </jahiaHtml:actionMenu>
+</jahia-components:box-list>
\ No newline at end of file
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=3D67&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 Tue Jan 22 11:33:52 2008
@@ -16,12 +16,9 @@
limitations under the License.
--%>
<%@ include file=3D"../declarations.jspf" %>
-<%
- if (Jahia.getSettings().isEsiCacheActivated()) {
- JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getA=
ttribute(JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE);
- fragmentTag.setExpiration("0");
- }
-%>
+
+<jesi:fragment expiration=3D"0"/>
+
<content:containerList name=3D"webapps${boxID}" id=3D"webapps" parentConta=
inerName=3D"boxContainer">
<content:container id=3D"webappsContainer">
<content:applicationField name=3D'boxWebapp' id=3D"webapp" display=
=3D"false"/>
@@ -35,11 +32,6 @@
<bean:write name=3D"webapp" property=3D"value" filter=3D"f=
alse"/>
</logic:present>
</jahiaHtml:actionMenu>
-
- <jahiaHtml:actionMenu name=3D"webapps" namePostFix=3D".webapps"
- resourceBundle=3D"jahiatemplates.default_v3_=
lang" useFieldSet=3D"false"
- labelKey=3D"add.webapps">
- </jahiaHtml:actionMenu>
</content:container>
=
<logic:equal name=3D"webapps" property=3D"size" value=3D"0">
Modified: trunk/src/jsp/double.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/double.=
jsp&rev=3D67&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 Tue Jan 22 11:33:52 2008
@@ -31,7 +31,7 @@
<!-- left navigation menu (end) -->
=
<!-- left box (start) -->
- <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:include page=3D"common/box/box.jsp">
<jahiaHtml:param name=3D"name" value=3D"left_box_list"/>
<jahiaHtml:param name=3D"id" value=3D"1"/>
</jahiaHtml:include>
@@ -42,7 +42,7 @@
</div>
<div id=3D"column-main-left">
<!-- main column (start) -->
- <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:include page=3D"common/box/box.jsp">
<jahiaHtml:param name=3D"name" value=3D"main_box_list"/>
<jahiaHtml:param name=3D"id" value=3D"1"/>
</jahiaHtml:include>
@@ -50,7 +50,7 @@
</div>
<div id=3D"column-main-right">
<!-- main column (start) -->
- <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:include page=3D"common/box/box.jsp">
<jahiaHtml:param name=3D"name" value=3D"main_box_list"/>
<jahiaHtml:param name=3D"id" value=3D"2"/>
</jahiaHtml:include>
Modified: trunk/src/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/home.js=
p&rev=3D67&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 Tue Jan 22 11:33:52 2008
@@ -24,7 +24,7 @@
kind=3D"topTabs"/>
<div id=3D"column-left"> =
<!-- left box (start) -->
- <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:include page=3D"common/box/box.jsp">
<jahiaHtml:param name=3D"name" value=3D"left_box_list"/>
<jahiaHtml:param name=3D"id" value=3D"1"/>
</jahiaHtml:include>
@@ -32,7 +32,7 @@
</div>
<div id=3D"column-main" class=3D"home">
<!-- main column (start) -->
- <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:include page=3D"common/box/box.jsp">
<jahiaHtml:param name=3D"name" value=3D"main_box_list"/>
<jahiaHtml:param name=3D"id" value=3D"1"/>
</jahiaHtml:include>
Modified: trunk/src/jsp/layoutmanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/layoutm=
anager.jsp&rev=3D67&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 Tue Jan 22 11:33:52 2008
@@ -25,7 +25,7 @@
=
<div id=3D"column-left" style=3D"display:none"> =
<!-- left box (start) -->
- <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:include page=3D"common/box/box_layoutmanager.jsp">
<jahiaHtml:param name=3D"name" value=3D"left_box_list"/>
<jahiaHtml:param name=3D"id" value=3D"1"/>
</jahiaHtml:include>
@@ -33,7 +33,7 @@
</div>
<div id=3D"column-full">
<!-- main column (start) -->
- <jahiaHtml:include page=3D"common/box/box_layoutmanager_dispatcher=
.jsp">
+ <jahiaHtml:include page=3D"common/box/box_layoutmanager.jsp">
<jahiaHtml:param name=3D"name" value=3D"main_box_list"/>
<jahiaHtml:param name=3D"id" value=3D"1"/>
</jahiaHtml:include>
Modified: trunk/src/jsp/simple.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/simple.=
jsp&rev=3D67&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 Tue Jan 22 11:33:52 2008
@@ -30,7 +30,7 @@
<!-- left navigation menu (end) -->
=
<!-- left box (start) -->
- <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:include page=3D"common/box/box.jsp">
<jahiaHtml:param name=3D"name" value=3D"left_box_list"/>
<jahiaHtml:param name=3D"id" value=3D"1"/>
</jahiaHtml:include>
@@ -41,7 +41,7 @@
<jahia-components:currentPagePath maxchar=3D"40"/>
</div>
<!-- main column (start) -->
- <jahiaHtml:include page=3D"common/box/box_dispatcher.jsp">
+ <jahiaHtml:include page=3D"common/box/box.jsp">
<jahiaHtml:param name=3D"name" value=3D"main_box_list"/>
<jahiaHtml:param name=3D"id" value=3D"1"/>
</jahiaHtml:include>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
