Author: xlawrence
Date: Mon Nov 5 14:54:25 2007
New Revision: 5
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D5&repname=3Dc=
orporate_portal_templates_v3
Log:
integrated the new topBar using the new topbar tag.
STILL SOME WORK TO DO IN ORDER TO BE ABLE TO CORRECTLY USE THE TEMPLATE SET=
!!!
Removed:
trunk/src/jsp/common/adminbuttons.jspf
Modified:
trunk/src/jsp/common/declarations.jspf
trunk/src/jsp/common/header.jspf
Modified: trunk/src/jsp/common/declarations.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
declarations.jspf&rev=3D5&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/declarations.jspf (original)
+++ trunk/src/jsp/common/declarations.jspf Mon Nov 5 14:54:25 2007
@@ -77,6 +77,7 @@
taglib uri=3D"contentLib" prefix=3D"content" %><%@
taglib uri=3D"http://displaytag.sf.net"; prefix=3D"display" %><%@
taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
+<%@ taglib tagdir=3D"/WEB-INF/tags" prefix=3D"h" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %><%!
=
final static String topLinkIcons[] =3D {"icon.key", "icon.briefcase", "ico=
n.download", "icon.wallet", "icon.sheet"};
Modified: trunk/src/jsp/common/header.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
header.jspf&rev=3D5&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/header.jspf (original)
+++ trunk/src/jsp/common/header.jspf Mon Nov 5 14:54:25 2007
@@ -39,8 +39,6 @@
<%if (jData.gui().isEditMode()){%>
<link href=3D"<content:contextURL/>/shared/css/editMode.css" rel=3D"styl=
esheet" type=3D"text/css" />
<%}%>
- <link rel=3D"stylesheet" href=3D"<content:serverHttpPath/>/jsp/jahia/css=
/core_css.jsp" type=3D"text/css"></link>
- <link href=3D"<content:contextURL/>/shared/css/admin.css" rel=3D"stylesh=
eet" type=3D"text/css" />
<script language=3D"javascript" src=3D"<content:contextURL/>/shared/js/a=
ctions.js" type=3D"text/javascript"></script>
<script language=3D"javascript" type=3D"text/javascript">
<!--
@@ -116,19 +114,9 @@
<%}%>
</head>
<body>
-
<a name=3D"top"></a>
<c:if test=3D"${!thePrint}">
- <%if (jData.gui().isLogged() && jData.page().checkWriteAccess(user)){%>
- <div id=3D"topmodules">
- <% if (isLogged) { %>
- <%@ include file=3D"/jsp/jahia/topbar/topmenu.inc"%>
- <% } %>
- <jesi:fragment aclGroup=3D"true">
- <%@ include file=3D"/jsp/jahia/topbar/operationbuttons.inc"%>
- </jesi:fragment>
- </div>
- <%}%>
+ <h:topbar />
</c:if>
<div id=3D"container">
<div id=3D"header">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
