tdraier 2004/11/09 20:21:24 CET
Modified files:
src/view/jsp categories.jsp mysettings.jsp
mysettingschanged.jsp
newuserregistration.jsp
userregistrationok.jsp
src/view/jsp/include box.jsp doc.inc folderDocumentBox.jsp
layout.jsp left_menu.inc main_menu.inc
site_settings.inc
Log:
compatibility support for bea/was
Revision Changes Path
1.22 +8 -2 corporate_portal_templates/src/view/jsp/categories.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/categories.jsp.diff?r1=1.21&r2=1.22&f=h
1.50 +7 -1 corporate_portal_templates/src/view/jsp/include/box.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/box.jsp.diff?r1=1.49&r2=1.50&f=h
1.10 +1 -1 corporate_portal_templates/src/view/jsp/include/doc.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/doc.inc.diff?r1=1.9&r2=1.10&f=h
1.2 +3 -1
corporate_portal_templates/src/view/jsp/include/folderDocumentBox.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/folderDocumentBox.jsp.diff?r1=1.1&r2=1.2&f=h
1.12 +0 -5
corporate_portal_templates/src/view/jsp/include/layout.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/layout.jsp.diff?r1=1.11&r2=1.12&f=h
1.11 +11 -5
corporate_portal_templates/src/view/jsp/include/left_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/left_menu.inc.diff?r1=1.10&r2=1.11&f=h
1.14 +3 -1
corporate_portal_templates/src/view/jsp/include/main_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/main_menu.inc.diff?r1=1.13&r2=1.14&f=h
1.3 +1 -1
corporate_portal_templates/src/view/jsp/include/site_settings.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/site_settings.inc.diff?r1=1.2&r2=1.3&f=h
1.2 +2 -7 corporate_portal_templates/src/view/jsp/mysettings.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/mysettings.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +0 -5
corporate_portal_templates/src/view/jsp/mysettingschanged.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/mysettingschanged.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -5
corporate_portal_templates/src/view/jsp/newuserregistration.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/newuserregistration.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -5
corporate_portal_templates/src/view/jsp/userregistrationok.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/userregistrationok.jsp.diff?r1=1.1&r2=1.2&f=h
Index: categories.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/categories.jsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- categories.jsp 25 Mar 2004 15:36:58 -0000 1.21
+++ categories.jsp 9 Nov 2004 19:21:23 -0000 1.22
@@ -50,7 +50,11 @@
<%int t=0;%>
<logic:iterate name="currentCategory" property="childCategoryBeans"
id="curCategoryBean" indexId="idx">
<%t++;if (t==1){%>Sub Categories<ul><%}%>
- <bean:define name="curCategoryBean" id="curCategoryBeanTitle"
property="category.key" />
+ <% if (((CategoryBean)
pageContext.findAttribute("curCategoryBean")).getTitle() == null){ %>
+ <bean:define name="curCategoryBean"
id="curCategoryBeanTitle" property="category.key" />
+ <% } %>
+
+
<% if (((CategoryBean)
pageContext.findAttribute("curCategoryBean")).getTitle() != null){ %>
<bean:define name="curCategoryBean"
id="curCategoryBeanTitle" property="title" />
<% } %>
@@ -159,7 +163,9 @@
<logic:equal name="currentFile"
property="downloadable" value="true">
-
<bean:define
id="fileRealName" name="currentFile" property="realName"/>
- <bean:define id="fileName"
name="currentFile" property="fileFieldTitle"/>
+ <logic:notEmpty
name="fileName">
+ <bean:define
id="fileName" name="currentFile" property="fileFieldTitle"/>
+ </logic:notEmpty>
<logic:empty name="fileName">
<bean:define
id="fileName" name="fileRealName"/>
</logic:empty>
Index: mysettings.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/mysettings.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysettings.jsp 24 Mar 2004 16:47:25 -0000 1.1
+++ mysettings.jsp 9 Nov 2004 19:21:23 -0000 1.2
@@ -1,12 +1,7 @@
<%@ include file="include/header.inc"%>
-<%@ page import="java.util.*,javax.servlet.http.*" %>
+
<%@ page import="org.jahia.engines.mysettings.MySettingsEngine"%>
-<%@ taglib uri="JahiaLib" prefix="jahia" %>
-<%@ taglib uri="jahiaHtmlLib" prefix="jahiaHtml" %>
-<%@ taglib uri="contentLib" prefix="content" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-bean" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-html" prefix="html" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-logic" prefix="logic" %>
+
<style type="text/css">
<!--
DIV#errors { color : #B42C29; }
Index: mysettingschanged.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/mysettingschanged.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysettingschanged.jsp 24 Mar 2004 16:47:25 -0000 1.1
+++ mysettingschanged.jsp 9 Nov 2004 19:21:23 -0000 1.2
@@ -1,10 +1,5 @@
<%@ include file="include/header.inc"%>
<%@ page import="java.util.*,javax.servlet.http.*" %>
-<%@ taglib uri="JahiaLib" prefix="jahia" %>
-<%@ taglib uri="contentLib" prefix="content" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-bean" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-html" prefix="html" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-logic" prefix="logic" %>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
Index: newuserregistration.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/newuserregistration.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newuserregistration.jsp 24 Mar 2004 16:47:25 -0000 1.1
+++ newuserregistration.jsp 9 Nov 2004 19:21:23 -0000 1.2
@@ -1,10 +1,6 @@
<%@ include file="include/header.inc"%>
<%@ page import="java.util.*,javax.servlet.http.*" %>
-<%@ taglib uri="JahiaLib" prefix="jahia" %>
-<%@ taglib uri="contentLib" prefix="content" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-bean" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-html" prefix="html" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-logic" prefix="logic" %>
+
<style type="text/css">
<!--
DIV#errors { color : #B42C29; }
Index: userregistrationok.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/userregistrationok.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userregistrationok.jsp 24 Mar 2004 16:47:25 -0000 1.1
+++ userregistrationok.jsp 9 Nov 2004 19:21:23 -0000 1.2
@@ -1,10 +1,6 @@
<%@ include file="include/header.inc"%>
<%@ page import="java.util.*,javax.servlet.http.*" %>
-<%@ taglib uri="JahiaLib" prefix="jahia" %>
-<%@ taglib uri="contentLib" prefix="content" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-bean" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-html" prefix="html" %>
-<%@ taglib uri="/WEB-INF/etc/struts/struts-logic" prefix="logic" %>
+
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
Index: box.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/box.jsp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- box.jsp 16 Dec 2003 14:39:37 -0000 1.49
+++ box.jsp 9 Nov 2004 19:21:23 -0000 1.50
@@ -26,11 +26,17 @@
String boxContentLayout = (String)
pageContext.findAttribute("boxContentLayoutValue");
%>
<content:textField name='<%="boxTitle" + id%>' diffActive="true"
display="false" valueId="boxTitle" defaultValue=""/>
- <bean:define id="displayBox" value="true"/>
+ <logic:notEmpty name="boxTitle">
+ <bean:define id="displayBox" value="true"/>
+ </logic:notEmpty>
+
<logic:empty name="boxTitle">
<jahia:ifNotEditMode>
<bean:define id="displayBox" value="false"/>
</jahia:ifNotEditMode>
+ <jahia:ifEditMode>
+ <bean:define id="displayBox" value="true"/>
+ </jahia:ifEditMode>
</logic:empty>
<logic:equal name="displayBox" value="true">
Index: doc.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/doc.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- doc.inc 3 Apr 2004 08:38:16 -0000 1.9
+++ doc.inc 9 Nov 2004 19:21:23 -0000 1.10
@@ -124,7 +124,7 @@
</jahia:containerList>
</jahia:jahiaPageForm>
<table width="100%" border="0" cellspacing="2" cellpadding="0">
-<jsp:include page="pagination_bar.jsp" flush="true">
+<jsp:include page="include/pagination_bar.jsp" flush="true">
<jsp:param name="id" value="bar_sup"/>
<jsp:param name="containerName" value="directoryDocContainer"/>
<jsp:param name="pageSize" value="20"/>
Index: folderDocumentBox.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/folderDocumentBox.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- folderDocumentBox.jsp 13 Nov 2003 14:38:22 -0000 1.1
+++ folderDocumentBox.jsp 9 Nov 2004 19:21:23 -0000 1.2
@@ -86,7 +86,9 @@
<bean:define id="fileObject" name="filesContainer"
property='<%="field(file" + id + ").object"%>'/>
<logic:notEmpty name="fileObject">
<bean:define id="fileRealName" name="fileObject"
property="realName"/>
- <bean:define id="fileName" name="fileObject"
property="fileFieldTitle"/>
+ <logic:notEmpty name="fileName">
+ <bean:define id="fileName" name="fileObject"
property="fileFieldTitle"/>
+ </logic:notEmpty>
<logic:empty name="fileName">
<bean:define id="fileName" name="fileRealName"/>
</logic:empty>
Index: layout.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/layout.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- layout.jsp 28 Oct 2003 22:56:40 -0000 1.11
+++ layout.jsp 9 Nov 2004 19:21:23 -0000 1.12
@@ -88,11 +88,6 @@
if (!jData.gui().html().drawAddContainerLauncher( contentFields
).equals("")) {
%><a href="javascript:<%=jData.gui().html().drawAddContainerLauncher(
contentFields )%>"><%=addButton%> <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="addWebapps"/></a><br/><%
}
-/*
-if (!jData.gui().html().drawContainerListPropertiesLauncher( contentFields
).equals("")) {
- %><a
href="javascript:<%=jData.gui().html().drawContainerListPropertiesLauncher(
contentFields )%>"><%=propertiesButton%> <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="sortAndProperties"/></a><br/><%
-}
-*/
if (!jData.gui().html().drawContainerListPropertiesLauncher( contentFields
).equals("")) {
%><img src="<%=theURL%>/images/box_prop.gif" width="12" height="12"
border="0" alt="Add Box"/> <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="resetLayout"/> <a
href="javascript:document.setDefault1.submit();">1</a> 
<a href="javascript:document.setDefault2.submit();">2</a> 
Index: left_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/left_menu.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- left_menu.inc 5 Nov 2004 09:44:52 -0000 1.10
+++ left_menu.inc 9 Nov 2004 19:21:23 -0000 1.11
@@ -193,13 +193,19 @@
<logic:notEmpty name="link">
- <bean:define id="state" value=""/>
- <logic:equal name="link" property="inCurrentPagePath"
value="true">
- <bean:define id="state" value="on"/>
- </logic:equal>
+
<logic:equal name="link" property="currentPage" value="true">
- <bean:define id="state" value="current"/>
+ <bean:define id="state" value="current"/>
+ </logic:equal>
+ <logic:notEqual name="link" property="currentPage"
value="true">
+ <logic:equal name="link" property="inCurrentPagePath"
value="true">
+ <bean:define id="state" value="on"/>
</logic:equal>
+ <logic:notEqual name="link" property="inCurrentPagePath"
value="true">
+ <bean:define id="state" value=""/>
+ </logic:notEqual>
+ </logic:notEqual>
+
<logic:notEmpty name="link" property="title">
<%
linkCount++;
Index: main_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/main_menu.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- main_menu.inc 28 Oct 2004 15:25:26 -0000 1.13
+++ main_menu.inc 9 Nov 2004 19:21:23 -0000 1.14
@@ -71,7 +71,9 @@
</logic:equal>
</logic:empty>
<logic:notEmpty name="topLink">
- <bean:define id="classpath" value="topmenu"/>
+ <logic:notEqual name="topLink" property="inCurrentPagePath"
value="true">
+ <bean:define id="classpath" value="topmenu"/>
+ </logic:notEqual>
<logic:equal name="topLink" property="inCurrentPagePath"
value="true">
<bean:define id="classpath" value="topmenuon"/>
</logic:equal>
Index: site_settings.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/site_settings.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- site_settings.inc 23 Aug 2004 09:12:51 -0000 1.2
+++ site_settings.inc 9 Nov 2004 19:21:23 -0000 1.3
@@ -145,7 +145,7 @@
<logic:present name="siteSettings" property="field(logo)">
<bean:define id="logo" name="siteSettings"
property="field(logo).object"/>
</logic:present>
- <bean:define id="isSiteSettingAvaliable" value="true"
scope="request"/>
+ <% isSiteSettingAvaliable="true"; %>
</content:container>
</content:absoluteContainerList>
<%
