Author: pvollenweider
Date: Fri Oct 19 11:59:28 2007
New Revision: 820
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D820&repname=
=3Dcorporate_portal_templates_v2
Log:
Keep only following templates
- Home
- Simple
- Double
- FAQ
- Form Generator
- Full screen
Keep only following boxes:
- News
- Files
- Links
- Text
- Portlets
- Pages
Other templates and boxes will be downloadable separately.
Removed:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_listing_rss_2_0.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blog_rss_2_0.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/addcomment_form.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/blog_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/categories.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/definitions.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entry.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/filters.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/list.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/listing_filters.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/searchbox.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_comments.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_pingurl.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_trackbacks.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/dav.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/filterWizards.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/groupsContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/pollbox.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/usersContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/categories.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/directories.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/container_revisions_listing.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/declaration_sources.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/declaration_types.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/definitions.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/filters.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/page_categories_list.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/pagination_bar.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/sources.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/types.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/docinfo.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/document_detail.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/document_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/folder.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/img/blog/
branches/JAHIA-5-0-SP-BRANCH/src/jsp/img/ldap/
branches/JAHIA-5-0-SP-BRANCH/src/jsp/layout.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap/
branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_pop.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/ldap_search.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/mediagallery/
branches/JAHIA-5-0-SP-BRANCH/src/jsp/mediagallery.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/metadataapi.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/metadatas/
branches/JAHIA-5-0-SP-BRANCH/src/jsp/people.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/poll/
branches/JAHIA-5-0-SP-BRANCH/src/jsp/poll.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/portal2/
branches/JAHIA-5-0-SP-BRANCH/src/jsp/project.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/quizz/
branches/JAHIA-5-0-SP-BRANCH/src/jsp/quizz.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/quizz_csv.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/survey/
branches/JAHIA-5-0-SP-BRANCH/src/jsp/survey.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/survey_csv.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/testFields.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/user_ldap_search.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/webdav.jsp
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/eventlistener.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top_declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/eventlistener.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/templates.xml
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/eventlistener.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/eventlistener.inc&rev=3D820&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/blogs/eventlistener.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/eventlistener.inc Fri Oct 19=
11:59:28 2007
@@ -15,172 +15,3 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<[EMAIL PROTECTED] import=3D"org.jahia.services.acl.JahiaBaseACL"%>
-<[EMAIL PROTECTED] import=3D"org.jahia.services.acl.ACLInfo"%>
-<[EMAIL PROTECTED] import=3D"org.jahia.hibernate.model.JahiaAclEntry"%>
-<[EMAIL PROTECTED]
import=3D"org.jahia.services.usermanager.JahiaGroupManagerService"=
%>
-<%@ page import=3D"java.util.ArrayList" %>
-<%
-if ( "blogs".equals(theContainer.getDefinition().getName()) ){
- if ( "addContainerEngineAfterInit".equals(eventName) ) {
- logger.debug("Start eventlistner for event addContainerEngineAfter=
Init for blogs");
- // we want to init the page field
- JahiaField theField =3D theContainer.getField("blogPage");
- JahiaPageEngineTempBean pageBean =3D null;
-
- HashMap pageBeans =3D (HashMap)jParams.
- getSessionState().getAttribute("Page_Field.PageBeans");
- if ( pageBeans =3D=3D null ){
- pageBeans =3D new HashMap();
- jParams.getSessionState().setAttribute("Page_Field.PageBeans",=
pageBeans);
- }
-
- // Verify if this page field was not already edited in this sessio=
n.
- pageBean =3D (JahiaPageEngineTempBean)pageBeans.get(theField.getDe=
finition().getName());
-
- if (pageBean =3D=3D null) {
- JahiaPage currentPage =3D jParams.getPage();
- String currentTemplateName =3D currentPage.getPageTemplate().g=
etName();
- logger.debug("Current templates =3D " + currentTemplateName);
- String defaultTemplate =3D "";
- if ("Blog listing".equals(currentTemplateName)) {
- defaultTemplate =3D "Blog";
- }
- logger.debug("defaultTemplate is [" + defaultTemplate + "]");
- if (! "".equals(defaultTemplate)) {
- JahiaPageDefinition pageDef =3D ServicesRegistry.getInstan=
ce().getJahiaPageTemplateService()
- .lookupPageTemplateByName (defaultTemplate, jParams.ge=
tSiteID());
- logger.debug("pageDef ID is [" + pageDef.getID() + "]");
-
- // First call or recall of engine.
- jParams.getSessionState().removeAttribute(SelectPage_Engin=
e.SESSION_PARAMS);
- if (theField.getObject() =3D=3D null) { // Is it a new pag=
e ?
- logger.debug("First call or recall of engine. This is =
a new page");
- boolean isLinkOnly =3D theField.getValue().toLowerCase=
().indexOf("jahia_linkonly") !=3D -1;
- pageBean =3D new JahiaPageEngineTempBean(
- -1, // Page ID
- theField.getJahiaID(),
- theField.getPageID(),
- isLinkOnly ? JahiaPage.TYPE_URL : // URL type =
per default
- JahiaPage.TYPE_DIRECT, // or crea=
te a new page per default
- pageDef.getID(),
- "http://";, // URL undefined
- -1, // Link ID undefined
- jParams.getUser().getUserKey(),
- theField.getID()); // value should be < 0 if n=
ew field.
- pageBean.setOperation(isLinkOnly ? Page_Field.LINK_URL=
: Page_Field.CREATE_PAGE);
- pageBean.sharedTitle(true);
- pageBeans.put("blogPage", pageBean);
- }
- }
- }
- } else if ( "containerAdded".equals(eventName) ) {
- JahiaBaseACL theACL =3D new JahiaBaseACL(theContainer.getAclID());
-
- theACL.setInheritance(ACLInfo.NO_INHERITANCE);
-
- JahiaAclEntry readPermission =3D new JahiaAclEntry();
- readPermission.setPermission(JahiaBaseACL.READ_RIGHTS, JahiaAclEnt=
ry.ACL_YES);
- theACL.setGroupEntry(ServicesRegistry.getInstance().getJahiaGroupM=
anagerService().lookupGroup(
- JahiaGroupManagerService.GUEST_GROUPNAME + ":" + jParams.g=
etSiteID()), readPermission);
-
- JahiaAclEntry adminPermission =3D new JahiaAclEntry();
- adminPermission.setPermission(JahiaBaseACL.READ_RIGHTS, JahiaAclEn=
try.ACL_YES);
- adminPermission.setPermission(JahiaBaseACL.WRITE_RIGHTS, JahiaAclE=
ntry.ACL_YES);
- adminPermission.setPermission(JahiaBaseACL.ADMIN_RIGHTS, JahiaAclE=
ntry.ACL_YES);
- theACL.setUserEntry(jParams.getUser(), adminPermission);
-
-
-
- JahiaPage blogPage =3D (JahiaPage) theContainer.getFieldObject("bl=
ogPage");
- if (blogPage !=3D null) {
- logger.debug("Activate blogPage ["+blogPage.getID()+"]");
- // container validation
- ArrayList locales =3D jParams.getSite().
- getLanguageSettingsAsLocales(true);
- Vector languageCodes =3D new Vector();
- for (int j =3D 0; j < locales.size(); j++) {
- Locale loc =3D (Locale) locales.get(j);
- languageCodes.add(loc.toString());
- }
- ContentPage.getPage(blogPage.getID()).activate(
- new HashSet(languageCodes), // languageCodes
- true, //versioningActive,
- ServicesRegistry.getInstance().getJahiaVersionService().
- getSiteSaveVersion(jParams.getSiteID()), // saveVersion
- jParams.getUser(),
- jParams,
- new StateModificationContext(new ContentPageKey(blogPage.
- getID()), new HashSet(languageCodes)) //stateModifContext
- );
-
- }
- }
-}
-
-if ( "blogEntries".equals(theContainer.getDefinition().getName()) ){
- if ( "addContainerEngineAfterInit".equals(eventName) ) {
- logger.debug("Start eventlistner for event addContainerEngineAfter=
Init for entries Container List");
-
- JahiaField theField =3D theField =3D theContainer.getField("blogAu=
thor");
- if (theField.getValue() =3D=3D null || "".equals(theField.getValue=
())) {
- String author =3D jParams.getUser().getUsername();
- theField.setValue(author);
- feh.addUpdatedField(theField.getID(), theField.getLanguageCode=
());
- updatedFields.add(new Integer(theField.getID()));
- logger.debug("Set value for field [blogAuthor] to [" + theFiel=
d.getValue() + "]");
- }
- } else if ( "containerAdded".equals(eventName) ) {
- logger.debug("Activate container ["+theContainer.getID()+"]");
- // container validation
- boolean substitutedElr =3D false;
- try {
- if (jParams.getEntryLoadRequest().isCurrent()) {
- substitutedElr =3D true;
- EntryLoadRequest elr =3D new EntryLoadRequest(EntryLoadReq=
uest.STAGING_WORKFLOW_STATE, 0,
- jParams.getEntryLoadRequest().getLocales());
- jParams.setSubstituteEntryLoadRequest(elr);
- }
- // container validation (for all active languages)
- ArrayList localeslist =3D jParams.getSite().
- getLanguageSettingsAsLocales(false);
- Set languageCodes =3D new HashSet();
- languageCodes.add(ContentObject.SHARED_LANGUAGE);
- for (int j =3D 0; j < localeslist.size(); j++) {
- Locale loc =3D (Locale) localeslist.get(j);
- languageCodes.add(loc.toString());
- logger.debug("validating in "+loc.toString());
- }
-
-
- JahiaSaveVersion saveVersion =3D
- ServicesRegistry.getInstance().getJahiaVersionService().
- getSiteSaveVersion(jParams.getSiteID());
-
- StateModificationContext smc =3D new StateModificationContext(
- new ContentContainerKey(theContainer.getID()), languageCo=
des);
- smc.setDescendingInSubPages(false);
-
- Enumeration childs =3D theContainer.getFields();
- while (childs.hasMoreElements()) {
- JahiaField child =3D (JahiaField)childs.nextElement();
- ContentField field =3D child.getContentField();
- if (field !=3D null) {
- field.activate(languageCodes, saveVersion.getVersionID=
(),jParams, smc);
- }
- }
- JahiaContainersService jahiaContainersService =3D
- ServicesRegistry.getInstance().getJahiaContainersService();
- if (jahiaContainersService !=3D null) {
- ActivationTestResults atr =3D jahiaContainersService.activ=
ateStagedContainer(languageCodes,theContainer.getID(),
- jParams.getUser(), saveVersion, jParams, smc);
- logger.debug("ActivationTestResults is " + atr.toString());
- }
- } finally {
- if (substitutedElr)
- jParams.resetSubstituteEntryLoadRequest();
- }
-
- }
-}
-%>
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/box.jsp&rev=3D820&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/box/box.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp Fri Oct 19 11:59:28 20=
07
@@ -27,19 +27,13 @@
<bean:define id=3D"files" value=3D'<%=3DResourceBundleMarke=
r.getValue(ResourceBundleMarker.drawMarker(resBundleID,"files",""),jParams.=
getLocale())%>'/>
<bean:define id=3D"links" value=3D'<%=3DResourceBundleMarke=
r.getValue(ResourceBundleMarker.drawMarker(resBundleID,"links",""),jParams.=
getLocale())%>'/>
<bean:define id=3D"pages" value=3D'<%=3DResourceBundleMarke=
r.getValue(ResourceBundleMarker.drawMarker(resBundleID,"pages",""),jParams.=
getLocale())%>'/>
- <!--bean:define id=3D"filterWizards" value=3D'<%=3DResourceBun=
dleMarker.getValue(ResourceBundleMarker.drawMarker(resBundleID,"filterWizar=
ds",""),jParams.getLocale())%>'/-->
<%
String bundlevaluekey=3D ResourceBundleMarker.getValue(Resou=
rceBundleMarker.drawMarker(resBundleID,"pollbox",""),jParams.getLocale());
logger.debug("valuebox=3D"+bundlevaluekey);
%>
- <bean:define id=3D"pollbox" value=3D'<%=3DResourceBundleMarke=
r.getValue(ResourceBundleMarker.drawMarker(resBundleID,"pollbox",""),jParam=
s.getLocale())%>'/>
<bean:define id=3D"webapps" value=3D'<%=3DResourceBundleMarke=
r.getValue(ResourceBundleMarker.drawMarker(resBundleID,"webapps",""),jParam=
s.getLocale())%>'/>
<bean:define id=3D"lastNews" value=3D'<%=3DResourceBundleM=
arker.getValue(ResourceBundleMarker.drawMarker(resBundleID,"lastNews",""),j=
Params.getLocale())%>'/>
- <bean:define id=3D"webdav" value=3D'<%=3DResourceBundleMark=
er.getValue(ResourceBundleMarker.drawMarker(resBundleID,"webdav",""),jParam=
s.getLocale())%>'/>
- <bean:define id=3D"savedSearch" value=3D'<%=3DResourceBundl=
eMarker.getValue(ResourceBundleMarker.drawMarker(resBundleID,"savedSearch",=
""),jParams.getLocale())%>'/>
<bean:define id=3D"texts" value=3D'<%=3DResourceBundleMarke=
r.getValue(ResourceBundleMarker.drawMarker(resBundleID,"texts",""),jParams.=
getLocale())%>'/>
- <bean:define id=3D"usersContainer" value=3D'<%=3DResourceBundl=
eMarker.getValue(ResourceBundleMarker.drawMarker(resBundleID,"usersContaine=
r",""),jParams.getLocale())%>'/>
- <bean:define id=3D"groupsContainer"
value=3D'<%=3DResourceBundleMarker.=
getValue(ResourceBundleMarker.drawMarker(resBundleID,"groupsContainer",""),=
jParams.getLocale())%>'/>
<logic:present name=3D"boxContainer" property=3D"field(layout)=
">
<bean:define id=3D"layoutValue" name=3D"boxContainer" proper=
ty=3D'field(layout).value'/>
</logic:present>
@@ -75,27 +69,9 @@
<c:when test=3D"${boxTypeRealValue =3D=3D webapps}=
">
<%@ include file=3D"webapps.inc"%>
</c:when>
- <c:when test=3D"${boxTypeRealValue =3D=3D filterWi=
zards}">
- <%@ include file=3D"filterWizards.inc"%>
- </c:when>
<c:when test=3D"${boxTypeRealValue =3D=3D lastNews=
}">
<%@ include file=3D"lastNews.inc"%>
</c:when>
- <c:when test=3D"${boxTypeRealValue =3D=3D webdav}">
- <%@ include file=3D"dav.inc"%>
- </c:when>
- <c:when test=3D"${boxTypeRealValue =3D=3D savedSea=
rch}">
- <%@ include file=3D"savedsearch.inc"%>
- </c:when>
- <c:when test=3D"${boxTypeRealValue =3D=3D usersCon=
tainer}">
- <%@ include file=3D"usersContainer.inc"%>
- </c:when>
- <c:when test=3D"${boxTypeRealValue =3D=3D groupsCo=
ntainer}">
- <%@ include file=3D"groupsContainer.inc"%>
- </c:when>
- <c:when test=3D"${boxTypeRealValue =3D=3D pollbox}=
">
- <!--%@ include file=3D"pollbox.inc"%-->
- </c:when>
<c:otherwise>
<%@ include file=3D"texts.inc"%>
</c:otherwise>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/declarations.inc&rev=3D820&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/box/declarations.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/declarations.inc Fri Oct 19 11=
:59:28 2007
@@ -21,8 +21,7 @@
int rowColorCount =3D 0;
%>
<%!
-//String boxTypes[] =3D {"files", "links", "lastNews", "texts", "webapps",=
"filterWizards"};
-String boxTypes[] =3D {"files", "links", "pages", "lastNews", "texts", "we=
bapps","savedSearch","usersContainer", "groupsContainer","webdav","pollbox"=
};
+String boxTypes[] =3D {"files", "links", "pages", "lastNews", "texts", "we=
bapps"};
String boxLayouts[] =3D {"layout0", "layout1"};
=
public String getCss (String layout, String resBundleID)
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top_declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/common/top_declarations.inc&rev=3D820&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/common/top_declarations.inc (origi=
nal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top_declarations.inc Fri Oc=
t 19 11:59:28 2007
@@ -1,23 +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.
--%><%@ include file=3D"declarations.inc"%>
<%@ include file=3D"common_vars.inc"%>
<%@ include file=3D"definitions.inc"%>
<%@ include file=3D"filters.inc"%>
<%@ include file=3D"../news/definitions.inc"%>
-<%@ include file=3D"../doc/declaration_sources.inc"%>
-<%@ include file=3D"../doc/declaration_types.inc"%>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/eventlistener.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/eventlistener.inc&rev=3D820&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/doc/eventlistener.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/eventlistener.inc Fri Oct 19 1=
1:59:28 2007
@@ -1,208 +1,17 @@
<%--
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.
---%><%
-if ( "directoryDocContainer".equals(theContainer.getDefinition().getName()=
) ){
- if ( "addContainerEngineAfterInit".equals(eventName) ) {
-
- // we want to init the page field
- JahiaField theField =3D theContainer.getField("directoryDocPage");
- JahiaPageEngineTempBean pageBean =3D null;
-
- HashMap pageBeans =3D (HashMap)jParams.
- getSessionState().getAttribute("Page_Field.PageBeans");
- if ( pageBeans =3D=3D null ){
- pageBeans =3D new HashMap();
- jParams.
- getSessionState().setAttribute("Page_Field.PageBeans", pag=
eBeans);
- }
-
- // Verify if this page field was not already edited in this sessio=
n.
- pageBean =3D (JahiaPageEngineTempBean)pageBeans.get(theField.getDe=
finition().getName());
-
- String creator =3D null;
- String creationDate =3D null;
- String lastContributor =3D null;
-
- if (pageBean =3D=3D null) {
-
- JahiaPageDefinition pageDef =3D ServicesRegistry.getInstance()=
.getJahiaPageTemplateService()
- .lookupPageTemplateByName ("Document Detail", jParams.getSiteI=
D());
-
- // First call or recall of engine.
- jParams.getSessionState().removeAttribute(SelectPage_Engine.SE=
SSION_PARAMS);
- if (theField.getObject() =3D=3D null) { // Is it a new page ?
- boolean isLinkOnly =3D theField.getValue().toLowerCase().i=
ndexOf("jahia_linkonly") !=3D -1;
- pageBean =3D new JahiaPageEngineTempBean(
- -1, // Page ID
- theField.getJahiaID(),
- theField.getPageID(),
- isLinkOnly ? JahiaPage.TYPE_URL : // URL type per =
default
- JahiaPage.TYPE_DIRECT, // or create a=
new page per default
- pageDef.getID(),
- "http://";, // URL undefined
- -1, // Link ID undefined
- jParams.getUser().getUserKey(),
- theField.getID()); // value should be < 0 if new f=
ield.
- pageBean.setOperation(isLinkOnly ? Page_Field.LINK_URL : P=
age_Field.CREATE_PAGE);
-
- pageBean.sharedTitle(true);
-
- pageBeans.put("directoryDocPage", pageBean);
- }
-
- } else {
- // check if the current page it a moved one
-
- String operation =3D jParams.getParameter("operation"); // Value f=
rom FORM
- int selectedPageID =3D pageBean.getPageLinkID();
- if (jParams.getParameter("shouldSetPageLinkID") !=3D null) {
- selectedPageID =3D SelectPage_Engine.getInstance()
- .getSelectedPageID(jParams.getSessionState());
- }
-
- // check if the current page it a moved one
- if ( Page_Field.MOVE_PAGE.equals(operation) ){
- Integer previousPageID =3D (Integer)jParams.
- getAttribute("eventlistener.previousPageID");
-
- if ( previousPageID =3D=3D null
- || previousPageID.intValue() !=3D selectedPageID ){
-
- previousPageID =3D new Integer(selectedPageID);
- request.setAttribute("eventlistener.previousPageID",
- previousPageID);
-
- if ( selectedPageID !=3D -1 ){
- try {
- ContentPage cPage =3D ContentPage
- .getPage(selectedPageID,false);
- ContentPageField cPageField =3D (ContentPageField)
- cPage.getParent( jParams.getUser(),
- jParams.getEntryLoadRequest(),
- ParamBean.NORMAL);
- if ( cPageField =3D=3D null ){
- // try to get the active
- EntryLoadRequest lRequest =3D
- new EntryLoadRequest(EntryLoadRequest.ACTI=
VE_WORKFLOW_STATE,0,
- jParams.getEntryLoadRequest().getLocales()=
);
- cPageField =3D (ContentPageField)
- cPage.getParent( jParams.getUser(),
- lRequest,
- ParamBean.NORMAL);
- }
- ContentContainer cContainer =3D
- (ContentContainer)cPageField
- .getParent( jParams.getUser(),
- jParams.getEntryLoadRe=
quest(),
- ParamBean.NORMAL) ;
- JahiaContainer jContainer =3D
- cContainer.getJahiaContainer(jParams,
- jParams.getEntryLoadRequest());
-
- JahiaField jField;
- String fieldValue =3D "";
-
- jField =3D jContainer.getField("directoryDocType");
- fieldValue =3D "";
- if ( jField !=3D null && jField.getValue() !=3D nu=
ll){
- fieldValue =3D jField.getValue().trim();
- }
- if ( !"".equals(fieldValue) ){
- // we want to set the last publisher
- jField =3D theContainer.getField("directoryDoc=
Type");
- jField.setValue(fieldValue);
- feh.addUpdatedField(jField.getID(), jField.get=
LanguageCode());
- updatedFields.add(new Integer(jField.getID()));
- }
-
- jField =3D jContainer.getField("directoryDocSource=
");
- fieldValue =3D "";
- if ( jField !=3D null && jField.getValue() !=3D nu=
ll){
- fieldValue =3D jField.getValue().trim();
- }
- if ( !"".equals(fieldValue) ){
- // we want to set the last publisher
- jField =3D theContainer.getField("directoryDoc=
Source");
- jField.setValue(fieldValue);
- feh.addUpdatedField(jField.getID(), jField.get=
LanguageCode());
- updatedFields.add(new Integer(jField.getID()));
- }
- jField =3D jContainer.getField("directoryShortDocD=
escription");
- fieldValue =3D "";
- if ( jField !=3D null && jField.getValue() !=3D nu=
ll){
- fieldValue =3D jField.getValue().trim();
- }
- if ( !"".equals(fieldValue) ){
- // we want to set the last publisher
- jField =3D theContainer.getField("directorySho=
rtDocDescription");
- jField.setValue(fieldValue);
- feh.addUpdatedField(jField.getID(), jField.get=
LanguageCode());
- updatedFields.add(new Integer(jField.getID()));
- }
-
- ContentDefinition contentDefinition =3D jContainer=
.getDefinition();
- ArrayList selectedCategories =3D new ArrayList();
- Set categories =3D Category.getObjectCategories(cC=
ontainer.getObjectKey());
- Iterator iterator =3D categories.iterator();
- while ( iterator.hasNext() ){
- Category cat =3D (Category)iterator.next();
- selectedCategories.add(cat.getKey());
- }
-
- ArrayList defaultSelectedCategories =3D
- (ArrayList) session.getAttribute(DEFAULTCATEGORIES_SES=
SIONKEYPREFIX +
- theContainer.getDefinition().getObjectKey());
- if (defaultSelectedCategories !=3D null) {
- for ( int i=3D0; i<defaultSelectedCategories.s=
ize() ; i++ ){
- String val =3D (String)defaultSelectedCate=
gories.get(i);
- if ( !selectedCategories.contains(val)=
){
- selectedCategories.add(val);
- }
- }
- }
- engineMap.put(SELECTEDCATEGORIES_ENGINEMAPKEY,=
selectedCategories);
-
- ManageCategories.getInstance().handleActions(j=
Params, JahiaEngine.LOAD_MODE,
- engineMap, new ContentContainerKey(jContai=
ner.getID()),
- jContainer.getDefinition(), false);
- } catch ( Throwable t ){
- t.printStackTrace();
- }
- }
- }
- }
- }
-
-
-
- } else if ( "addContainerEngineBeforeSave".equals(eventName) ) {
- // we want set the page title
- HashMap pageBeans =3D (HashMap)jParams.
- getSessionState().getAttribute("Page_Field.PageBeans");
- if ( pageBeans !=3D null ){
- // Verify if this page field was not already edited in thi=
s session.
- JahiaPageEngineTempBean pageBean =3D
- (JahiaPageEngineTempBean)pageBeans.get("directoryDocPa=
ge");
-
- if (pageBean !=3D null) {
- // we want to set the title
- pageBeans.put("directoryDocPage", pageBean);
- }
- }
- }
-}
-%>
\ No newline at end of file
+--%>
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/templates.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/templates.xml&rev=3D820&repname=3Dcorporate_portal_template=
s_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/templates.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/templates.xml Fri Oct 19 11:59:28 =
2007
@@ -26,103 +26,13 @@
<parameter name=3D"display-name">Form generator</parameter>
</template>
<template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">blog</parameter>
- <parameter name=3D"filename">blog.jsp</parameter>
- <parameter name=3D"display-name">Blog</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">blog_listing</parameter>
- <parameter name=3D"filename">blog_listing.jsp</parameter>
- <parameter name=3D"display-name">Blog listing</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
<parameter name=3D"name">news</parameter>
<parameter name=3D"filename">news.jsp</parameter>
<parameter name=3D"display-name">News</parameter>
</template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">ldap</parameter>
- <parameter name=3D"filename">ldap.jsp</parameter>
- <parameter name=3D"display-name">Users directory</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">mediagallery</parameter>
- <parameter name=3D"filename">mediagallery.jsp</parameter>
- <parameter name=3D"display-name">Mediagallery</parameter>
- </template>
<template browsable=3D"1" visible=3D"1">
<parameter name=3D"name">fullbox.jsp</parameter>
<parameter name=3D"filename">fullbox.jsp</parameter>
<parameter name=3D"display-name">Full screen box</parameter>
</template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">poll</parameter>
- <parameter name=3D"filename">poll.jsp</parameter>
- <parameter name=3D"display-name">Poll</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">quizz</parameter>
- <parameter name=3D"filename">quizz.jsp</parameter>
- <parameter name=3D"display-name">Quizz</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">survey</parameter>
- <parameter name=3D"filename">survey.jsp</parameter>
- <parameter name=3D"display-name">Survey</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">categories</parameter>
- <parameter name=3D"filename">categories.jsp</parameter>
- <parameter name=3D"display-name">Categories Browsing</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">files_listing</parameter>
- <parameter name=3D"filename">folder.jsp</parameter>
- <parameter name=3D"display-name">Directories Files</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">links_listing</parameter>
- <parameter name=3D"filename">links.jsp</parameter>
- <parameter name=3D"display-name">Directories Links</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">main_dir</parameter>
- <parameter name=3D"filename">directories.jsp</parameter>
- <parameter name=3D"display-name">Directories Main</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Directories People</parameter>
- <parameter name=3D"filename">people.jsp</parameter>
- <parameter name=3D"display-name">Directories People</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Directories Project</parameter>
- <parameter name=3D"filename">project.jsp</parameter>
- <parameter name=3D"display-name">Directories Project</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Document Detail</parameter>
- <parameter name=3D"filename">document_detail.jsp</parameter>
- <parameter name=3D"display-name">Document Detail</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Document listing</parameter>
- <parameter name=3D"filename">document_listing.jsp</parameter>
- <parameter name=3D"display-name">Document Listing</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Metadata Api</parameter>
- <parameter name=3D"filename">metadataapi.jsp</parameter>
- <parameter name=3D"display-name">Metadata api</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">testFields</parameter>
- <parameter name=3D"filename">testFields.jsp</parameter>
- <parameter name=3D"display-name">Testing</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">portal</parameter>
- <parameter name=3D"filename">layout.jsp</parameter>
- <parameter name=3D"display-name">Portal</parameter>
- </template>
</tpml>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
