Author: dpillot
Date: Wed May 30 18:15:01 2007
New Revision: 687
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D687&repname=
=3Dcorporate_portal_templates_v2
Log:
TEMPLATES-235, 237
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/layout.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_files.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_links.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_news.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_text.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_webapps.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/layout.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/layout_fullscreen.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/layout_standard.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/layout.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/layout.jsp&rev=3D687&repname=3Dcorporate_portal_templates_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/layout.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/layout.jsp Wed May 30 18:15:01 2007
@@ -1,18 +1,18 @@
<%--
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.
--%><%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
<jesi:template >
@@ -128,10 +128,24 @@
<%@ include file=3D"common/declarations.inc"%>
<%@ include file=3D"common/common_vars.inc"%>
<%@ include file=3D"common/definitions.inc"%>
+<%
+isFullScreen=3Dtrue;
+%>
<%@ include file=3D"common/top.inc"%>
=
<jesi:fragment >
<div class=3D"full2">
+<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>
+ </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;">
<jsp:include page=3D"common/pagetitle.jsp" flush=3D"true"/>
<div style=3D"display:block;float:left;width:100%;border-color: gray;bord=
er-width: 0px 0px 0px 1px;border-style: none none none dotted;padding: 10px=
;">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_files.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/portal2/box_files.inc&rev=3D687&repname=3Dcorporate_portal_=
templates_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/portal2/box_files.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_files.inc Wed May 30 1=
8:15:01 2007
@@ -1,21 +1,21 @@
<%--
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.
--%><table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
-<content:containerList name=3D'<%=3D"PfilesContainer" + id%>' id=3D"filesC=
ontainerList" parentContainerName=3D"boxContainer">
+<content:containerList name=3D'<%=3D"filesContainer" + id%>' id=3D"filesCo=
ntainerList" parentContainerName=3D"boxContainer">
<content:container id=3D"filesContainer">
<%
ContainerBean filesContainerBean =3D (ContainerBean) pageContext.f=
indAttribute("filesContainer");
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_links.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/portal2/box_links.inc&rev=3D687&repname=3Dcorporate_portal_=
templates_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/portal2/box_links.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_links.inc Wed May 30 1=
8:15:01 2007
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%><table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
-<content:containerList name=3D'<%=3D"PlinksContainer" + id%>' id=3D"linksC=
ontainerList" parentContainerName=3D"boxContainer">
+<content:containerList name=3D'<%=3D"linksContainer" + id%>' id=3D"linksCo=
ntainerList" parentContainerName=3D"boxContainer">
<content:container id=3D"linksContainer">
<% rowColorCount++; %>
<tr bgcolor=3D'<%=3DrowColorCount % 2 =3D=3D 1 ? "#ffffff" : "#ddd=
ddd"%>'>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_news.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/portal2/box_news.inc&rev=3D687&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/portal2/box_news.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_news.inc Wed May 30 18=
:15:01 2007
@@ -1,21 +1,21 @@
<%--
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.
--%><%
-JahiaContainerList newsContainerList =3D theContainer.getContainerList( "P=
newsContainer" + id);
+JahiaContainerList newsContainerList =3D theContainer.getContainerList( "n=
ewsContainer" + id);
Enumeration newsEnumeration =3D newsContainerList.getContainers();
long cacheExpirationDelay =3D Long.MAX_VALUE;
int newsCount =3D 0;
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_text.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/portal2/box_text.inc&rev=3D687&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/portal2/box_text.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_text.inc Wed May 30 18=
:15:01 2007
@@ -1,20 +1,20 @@
<%--
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.
---%><content:containerList name=3D'<%=3D"PtextContainer" + id%>' id=3D"tex=
tContainerList" parentContainerName=3D"boxContainer">
+--%><content:containerList name=3D'<%=3D"textContainer" + id%>' id=3D"text=
ContainerList" parentContainerName=3D"boxContainer">
<content:container id=3D"textContainer">
<jahiaHtml:actionMenu name=3D"textContainer" namePostFix=3D"" reso=
urceBundle=3D"jahiatemplates.Corporate_portal_templates_v2">
<logic:present name=3D"textContainer" property=3D'<%=3D"field(=
textimage)"%>'>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_webapps.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/portal2/box_webapps.inc&rev=3D687&repname=3Dcorporate_porta=
l_templates_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/portal2/box_webapps.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/box_webapps.inc Wed May 30=
18:15:01 2007
@@ -1,20 +1,20 @@
<%--
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.
---%><content:containerList name=3D'<%=3D"PwebappsContainer" + id%>' id=3D"=
webappsContainerList" parentContainerName=3D"boxContainer">
+--%><content:containerList name=3D'<%=3D"webappsContainer" + id%>' id=3D"w=
ebappsContainerList" parentContainerName=3D"boxContainer">
<content:container>
<content:applicationField name=3D'webapp' id=3D"webapp" display=3D=
"false" />
<logic:present name=3D"webapp" property=3D"object">
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/layout.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/portal2/layout.jsp&rev=3D687&repname=3Dcorporate_portal_tem=
plates_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/portal2/layout.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/layout.jsp Wed May 30 18:1=
5:01 2007
@@ -1,18 +1,18 @@
<%--
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.
--%><%@ page language=3D"java" %>
<%@ page import=3D"org.jahia.data.containers.JahiaContainer"%>
@@ -92,9 +92,9 @@
jParams.setOperationMode(savedOperationMode);
jParams.setCacheStatus(savedCacheStatus);
String languageCode =3D jParams.getLocale().toString();
- =
+
boolean advSearchLicenseEnabled =3D LicenseActionChecker.isAuthorizedB=
yLicense("org.jahia.engines.search.advancedSearch", 0);
- =
+
String id =3D request.getParameter("id"); // must be different if this=
jsp is called more than one time
String rowColor =3D "#ffffff";
int rowColorCount =3D 0;
@@ -103,7 +103,7 @@
String chatstatus=3D(String) session.getAttribute("chatstatus");
if(chatstatus=3D=3Dnull) chatstatus=3D"false";
=
- =
+
=
// usefull buttons
=
@@ -516,14 +516,14 @@
validatorKey=3D"boxValidationBean"
>
<content:declareContainer>
-<content:declareField name=3D'PboxTitle'
+<content:declareField name=3D'boxTitle'
title=3D"Title"
titleKey=3D"boxTitle"
bundleKey=3D"<%=3DresBundleID%>"
aliasNames=3D"boxTitle"
type=3D"SmallText"
/>
-<content:declareField name=3D'PboxType'
+<content:declareField name=3D'boxType'
title=3D"Content"
titleKey=3D"content"
bundleKey=3D"<%=3DresBundleID%>"
@@ -531,7 +531,7 @@
aliasNames=3D"boxType"
value=3D"<%=3DgetMultivalues(resBundleID,boxTypes)%>"
/>
-<content:declareField name=3D'PboxTitleLayout'
+<content:declareField name=3D'boxTitleLayout'
title=3D"Title Layout"
titleKey=3D"titleLayout"
bundleKey=3D"<%=3DresBundleID%>"
@@ -539,7 +539,7 @@
aliasNames=3D"boxTitleLayout"
value=3D"<%=3DgetMultivalues(resBundleID,boxTitleTyp=
es)%>"
/>
-<content:declareField name=3D'PboxContentLayout'
+<content:declareField name=3D'boxContentLayout'
title=3D"Content Layout"
titleKey=3D"contentLayout"
bundleKey=3D"<%=3DresBundleID%>"
@@ -549,7 +549,7 @@
/>
=
<%//------------------------files-----------------------------------------=
%>
-<content:declareContainerList name=3D'<%=3D"PfilesContainer" + id%>'
+<content:declareContainerList name=3D'<%=3D"filesContainer" + id%>'
title=3D"Files Container"
titleKey=3D"filesContainer"
bundleKey=3D"<%=3DresBundleID%>"
@@ -578,14 +578,14 @@
=
=
<%//------------------------links-----------------------------------------=
%>
-<content:declareContainerList name=3D'<%=3D"PlinksContainer" + id%>'
+<content:declareContainerList name=3D'<%=3D"linksContainer" + id%>'
title=3D"Links Container"
titleKey=3D"linksContainer"
bundleKey=3D"<%=3DresBundleID%>"
aliasNames=3D"boxLinks"
>
<content:declareContainer>
- <content:declareField name=3D'Pboxlink'
+ <content:declareField name=3D'boxlink'
title=3D"Link"
titleKey=3D"link"
bundleKey=3D"<%=3DresBundleID%>"
@@ -603,7 +603,7 @@
</content:declareContainerList>
=
<%//-------------------------text---------------------------------------- =
%>
-<content:declareContainerList name=3D'<%=3D"PtextContainer" + id%>'
+<content:declareContainerList name=3D'<%=3D"textContainer" + id%>'
title=3D"Free text and Container"
titleKey=3D"freeTextContainer"
bundleKey=3D"<%=3DresBundleID%>"
@@ -628,7 +628,7 @@
</content:declareContainerList>
=
<%//-------------------------webapp---------------------------------------=
- %>
-<content:declareContainerList name=3D'<%=3D"PwebappsContainer" + id%>'
+<content:declareContainerList name=3D'<%=3D"webappsContainer" + id%>'
title=3D"Webapps Container"
titleKey=3D"webappsContainer"
bundleKey=3D"<%=3DresBundleID%>"
@@ -646,7 +646,7 @@
</content:declareContainerList>
=
<%//----------------------------news------------------------------------- =
%>
-<content:declareContainerList name=3D'<%=3D"PnewsContainer" + id%>'
+<content:declareContainerList name=3D'<%=3D"newsContainer" + id%>'
title=3D"News Container"
titleKey=3D"newsContainer"
bundleKey=3D"<%=3DresBundleID%>"
@@ -723,15 +723,15 @@
int fullScreenFieldID =3D -1;
=
Vector boxContainerFields =3D new Vector();
- boxContainerFields.add( "PboxTitle" );
- boxContainerFields.add( "PboxType" );
- boxContainerFields.add( "PboxTitleLayout" );
- boxContainerFields.add( "PboxContentLayout" );
- boxContainerFields.add( "PfilesContainer" + id ); // Files Container
- boxContainerFields.add( "PlinksContainer" + id ); // Links Container
- boxContainerFields.add( "PtextContainer" + id ); // Free Text Conta=
iner
- boxContainerFields.add( "PwebappsContainer" + id ); // Webapps Contain=
er
- boxContainerFields.add( "PnewsContainer" + id ); // News Container
+ boxContainerFields.add( "boxTitle" );
+ boxContainerFields.add( "boxType" );
+ boxContainerFields.add( "boxTitleLayout" );
+ boxContainerFields.add( "boxContentLayout" );
+ boxContainerFields.add( "filesContainer" + id ); // Files Container
+ boxContainerFields.add( "linksContainer" + id ); // Links Container
+ boxContainerFields.add( "textContainer" + id ); // Free Text Contai=
ner
+ boxContainerFields.add( "webappsContainer" + id ); // Webapps Container
+ boxContainerFields.add( "newsContainer" + id ); // News Container
//boxContainerFields.add( "linkNewsListContainer" + id ); // News C=
ontainer
=
jData.containers().declareContainer("PortletContentList", "Portlet Con=
tainer", boxContainerFields,
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/layout_fullscreen.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/portal2/layout_fullscreen.inc&rev=3D687&repname=3Dcorporate=
_portal_templates_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/portal2/layout_fullscreen.inc (ori=
ginal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/layout_fullscreen.inc Wed =
May 30 18:15:01 2007
@@ -1,18 +1,18 @@
<%--
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.
--%><%
theContainer =3D jData.containers().getContainer(fullScreenContainerID);
@@ -21,10 +21,10 @@
<td width=3D"100%" height=3D"100%" valign=3D"top">
<table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" width=3D"1=
00%" height=3D"100%">
<%
- String boxTitle =3D theContainer.getFieldValue("PboxTitle" , "", =
true , jData.params());
- String boxTypeKey =3D (String) theContainer.getFieldValue("PboxTy=
pe" );
- String boxTitleLayoutKey =3D (String)theContainer.getFieldValue("P=
boxTitleLayout" );
- String boxContentLayoutKey =3D (String)theContainer.getFieldValue(=
"PboxContentLayout" );
+ String boxTitle =3D theContainer.getFieldValue("boxTitle" , "", t=
rue , jData.params());
+ String boxTypeKey =3D (String) theContainer.getFieldValue("boxTyp=
e" );
+ String boxTitleLayoutKey =3D (String)theContainer.getFieldValue("b=
oxTitleLayout" );
+ String boxContentLayoutKey =3D (String)theContainer.getFieldValue(=
"boxContentLayout" );
=
%>
<tr>
@@ -48,19 +48,19 @@
=
// Files Container
if ( boxTypeKey.equals(ResourceBundleMarker.drawMarker(res=
BundleID,"files","")) ){
- %><!--%@ include file=3D"box_files.inc"%--><%
+ %><%@ include file=3D"box_files.inc"%><%
=
// Links Container
} else if ( boxTypeKey.equals(ResourceBundleMarker.drawMar=
ker(resBundleID,"links","")) ){
- %><!--%@ include file=3D"box_links.inc"%--><%
+ %><%@ include file=3D"box_links.inc"%><%
=
// Webapps
} else if ( boxTypeKey.equals(ResourceBundleMarker.drawMar=
ker(resBundleID,"webapps","")) ){
- %><!--%@ include file=3D"box_webapps.inc"%--><%
+ %><%@ include file=3D"box_webapps.inc"%><%
=
// News
} else if ( boxTypeKey.equals(ResourceBundleMarker.drawMar=
ker(resBundleID,"news","")) ){
- %><!--%@ include file=3D"box_news.inc"%--><%
+ %><%@ include file=3D"box_news.inc"%><%
=
// Free Text (Default)
} else {
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/layout_standard.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/portal2/layout_standard.inc&rev=3D687&repname=3Dcorporate_p=
ortal_templates_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/portal2/layout_standard.inc (origi=
nal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/layout_standard.inc Wed Ma=
y 30 18:15:01 2007
@@ -63,7 +63,7 @@
// good old way ..
theContainer =3D jData.containers().getContainer(thePo=
rtlet.getPortletSourceID());
}
- =
+
boolean hasRight =3D !jData.gui().html().drawUpdateContain=
erLauncher( theContainer ).equals("");
if (theContainer !=3D null) {
%>
@@ -87,10 +87,10 @@
<td width=3D"100%" height=3D"100%" valign=3D"t=
op">
</logic:equal>
<%
- String boxTitle =3D theContainer.getFieldV=
alue("PboxTitle" , "", true , jData.params());
- String boxTypeKey =3D (String) theContain=
er.getFieldValue("PboxType" );
- String boxTitleLayoutKey =3D (String)theCo=
ntainer.getFieldValue("PboxTitleLayout" );
- String boxContentLayoutKey =3D (String)the=
Container.getFieldValue("PboxContentLayout" );
+ String boxTitle =3D theContainer.getFieldV=
alue("boxTitle" , "", true , jData.params());
+ String boxTypeKey =3D (String) theContain=
er.getFieldValue("boxType" );
+ String boxTitleLayoutKey =3D (String)theCo=
ntainer.getFieldValue("boxTitleLayout" );
+ String boxContentLayoutKey =3D (String)the=
Container.getFieldValue("boxContentLayout" );
boolean displayBox =3D true;
if ( "".equals(boxTitle)) {
if (! jData.gui().isEditMode()){
@@ -105,7 +105,7 @@
=
int fieldID =3D 0;
if ( boxTypeKey.equals(ResourceBundleM=
arker.drawMarker(resBundleID,"webapps","")) ){
- JahiaContainerList webappsContaine=
r_tmp =3D theContainer.getContainerList( "PwebappsContainer" + id);
+ JahiaContainerList webappsContaine=
r_tmp =3D theContainer.getContainerList( "webappsContainer" + id);
Enumeration webappsContainerList_t=
mp =3D webappsContainer_tmp.getContainers();
int appCounter =3D 0;
while (webappsContainerList_tmp.ha=
sMoreElements()) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
