Author: dpillot
Date: Fri May 18 16:51:50 2007
New Revision: 667
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D667&repname=
=3Dcorporate_portal_templates_v2
Log:
TEMPLATES-231
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/document_listing.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/common/top.inc&rev=3D667&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc Fri May 18 16:51:50=
2007
@@ -102,7 +102,7 @@
if(isEditMode && introducingTheVeryFatZimbra) {
%>
<% if (request.getServletPath().endsWith("advsearchresult.jsp")) { %>
- <meta name=3D"robots" content=3D"noindex,nofollow"> =
+ <meta name=3D"robots" content=3D"noindex,nofollow">
<% } %>
<ajax:zimbraInclude/>
<%
@@ -401,4 +401,5 @@
%>
<div id=3D"content" <%if (isFullScreen) {%> style=3D"width: 984px;"<%}=
%> >
<jsp:include page=3D"splash/splash.jsp" flush=3D"true"/>
+ <%if (isFullScreen) {%> </div><%}%>
</jesi:fragment>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/listing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/listing.jsp&rev=3D667&repname=3Dcorporate_portal_templa=
tes_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/listing.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/listing.jsp Fri May 18 16:51:5=
0 2007
@@ -21,7 +21,14 @@
<%@ include file=3D"types.inc"%>
<%@ include file=3D"filters.inc"%>
<%@ include file=3D"definitions.inc"%>
+</div>
+<div style=3D"display:block;float:left;width:70%;border-color: gray;border=
-width: 0px 0px 0px 1px;border-style: none none none dotted;padding: 10px;">
=
+<jesi:fragment aclGroup=3D"true" expiration=3D"5"> <!-- TODO: invalidate t=
his automatically -->
+<jsp:include page=3D"../common/pagetitle.jsp" flush=3D"true"/>
+<jsp:include page=3D"../common/main_content.jsp" flush=3D"true">
+ <jsp:param name=3D"id" value=3D"full"/>
+</jsp:include>
<%
long cacheExpirationDelay =3D 5000; // [ms]
jParams.setCacheExpirationDelay(cacheExpirationDelay);
@@ -321,4 +328,4 @@
}
=
%>
-
+ </jesi:fragment>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/document_listing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/document_listing.jsp&rev=3D667&repname=3Dcorporate_portal_t=
emplates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/document_listing.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/document_listing.jsp Fri May 18 16=
:51:50 2007
@@ -1,31 +1,42 @@
<%--
Copyright 2002-2006 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 ma=
y =
-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 =
+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 =
+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/top_declarations.inc"%>
<jesi:template>
- =
- <%@ include file=3D"common/top.inc"%>
+ <%
+ isFullScreen=3Dtrue;
+ %>
+<%@ include file=3D"common/top.inc"%>
=
<div class=3D"full2">
- =
- <jesi:fragment aclGroup=3D"true" expiration=3D"5"> <!-- TODO:
invalidat=
e this automatically --> =
- <jsp:include page=3D"doc/listing.jsp" flush=3D"true"/>
- </jesi:fragment> =
- =
-</div>
+<div style=3D"float: left;margin: 10px 10px 10px 10px;width: 24%;">
+ <div id=3D"navigation">
+ <div class=3D"navdeco">
+ <logic:notEqual name=3D"currentPage" property=3D"homePage"=
value=3D"true">
+ <jsp:include page=3D"nav/menu.jsp" flush=3D"true"/>
+ </logic:notEqual>
+
+ </div>
+ </div>
+
+
+ <jsp:include page=3D"doc/listing.jsp" flush=3D"true"/>
+
+
+</div></div>
<%@ include file=3D"common/bottom.inc"%>
=
</jesi:template>
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
