Author: xlawrence
Date: Wed Jan 16 16:25:19 2008
New Revision: 61
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D61&repname=3D=
corporate_portal_templates_v3
Log:
removed file common_vars.jspf and its dependency
Removed:
trunk/src/jsp/common/common_vars.jspf
Modified:
trunk/src/jsp/common/box/filesBoxDisplay.jsp
trunk/src/jsp/common/box/groupsBoxDisplay.jsp
trunk/src/jsp/common/box/lastNewsBoxDisplay.jsp
trunk/src/jsp/common/box/newsBoxDisplay.jsp
trunk/src/jsp/common/box/usersBoxDisplay.jsp
trunk/src/jsp/common/box/webappsBoxDisplay.jsp
trunk/src/jsp/common/declarations.jspf
trunk/src/jsp/common/footer.jspf
trunk/src/jsp/common/header.jspf
trunk/src/jsp/common/page_image.jspf
trunk/src/jsp/common/site_settings.jspf
trunk/src/jsp/common/top_links.jspf
trunk/src/jsp/common/top_tabs.jspf
trunk/src/jsp/content.jsp
trunk/src/jsp/home.jsp
trunk/src/jsp/layoutmanager.jsp
trunk/src/jsp/mysettings.jsp
trunk/src/jsp/mysettingschanged.jsp
trunk/src/jsp/sitemap.jsp
Modified: trunk/src/jsp/common/box/filesBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/filesBoxDisplay.jsp&rev=3D61&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/box/filesBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/filesBoxDisplay.jsp Wed Jan 16 16:25:19 2008
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ include file=3D"../declarations.jspf" %>
-<%@ include file=3D"../common_vars.jspf" %>
<content:containerList name=3D"files${boxID}" id=3D"files" parentContainer=
Name=3D"boxContainer">
<table class=3D"files" border=3D"0" cellspacing=3D"0" cellpadding=3D"0=
" width=3D"100%">
<tr>
Modified: trunk/src/jsp/common/box/groupsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/groupsBoxDisplay.jsp&rev=3D61&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/box/groupsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/groupsBoxDisplay.jsp Wed Jan 16 16:25:19 2008
@@ -16,8 +16,15 @@
limitations under the License.
--%>
<%@ include file=3D"../declarations.jspf" %>
-<%@ include file=3D"../common_vars.jspf" %>
<%
+ final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.=
data.JahiaData");
+ // get the parambean
+ ParamBean jParams =3D jData.params();
+
+ String theURL =3D jData.gui().drawHttpJspContext(request);
+
+ // get the context url
+ String contextURL =3D jData.gui().drawHttpJspContext(request);
final String id =3D request.getParameter("id");
JahiaContainerList gcontlist =3D jData.containers().getContainerList("=
groupsContainer" + id);
JahiaContainer thegboxcontainer =3D null;
Modified: trunk/src/jsp/common/box/lastNewsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/lastNewsBoxDisplay.jsp&rev=3D61&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/box/lastNewsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/lastNewsBoxDisplay.jsp Wed Jan 16 16:25:19 2008
@@ -16,14 +16,18 @@
limitations under the License.
--%>
<%@ include file=3D"../declarations.jspf" %>
-<%@ include file=3D"../common_vars.jspf" %>
<%
+ final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.=
data.JahiaData");
+ // get the parambean
+ ParamBean jParams =3D jData.params();
if (Jahia.getSettings().isEsiCacheActivated()) {
JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getA=
ttribute(JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE);
fragmentTag.setExpiration("900");
} else {
jParams.setCacheExpirationDelay(90000);
}
+ // get the context url
+ String contextURL =3D jData.gui().drawHttpJspContext(request);
String categoriespackage =3D "org.jahia.actions.server.admin.categorie=
s.ManageCategories";
boolean licenseEnabled =3D LicenseActionChecker.isAuthorizedByLicense(=
categoriespackage, 0);
String windowSize =3D "10";
Modified: trunk/src/jsp/common/box/newsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/newsBoxDisplay.jsp&rev=3D61&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/box/newsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/newsBoxDisplay.jsp Wed Jan 16 16:25:19 2008
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ include file=3D"../declarations.jspf" %>
-<%@ include file=3D"../common_vars.jspf" %>
<content:containerList name=3D"news${boxID}" id=3D"news" parentContainerNa=
me=3D"boxContainer">
<dl class=3D"news">
<content:container id=3D"newsContainer">
Modified: trunk/src/jsp/common/box/usersBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/usersBoxDisplay.jsp&rev=3D61&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/box/usersBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/usersBoxDisplay.jsp Wed Jan 16 16:25:19 2008
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ include file=3D"../declarations.jspf" %>
-<%@ include file=3D"../common_vars.jspf" %>
=
<content:containerList name=3D"users${boxID}" id=3D"users" parentContainer=
Name=3D"boxContainer">
<content:container id=3D"usersContainer">
Modified: trunk/src/jsp/common/box/webappsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/webappsBoxDisplay.jsp&rev=3D61&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/box/webappsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/webappsBoxDisplay.jsp Wed Jan 16 16:25:19 2008
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ include file=3D"../declarations.jspf" %>
-<%@ include file=3D"../common_vars.jspf" %>
<%
if (Jahia.getSettings().isEsiCacheActivated()) {
JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getA=
ttribute(JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE);
Modified: trunk/src/jsp/common/declarations.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
declarations.jspf&rev=3D61&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 Wed Jan 16 16:25:19 2008
@@ -87,6 +87,10 @@
<%@ taglib uri=3D"http://displaytag.sf.net"; prefix=3D"display" %>
<%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
+
+<!-- Let us declare the resource bundle -->
+<jahia-components:resourceBundle resBundleID=3D"DEFAULT_V3_LANG" resourceB=
undleName=3D"jahiatemplates.default_v3_lang"/>
+
<%!
final static String topLinkIcons[] =3D {"icon.key", "icon.briefcase", =
"icon.download", "icon.wallet", "icon.sheet"};
final static String siteSkins[] =3D {"siteSettings.blue", "siteSetting=
s.green"};
Modified: trunk/src/jsp/common/footer.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
footer.jspf&rev=3D61&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 Wed Jan 16 16:25:19 2008
@@ -18,9 +18,9 @@
<div id=3D"bottom-nav">
<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>
+ resourceBundle=3D"jahiatemplates.default_v3_lang" resource=
Name=3D"header.home"/></a></li>
<li><a href=3D"<jahiaHtml:siteMapLink />" class=3D"icon sitemap"><=
content:resourceBundle
- resourceBundle=3D"<%=3DresourceBundleName%>" resourceName=
=3D"header.sitemap"/></a></li>
+ resourceBundle=3D"jahiatemplates.default_v3_lang" resource=
Name=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
value=3D"${linkContactUs.title}" escapeXml=3D"false"/>=
</a></li>
@@ -38,7 +38,7 @@
%>
<a href=3D"<c:out value=3D"${topLink.url}" escapeX=
ml=3D"false" />" title=3D"<c:out
value=3D"${topLink.title}" escapeXml=3D"false"=
/>"
- class=3D"icon <%=3DgetTopIcon(linkIcon, resBundleI=
D)%>"><c:out value=3D"${topLink.title}"
+ class=3D"icon <%=3DgetTopIcon(linkIcon, "DEFAULT_V=
3_LANG")%>"><c:out value=3D"${topLink.title}"
=
escapeXml=3D"false"/></a>
</li>
</content:container>
Modified: trunk/src/jsp/common/header.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
header.jspf&rev=3D61&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 Wed Jan 16 16:25:19 2008
@@ -29,10 +29,11 @@
<meta name=3D"robots" content=3D"index,follow"/>
=
<%
+ final JahiaData jData =3D (JahiaData) request.getAttribute("org.ja=
hia.data.JahiaData");
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"
+ <link href=3D"<content:contextURL/>/shared/css/<%=3DgetSiteSkin(skin, =
"DEFAULT_V3_LANG")%>.css" rel=3D"stylesheet"
type=3D"text/css"/>
<link href=3D"<content:contextURL/>/shared/css/menu.css" rel=3D"styles=
heet" type=3D"text/css"/>
<!--[if gte IE 7]><link href=3D"<content:contextURL/>/css/shared/ie7.c=
ss" rel=3D"stylesheet" type=3D"text/css" /><![endif]-->
@@ -61,14 +62,14 @@
<input type=3D"text" name=3D"search" size=3D"10"
value=3D'<%=3DJahiaTools.getStrParameter(reques=
t,"search","")%>'/>
<input type=3D"image" src=3D"<content:contextURL/>/ima=
ges/btn-search.gif"
- value=3D"<content:resourceBundle resourceBundle=
=3D"<%=3DresourceBundleName%>"
+ value=3D"<content:resourceBundle resourceBundle=
=3D"jahiatemplates.default_v3_lang"
resourceName=3D"header.search.alt"/>" border=3D"0" onm=
ouseover=3D"this.src=3D'<content:contextURL/>/images/btn-search-on.gif';"
onmouseout=3D"this.src=3D'<content:contextURL/>/images=
/btn-search.gif';" align=3D"absmiddle"/>
</div>
</form>
<ul>
<li><a href=3D"<jahiaHtml:siteMapLink />" class=3D"icon si=
temap"><content:resourceBundle
- resourceBundle=3D"<%=3DresourceBundleName%>" resou=
rceName=3D"header.sitemap"/></a></li>
+ resourceBundle=3D"jahiatemplates.default_v3_lang" =
resourceName=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
value=3D"${linkContactUs.title}" escapeXml=3D"=
false"/></a></li>
@@ -80,7 +81,7 @@
<content:absoluteContainerList id=3D"siteSettingsList" nam=
e=3D"siteSettings" pageLevel=3D"1">
<content:container id=3D"siteSettings">
<jahiaHtml:actionMenu name=3D"siteSettings" namePo=
stFix=3D""
- resourceBundle=3D"<%=3Dresou=
rceBundleName %>"
+ resourceBundle=3D"jahiatempl=
ates.default_v3_lang"
labelKey=3D"action.siteSetti=
ngs.edit">
<c:if test=3D"${!empty siteLogo}">
<a href=3D"<jahia:homePageURL/>">
Modified: trunk/src/jsp/common/page_image.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
page_image.jspf&rev=3D61&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/page_image.jspf (original)
+++ trunk/src/jsp/common/page_image.jspf Wed Jan 16 16:25:19 2008
@@ -15,14 +15,14 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<content:declareContainerList name=3D"pageImage" title=3D"Image" titleKey=
=3D"image" bundleKey=3D"<%=3DresBundleID%>">
+<content:declareContainerList name=3D"pageImage" title=3D"Image" titleKey=
=3D"image" bundleKey=3D"DEFAULT_V3_LANG">
<content:declareContainer>
- <content:declareField name=3D"image" title=3D"Image" titleKey=3D"i=
mage" bundleKey=3D"<%=3DresBundleID%>" type=3D"File"/>
+ <content:declareField name=3D"image" title=3D"Image" titleKey=3D"i=
mage" bundleKey=3D"DEFAULT_V3_LANG" type=3D"File"/>
</content:declareContainer>
</content:declareContainerList>
=
<content:absoluteContainerList name=3D"pageImage" id=3D"pageImage" pageLev=
el=3D"2">
- <jahiaHtml:actionMenu name=3D"pageImage" resourceBundle=3D"<%=3Dresour=
ceBundleName %>" useFieldSet=3D"true"
+ <jahiaHtml:actionMenu name=3D"pageImage" resourceBundle=3D"jahiatempla=
tes.default_v3_lang" useFieldSet=3D"true"
namePostFix=3D".pageImage">
<content:container id=3D"pageImageContainer">
<logic:notEmpty name=3D"pageImageContainer" property=3D"<%=3D"=
fieldObject(image)"%>">
@@ -30,7 +30,7 @@
</logic:notEmpty>
<c:choose>
<c:when test=3D"${!empty image && image.image}">
- <jahiaHtml:actionMenu name=3D"pageImageContainer" reso=
urceBundle=3D"<%=3DresourceBundleName %>"
+ <jahiaHtml:actionMenu name=3D"pageImageContainer" reso=
urceBundle=3D"jahiatemplates.default_v3_lang"
useFieldSet=3D"true" namePostFix=
=3D".pageImage">
<img src=3D"<c:out value=3D"${image.downloadUrl}" =
escapeXml=3D"false" />" border=3D"0" alt=3D"" /><br/>
</jahiaHtml:actionMenu>
@@ -38,15 +38,15 @@
<c:when test=3D"${editMode}">
<content:resourceBundle resourceBundle=3D"jahiatemplat=
es.default_v3_lang"
resourceName=3D"error.image.no=
Image"/>
- <jahiaHtml:actionMenu name=3D"pageImageContainer" reso=
urceBundle=3D"<%=3DresourceBundleName %>"
+ <jahiaHtml:actionMenu name=3D"pageImageContainer" reso=
urceBundle=3D"jahiatemplates.default_v3_lang"
useFieldSet=3D"false" namePostFi=
x=3D".pageImage"></jahiaHtml:actionMenu>
</c:when>
</c:choose>
</content:container>
<c:if test=3D"${pageImage.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/add.gif" alt=
=3D"+"
- border=3D"0"/> <content:resourceBundle resourc=
eBundle=3D"<%=3DresourceBundleName%>"
+ border=3D"0"/> <content:resourceBundle resourc=
eBundle=3D"jahiatemplates.default_v3_lang"
resourceN=
ame=3D"action.pageImage.add"/></a>
</c:if>
</jahiaHtml:actionMenu>
Modified: trunk/src/jsp/common/site_settings.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
site_settings.jspf&rev=3D61&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/site_settings.jspf (original)
+++ trunk/src/jsp/common/site_settings.jspf Wed Jan 16 16:25:19 2008
@@ -23,7 +23,7 @@
type=3D"File"
value=3D""
titleKey=3D"siteSettings.siteLogo"
- bundleKey=3D"<%=3DresBundleID%>"
+ bundleKey=3D"DEFAULT_V3_LANG"
/>
=
<content:declareField name=3D"footerSiteLogo"
@@ -31,13 +31,13 @@
type=3D"File"
value=3D""
titleKey=3D"siteSettings.footerSiteLogo"
- bundleKey=3D"<%=3DresBundleID%>"
+ bundleKey=3D"DEFAULT_V3_LANG"
/>
=
<content:declareField name=3D"footerCopyright"
title=3D"Footer copyright"
titleKey=3D"siteSettings.footerCopyright"
- bundleKey=3D"<%=3DresBundleID%>"
+ bundleKey=3D"DEFAULT_V3_LANG"
type=3D"BigText"
value=3D"© 2002-2008 Jahia Ltd - All ri=
ghts reserved - Website Designed by Intellogix"
/>
@@ -46,36 +46,36 @@
title=3D"Title Prefix"
type=3D"SmallText"
titleKey=3D"siteSettings.titlePrefix"
- bundleKey=3D"<%=3DresBundleID%>"
+ bundleKey=3D"DEFAULT_V3_LANG"
/>
=
<content:declareField name=3D"siteSkin"
title=3D"Skin"
type=3D"SharedSmallText"
titleKey=3D"siteSettings.siteSkin"
- value=3D"<%=3DJahiaTools.getMultiValuesSingl=
e(resBundleID, siteSkins)%>"
- bundleKey=3D"<%=3DresBundleID%>"
+ value=3D"<%=3DJahiaTools.getMultiValuesSingl=
e("DEFAULT_V3_LANG", siteSkins)%>"
+ bundleKey=3D"DEFAULT_V3_LANG"
/>
=
<content:declareField name=3D"defaultMetaDescription"
title=3D"Default Meta Description"
type=3D"SmallText"
titleKey=3D"siteSettings.defaultMetaDescript=
ion"
- bundleKey=3D"<%=3DresBundleID%>"
+ bundleKey=3D"DEFAULT_V3_LANG"
/>
=
<content:declareField name=3D"defaultMetaKeyword"
title=3D"Default Meta Keyword"
type=3D"SmallText"
titleKey=3D"siteSettings.defaultMetaKeyword"
- bundleKey=3D"<%=3DresBundleID%>"
+ bundleKey=3D"DEFAULT_V3_LANG"
/>
=
<content:declareField name=3D'linkContactUs'
title=3D"Contact us page"
type=3D"Page"
titleKey=3D"siteSettings.linkContactUs"
- bundleKey=3D"<%=3DresBundleID%>"
+ bundleKey=3D"DEFAULT_V3_LANG"
/>
</content:declareContainer>
</content:declareContainerList>
Modified: trunk/src/jsp/common/top_links.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
top_links.jspf&rev=3D61&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/top_links.jspf (original)
+++ trunk/src/jsp/common/top_links.jspf Wed Jan 16 16:25:19 2008
@@ -16,7 +16,7 @@
limitations under the License.
--%>
<content:absoluteContainerList name=3D"topLinks" id=3D"topLinks" pageLevel=
=3D"1">
- <jahiaHtml:actionMenu name=3D"topLinks" resourceBundle=3D"<%=3Dresourc=
eBundleName %>" useFieldSet=3D"true"
+ <jahiaHtml:actionMenu name=3D"topLinks" resourceBundle=3D"jahiatemplat=
es.default_v3_lang" useFieldSet=3D"true"
namePostFix=3D".topLinks">
<ul>
<content:container id=3D"topLinksContainer">
@@ -28,9 +28,9 @@
%>
<a href=3D"<c:out value=3D"${topLink.url}" escapeXml=
=3D"false" />" title=3D"<c:out value=3D"${topLink.title}"
=
escapeXml=3D"false"/>"
- class=3D"icon <%=3DgetTopIcon(linkIcon, resBundleID)%>=
"><c:out value=3D"${topLink.title}"
+ class=3D"icon <%=3DgetTopIcon(linkIcon, "DEFAULT_V3_LA=
NG")%>"><c:out value=3D"${topLink.title}"
=
escapeXml=3D"false"/></a>
- <jahiaHtml:actionMenu name=3D"topLinksContainer" resou=
rceBundle=3D"<%=3DresourceBundleName %>"
+ <jahiaHtml:actionMenu name=3D"topLinksContainer" resou=
rceBundle=3D"jahiatemplates.default_v3_lang"
useFieldSet=3D"false" namePostFi=
x=3D".topLinks">
</jahiaHtml:actionMenu>
</li>
Modified: trunk/src/jsp/common/top_tabs.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
top_tabs.jspf&rev=3D61&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/top_tabs.jspf (original)
+++ trunk/src/jsp/common/top_tabs.jspf Wed Jan 16 16:25:19 2008
@@ -15,9 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<content:declareContainerList name=3D"topTabs" title=3D"Top tabs" titleKey=
=3D"header.topTabs" bundleKey=3D"<%=3DresBundleID%>">
+<content:declareContainerList name=3D"topTabs" title=3D"Top tabs" titleKey=
=3D"header.topTabs" bundleKey=3D"DEFAULT_V3_LANG">
<content:declareContainer>
- <content:declareField name=3D"topTabLink" title=3D"Link" titleKey=
=3D"header.topTabLink" bundleKey=3D"<%=3DresBundleID%>"
+ <content:declareField name=3D"topTabLink" title=3D"Link" titleKey=
=3D"header.topTabLink" bundleKey=3D"DEFAULT_V3_LANG"
type=3D"Page"/>
</content:declareContainer>
</content:declareContainerList>
@@ -45,7 +45,7 @@
</c:when>
<c:otherwise>
<content:absoluteContainerList name=3D"topTabs" id=3D"topTabs"=
pageLevel=3D"1">
- <jahiaHtml:actionMenu name=3D"topTabs" resourceBundle=3D"<=
%=3DresourceBundleName %>" useFieldSet=3D"true"
+ <jahiaHtml:actionMenu name=3D"topTabs" resourceBundle=3D"j=
ahiatemplates.default_v3_lang" useFieldSet=3D"true"
namePostFix=3D".topTabs">
<table cellpadding=3D"5" cellspacing=3D"0" border=3D"0=
">
<tr>
@@ -56,7 +56,7 @@
value=3D"${topTabLink.title}" esca=
peXml=3D"false"/>"><c:out
value=3D"${topTabLink.title}" esca=
peXml=3D"false"/></a>
<jahiaHtml:actionMenu name=3D"topTabsC=
ontainer"
- resourceBundle=
=3D"<%=3DresourceBundleName %>" useFieldSet=3D"false"
+ resourceBundle=
=3D"jahiatemplates.default_v3_lang" useFieldSet=3D"false"
namePostFix=3D".=
topTabs">
</jahiaHtml:actionMenu>
</td>
Modified: trunk/src/jsp/content.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/content=
.jsp&rev=3D61&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/content.jsp (original)
+++ trunk/src/jsp/content.jsp Wed Jan 16 16:25:19 2008
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ include file=3D"common/declarations.jspf" %>
-<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
=
<div id=3D"main">
Modified: trunk/src/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/home.js=
p&rev=3D61&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/home.jsp (original)
+++ trunk/src/jsp/home.jsp Wed Jan 16 16:25:19 2008
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ include file=3D"common/declarations.jspf" %>
-<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
<%@ include file=3D"common/pub.jspf" %>
=
Modified: trunk/src/jsp/layoutmanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/layoutm=
anager.jsp&rev=3D61&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/layoutmanager.jsp (original)
+++ trunk/src/jsp/layoutmanager.jsp Wed Jan 16 16:25:19 2008
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ include file=3D"common/declarations.jspf" %>
-<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
<ajax:gwt-init/>
<ajax:gwt-import module=3D"org.jahia.ajax.gwt.layoutManager.JahiaLayoutMan=
ager"/>
@@ -26,7 +25,7 @@
=
<div id=3D"column-left" style=3D"display:none"> =
<!-- left box (start) -->
- <jsp:include page=3D"common/box/box.jsp" flush=3D"true">
+ <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
<jsp:param name=3D"name" value=3D"left_box_list"/>
<jsp:param name=3D"id" value=3D"1"/>
</jsp:include>
Modified: trunk/src/jsp/mysettings.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/mysetti=
ngs.jsp&rev=3D61&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/mysettings.jsp (original)
+++ trunk/src/jsp/mysettings.jsp Wed Jan 16 16:25:19 2008
@@ -18,7 +18,6 @@
<%@ page import=3D"org.jahia.engines.mysettings.MySettingsEngine" %>
<%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
<%@ include file=3D"common/declarations.jspf" %>
-<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
=
<%!
@@ -53,9 +52,11 @@
<div id=3D"column-main">
<jesi:fragment cache=3D"no">
<%
- Locale locale =3D (Locale) session.getAttribute(ParamBean.SESSION_LOCA=
LE);
- String[] defaultkeys =3D {"firstname", "lastname", "organization", "em=
ail"};
- String[] defaultRkeys =3D {"mySettingsFirstName", "mySettingsLastName"=
, "mySettingsOrganization", "mySettingsEmail"};
+ final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.=
data.JahiaData");
+ final HashMap engineMap =3D (HashMap) request.getAttribute( "org.jahia=
.engines.EngineHashMap" );
+ final Locale locale =3D (Locale) session.getAttribute(ParamBean.SESSIO=
N_LOCALE);
+ final String[] defaultkeys =3D {"firstname", "lastname", "organization=
", "email"};
+ final String[] defaultRkeys =3D {"mySettingsFirstName", "mySettingsLas=
tName", "mySettingsOrganization", "mySettingsEmail"};
%>
=
<script type=3D"text/javascript" language=3D"javascript">
Modified: trunk/src/jsp/mysettingschanged.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/mysetti=
ngschanged.jsp&rev=3D61&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/mysettingschanged.jsp (original)
+++ trunk/src/jsp/mysettingschanged.jsp Wed Jan 16 16:25:19 2008
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ include file=3D"common/declarations.jspf" %>
-<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
<jesi:template>
<div id=3D"main">
Modified: trunk/src/jsp/sitemap.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/sitemap=
.jsp&rev=3D61&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/sitemap.jsp (original)
+++ trunk/src/jsp/sitemap.jsp Wed Jan 16 16:25:19 2008
@@ -16,16 +16,18 @@
limitations under the License.
--%>
<%@ include file=3D"common/declarations.jspf" %>
-<%@ include file=3D"common/common_vars.jspf" %>
-<%@ include file=3D"common/header.jspf"%>
- <div id=3D"main">
- <div id=3D"column-left"> </div>
- <div id=3D"column-main">
- <div id=3D"content">
- <% final String entryPoint =3D
jData.params().getSite().getHomeCont=
entPage().getObjectKey().toString(); %>
- <ajax:complexTreeInclude divID=3D"tree1"
style=3D"<%=3DComplexTreeIn=
clude.SITEMAP_STYLE%>" title=3D"Site Map" entryPointKey=3D"<%=3DentryPoint%=
>"/> =
- </div>
- </div>
- <div id=3D"main-bottom"></div>
- </div>
-<%@ include file=3D"common/footer.jspf"%>
+<%@ include file=3D"common/header.jspf" %>
+<div id=3D"main">
+ <div id=3D"column-left"> </div>
+ <div id=3D"column-main">
+ <div id=3D"content">
+ <%
+ final JahiaData jData =3D (JahiaData) request.getAttribute=
("org.jahia.data.JahiaData");
+ final String entryPoint =3D jData.getProcessingContext().g=
etSite().getHomeContentPage().getObjectKey().toString(); %>
+ <ajax:complexTreeInclude divID=3D"tree1" style=3D"<%=3DComplex=
TreeInclude.SITEMAP_STYLE%>" title=3D"Site Map"
+ entryPointKey=3D"<%=3DentryPoint%>"/>
+ </div>
+ </div>
+ <div id=3D"main-bottom"></div>
+</div>
+<%@ include file=3D"common/footer.jspf" %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
