Author: xlawrence
Date: Tue Jan 22 17:20:00 2008
New Revision: 70
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D70&repname=3D=
corporate_portal_templates_v3
Log:
added fullscreenbox templates
added <% page %> statements
Added:
trunk/src/jsp/fullscreenbox.jsp
Modified:
trunk/src/jsp/common/box/lastNewsBoxDisplay.jsp
trunk/src/jsp/home.jsp
trunk/src/jsp/layoutmanager.jsp
trunk/src/jsp/simple.jsp
trunk/src/jsp/templates.xml
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=3D70&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 Tue Jan 22 17:20:00 2008
@@ -16,158 +16,27 @@
limitations under the License.
--%>
<%@ include file=3D"../declarations.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";
- ContainerBean boxContainerBean =3D (ContainerBean) pageContext.findAtt=
ribute("boxContainer");
- JahiaContainer boxContainer =3D boxContainerBean.getJahiaContainer();
- JahiaContainerList maxContainerList =3D boxContainer.getContainerList(=
"news");
- Enumeration newsEnumeration =3D maxContainerList.getContainers();
- Set categories =3D Category.getObjectCategories(boxContainerBean.getCo=
ntentContainer().getObjectKey());
- if (jData.gui().isEditMode()) {
- StringBuffer displayNewsFromCategories =3D new StringBuffer("");
- Iterator ite =3D categories.iterator();
- while (ite.hasNext()) {
- Category curCategory =3D (Category) ite.next();
- if (curCategory !=3D null) {
- String categoryTitle =3D curCategory.getTitle(jParams.getL=
ocale());
- if (categoryTitle =3D=3D null) {
- categoryTitle =3D curCategory.getKey();
- }
- displayNewsFromCategories.append(categoryTitle);
- if (ite.hasNext()) {
- displayNewsFromCategories.append(", ");
- }
- }
- }
- if (licenseEnabled) {
-%><br/><content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3=
_lang"
- resourceName=3D"blog.categories"/>: <%=3Ddi=
splayNewsFromCategories.toString()%>
-
-<br/>
-<% if (Jahia.getSettings().isEsiCacheActivated()) {
- JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getAttri=
bute(JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE);%>
-<content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3_lang"
- resourceName=3D"newsbox.cache" defaultValue=3D"Cac=
he expiration"/>: <%=3DfragmentTag.getExpiration()%>
-<content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3_lang"
- resourceName=3D"newsbox.seconds" defaultValue=3D"S=
econds"/>
-
-<%
-} else {
- SimpleDateFormat dateFormat =3D new SimpleDateFormat("dd. MMM yyyy HH:=
mm:ss");
-%>
-<content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3_lang"
- resourceName=3D"newsbox.cache"
- defaultValue=3D"Cache expiration"/>: <%=3DdateForm=
at.format(jParams.getCacheExpirationDate())%>
-<%
- }
- if ("".equals(displayNewsFromCategories.toString())) {
-%>
-<content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3_lang"
- resourceName=3D"message.addCategory"/>
-<%
- }
- }
- }
-// create the filter
- Vector filtersVector =3D new Vector();
-
-// Set filters for box categ
- if (!categories.isEmpty()) {
- ContainerFilterByCategories containerFilter =3D
- new ContainerFilterByCategories(categories, jParams.getEnt=
ryLoadRequest(), false);
- filtersVector.add(containerFilter);
- }
-
-// set filter for date
-//if (! isEditMode) {
-// long now =3D (new Date()).getTime();
-// ContainerFilterBean dateFilter =3D new ContainerFilterBean("date",tr=
ue,jParams.getEntryLoadRequest());
-// dateFilter.addClause(ContainerFilterBean.COMP_SMALLER, String.valueO=
f(now) );
-// filtersVector.add(dateFilter);
-//}
-
-// get all containers in site
- ContainerFilterByContainerDefinition filterByContainerDefinition =3D
- new ContainerFilterByContainerDefinition("newsCl", jParams.get=
EntryLoadRequest());
- filtersVector.add(filterByContainerDefinition);
-
- if (filtersVector.size() > 0) {
-
- ContainerFilters containerFilters =3D new ContainerFilters(
- filtersVector, jParams.getSiteID(), "newsCl");
- request.setAttribute("newsCl_filter_handler", containerFilters);
- }
-
-// sort by date desc
- ContainerSorterByContainerDefinition entries_sort_handler =3D
- new ContainerSorterByContainerDefinition(jParams.getSiteID(), =
"date", "newsCl", true, jParams.getEntryLoadRequest());
- entries_sort_handler.setDescOrdering();
- request.setAttribute("newsCl_sort_handler", entries_sort_handler);
-
-//logger.debug("Set container list pagination on newsContainerList to " + =
windowSize + " (" + pageContext.getAttribute("boxtitle") + ")");
- request.setAttribute("newsCl_windowsize", windowSize);
-
-// if containerList empty then create it.
- JahiaContainerList newsContainerList =3D jData.containers().getContain=
erList("newsCl");
- if (newsContainerList !=3D null && newsContainerList.getID() =3D=3D 0)=
{
- ServicesRegistry.getInstance().getJahiaContainersService().
- saveContainerListInfo(newsContainerList, jParams.getConten=
tPage().getAclID());
- }
- newsContainerList.setIsContainersLoaded(false);
- Enumeration newsContainers =3D newsContainerList.getContainers();
- SimpleDateFormat sdf =3D new SimpleDateFormat("dd/MM/yyyy", jParams.ge=
tLocale());
-
- while (newsContainers.hasMoreElements()) {
- JahiaContainer newsContainer =3D (JahiaContainer) newsContainers.n=
extElement();
- String newsTitle =3D newsContainer.getFieldValue("newsTitle", "");
- String newsDesc =3D newsContainer.getFieldValue("newsDesc", "");
- String excerpt =3D removeTags(newsDesc);
- if ((excerpt.length()) > 155) {
- excerpt =3D excerpt.substring(0, 155 - 3) + "...";
- }
- JahiaPage link =3D (JahiaPage) newsContainer.getFieldObject("link"=
);
- String newsPageUrl =3D jParams.composePageUrl(newsContainer.getPag=
eID());
- long dateLong =3D -1;
- try {
- dateLong =3D Long.parseLong((String) newsContainer.getFieldObj=
ect("date"));
- } catch (NumberFormatException nfe) {
- }
- String dateStr =3D sdf.format(new Date(dateLong));
- if (!newsTitle.equals("")) {
-%>
-<div class=3D"new">
- <a href=3D"<%=3DnewsPageUrl%>?newsContainerId=3D<%=3DnewsContainer.get=
ID()%>"><strong><%=3DnewsTitle%>
- </strong> - <%=3DdateStr%>
- </a>
- <%
- if (!jData.gui().html().drawUpdateContainerLauncher(newsContainer)=
.equals("")) {
- %><a href=3D"javascript:<%=3D jData.gui().html().drawUpdateContainerLa=
uncher( newsContainer )%>"
- ><img src=3D"<%=3DcontextURL%>/img/actions/update.gif" width=3D"11=
" height=3D"11" border=3D"0" alt=3D"Edit"></a><%
- }
-%>
- <br/>
- <%=3Dexcerpt%>
- <%
- if (link !=3D null) {
- %><br/><a href=3D"<%=3Dlink.getUrl(jData.params())%>"><%=3Dlink.getTit=
le()%>
-</a><%
- }
-%>
-</div>
-<%
- }
- }
-%>
+
+<jesi:fragment expiration=3D"0"/>
+
+<content:containerList name=3D"lastNews${boxID}" id=3D"lastNews" parentCon=
tainerName=3D"boxContainer" windowSize=3D"10">
+ <content:containerQuery contentDefinitionNames=3D"newsCl" siteLevelQue=
ry=3D"true">
+ <content:order propertyName=3D"date" order=3D"desc"/>
+ </content:containerQuery>
+
+ <content:container id=3D"lastNewsContainer">
+
+
+ <jahiaHtml:actionMenu name=3D"lastNewsContainer" namePostFix=3D".l=
astNews"
+ resourceBundle=3D"jahiatemplates.default_v3_=
lang">
+ </jahiaHtml:actionMenu>
+
+
+ </content:container>
+
+ <jahiaHtml:actionMenu name=3D"lastNews" namePostFix=3D".webapps"
+ resourceBundle=3D"jahiatemplates.default_v3_lang=
" useFieldSet=3D"false"
+ labelKey=3D"add.lastNews">
+ </jahiaHtml:actionMenu>
+
+</content:containerList>
Added: trunk/src/jsp/fullscreenbox.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
fullscreenbox.jsp&rev=3D70&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/fullscreenbox.jsp (added)
+++ trunk/src/jsp/fullscreenbox.jsp Tue Jan 22 17:20:00 2008
@@ -0,0 +1,34 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
+<%--
+Copyright 2002-2008 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 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
+limitations under the License.
+--%>
+<%@ include file=3D"common/declarations.jspf" %>
+<%@ include file=3D"common/header.jspf" %>
+<div id=3D"main">
+ <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"=
kind=3D"topTabs"/>
+
+ <div id=3D"column-full">
+ <!-- main column (start) -->
+ <jahiaHtml:include page=3D"common/box/box.jsp">
+ <jahiaHtml:param name=3D"name" value=3D"fullScreen_box_list"/>
+ <jahiaHtml:param name=3D"id" value=3D"1"/>
+ </jahiaHtml:include>
+ <!-- main column (end) -->
+ </div>
+ <div id=3D"main-bottom"></div>
+</div>
+<%@ include file=3D"common/footer.jspf" %>
\ No newline at end of file
Modified: trunk/src/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/home.js=
p&rev=3D70&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 Tue Jan 22 17:20:00 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
<%--
Copyright 2002-2008 Jahia Ltd
=
Modified: trunk/src/jsp/layoutmanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/layoutm=
anager.jsp&rev=3D70&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 Tue Jan 22 17:20:00 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
<%--
Copyright 2002-2008 Jahia Ltd
=
@@ -23,14 +24,6 @@
<div id=3D"main">
<jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang" =
kind=3D"topTabs"/>
=
-<div id=3D"column-left" style=3D"display:none"> =
- <!-- left box (start) -->
- <jahiaHtml:include page=3D"common/box/box_layoutmanager.jsp">
- <jahiaHtml:param name=3D"name" value=3D"left_box_list"/>
- <jahiaHtml:param name=3D"id" value=3D"1"/>
- </jahiaHtml:include>
- <!-- left box (end) -->
- </div>
<div id=3D"column-full">
<!-- main column (start) -->
<jahiaHtml:include page=3D"common/box/box_layoutmanager.jsp">
Modified: trunk/src/jsp/simple.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/simple.=
jsp&rev=3D70&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/simple.jsp (original)
+++ trunk/src/jsp/simple.jsp Tue Jan 22 17:20:00 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
<%--
Copyright 2002-2008 Jahia Ltd
=
Modified: trunk/src/jsp/templates.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/templat=
es.xml&rev=3D70&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/templates.xml (original)
+++ trunk/src/jsp/templates.xml Tue Jan 22 17:20:00 2008
@@ -1,5 +1,6 @@
<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<template-set xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"; xmln=
s=3D"http://www.jahia.net/jahia/templates"; xsi:schemaLocation=3D"http://www=
.jahia.net/jahia/templates http://www.jahia.net/shemas/templates_2_0.xsd";>
+<template-set xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"; xmln=
s=3D"http://www.jahia.net/jahia/templates";
+ xsi:schemaLocation=3D"http://www.jahia.net/jahia/templates h=
ttp://www.jahia.net/shemas/templates_2_0.xsd">
<package-name>Default V3</package-name>
<root-folder>default_v3</root-folder>
<classes-file>default_v3_jahiatemplates.jar</classes-file>
@@ -15,6 +16,7 @@
<template name=3D"Double" display-name=3D"Double" filename=3D"doub=
le.jsp"/>
<template name=3D"Home" display-name=3D"Home" filename=3D"home.jsp=
"/>
<template name=3D"Layoutmanager" display-name=3D"Layout manager" f=
ilename=3D"layoutmanager.jsp"/>
+ <template name=3D"Fullscreenbox" display-name=3D"Full Screen Box" =
filename=3D"fullscreenbox.jsp"/>
</templates>
</template-set>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
