Author: xlawrence
Date: Thu Jan 24 11:10:18 2008
New Revision: 73
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D73&repname=3D=
corporate_portal_templates_v3
Log:
removed usage of parameter ID (unnecessary, use the name attribute instead =
to specify your id)
completed missing authorized types attribute usage for include
Modified:
trunk/src/jsp/common/box/box.jsp
trunk/src/jsp/common/box/box_layoutmanager.jsp
trunk/src/jsp/double.jsp
trunk/src/jsp/faq.jsp
trunk/src/jsp/fullscreenbox.jsp
trunk/src/jsp/home.jsp
trunk/src/jsp/layoutmanager.jsp
trunk/src/jsp/simple.jsp
Modified: trunk/src/jsp/common/box/box.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/box.jsp&rev=3D73&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 (original)
+++ trunk/src/jsp/common/box/box.jsp Thu Jan 24 11:10:18 2008
@@ -19,17 +19,17 @@
<%@ 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}"=
/>
+<c:set var=3D"boxID" scope=3D"request" value=3D"${param.name}"/>
=
<!-- 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"/>
+<jahia-components:declare-default-boxes id=3D"${param.name}" bundleKey=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" />
+<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}"
+<jahia-components:declare-box-list name=3D"${param.name}"
+ title=3D"${param.name}"
bundleKey=3D"DEFAULT_V3_LANG"
titleKey=3D"boxContainer"
authorizedTypes=3D"${param.authorizedTy=
pes}"
@@ -37,8 +37,8 @@
</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}"
+<jahia-components:box-list name=3D"${param.name}" id=3D"${param.name}">
+ <jahiaHtml:actionMenu name=3D"${param.name}"
resourceBundle=3D"jahiatemplates.default_v3_lang"
useFieldSet=3D"true"
namePostFix=3D".boxContainers">
@@ -48,7 +48,7 @@
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>
+ <p><jahia-components:box id=3D"${param.name}"/></p>
</jahiaHtml:actionMenu>
</content:container>
</jahiaHtml:actionMenu>
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=3D73&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 Thu Jan 24 11:10:18 2008
@@ -18,17 +18,17 @@
<%@ 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}"=
/>
+<c:set var=3D"boxID" scope=3D"request" value=3D"${param.name}"/>
=
<!-- 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"/>
+<jahia-components:declare-default-boxes id=3D"${param.name}" bundleKey=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" />
+<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}"
+<jahia-components:declare-box-list name=3D"${param.name}"
+ title=3D"${param.name}"
bundleKey=3D"DEFAULT_V3_LANG"
titleKey=3D"boxContainer"
authorizedTypes=3D"${param.authorizedTy=
pes}"
@@ -36,8 +36,8 @@
</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}"
+<jahia-components:box-list name=3D"${param.name}" id=3D"${param.name}">
+ <jahiaHtml:actionMenu name=3D"${param.name}"
resourceBundle=3D"jahiatemplates.default_v3_lang"
useFieldSet=3D"true"
namePostFix=3D".boxContainers">
@@ -45,14 +45,14 @@
<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.-->
+ <!-- Let us define the current box as a layout-manager box=
.-->
<ajax:layout-manager-box id=3D"lm_box_${boxContainer.id}" =
title=3D"${boxTitle}">
<jahiaHtml:actionMenu name=3D"boxContainer"
resourceBundle=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>
+ <p><jahia-components:box displayTitle=3D"false" id=
=3D"${param.name}"/></p>
</jahiaHtml:actionMenu>
</ajax:layout-manager-box>
</content:container>
Modified: trunk/src/jsp/double.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/double.=
jsp&rev=3D73&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 Thu Jan 24 11:10:18 2008
@@ -32,8 +32,7 @@
=
<!-- left box (start) -->
<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: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) -->
@@ -42,22 +41,20 @@
<jahia-components:currentPagePath maxchar=3D"40"/>
</div>
<div id=3D"column-main-left">
- <!-- main column (start) -->
+ <!-- main left column (start) -->
<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:param name=3D"name" value=3D"main_box_list_1"/>
<jahiaHtml:param name=3D"authorizedTypes" value=3D"<jahia_defa=
ult_boxes>"/>
</jahiaHtml:include>
- <!-- main column (end) -->
+ <!-- main left column (end) -->
</div>
<div id=3D"column-main-right">
- <!-- main column (start) -->
+ <!-- main right column (start) -->
<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:param name=3D"name" value=3D"main_box_list_2"/>
<jahiaHtml:param name=3D"authorizedTypes" value=3D"<jahia_defa=
ult_boxes>"/>
</jahiaHtml:include>
- <!-- main column (end) -->
+ <!-- main right column (end) -->
</div>
<div id=3D"main-bottom"></div>
</div>
Modified: trunk/src/jsp/faq.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/faq.jsp=
&rev=3D73&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 Thu Jan 24 11:10:18 2008
@@ -32,8 +32,8 @@
=
<!-- left box (start) -->
<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: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>
Modified: trunk/src/jsp/fullscreenbox.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/fullscr=
eenbox.jsp&rev=3D73&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/fullscreenbox.jsp (original)
+++ trunk/src/jsp/fullscreenbox.jsp Thu Jan 24 11:10:18 2008
@@ -24,8 +24,8 @@
<div id=3D"column-full">
<!-- main column (start) -->
<jahiaHtml:include page=3D"common/box/box.jsp">
- <jahiaHtml:param name=3D"name" value=3D"fullScreen_box_list"/>
- <jahiaHtml:param name=3D"id" value=3D"1"/>
+ <jahiaHtml:param name=3D"name" value=3D"fullScreen_box_list_1"=
/>
+ <jahiaHtml:param name=3D"authorizedTypes" value=3D"<jahia_defa=
ult_boxes>"/>
</jahiaHtml:include>
<!-- main column (end) -->
</div>
Modified: trunk/src/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/home.js=
p&rev=3D73&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 Thu Jan 24 11:10:18 2008
@@ -26,8 +26,7 @@
<div id=3D"column-left"> =
<!-- left box (start) -->
<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: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) -->
@@ -35,8 +34,7 @@
<div id=3D"column-main" class=3D"home">
<!-- main column (start) -->
<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:param name=3D"name" value=3D"main_box_list_1"/>
<jahiaHtml:param name=3D"authorizedTypes" value=3D"<jahia_defa=
ult_boxes>"/>
</jahiaHtml:include>
<!-- main column (end) -->
Modified: trunk/src/jsp/layoutmanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/layoutm=
anager.jsp&rev=3D73&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 Thu Jan 24 11:10:18 2008
@@ -27,8 +27,7 @@
<div id=3D"column-full">
<!-- main column (start) -->
<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:param name=3D"name" value=3D"main_box_list_1"/>
<jahiaHtml:param name=3D"authorizedTypes" value=3D"<jahia_defa=
ult_boxes>"/>
</jahiaHtml:include>
<!-- main column (end) -->
Modified: trunk/src/jsp/simple.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/simple.=
jsp&rev=3D73&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 Thu Jan 24 11:10:18 2008
@@ -32,8 +32,7 @@
=
<!-- left box (start) -->
<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: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) -->
@@ -44,8 +43,7 @@
</div>
<!-- main column (start) -->
<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:param name=3D"name" value=3D"main_box_list_1"/>
<jahiaHtml:param name=3D"authorizedTypes" value=3D"<jahia_defa=
ult_boxes>"/>
</jahiaHtml:include>
<!-- main column (end) -->
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
