Author: xlawrence
Date: Tue Nov 13 15:42:35 2007
New Revision: 30
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D30&repname=3D=
corporate_portal_templates_v3
Log:
use the newly created tags in templates. =
Tags now used are:
- meta
- login link
- site map link
Modified:
trunk/src/jsp/common/footer.jspf
trunk/src/jsp/common/header.jspf
Modified: trunk/src/jsp/common/footer.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
footer.jspf&rev=3D30&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/footer.jspf (original)
+++ trunk/src/jsp/common/footer.jspf Tue Nov 13 15:42:35 2007
@@ -2,7 +2,7 @@
<ul class=3D"fleft">
<li><a href=3D"<jahia:homePageURL/>" class=3D"icon home"><content:=
resourceBundle
resourceBundle=3D"<%=3DresourceBundleName%>" resourceName=
=3D"header.home"/></a></li>
- <li><a href=3D"<%=3DjData.gui().html().drawSiteMapLauncher()%>" cl=
ass=3D"icon sitemap"><content:resourceBundle
+ <li><a href=3D"<jahiaHtml:siteMapLink />" class=3D"icon sitemap"><=
content:resourceBundle
resourceBundle=3D"<%=3DresourceBundleName%>" resourceName=
=3D"header.sitemap"/></a></li>
<c:if test=3D"${!empty linkContactUs}">
<li><a href=3D"<c:out value=3D"${linkContactUs.url}" escapeXml=
=3D"false" />" class=3D"icon email"><c:out
@@ -35,7 +35,7 @@
</div>
<div id=3D"key">
<a href=3D"#"
- onclick=3D"window.open('<%=3DjData.gui().drawPopupLoginUrl()%>'=
,'Login','width=3D380,height=3D450,toolbar=3Dno,directories=3Dno,location=
=3Dno,status=3Dyes,menubar=3Dno,resizable=3Dyes,scrollbars=3Dauto'); return=
false;"
+ onclick=3D"window.open('<jahiaHtml:loginLink urlonly=3D"true" /=
>','Login','width=3D380,height=3D450,toolbar=3Dno,directories=3Dno,location=
=3Dno,status=3Dyes,menubar=3Dno,resizable=3Dyes,scrollbars=3Dauto'); return=
false;"
title=3D""><img src=3D"<content:contextURL/>/images/footer-key.=
gif" width=3D"11" height=3D"12" border=3D"0" alt=3D""
align=3D"absmiddle"/></a>
</div>
Modified: trunk/src/jsp/common/header.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
header.jspf&rev=3D30&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 Tue Nov 13 15:42:35 2007
@@ -1,32 +1,21 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns=3D"http://www.w3.org/1999/xhtml";>
<head>
- <content:JSTools/>
+ <content:JSTools/> =
<%@ include file=3D"site_settings.jspf" %>
<%@ include file=3D"globals.jspf" %>
<%@ include file=3D"utils.jspf" %>
<title><jahia:currentPageTitle/><c:if test=3D"${!empty titlePrefix}"> =
- <c:out value=3D"${titlePrefix}"
=
escapeXml=3D"false"/></c:if></title>
- <%
- String metadatakeywords =3D jParams.getContentPage().getMetadataVa=
lue("keywords", jParams, "").trim();
- String metadatadescription =3D jParams.getContentPage().getMetadat=
aValue("description", jParams, "").trim();
- String metadataauthor =3D jParams.getContentPage().getMetadataValu=
e("creator", jParams, "").trim();
- String metadatalastPublished =3D jParams.getContentPage().getMetad=
ataValue("lastPublishingDate", jParams, "").trim();
+ <jahiaHtml:meta name=3D"keywords" value=3D"keywords"/>
+ <jahiaHtml:meta name=3D"description" metadata=3D"description"/>
+ <jahiaHtml:meta name=3D"author" metadata=3D"creator"/> =
=
- String skin =3D (String) pageContext.findAttribute("siteSkin");
- %>
- <% if (!"".equals(metadatakeywords)) { %>
- <meta name=3D"keywords" lang=3D"<%=3DjParams.getLocale().getLanguage()=
%>" content=3D"<%=3Dmetadatakeywords%>"/>
- <%}%>
- <% if (!"".equals(metadatadescription)) { %>
- <meta name=3D"description" lang=3D"<%=3DjParams.getLocale().getLanguag=
e()%>" content=3D"<%=3Dmetadatadescription%>"/>
- <%}%>
- <% if (!"".equals(metadataauthor)) { %>
- <meta name=3D"author" lang=3D"<%=3DjParams.getLocale().getLanguage()%>=
" content=3D"<%=3Dmetadataauthor%>"/>
- <%}%>
<meta name=3D"robots" content=3D"index,follow"/>
- <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF-=
8"/>
=
+ <%
+ String skin =3D (String) pageContext.findAttribute("siteSkin");
+ %>
<link href=3D"<content:contextURL/>/shared/css/base.css" rel=3D"styles=
heet" type=3D"text/css"/>
<link href=3D"<content:contextURL/>/shared/css/<%=3DgetSiteSkin(skin, =
resBundleID)%>.css" rel=3D"stylesheet"
type=3D"text/css"/>
@@ -63,7 +52,7 @@
</div>
</form>
<ul>
- <li><a href=3D"<%=3DjData.gui().html().drawSiteMapLauncher=
()%>" class=3D"icon sitemap"><content:resourceBundle
+ <li><a href=3D"<jahiaHtml:siteMapLink />" class=3D"icon si=
temap"><content:resourceBundle
resourceBundle=3D"<%=3DresourceBundleName%>" resou=
rceName=3D"header.sitemap"/></a></li>
<c:if test=3D"${!empty linkContactUs}">
<li><a href=3D"<c:out value=3D"${linkContactUs.url}" e=
scapeXml=3D"false" />" class=3D"icon email"><c:out
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
