mcardle 2005/06/13 12:25:11 CEST
Modified files:
src/view/jsp/include layout_fullscreen.inc layout_standard.inc
Log:
added support new box syntax and for News Last 5 box
Revision Changes Path
1.2 +8 -4
corporate_portal_templates/src/view/jsp/include/layout_fullscreen.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/layout_fullscreen.inc.diff?r1=1.1&r2=1.2&f=h
1.3 +10 -6
corporate_portal_templates/src/view/jsp/include/layout_standard.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/layout_standard.inc.diff?r1=1.2&r2=1.3&f=h
Index: layout_fullscreen.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/layout_fullscreen.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- layout_fullscreen.inc 28 Oct 2003 22:56:41 -0000 1.1
+++ layout_fullscreen.inc 13 Jun 2005 10:25:10 -0000 1.2
@@ -5,10 +5,10 @@
<td width="100%" height="100%" valign="top">
<table border="0" cellpadding="0" cellspacing="0" width="100%"
height="100%">
<%
- String boxTitle = theContainer.getFieldValue("boxTitle" + id , "",
true , jData.params());
- String boxTypeKey = (String) theContainer.getFieldValue("boxType" +
id);
- String boxTitleLayoutKey =
(String)theContainer.getFieldValue("boxTitleLayout" + id);
- String boxContentLayoutKey =
(String)theContainer.getFieldValue("boxContentLayout" + id);
+ String boxTitle = theContainer.getFieldValue("boxTitle" , "", true
, jData.params());
+ String boxTypeKey = (String) theContainer.getFieldValue("boxType" );
+ String boxTitleLayoutKey =
(String)theContainer.getFieldValue("boxTitleLayout" );
+ String boxContentLayoutKey =
(String)theContainer.getFieldValue("boxContentLayout" );
%>
<tr>
@@ -50,6 +50,10 @@
} else if (
boxTypeKey.equals(ResourceBundleMarker.drawMarker(resBundleID,"newsLink","")) ){
%><%@ include file="box_link_news.inc"%><%
+ // Last 5 News
+ } else if (
boxTypeKey.equals(ResourceBundleMarker.drawMarker(resBundleID,"newslast5",""))
){
+ %><%@ include file="box_newslast5.inc"%><%
+
// Free Text (Default)
} else {
%><%@ include file="box_text.inc"%><%
Index: layout_standard.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/layout_standard.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- layout_standard.inc 11 Nov 2003 15:32:39 -0000 1.2
+++ layout_standard.inc 13 Jun 2005 10:25:10 -0000 1.3
@@ -61,10 +61,10 @@
<td width="100%" height="100%" valign="top">
</jahia:ifEditMode>
<%
- String boxTitle =
theContainer.getFieldValue("boxTitle" + id , "", true , jData.params());
- String boxTypeKey = (String)
theContainer.getFieldValue("boxType" + id);
- String boxTitleLayoutKey =
(String)theContainer.getFieldValue("boxTitleLayout" + id);
- String boxContentLayoutKey =
(String)theContainer.getFieldValue("boxContentLayout" + id);
+ String boxTitle =
theContainer.getFieldValue("boxTitle" , "", true , jData.params());
+ String boxTypeKey = (String)
theContainer.getFieldValue("boxType" );
+ String boxTitleLayoutKey =
(String)theContainer.getFieldValue("boxTitleLayout" );
+ String boxContentLayoutKey =
(String)theContainer.getFieldValue("boxContentLayout" );
boolean displayBox = true;
if ( "".equals(boxTitle)) {
if (! jData.gui().isEditMode()){
@@ -85,11 +85,11 @@
while
(webappsContainerList_tmp.hasMoreElements()) {
appCounter++;
JahiaContainer myContainer =
(JahiaContainer)webappsContainerList_tmp.nextElement();
- JahiaField webappField =
myContainer.getField("webapp" + id);
+ JahiaField webappField =
myContainer.getField("webapp" );
if ( webappField != null ){
fieldID =
webappField.getID();
}
- %><content:containerAnchor
fieldName='<%="webapp" + id%>'/><%
+ %><content:containerAnchor
fieldName='webapp'/><%
}
}
@@ -132,6 +132,10 @@
} else if (
boxTypeKey.equals(ResourceBundleMarker.drawMarker(resBundleID,"newsLink","")) ){
%><%@ include
file="box_link_news.inc"%><%
+ // Last 5 News
+ } else if (
boxTypeKey.equals(ResourceBundleMarker.drawMarker(resBundleID,"newslast5",""))
){
+ %><%@ include
file="box_newslast5.inc"%><%
+
// Free Text (Default)
} else {
%><%@ include
file="box_text.inc"%><%
