Author: pvollenweider
Date: Fri Oct 19 10:18:04 2007
New Revision: 818
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D818&repname=
=3Dcorporate_portal_templates_v2
Log:
Sync JAHIA-5-1-SP-BRANCH with JAHIA-5-0-SP-BRANCH
Modified:
branches/JAHIA-5-1-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties
branches/JAHIA-5-1-SP-BRANCH/src/jsp/advsearch/search_result_list.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/blogs/list.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/box/lastNews.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/box/webapps.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/common/declarations.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/common/top.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/common/topmenu.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/css/template_css.jsp
branches/JAHIA-5-1-SP-BRANCH/src/jsp/doc/detail.jsp
branches/JAHIA-5-1-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp
branches/JAHIA-5-1-SP-BRANCH/src/jsp/double.jsp
branches/JAHIA-5-1-SP-BRANCH/src/jsp/form_generator/display_form.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/form_generator/process_post.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/javascript/transmenu_js.jsp
branches/JAHIA-5-1-SP-BRANCH/src/jsp/mediagallery/medialist.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/news.jsp
branches/JAHIA-5-1-SP-BRANCH/src/jsp/news/eventlistener.inc
branches/JAHIA-5-1-SP-BRANCH/src/jsp/news/news.jsp
branches/JAHIA-5-1-SP-BRANCH/src/jsp/portal2/layout.jsp
branches/JAHIA-5-1-SP-BRANCH/src/jsp/project.jsp
branches/JAHIA-5-1-SP-BRANCH/src/jsp/searchresult.jsp
Modified: branches/JAHIA-5-1-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2.properties&re=
v=3D818&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-1-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties Fri Oct 19 10:18:04 2007
@@ -264,6 +264,7 @@
form.addSender =3D Add sender, recipient, ...
form.fieldIsMandatory =3D Error: Fields with (*) are mandatory
form.defaultValueRequired =3D Default value is required for this type
+form.defaultPathWillBeUsed =3D Storage path (default value) is missing, /s=
hared/forms/missing_path will be used
form.storePostedValues =3D Store posted values
form.create =3D Create your form
form.sendMail =3D Send an E-Mail of the posted values
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/advsearch/search_result_list=
.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/advsearch/search_result_list.inc&rev=3D818&repname=3Dcorpor=
ate_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-1-SP-BRANCH/src/jsp/advsearch/search_result_list.inc (=
original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/advsearch/search_result_list.inc F=
ri Oct 19 10:18:04 2007
@@ -98,7 +98,7 @@
<div id=3D"searchFileDetail<%=3DfieldId%>"
style=3D"di=
splay: none;"> </div>
<%
} %>
- <br/><br/></li><% if ( i < l-1 ){%><hr /><% } %></div>
+ <br/><br/></li><% if ( i < displayedHitCount-1 ){%><hr /><% } =
%></div>
<% } %>
</pg:item>
<% } %>
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/blogs/list.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/blogs/list.inc&rev=3D818&repname=3Dcorporate_portal_templat=
es_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-1-SP-BRANCH/src/jsp/blogs/list.inc (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/blogs/list.inc Fri Oct 19 10:18:04=
2007
@@ -45,7 +45,7 @@
=
if (jParams.getUser().isAdminMember( jParams.getSiteID() )) { =
jData.gui().html().drawBeginActionMenu(blogsBean ,
- null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates", null, out); =
+ null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates_v2", null, out); =
}
=
// get all pages with template definition name "Blog"
@@ -152,7 +152,7 @@
<%
if (jParams.getUser().isAdminMember( jParams.getSiteID() )) { =
jData.gui().html().drawEndActionMenu(blogsBean ,
- null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates", null, out); =
+ null, null, true, "", "jahiatemplates.Corporate_po=
rtal_templates_v2", null, out); =
}
%>
</content:containerList>
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/box/lastNews.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/box/lastNews.inc&rev=3D818&repname=3Dcorporate_portal_templ=
ates_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-1-SP-BRANCH/src/jsp/box/lastNews.inc (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/box/lastNews.inc Fri Oct 19 10:18:=
04 2007
@@ -1,3 +1,15 @@
+<%@ page import=3D"org.jahia.bin.Jahia" %>
+<%@ page import=3D"org.jahia.data.beans.ContainerBean" %>
+<%@ page import=3D"org.jahia.data.containers.*" %>
+<%@ page import=3D"org.jahia.registries.ServicesRegistry" %>
+<%@ page import=3D"org.jahia.resourcebundle.ResourceBundleMarker" %>
+<%@ page import=3D"org.jahia.security.license.LicenseActionChecker" %>
+<%@ page import=3D"org.jahia.services.categories.Category" %>
+<%@ page import=3D"org.jahia.services.pages.JahiaPage" %>
+<%@ page import=3D"org.jahia.taglibs.esi.JesiConst" %>
+<%@ page import=3D"org.jahia.taglibs.esi.JesiFragmentTag" %>
+<%@ page import=3D"java.text.SimpleDateFormat" %>
+<%@ page import=3D"java.util.*" %>
<%--
Copyright 2002-2006 Jahia Ltd
=
@@ -15,6 +27,12 @@
See the License for the specific language governing permissions and
limitations under the License.
--%><%
+ 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);
+ }
String categoriespackage=3D"org.jahia.actions.server.admin.categories.Mana=
geCategories";
boolean licenseEnabled =3D LicenseActionChecker.isAuthorizedByLicense(cate=
goriespackage, 0);
String windowSize =3D "10";
@@ -89,6 +107,9 @@
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().getContainerLi=
st( "newsCl" );
if ( newsContainerList !=3Dnull && newsContainerList.getID()=3D=3D0 ) {
@@ -97,9 +118,6 @@
} else {
logger.debug("newsContainerList exist");
}
-logger.debug("Set container list pagination on newsContainerList to " + wi=
ndowSize + " (" + pageContext.getAttribute("boxtitle") + ")");
-newsContainerList.getDefinition().setProperty("windowSize",windowSize);
-newsContainerList.getDefinition().setProperty("windowOffset","0");
newsContainerList.setIsContainersLoaded(false);
logger.debug("newsContainerList has " + newsContainerList.getFullSize() + =
" elements");
Enumeration newsContainers =3D newsContainerList.getContainers();
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/box/webapps.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/box/webapps.inc&rev=3D818&repname=3Dcorporate_portal_templa=
tes_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-1-SP-BRANCH/src/jsp/box/webapps.inc (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/box/webapps.inc Fri Oct 19 10:18:0=
4 2007
@@ -14,7 +14,14 @@
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"webapps" + id%>' id=3D"webapps" =
parentContainerName=3D"boxContainer">
+--%>
+<%
+ if(Jahia.getSettings().isEsiCacheActivated()) {
+ JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getA=
ttribute( JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE );
+ fragmentTag.setExpiration("0");
+ }
+%>
+<content:containerList name=3D'<%=3D"webapps" + id%>' id=3D"webapps" pare=
ntContainerName=3D"boxContainer">
<content:container id=3D"webappsContainer">
<content:applicationField name=3D'webapp' id=3D"webapp" display=3D=
"false" />
<jahiaHtml:actionMenu name=3D"webappsContainer" namePostFix=3D".we=
bapp"
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/common/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/common/declarations.inc&rev=3D818&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-1-SP-BRANCH/src/jsp/common/declarations.inc (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/common/declarations.inc Fri Oct 19=
10:18:04 2007
@@ -273,11 +273,11 @@
String extention[] =3D {"doc", "xls", "ppt", "zip", "pdf", "txt", "html",
"htm", "waw", "mp3", "jpg", "jpeg", "gif", "tif",
"avi", "mpeg", "mpa", "mpg", "mpe", "mov", "exe",
- "text", "rar", "tgz","dir"};
+ "text", "rar", "tgz","dir", "png"};
String picto[] =3D {"doc", "xls", "ppt", "zip", "pdf", "txt", "html",
"html", "sound", "sound", "img", "img", "img",
"img", "video", "video", "video", "video",
- "video", "video", "exe", "txt", "zip", "tgz","dir"};
+ "video", "video", "exe", "txt", "zip", "tgz","dir", =
"img"};
=
public String getPicto (String fileName)
throws JahiaException
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/common/top.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/common/top.inc&rev=3D818&repname=3Dcorporate_portal_templat=
es_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-1-SP-BRANCH/src/jsp/common/top.inc (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/common/top.inc Fri Oct 19 10:18:04=
2007
@@ -34,7 +34,7 @@
var chatOnline =3D "<%=3Dchatstatus%>";//default state of the chat
var currentUserKey =3D "<%=3Duser.getUserKey()%>";//our userkey
</script>
-<jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
+<jesi:fragment aclGroup=3D"true">
<%
=
if (contentPage.getPageTemplate(entryLoadRequest).getSourcePath().indexOf(=
"webdav") !=3D -1 ) {
@@ -318,6 +318,7 @@
<div id=3D"toplinks"><%@ include file=3D"/jsp/jahia/topbar/operationbutton=
s.inc"%></div>
</jesi:fragment>
=
+<jesi:fragment aclGroup=3D"true">
<div id=3D"header">
<div id=3D"logo">
<logic:present name=3D"logo">
@@ -353,7 +354,6 @@
<%@ include file=3D"topmenu.inc" %>
</div>
</div>
-
<div id=3D"pagebody">
<%
if (! isFullScreen) {
@@ -410,4 +410,4 @@
<div id=3D"content" <%if (isFullScreen) {%> style=3D"width: 984px;"<%}=
%> >
<jsp:include page=3D"splash/splash.jsp" flush=3D"true"/>
<%if (isFullScreen) {%> </div><%}%>
-
+</jesi:fragment>
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/common/topmenu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/common/topmenu.inc&rev=3D818&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-1-SP-BRANCH/src/jsp/common/topmenu.inc (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/common/topmenu.inc Fri Oct 19 10:1=
8:04 2007
@@ -38,13 +38,11 @@
}
%>>
<a class=3D"link" href=3D"<%=3DnavigationLink.getURL(jPara=
ms)%>">
- <span>
<%if(navigationLink.getTitle()!=3Dnull && !navigationLink.=
getTitle().equals("")){%>
- <%=3DnavigationLink.getHighLightDiffTitle(jData.params=
())%>
+ <span><%=3DnavigationLink.getHighLightDiffTitle(jData.=
params())%></span>
<% } else { %>
- <font color=3D"#FF0000"><content:resourceBundle resour=
ceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"n=
oTitle" defaultValue=3D"No title"/></font>
+ <span style=3D"color:red;"><content:resourceBundle res=
ourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=
=3D"noTitle" defaultValue=3D"No title"/></span>
<% }%>
- </span>
</a>
<%
if (isEditMode) {
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/css/template_css.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/css/template_css.jsp&rev=3D818&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-1-SP-BRANCH/src/jsp/css/template_css.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/css/template_css.jsp Fri Oct 19 10=
:18:04 2007
@@ -14,29 +14,20 @@
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" %><%@ taglib uri=3D"contentLib" prefix=3D"c=
ontent" %><%
+--%><%@ page language=3D"java" %><%
response.setContentType("text/css");
- // this value can control the different parts of css (if needed)
- String bv=3D"";
- bv=3D(String)request.getParameter("bval");
- if(bv=3D=3Dnull || bv.equalsIgnoreCase("")) bv=3D"3";
- int bval=3DInteger.parseInt(bv);
-org.apache.log4j.Logger logger =3D org.apache.log4j.Logger.getLogger(getCl=
ass());
+String ctx =3D request.getContextPath();
org.jahia.settings.SettingsBean siteSetting =3D org.jahia.bin.Jahia.getSet=
tings();
-if (siteSetting !=3D null) {
- if (siteSetting.isDevelopmentMode()) {
- logger.debug("We are in dev mode -> Disable browser cache for temp=
late_css.jsp");
- response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
- response.setHeader("Pragma","no-cache"); //HTTP 1.0
- response.setDateHeader ("Expires", -1);
- } else {
- logger.debug("We are in production mode -> Set browser cache for t=
emplate_css.jsp to 1 hour");
- long now =3D System.currentTimeMillis();
- response.setDateHeader("Expires", now + 3600000); // 1 hour
- response.addHeader("Cache-Control", "max-age=3D3600");
- }
+if (siteSetting !=3D null && siteSetting.isDevelopmentMode()) {
+ response.setHeader("Cache-Control","no-store, no-cache, must-revalidat=
e, max-age=3D0"); //HTTP 1.1
+ response.addHeader("Cache-Control","post-check=3D0, pre-check=3D0");
+ response.setHeader("Pragma","no-cache"); //HTTP 1.0
+ response.setDateHeader ("Expires", -1);
+} else {
+ response.setHeader("Cache-Control", "public, max-age=3D604800, post-ch=
eck=3D7200, pre-check=3D604800");
+ response.setHeader("Pragma", "");
+ response.setDateHeader("Expires", System.currentTimeMillis() + 604800 =
* 1000); // 7 days
}
-logger.debug("Opening template_css.jsp");
%>/* GLOBAL SETTINGS
------------------------------------------------ */
body{background:#ddd;color:#333;font-family:Arial, Helvetica, sans-serif;f=
ont-size:11px;text-align:left;margin:0;padding:0;}
@@ -373,9 +364,9 @@
table.searchResultListing th a,table.searchResultListing th a:visited{colo=
r:#000;}
table.searchResultListing th a:hover{color:#000;text-decoration:underline;}
table.searchResultListing th.sorted a,table.searchResultListing th.sortabl=
e a{background:right top;display:block;width:100%;}
-table.searchResultListing th.sortable a{background:url(<content:serverHttp=
Path/>/jsp/jahia/engines/images/arrow_off.png) no-repeat;padding-right:5px;}
-table.searchResultListing th.order1 a{background:url(<content:serverHttpPa=
th/>/jsp/jahia/engines/images/arrow_down.png) no-repeat;padding-right:5px;}
-table.searchResultListing th.order2 a{background:url(<content:serverHttpPa=
th/>/jsp/jahia/engines/images/arrow_up.png) no-repeat;padding-right:5px;}
+table.searchResultListing th.sortable a{background:url(<%=3Dctx%>/jsp/jahi=
a/engines/images/arrow_off.png) no-repeat;padding-right:5px;}
+table.searchResultListing th.order1 a{background:url(<%=3Dctx%>/jsp/jahia/=
engines/images/arrow_down.png) no-repeat;padding-right:5px;}
+table.searchResultListing th.order2 a{background:url(<%=3Dctx%>/jsp/jahia/=
engines/images/arrow_up.png) no-repeat;padding-right:5px;}
table.searchResultListing tr.odd{background:#ecf7ce;}
table.searchResultListing tr.even{background:#fff;}
div.searchResultListing span.pagelinks a{display:inline;}
@@ -469,9 +460,9 @@
table.formResultListing th a,table.formResultListing th a:visited{color:#0=
00;}
table.formResultListing th a:hover{color:#000;text-decoration:underline;}
table.formResultListing th.sorted a,table.formResultListing th.sortable a{=
background:right top;display:block;width:100%;}
-table.formResultListing th.sortable a{padding-left: 12px; background:url(<=
content:serverHttpPath/>/jsp/jahia/engines/images/arrow_off.png) no-repeat;=
padding-right:5px;}
-table.formResultListing th.order1 a{background:url(<content:serverHttpPath=
/>/jsp/jahia/engines/images/arrow_down.png) no-repeat;padding-right:5px;}
-table.formResultListing th.order2 a{background:url(<content:serverHttpPath=
/>/jsp/jahia/engines/images/arrow_up.png) no-repeat;padding-right:5px;}
+table.formResultListing th.sortable a{padding-left: 12px; background:url(<=
%=3Dctx%>/jsp/jahia/engines/images/arrow_off.png) no-repeat;padding-right:5=
px;}
+table.formResultListing th.order1 a{background:url(<%=3Dctx%>/jsp/jahia/en=
gines/images/arrow_down.png) no-repeat;padding-right:5px;}
+table.formResultListing th.order2 a{background:url(<%=3Dctx%>/jsp/jahia/en=
gines/images/arrow_up.png) no-repeat;padding-right:5px;}
table.formResultListing tr.odd{background:#ecf7ce;}
table.formResultListing tr.even{background:#fff;}
div.formResultListing span.pagelinks a {display: inline;}
@@ -486,9 +477,9 @@
table.revisionsListing th a,table.revisionsListing th a:visited {color: bl=
ack;}
table.revisionsListing th a:hover {text-decoration: underline;color: black=
;}
table.revisionsListing th.sorted a,table.revisionsListing th.sortable a {b=
ackground-position: right top;display: block;width: 100%;}
-table.revisionsListing th.sortable a {padding-right: 5px;background-image:=
url(<content:serverHttpPath/>/jsp/jahia/engines/images/arrow_off.png);back=
ground-repeat:no-repeat;}
-table.revisionsListing th.order1 a {padding-right: 5px;background-image: u=
rl(<content:serverHttpPath/>/jsp/jahia/engines/images/arrow_down.png);backg=
round-repeat:no-repeat;}
-table.revisionsListing th.order2 a {padding-right: 5px;background-image: u=
rl(<content:serverHttpPath/>/jsp/jahia/engines/images/arrow_up.png);backgro=
und-repeat:no-repeat;}
+table.revisionsListing th.sortable a {padding-right: 5px;background-image:=
url(<%=3Dctx%>/jsp/jahia/engines/images/arrow_off.png);background-repeat:n=
o-repeat;}
+table.revisionsListing th.order1 a {padding-right: 5px;background-image: u=
rl(<%=3Dctx%>/jsp/jahia/engines/images/arrow_down.png);background-repeat:no=
-repeat;}
+table.revisionsListing th.order2 a {padding-right: 5px;background-image: u=
rl(<%=3Dctx%>/jsp/jahia/engines/images/arrow_up.png);background-repeat:no-r=
epeat;}
table.revisionsListing tr.odd {background-color: #fff}
table.revisionsListing tr.tableRowEven,tr.even {background-color: #fea}
table.revisionsListing {padding:0px;width: 100%;margin-left: -2px;margin-r=
ight: -2px;}
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/doc/detail.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/doc/detail.jsp&rev=3D818&repname=3Dcorporate_portal_templat=
es_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-1-SP-BRANCH/src/jsp/doc/detail.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/doc/detail.jsp Fri Oct 19 10:18:04=
2007
@@ -40,7 +40,7 @@
=
int linkPID =3D -1;
StringBuffer fullPath =3D new StringBuffer();
- JahiaPage aPage;
+ ContentPage aPage;
int count =3D 0;
if (link.getPageType() =3D=3D 0) {
linkPID =3D link.getID();
@@ -49,14 +49,14 @@
}
if (linkPID !=3D -1){
ContentPage contentPage =3D ContentPage.getPage(linkPID);
- Enumeration thePath =3D contentPage.getPagePath(jData.params().ge=
tEntryLoadRequest(),
+ Enumeration thePath =3D contentPage.getContentPagePath(jData.para=
ms().getEntryLoadRequest(),
jData.params().getOperationMode(),
- jData.params().getUser());
+ jData.params().getUser(),
JahiaPageService.PAGEPATH_BREAK_ON=
_RESTRICTED);
if ((thePath.hasMoreElements()) && (skipHome)){
thePath.nextElement();// skip home page
}
while (thePath.hasMoreElements()) {
- aPage =3D (JahiaPage) thePath.nextElement();
+ aPage =3D (ContentPage) thePath.nextElement();
if (aPage !=3D null) {
count++;
if (count > 1){
@@ -65,7 +65,7 @@
fullPath.append("<a href=3D\"");
fullPath.append(aPage.getURL(jData.params()));
fullPath.append("\">");
- fullPath.append(aPage.getTitle());
+ fullPath.append(aPage.getTitle(jData.params()));
fullPath.append("</a>");
}
}
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/doc/folderDocumentBox.jsp&rev=3D818&repname=3Dcorporate_por=
tal_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-1-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp (origina=
l)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/doc/folderDocumentBox.jsp Fri Oct =
19 10:18:04 2007
@@ -36,7 +36,7 @@
=
int linkPID =3D -1;
StringBuffer fullPath =3D new StringBuffer();
- JahiaPage aPage;
+ ContentPage aPage;
int count =3D 0;
if (link.getPageType() =3D=3D 0) {
linkPID =3D link.getID();
@@ -45,14 +45,14 @@
}
if (linkPID !=3D -1){
ContentPage contentPage =3D ContentPage.getPage(linkPID);
- Enumeration thePath =3D contentPage.getPagePath(jData.params().ge=
tEntryLoadRequest(),
+ Enumeration thePath =3D contentPage.getContentPagePath(jData.para=
ms().getEntryLoadRequest(),
jData.params().getOperationMode(),
- jData.params().getUser());
+ jData.params().getUser(),
JahiaPageService.PAGEPATH_BREAK_ON=
_RESTRICTED);
if ((thePath.hasMoreElements()) && (skipHome)){
thePath.nextElement();// skip home page
}
while (thePath.hasMoreElements()) {
- aPage =3D (JahiaPage) thePath.nextElement();
+ aPage =3D (ContentPage) thePath.nextElement();
if (aPage !=3D null) {
count++;
if (count > 1){
@@ -61,7 +61,7 @@
fullPath.append("<a href=3D\"");
fullPath.append(aPage.getURL(jData.params()));
fullPath.append("\">");
- fullPath.append(aPage.getTitle());
+ fullPath.append(aPage.getTitle(jData.params()));
fullPath.append("</a>");
}
}
@@ -179,7 +179,7 @@
<tr><td <%if (editMode){%>class=3D"boxEPbordercolor1"<%}%>><table width=3D=
"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"2">
<content:containerList name=3D'<%=3D"contentContainer" + id%>' id=3D"conte=
ntContainerList">
<tr><td><table width=3D"100%" border=3D"0"><content:container id=3D"co=
ntentContainer">
- <tr><td><jahiaHtml:actionMenu name=3D"contentContainer" namePo=
stFix=3D"" resourceBundle=3D"jahiatemplates.Corporate_portal_templates">
+ <tr><td><jahiaHtml:actionMenu name=3D"contentContainer" namePo=
stFix=3D"" resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2">
<content:containerDiffHighlight id=3D"contentContainerHighLigh=
t" name=3D"contentContainer"/>
<content:textField name=3D'<%=3D"subTitle" + id%>'
defaultValue=3D"" di=
ffActive=3D"true" display=3D"false" valueId=3D"subTitle"/>
<logic:notEmpty name=3D"subTitle">
@@ -211,7 +211,7 @@
=
<content:addContainerURL id=3D"addContentContainerUrl" display=3D"none"/>
<logic:present name=3D"addContentContainerUrl">
- <a href=3D"<bean:write name=3D'addContentContainerUrl'/>"><img src=3D'=
<content:contextURL/>/img/add.gif' border=3D0> <%=3DResourceBundle.get=
Bundle("jahiatemplates.Corporate_portal_templates",jData.params().getLocale=
()).getString("addText")%></a>
+ <a href=3D"<bean:write name=3D'addContentContainerUrl'/>"><img src=3D'=
<content:contextURL/>/img/add.gif' border=3D0> <%=3DResourceBundle.get=
Bundle("jahiatemplates.Corporate_portal_templates_v2",jData.params().getLoc=
ale()).getString("addText")%></a>
</logic:present>
=
</content:containerList><%}%>
@@ -242,7 +242,7 @@
<td class=3D"nowrap"> <bean:write name=3D'fil=
eObject' property=3D'formatedSize' filter=3D"false"/> </td>
<td class=3D"nowrap">/ <bean:write name=3D'fi=
leObject' property=3D'formatedLastModifDate' filter=3D"false"/> </td>
<logic:equal name=3D"filesContainer" property=3D"acti=
onURIsEmpty" value=3D"false">
- <td align=3D"right"><jahiaHtml:actionMenu name=3D"=
filesContainer" namePostFix=3D"" resourceBundle=3D"jahiatemplates.Corporate=
_portal_templates" useFieldSet=3D"false"/></td>
+ <td align=3D"right"><jahiaHtml:actionMenu name=3D"=
filesContainer" namePostFix=3D"" resourceBundle=3D"jahiatemplates.Corporate=
_portal_templates_v2" useFieldSet=3D"false"/></td>
</logic:equal>
</tr>
<tr class=3D"boxEPcontentcolor1">
@@ -262,7 +262,7 @@
</content:containerList>
</table></td></tr></table>
<%if (editMode){%><br><%}%>
-<jahiaHtml:actionMenu name=3D"filesContainerList" namePostFix=3D"" resourc=
eBundle=3D"jahiatemplates.Corporate_portal_templates"
+<jahiaHtml:actionMenu name=3D"filesContainerList" namePostFix=3D"" resourc=
eBundle=3D"jahiatemplates.Corporate_portal_templates_v2"
useFieldSet=3D"false" actionIcon=3D'<%=3DcontextURL + "/img/box_upload=
.gif"%>' labelKey=3D"uploadFile">
</jahiaHtml:actionMenu><%}%>
<%if ((linkSize > 0) || (editMode)){
@@ -280,7 +280,7 @@
<td valign=3D"top" width=3D"100%"><a class=3D"box" <logic:=
equal name=3D"link" property=3D"type" value=3D"2">target=3D"_new"</logic:eq=
ual> href=3D"<bean:write name=3D'link' property=3D'url'/>">
<b><bean:write name=3D"link" property=3D"title" fi=
lter=3D"false"/></b></a>
<%=3DgetPath(linkBean.getJahiaPage(), jData)%></td>
- <td align=3D"right"><jahiaHtml:actionMenu name=3D"=
linksContainer" namePostFix=3D"" resourceBundle=3D"jahiatemplates.Corporate=
_portal_templates" useFieldSet=3D"false"/></td>
+ <td align=3D"right"><jahiaHtml:actionMenu name=3D"=
linksContainer" namePostFix=3D"" resourceBundle=3D"jahiatemplates.Corporate=
_portal_templates_v2" useFieldSet=3D"false"/></td>
</tr>
<content:textField valueId=3D"linkDesc" name=3D'linkDesc' =
display=3D"false" defaultValue=3D""/>
<logic:notEmpty name=3D"linkDesc">
@@ -292,7 +292,7 @@
<logic:empty name=3D"link">
<logic:equal name=3D"currentRequest" property=3D"editMode"
va=
lue=3D"true">
<td valign=3D"top">-</td>
- <td valign=3D"top"><content:resourceBundle
resourceBundle=
=3D"jahiatemplates.Corporate_portal_templates" resourceName=3D"noLink"/></t=
d></tr>
+ <td valign=3D"top"><content:resourceBundle
resourceBundle=
=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"noLink"/>=
</td></tr>
</logic:equal>
</logic:empty>
</content:pageField>
@@ -305,7 +305,7 @@
<content:containerList name=3D'<%=3D"linksContainer" + id%>'>
<content:addContainerURL id=3D"addLinksContainerUrl" display=3D"none"/>
<logic:present name=3D"addLinksContainerUrl">
- <a href=3D"<bean:write name=3D'addLinksContainerUrl'/>"><img src=3D'<c=
ontent:contextURL/>/img/add.gif' border=3D0> <%=3DResourceBundle.getBu=
ndle("jahiatemplates.Corporate_portal_templates",jData.params().getLocale()=
).getString("addLink")%></a>
+ <a href=3D"<bean:write name=3D'addLinksContainerUrl'/>"><img src=3D'<c=
ontent:contextURL/>/img/add.gif' border=3D0> <%=3DResourceBundle.getBu=
ndle("jahiatemplates.Corporate_portal_templates_v2",jData.params().getLocal=
e()).getString("addLink")%></a>
</logic:present>
</content:containerList><%}
if (jData.gui().isEditMode()) {%><img src=3D"<content:contextURL/>/img/pix=
.gif" alt=3D"" width=3D"147" height=3D"12"/><%}%>
\ No newline at end of file
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/double.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/double.jsp&rev=3D818&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-1-SP-BRANCH/src/jsp/double.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/double.jsp Fri Oct 19 10:18:04 2007
@@ -22,13 +22,17 @@
</div>
<div class=3D"leftcol">
<jsp:include page=3D"common/pagetitle.jsp" flush=3D"true"/>
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"common/main_content.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"leftcol"/>
</jsp:include>
+ </jesi:fragment>
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"box/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"leftcol"/>
<jsp:param name=3D"displayDetails" value=3D"true"/>
</jsp:include>
+ </jesi:fragment>
</div>
<div class=3D"rightcol">
<logic:equal name=3D"currentRequest" property=3D"logged" value=3D"fals=
e">
@@ -54,13 +58,17 @@
</div>
</div>
</logic:equal>
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"common/main_content.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"rightcol"/>
</jsp:include>
+ </jesi:fragment>
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"box/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"rightcol"/>
<jsp:param name=3D"displayDetails" value=3D"false"/>
</jsp:include>
+ </jesi:fragment>
</div>
<%@ include file=3D"common/bottom.inc"%>
=
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/form_generator/display_form.=
inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/form_generator/display_form.inc&rev=3D818&repname=3Dcorpora=
te_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-1-SP-BRANCH/src/jsp/form_generator/display_form.inc (o=
riginal)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/form_generator/display_form.inc Fr=
i Oct 19 10:18:04 2007
@@ -304,7 +304,6 @@
}
=
} else if (ResourceBundleMarker.drawMarker=
(resBundleID,"fileUpload","").equals(type)) { =
- if (! "".equals(defaultValue)) { =
%>
<script
type=3D"text/javascript"> =
=
document.submitToContainerList.encty=
pe =3D "multipart/form-data";
@@ -312,12 +311,10 @@
</script>
<input size=3D"80"
type=3D"file" name=3D=
"field_<%=3DcurrentField.getID()%>" />
<%
- } else {
- if (isEditMode) {
+ if (isEditMode &&
"".equals(defaultValue=
)) {
%><span style=3D"color:red;"><cont=
ent:resourceBundle
resourceBundle=3D"jahiatemplat=
es.Corporate_portal_templates_v2"
- resourceName=3D"form.defaultVa=
lueRequired"/></span><%
- }
+ resourceName=3D"form.defaultPa=
thWillBeUsed"/></span><%
}
=
} else if (ResourceBundleMarker.drawMarker=
(resBundleID,"submitButton","").equals(type)) {
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/form_generator/process_post.=
inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/form_generator/process_post.inc&rev=3D818&repname=3Dcorpora=
te_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-1-SP-BRANCH/src/jsp/form_generator/process_post.inc (o=
riginal)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/form_generator/process_post.inc Fr=
i Oct 19 10:18:04 2007
@@ -68,12 +68,21 @@
String type =3D currentField.getFieldValue("type","");
=
String path =3D null;
+ String storePath =3D null ;
final boolean isFileUploadType =3D ResourceBundleMarker.drawMa=
rker(resBundleID,"fileUpload","").equals(type);
if (isFileUploadType) {
final
org.jahia.engines.filemanager.DAVFilemanager_Engine da=
vEngine =3D org.jahia.engines.filemanager.DAVFilemanager_Engine.getInstance=
();
final String uploadPath =3D
currentField.getFieldValue("defa=
ultValue","");
+ if (uploadPath.equals("")) {
+ // uses a default path if none specified
(generated folder)
+ // this will be displayed next to the file
field when in ed=
it mode
+ path =3D
davEngine.uploadAndRenameAutomatically("/shared/fo=
rms/missing_path", jData.params(), "field_" + currentField.getID()) ;
+ } else {
path =3D
davEngine.uploadAndRenameAutomatically(uploadPath, =
jData.params(), "field_" + currentField.getID()); =
} =
+ DAVFileAccess dfa =3D new DAVFileAccess(jParams,
jParams.get=
Site(), jParams.getUser(), path);
+ storePath =3D
dfa.getFullPath(jParams) ;
+ }
=
if (! ResourceBundleMarker.drawMarker(resBundleID,"submitButto=
n","").equals(type)) {
String fieldTitle =3D currentField.getFieldValue("fieldTit=
le","");
@@ -81,7 +90,7 @@
boolean isMandatory =3D "true".equals(isMandatoryStr);
final String[] postedValues;
if (isFileUploadType) {
- postedValues =3D new String[] {(path =3D=3D
null ? "" : =
path)}; =
+ postedValues =3D new String[] {(path =3D=3D
null ? "" : =
storePath)}; =
} else {
if (fupload =3D=3D null) {
postedValues =3D
request.getParameterValues("field_" +=
currentField.getID());
@@ -99,12 +108,7 @@
}
}
logger.debug("-- " + fieldTitle + ": " + postedValuesSB.to=
String());
- if (isFileUploadType) {
- mailBody.append(fieldTitle).append(" :
").append(request=
.getScheme()).append("://").append(request.getServerName()). =
-
append(":").append(request.getServerPort()).append(pos=
tedValuesSB.toString()).append("\n"); =
- } else {
mailBody.append(fieldTitle).append(" :
").append(postedV=
aluesSB.toString()).append("\n");
- }
if (isMandatory && "".equals(postedValuesSB.toString())) {
logger.debug("Field [" + fieldTitle + "] is mandatory"=
);
emptyMandatoryFields.add(new Integer(currentField.getI=
D()));
@@ -162,6 +166,7 @@
sender =3D JahiaTools.html2text(sender);
recipients =3D JahiaTools.html2text(recipients);
recipientsCC =3D JahiaTools.html2text(recipientsCC);
+ if (recipientsCC.equals("")) recipientsCC =3D null ; // avoid =
exception if CC is an empty string
subject =3D JahiaTools.html2text(subject);
String body =3D JahiaTools.html2text(mailBody.toString());
org.jahia.services.mail.MailService mailService =3D
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/javascript/transmenu_js.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/javascript/transmenu_js.jsp&rev=3D818&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-1-SP-BRANCH/src/jsp/javascript/transmenu_js.jsp (origi=
nal)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/javascript/transmenu_js.jsp Fri Oc=
t 19 10:18:04 2007
@@ -14,10 +14,11 @@
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"java.util.*" %>
-<%
+--%><%@ page language=3D"java" %><%@ page import=3D"java.util.*" %><%
response.setContentType("application/x-javascript");
+response.setHeader("Cache-Control", "public, max-age=3D604800, post-check=
=3D7200, pre-check=3D604800");
+response.setHeader("Pragma", "");
+response.setDateHeader("Expires", System.currentTimeMillis() + 604800 * 10=
00); // 7 days
String contextUrl =3D request.getContextPath() + request.getServletPath();
contextUrl =3D contextUrl.substring(0,contextUrl.lastIndexOf("/") );
%>
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/mediagallery/medialist.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/mediagallery/medialist.inc&rev=3D818&repname=3Dcorporate_po=
rtal_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-1-SP-BRANCH/src/jsp/mediagallery/medialist.inc (origin=
al)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/mediagallery/medialist.inc Fri Oct=
19 10:18:04 2007
@@ -124,7 +124,7 @@
// edit mode
if (jData.gui().isEditMode()) {
%>
-size:<%=3Dsizethumb%>path:<%=3Dwebdavpath%><br/>
+size:<%=3Dsizethumb%><br/>path:<%=3Dwebdavpath%><br/>
=
<h3>MEDIAGALLERY</h3>
=
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/news.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/news.jsp&rev=3D818&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-1-SP-BRANCH/src/jsp/news.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/news.jsp Fri Oct 19 10:18:04 2007
@@ -20,7 +20,8 @@
<%@ include file=3D"common/top.inc"%>
=
<div class=3D"full2">
- <jesi:fragment aclGroup=3D"true">
+ <!-- This fragment will expire every 15 minutes -->
+ <jesi:fragment aclGroup=3D"true" expiration=3D"900">
<jsp:include page=3D"news/news.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"full"/>
</jsp:include>
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/news/eventlistener.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/news/eventlistener.inc&rev=3D818&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-1-SP-BRANCH/src/jsp/news/eventlistener.inc (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/news/eventlistener.inc Fri Oct 19 =
10:18:04 2007
@@ -17,23 +17,23 @@
--%><%
if ( "newsCl".equals(theContainer.getDefinition().getName()) ){
if ( "addContainerEngineAfterInit".equals(eventName) ) {
- logger.debug("Start eventlistner for event addContainerEngineAfter=
Init for newsCl Container List");
+ logger.debug("Start eventlistner for newsCl Container List");
JahiaField theField =3D theContainer.getField("date");
- if (theField.getObject() =3D=3D null) {
- Calendar cal =3D Calendar.getInstance(TimeZone.getTimeZone("UT=
C"));
- long now =3D cal.getTime().getTime();
- String nowStr =3D String.valueOf(now);
- theField.setObject(nowStr);
+ String eventDate =3D String.valueOf(jahiaEvent.getEventTime());
+ theField.setObject(eventDate);
feh.addUpdatedField(theField.getID(), theField.getLanguageCode=
());
logger.debug("Adding updated field #" + theField.getID() + " f=
or language code [" + theField.getLanguageCode() + "]");
updatedFields.add(new Integer(theField.getID()));
- logger.debug("Set value for field [date] to : [" + theField.ge=
tObject() +"]");
+ logger.debug("Set value for field [internalEventDate] to : [" + th=
eField.getObject() +"]");
}
- logger.debug ("Flushing Output Cache");
- try {
- ServicesRegistry.getInstance().getCacheService().getHtmlCacheI=
nstance().flush();
- } catch (Throwable t) {
- logger.error("Error while trying to flush HTML cache", t);
+ if ("addContainerEngineBeforeSave".equals(eventName) || "updateContain=
erEngineBeforeSave".equals(eventName) || =
+ "containerUpdated".equals(eventName)){
+ JahiaField theField =3D theContainer.getField("date");
+ String savedValue =3D (String) theField.getObject();
+ if (savedValue =3D=3D null || "<empty>".equals(savedValue) || "".e=
quals(savedValue)) {
+ String eventDate =3D String.valueOf(jahiaEvent.getEventTime());
+ theField.setObject(eventDate);
+ theField.save(jParams);
}
}
}
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/news/news.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/news/news.jsp&rev=3D818&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-1-SP-BRANCH/src/jsp/news/news.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/news/news.jsp Fri Oct 19 10:18:04 =
2007
@@ -22,7 +22,26 @@
<%@ include file=3D"filters.inc"%>
<%//@ include file=3D"definitions.inc"%>
=
-<content:containerList name=3D"newsCl" id=3D"newsCl">
+<content:containerList name=3D"newsCl" id=3D"newsCl" windowSize=3D"10">
+<content:cListPaginationCurrentPageScrollingValue valueOnly=3D"false"/>
+
+<content:jahiaPageForm name=3D"pageForm_newsCl" method=3D"post">
+<content:previousWindowButton title=3D'<%=3D"<<" + getResourceBundle=
("quizz.previous","Previous",jData)%>' method=3D"post"
+ formName=3D"pageForm_newsCl" />
+<content:cListPaginationCurrentPageScrollingValue valueOnly=3D"false" />
+ <content:cListPagination nbStepPerPage=3D"10" >
+ <content:cListPaginationPreviousRangeOfPages method=3D"post"
+ formName=3D"pageForm_newsCl" title=3D"..."/>
+ <content:ifCListPaginationCurrentPage><strong></content:ifCListPaginat=
ionCurrentPage>
+ <content:cListPaginationPageUrl method=3D"post"
+ formName=3D"pageForm_newsCl" />
+ <content:ifCListPaginationCurrentPage></strong></content:ifCListPagina=
tionCurrentPage>
+ <content:cListPaginationNextRangeOfPages method=3D"post"
+ formName=3D"pageForm_newsCl" title=3D"..."/>
+</content:cListPagination>
+<content:nextWindowButton title=3D'<%=3DgetResourceBundle("quizz.next","Ne=
xt",jData) + ">>"%>' method=3D"post" formName=3D"pageForm_newsCl" />
+</content:jahiaPageForm>
+
<jahiaHtml:actionMenu name=3D"newsCl"
namePostFix=3D".news" resourceBundle=3D"jahiatemplates.Corporate_p=
ortal_templates_v2">
<content:container id=3D"new">
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/portal2/layout.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/portal2/layout.jsp&rev=3D818&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-1-SP-BRANCH/src/jsp/portal2/layout.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/portal2/layout.jsp Fri Oct 19 10:1=
8:04 2007
@@ -356,7 +356,7 @@
=
int linkPID =3D -1;
StringBuffer fullPath =3D new StringBuffer();
- JahiaPage aPage;
+ ContentPage aPage;
int count =3D 0;
if (link.getPageType() =3D=3D 0) {
linkPID =3D link.getID();
@@ -365,14 +365,14 @@
}
if (linkPID !=3D -1){
ContentPage contentPage =3D ContentPage.getPage(linkPID);
- Enumeration thePath =3D contentPage.getPagePath(jData.params().ge=
tEntryLoadRequest(),
+ Enumeration thePath =3D contentPage.getContentPagePath(jData.para=
ms().getEntryLoadRequest(),
jData.params().getOperationMode(),
- jData.params().getUser());
+ jData.params().getUser(),
JahiaPageService.PAGEPATH_BREAK_ON=
_RESTRICTED);
if ((thePath.hasMoreElements()) && (skipHome)){
thePath.nextElement();// skip home page
}
while (thePath.hasMoreElements()) {
- aPage =3D (JahiaPage) thePath.nextElement();
+ aPage =3D (ContentPage) thePath.nextElement();
if (aPage !=3D null) {
count++;
if (count > 1){
@@ -381,7 +381,7 @@
fullPath.append("<a href=3D\"");
fullPath.append(aPage.getURL(jData.params()));
fullPath.append("\">");
- fullPath.append(aPage.getTitle());
+ fullPath.append(aPage.getTitle(jData.params()));
fullPath.append("</a>");
}
}
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/project.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/project.jsp&rev=3D818&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-1-SP-BRANCH/src/jsp/project.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/project.jsp Fri Oct 19 10:18:04 20=
07
@@ -86,11 +86,11 @@
}
if (!jData.gui().html().drawAddContainerLauncher( linkContainerLis=
t ).equals("")) {
%>
- <br/><a class=3D"horizontaleline" href=3D"javascript:<%=3DjDat=
a.gui().html().drawAddContainerLauncher( linkContainerList )%>"><%=3DaddBut=
ton%> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corpora=
te_portal_templates" resourceName=3D"addFolder"/></a><br/>
+ <br/><a class=3D"horizontaleline" href=3D"javascript:<%=3DjDat=
a.gui().html().drawAddContainerLauncher( linkContainerList )%>"><%=3DaddBut=
ton%> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corpora=
te_portal_templates_v2" resourceName=3D"addFolder"/></a><br/>
<%
}
if (!jData.gui().html().drawContainerListPropertiesLauncher( linkC=
ontainerList ).equals("")) {
- %><a href=3D"javascript:<%=3DjData.gui().html().drawContainerL=
istPropertiesLauncher( linkContainerList )%>"><%=3DupdateButton%> <con=
tent:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templ=
ates" resourceName=3D"sortAndProperties"/></a><br/><%
+ %><a href=3D"javascript:<%=3DjData.gui().html().drawContainerL=
istPropertiesLauncher( linkContainerList )%>"><%=3DupdateButton%> <con=
tent:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templ=
ates_v2" resourceName=3D"sortAndProperties"/></a><br/><%
}
}
%>
Modified: branches/JAHIA-5-1-SP-BRANCH/src/jsp/searchresult.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/jsp/searchresult.jsp&rev=3D818&repname=3Dcorporate_portal_templ=
ates_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-1-SP-BRANCH/src/jsp/searchresult.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/jsp/searchresult.jsp Fri Oct 19 10:18:=
04 2007
@@ -527,7 +527,7 @@
<%
} %>
<br/><br/>
- </li><% if ( i < l-1 ){%><hr /><% } %></div>
+ </li><% if ( i < displayedSearchHitCount-1
){%><hr /><% } %></div>
<% } %>
</pg:item>
<% } %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
