Author: xlawrence
Date: Mon Nov 12 16:05:42 2007
New Revision: 27
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D27&repname=3D=
corporate_portal_templates_v3
Log:
cleanup file
Modified:
trunk/src/jsp/common/pub.jspf
Modified: trunk/src/jsp/common/pub.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
pub.jspf&rev=3D27&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/pub.jspf (original)
+++ trunk/src/jsp/common/pub.jspf Mon Nov 12 16:05:42 2007
@@ -1,14 +1,14 @@
<content:declareContainerList name=3D"homePub" title=3D"Promotion image" t=
itleKey=3D"header.homePub"
- bundleKey=3D"<%=3DresBundleID%>">
+ bundleKey=3D"jahiatemplates.default_v3_lang">
<content:declareContainer>
<content:declareField name=3D"pubImage" title=3D"Promotion image" =
titleKey=3D"header.pubImage"
- bundleKey=3D"<%=3DresBundleID%>" type=3D"Fil=
e"/>
+ bundleKey=3D"jahiatemplates.default_v3_lang"=
type=3D"File"/>
<content:declareField name=3D"pubImageButton" title=3D"Button on i=
mage" titleKey=3D"header.pubImageButton"
- bundleKey=3D"<%=3DresBundleID%>" type=3D"Fil=
e"/>
+ bundleKey=3D"jahiatemplates.default_v3_lang"=
type=3D"File"/>
<content:declareField name=3D"pubImageButtonOver" title=3D"Button =
on image over"
- titleKey=3D"header.pubImageButtonOver" bundl=
eKey=3D"<%=3DresBundleID%>" type=3D"File"/>
+ titleKey=3D"header.pubImageButtonOver" bundl=
eKey=3D"jahiatemplates.default_v3_lang" type=3D"File"/>
<content:declareField name=3D"pubButtonLink" title=3D"Link on the =
button" titleKey=3D"header.pubButtonLink"
- bundleKey=3D"<%=3DresBundleID%>" type=3D"Pag=
e"/>
+ bundleKey=3D"jahiatemplates.default_v3_lang"=
type=3D"Page"/>
</content:declareContainer>
</content:declareContainerList>
=
@@ -26,19 +26,21 @@
property=3D"field(pubImageButtonOver).object"=
/>
</logic:present>
<content:pageField valueId=3D"pubButtonLink" name=3D"pubButton=
Link"/>
- <jahiaHtml:actionMenu name=3D"homePubContainer" namePostFix=3D=
"" resourceBundle=3D"<%=3DresourceBundleName %>"
+ <jahiaHtml:actionMenu name=3D"homePubContainer" namePostFix=3D=
"" resourceBundle=3D"jahiatemplates.default_v3_lang"
useFieldSet=3D"true">
<c:if test=3D"${!empty pubImage && pubImage.image}">
- <img src=3D"<c:out value=3D"${pubImage.downloadUrl}" e=
scapeXml=3D"false" />" width=3D"918" border=3D"0" alt=3D""
+ <img src=3D"<c:out value=3D'${pubImage.downloadUrl}' e=
scapeXml=3D'false' />" width=3D"918" border=3D"0" alt=3D""
/><br/>
</c:if>
</jahiaHtml:actionMenu>
<c:if test=3D"${!empty pubImageButton && pubImageButton.image}=
">
<div class=3D"button">
- <c:if test=3D"${!empty pubButtonLink}"><a href=3D"<c:o=
ut value=3D"${pubButtonLink.url}" escapeXml=3D"false"
- />" title=3D"<c:out value=3D"${pubButtonLink.title=
}" escapeXml=3D"false"/>"></c:if>
- <img src=3D"<c:out value=3D"${pubImageButton.downloadU=
rl}" escapeXml=3D"false" />" border=3D"0" alt=3D""<c:if
- test=3D"${!empty pubImageButtonOver && pubImageBut=
tonOver.image}"> onmouseover=3D"this.src=3D'<c:out
+ <c:if test=3D"${!empty pubButtonLink}">
+ <a href=3D'<c:out value=3D"${pubButtonLink.url}" e=
scapeXml=3D"false"/>'
+ title=3D'<c:out value=3D"${pubButtonLink.title}=
" escapeXml=3D"false"/>'>
+ </c:if>
+ <img src=3D'<c:out value=3D"${pubImageButton.downloadU=
rl}" escapeXml=3D"false" />' border=3D"0" alt=3D""<c:if
+ test=3D'${!empty pubImageButtonOver && pubImageBut=
tonOver.image}'> onmouseover=3D"this.src=3D'<c:out
value=3D"${pubImageButtonOver.downloadUrl}" escape=
Xml=3D"false"/>';" onmouseout=3D"this.src=3D'<c:out
value=3D"${pubImageButton.downloadUrl}" escapeXml=
=3D"false"/>';"</c:if> /><br/>
<c:if test=3D"${!empty pubButtonLink}"></a></c:if>
@@ -46,7 +48,7 @@
</c:if>
</content:container>
<c:if test=3D"${homePub.fullSize =3D=3D 0 && editMode}">
- <a href=3D"<content:addContainerURL id=3D" addBoxContainerURL"=
/>">
+ <a href=3D"<content:addContainerURL id=3D'addBoxContainerURL'/=
>">
<img src=3D"<content:contextURL/>/images/actions/component_add=
.gif" width=3D"16" height=3D"16" alt=3D"+"
border=3D"0"/> Add promotion image</a>
</c:if>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
