Author: xlawrence
Date: Mon Jan 21 16:38:38 2008
New Revision: 66
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D66&repname=3D=
corporate_portal_templates_v3
Log:
Added double.jsp templates
renamed content.jsp to simple.jsp
Added:
trunk/src/jsp/double.jsp
trunk/src/jsp/simple.jsp
Removed:
trunk/src/jsp/content.jsp
Modified:
trunk/src/jsp/shared/css/base.css
trunk/src/jsp/templates.xml
Added: trunk/src/jsp/double.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
double.jsp&rev=3D66&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 (added)
+++ trunk/src/jsp/double.jsp Mon Jan 21 16:38:38 2008
@@ -0,0 +1,61 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
+<%--
+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"common/declarations.jspf" %>
+<%@ include file=3D"common/header.jspf" %>
+
+<div id=3D"main">
+ <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"
+ kind=3D"topTabs"/>
+ <div id=3D"column-left">
+ <%@ include file=3D"common/page_image.jspf" %>
+
+ <!-- left navigation menu (start) -->
+ <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang"
+ kind=3D"sideMenu" startLevel=3D"2"/>
+ <!-- left navigation menu (end) -->
+
+ <!-- left box (start) -->
+ <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"pagePath">
+ <jahia-components:currentPagePath maxchar=3D"40"/>
+ </div>
+ <div id=3D"column-main-left">
+ <!-- main column (start) -->
+ <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"column-main-right">
+ <!-- main column (start) -->
+ <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"2"/>
+ </jahiaHtml:include>
+ <!-- main column (end) -->
+ </div>
+ <div id=3D"main-bottom"></div>
+</div>
+<%@ include file=3D"common/footer.jspf" %>
\ No newline at end of file
Modified: trunk/src/jsp/shared/css/base.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/shared/=
css/base.css&rev=3D66&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/shared/css/base.css (original)
+++ trunk/src/jsp/shared/css/base.css Mon Jan 21 16:38:38 2008
@@ -86,14 +86,20 @@
=
.topTabs ul {
margin: 0 0 0 210px;
+ display: block;
}
=
-.topTabs li {
+.topTabs ul li {
margin: 1px 0 0 5px;
- padding: 0 0 0 0;
- float: left;
- list-style-type: none;
+ list-style: none;
text-align: center;
+ display: inline;
+ padding: 0;
+}
+
+.topTabs ul li div {
+ display:inline;
+ padding: 2px 0 3px 0;
}
=
.topTabs div div a {
@@ -105,13 +111,7 @@
color: gray;
}
=
-.topTabs li div {
- height: 20px;
- padding: 0;
-}
-
.topTabs .standard div {
-
background: #9EC8F4 url( ../images/tabs/tab-left9EC8F4.gif ) no-repeat=
top left;
}
=
@@ -587,6 +587,20 @@
padding-bottom: 30px;
}
=
+#column-main-right {
+ width: 355px;
+ overflow: hidden;
+ float: left;
+ padding-bottom: 30px;
+}
+
+#column-main-left {
+ width: 355px;
+ overflow: hidden;
+ float: left;
+ padding-bottom: 30px;
+}
+
#column-full {
width: 920px;
float: left;
Added: trunk/src/jsp/simple.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
simple.jsp&rev=3D66&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 (added)
+++ trunk/src/jsp/simple.jsp Mon Jan 21 16:38:38 2008
@@ -0,0 +1,52 @@
+<%--
+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"common/declarations.jspf" %>
+<%@ include file=3D"common/header.jspf" %>
+
+<div id=3D"main">
+ <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"
+ kind=3D"topTabs"/>
+ <div id=3D"column-left">
+ <%@ include file=3D"common/page_image.jspf" %>
+
+ <!-- left navigation menu (start) -->
+ <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang"
+ kind=3D"sideMenu" startLevel=3D"2"/>
+ <!-- left navigation menu (end) -->
+
+ <!-- left box (start) -->
+ <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">
+ <div id=3D"pagePath">
+ <jahia-components:currentPagePath maxchar=3D"40"/>
+ </div>
+ <!-- main column (start) -->
+ <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>
+</div>
+<%@ include file=3D"common/footer.jspf" %>
\ No newline at end of file
Modified: trunk/src/jsp/templates.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/templat=
es.xml&rev=3D66&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 Mon Jan 21 16:38:38 2008
@@ -10,8 +10,9 @@
<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"/>
+ <templates default=3D"Simple" homepage=3D"Home">
+ <template name=3D"Simple" display-name=3D"Simple" filename=3D"simp=
le.jsp"/>
+ <template name=3D"Double" display-name=3D"Double" filename=3D"doub=
le.jsp"/>
<template name=3D"Home" display-name=3D"Home" filename=3D"home.jsp=
"/>
<template name=3D"Layoutmanager" display-name=3D"Layout manager" f=
ilename=3D"layoutmanager.jsp"/>
</templates>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
