Author: xlawrence
Date: Mon Nov 12 10:39:07 2007
New Revision: 22
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D22&repname=3D=
corporate_portal_templates_v3
Log:
removed unecessary jspf file
Removed:
trunk/src/jsp/common/top_declarations.jspf
Modified:
trunk/src/jsp/content.jsp
trunk/src/jsp/home.jsp
trunk/src/jsp/mysettings.jsp
trunk/src/jsp/mysettingschanged.jsp
trunk/src/jsp/sitemap.jsp
Modified: trunk/src/jsp/content.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/content=
.jsp&rev=3D22&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 Mon Nov 12 10:39:07 2007
@@ -1,42 +1,43 @@
-<%@ include file=3D"common/top_declarations.jspf"%>
-<%@ include file=3D"common/header.jspf"%>
-<%@ include file=3D"common/menu.jspf"%>
- <div id=3D"main">
+<%@ include file=3D"declarations.jspf" %>
+<%@ include file=3D"common_vars.jspf" %>
+<%@ include file=3D"common/header.jspf" %>
+<%@ include file=3D"common/menu.jspf" %>
+<div id=3D"main">
<div id=3D"column-left">
- <%@ include file=3D"common/page_image.jspf"%>
- =
- <content:declareContainerList name=3D"navListTest" title=3D"Navigati=
on">
- <content:declareContainer>
- <content:declareField name=3D"navLink" title=3D"Page"
type=3D"Page" =
- titleKey=3D"navigation.navLink"
bundleKey=3D"jahiatemplates.defa=
ult_v3_lang"/>
- </content:declareContainer>
- </content:declareContainerList>
+ <%@ include file=3D"common/page_image.jspf" %>
=
- <jahiaComponents:navmenu
containerListName=3D"navListTest" pageFieldNam=
e=3D"navLink"
-
bundleKey=3D"jahiatemplates.Corporate_portal_templates_v2" startLevel=
=3D"1"/>
+ <content:declareContainerList name=3D"navListTest" title=3D"Naviga=
tion">
+ <content:declareContainer>
+ <content:declareField name=3D"navLink" title=3D"Page" type=
=3D"Page"
+ titleKey=3D"navigation.navLink" bund=
leKey=3D"jahiatemplates.default_v3_lang"/>
+ </content:declareContainer>
+ </content:declareContainerList>
=
- <!-- left column (start) -->
- <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
- <jsp:param name=3D"id" value=3D"2"/>
- <jsp:param name=3D"column" value=3D"boxTypesContentLeft"/>
- </jsp:include>
- <!-- left column (end) -->
+ <jahiaComponents:navmenu containerListName=3D"navListTest" pageFie=
ldName=3D"navLink"
+ bundleKey=3D"jahiatemplates.Corporate_por=
tal_templates_v2" startLevel=3D"1"/>
+
+ <!-- left column (start) -->
+ <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
+ <jsp:param name=3D"id" value=3D"2"/>
+ <jsp:param name=3D"column" value=3D"boxTypesContentLeft"/>
+ </jsp:include>
+ <!-- left column (end) -->
</div>
<div id=3D"column-main">
- <div id=3D"pagePath">
- <ul>
- <li>
- <content:currentPagePath maxchar=3D"40" separator=3D"</li><li>=
"/>
- </li>
- </ul>
- </div>
- <!-- main column (start) -->
- <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
- <jsp:param name=3D"id" value=3D"1"/>
- <jsp:param name=3D"column" value=3D"boxTypesContentMain"/>
- </jsp:include>
- <!-- main column (end) -->
+ <div id=3D"pagePath">
+ <ul>
+ <li>
+ <content:currentPagePath maxchar=3D"40" separator=3D"<=
/li><li>"/>
+ </li>
+ </ul>
+ </div>
+ <!-- main column (start) -->
+ <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
+ <jsp:param name=3D"id" value=3D"1"/>
+ <jsp:param name=3D"column" value=3D"boxTypesContentMain"/>
+ </jsp:include>
+ <!-- main column (end) -->
</div>
<div id=3D"main-bottom"></div>
- </div>
-<%@ include file=3D"common/footer.jspf"%>
\ No newline at end of file
+</div>
+<%@ include file=3D"common/footer.jspf" %>
\ No newline at end of file
Modified: trunk/src/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/home.js=
p&rev=3D22&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 Mon Nov 12 10:39:07 2007
@@ -1,4 +1,5 @@
-<%@ include file=3D"common/top_declarations.jspf"%>
+<%@ include file=3D"declarations.jspf" %>
+<%@ include file=3D"common_vars.jspf" %>
<%@ include file=3D"common/header.jspf"%>
<%@ include file=3D"common/menu.jspf"%>
<%@ include file=3D"common/pub.jspf"%>
Modified: trunk/src/jsp/mysettings.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/mysetti=
ngs.jsp&rev=3D22&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/mysettings.jsp (original)
+++ trunk/src/jsp/mysettings.jsp Mon Nov 12 10:39:07 2007
@@ -17,7 +17,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ include file=3D"common/top_declarations.jspf" %>
+<%@ include file=3D"declarations.jspf" %>
+<%@ include file=3D"common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
<%@ include file=3D"common/menu.jspf" %>
=
Modified: trunk/src/jsp/mysettingschanged.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/mysetti=
ngschanged.jsp&rev=3D22&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/mysettingschanged.jsp (original)
+++ trunk/src/jsp/mysettingschanged.jsp Mon Nov 12 10:39:07 2007
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%>
-<%@ include file=3D"common/top_declarations.jspf" %>
+<%@ include file=3D"declarations.jspf" %>
+<%@ include file=3D"common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
<%@ include file=3D"common/menu.jspf" %>
<jesi:template>
Modified: trunk/src/jsp/sitemap.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/sitemap=
.jsp&rev=3D22&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/sitemap.jsp (original)
+++ trunk/src/jsp/sitemap.jsp Mon Nov 12 10:39:07 2007
@@ -1,4 +1,5 @@
-<%@ include file=3D"common/top_declarations.jspf"%>
+<%@ include file=3D"declarations.jspf" %>
+<%@ include file=3D"common_vars.jspf" %>
<%@ include file=3D"common/header.jspf"%>
<%@ include file=3D"common/menu.jspf"%>
<%@ include file=3D"common/pub.jspf"%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
