xlawrence 2005/10/28 10:24:21 CEST
Modified files:
src/view/jsp/include blog_entries.inc blog_entry.inc
blog_view_comments.inc
blog_view_pingurl.inc
blog_view_trackbacks.inc box_news.inc
box_newslast5_cached.inc declarations.inc
files.inc html_file_clipping.inc
links.inc
simple_form_generator_display_form.inc
Log:
Fixed problem regarding linked page and closing fieldset tags
Revision Changes Path
1.7 +2 -4
corporate_portal_templates/src/view/jsp/include/blog_entries.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_entries.inc.diff?r1=1.6&r2=1.7&f=h
1.3 +1 -2
corporate_portal_templates/src/view/jsp/include/blog_entry.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_entry.inc.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -2
corporate_portal_templates/src/view/jsp/include/blog_view_comments.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_view_comments.inc.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -2
corporate_portal_templates/src/view/jsp/include/blog_view_pingurl.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_view_pingurl.inc.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -2
corporate_portal_templates/src/view/jsp/include/blog_view_trackbacks.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_view_trackbacks.inc.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -1
corporate_portal_templates/src/view/jsp/include/box_news.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/box_news.inc.diff?r1=1.2&r2=1.3&f=h
1.7 +1 -2
corporate_portal_templates/src/view/jsp/include/box_newslast5_cached.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/box_newslast5_cached.inc.diff?r1=1.6&r2=1.7&f=h
1.14 +1 -1
corporate_portal_templates/src/view/jsp/include/declarations.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/declarations.inc.diff?r1=1.13&r2=1.14&f=h
1.6 +1 -1 corporate_portal_templates/src/view/jsp/include/files.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/files.inc.diff?r1=1.5&r2=1.6&f=h
1.4 +1 -1
corporate_portal_templates/src/view/jsp/include/html_file_clipping.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/html_file_clipping.inc.diff?r1=1.3&r2=1.4&f=h
1.3 +1 -1 corporate_portal_templates/src/view/jsp/include/links.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/links.inc.diff?r1=1.2&r2=1.3&f=h
1.3 +3 -8
corporate_portal_templates/src/view/jsp/include/simple_form_generator_display_form.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/simple_form_generator_display_form.inc.diff?r1=1.2&r2=1.3&f=h
Index: blog_entries.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_entries.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blog_entries.inc 5 Aug 2005 14:01:27 -0000 1.6
+++ blog_entries.inc 28 Oct 2005 08:24:20 -0000 1.7
@@ -162,8 +162,7 @@
}
}
*/
- jData.gui().html().drawEndActionMenu(entryBean ,
- null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ jData.gui().html().drawEndActionMenu(entryBean, true, out);
}
if (! isDivDateClosed) {
%></div><%
@@ -241,8 +240,7 @@
<%
}
- jData.gui().html().drawEndActionMenu(entriesBean ,
- null, null, true, "", "jahiatemplates.Corporate_portal_templates",
null, out);
+ jData.gui().html().drawEndActionMenu(entriesBean, true, out);
}
%>
Index: blog_entry.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_entry.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blog_entry.inc 29 Apr 2005 12:48:46 -0000 1.2
+++ blog_entry.inc 28 Oct 2005 08:24:20 -0000 1.3
@@ -114,8 +114,7 @@
%>
</div>
<%
- jData.gui().html().drawEndActionMenu(entryBean ,
- null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ jData.gui().html().drawEndActionMenu(entryBean, true, out);
%>
<dd class="posted">
<a href="<%=bypassUrl%>?entryId=<%=entry.getID()%>"
Index: blog_view_comments.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_view_comments.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blog_view_comments.inc 29 Apr 2005 12:48:46 -0000 1.2
+++ blog_view_comments.inc 28 Oct 2005 08:24:20 -0000 1.3
@@ -57,7 +57,6 @@
</dl>
<%
}
- jData.gui().html().drawEndActionMenu(commentsBean ,
- null, null, true, "", "jahiatemplates.Corporate_portal_templates",
null, out);
+ jData.gui().html().drawEndActionMenu(commentsBean, true, out);
}
%>
\ No newline at end of file
Index: blog_view_pingurl.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_view_pingurl.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blog_view_pingurl.inc 29 Apr 2005 12:48:46 -0000 1.2
+++ blog_view_pingurl.inc 28 Oct 2005 08:24:21 -0000 1.3
@@ -22,7 +22,6 @@
<%
}
}
- jData.gui().html().drawEndActionMenu(pingURLsBean ,
- null, null, true, "", "jahiatemplates.Corporate_portal_templates",
null, out);
+ jData.gui().html().drawEndActionMenu(pingURLsBean, true, out);
}
%>
\ No newline at end of file
Index: blog_view_trackbacks.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/blog_view_trackbacks.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blog_view_trackbacks.inc 29 Apr 2005 12:48:46 -0000 1.2
+++ blog_view_trackbacks.inc 28 Oct 2005 08:24:21 -0000 1.3
@@ -48,7 +48,6 @@
</dl>
<%
}
- jData.gui().html().drawEndActionMenu(trackbacksBean ,
- null, null, true, "", "jahiatemplates.Corporate_portal_templates",
null, out);
+ jData.gui().html().drawEndActionMenu(trackbacksBean, true, out);
}
%>
\ No newline at end of file
Index: box_news.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/box_news.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- box_news.inc 31 May 2005 16:20:34 -0000 1.2
+++ box_news.inc 28 Oct 2005 08:24:21 -0000 1.3
@@ -73,7 +73,7 @@
}
%><br/><br/><%
}
- jData.gui().html().drawEndActionMenu(newsContainerBean , null, null,
true, "", "jahiatemplates.Corporate_portal_templates", null, out);
+ jData.gui().html().drawEndActionMenu(newsContainerBean, true, out);
}
if (newsCount == 0){
%><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="noNews"/><br/><%
Index: box_newslast5_cached.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/box_newslast5_cached.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- box_newslast5_cached.inc 27 Oct 2005 12:24:06 -0000 1.6
+++ box_newslast5_cached.inc 28 Oct 2005 08:24:21 -0000 1.7
@@ -330,8 +330,7 @@
%><a
href="<%=myNewsLink.getUrl(jData.params())%>"><%=myNewsLink.getTitle()%></a><br/><%
}
%><br/><br/><%
- jData.gui().html().drawEndActionMenu(newsContainerBean , null, null,
true,
- "", "jahiatemplates.Corporate_portal_templates", null, out);
+ jData.gui().html().drawEndActionMenu(newsContainerBean, true, out);
}
if (newsCount ==0){
%><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="noNews"/><br/><%
Index: declarations.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/declarations.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- declarations.inc 16 Aug 2005 09:52:20 -0000 1.13
+++ declarations.inc 28 Oct 2005 08:24:21 -0000 1.14
@@ -343,7 +343,7 @@
public void drawUpdateDelete(JahiaContainer jc, JahiaData jd, JspWriter out)
throws IOException {
ContainerBean cb = new ContainerBean(jc,jd.params());
jd.gui().html().drawBeginActionMenu(cb, null, null, false, "",
"jahiatemplates.Corporate_portal_templates", null,out);
- jd.gui().html().drawEndActionMenu(cb, null, null, false, "",
"jahiatemplates.Corporate_portal_templates", null,out);
+ jd.gui().html().drawEndActionMenu(cb, false, out);
}
public int getListSize(JahiaData jd, String listName) throws JahiaException {
Index: files.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/files.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- files.inc 29 Apr 2005 12:48:46 -0000 1.5
+++ files.inc 28 Oct 2005 08:24:21 -0000 1.6
@@ -198,7 +198,7 @@
<a class="horizontaleline" href="javascript:<%=
jData.gui().html().drawAddContainerLauncher( filesContainer )%>"><img
src="<%=theURL%>/images/box_upload.gif" width="15" height="15" border="0"
alt="Upload file"/> <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="uploadFile"/></a><br/>
<%
}
-jData.gui().html().drawEndActionMenu(filesContainerListBean , null, null,
false, "", "jahiatemplates.Corporate_portal_templates", null, out);
+jData.gui().html().drawEndActionMenu(filesContainerListBean, false, out);
%>
Index: html_file_clipping.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/html_file_clipping.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- html_file_clipping.inc 19 Aug 2004 19:46:39 -0000 1.3
+++ html_file_clipping.inc 28 Oct 2005 08:24:21 -0000 1.4
@@ -250,5 +250,5 @@
e.printStackTrace();
}
- jData.gui().html().drawEndActionMenu(theFILEBean , null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null,out);
+ jData.gui().html().drawEndActionMenu(theFILEBean, true, out);
%>
Index: links.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/links.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- links.inc 9 Mar 2005 11:09:03 -0000 1.2
+++ links.inc 28 Oct 2005 08:24:21 -0000 1.3
@@ -108,6 +108,6 @@
<br/><a class="horizontaleline" href="javascript:<%=
jData.gui().html().drawAddContainerLauncher( directoryLinkContainerList
)%>"><%=addButton%> <jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="addLink"/></a><br/>
<%
}
-jData.gui().html().drawEndActionMenu(directoryLinkContainerListBean , null,
null, true, "", "jahiatemplates.Corporate_portal_templates", null, out);
+jData.gui().html().drawEndActionMenu(directoryLinkContainerListBean, true,
out);
%>
Index: simple_form_generator_display_form.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/simple_form_generator_display_form.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple_form_generator_display_form.inc 22 Aug 2005 11:18:18 -0000
1.2
+++ simple_form_generator_display_form.inc 28 Oct 2005 08:24:21 -0000
1.3
@@ -50,9 +50,7 @@
resourceName="form.recipientsCC"/>:
</strong><%=recipientsCC%><br/>
<%
}
- jData.gui().html().drawEndActionMenu(formBean ,
- null, null, true, "",
"jahiatemplates.Corporate_portal_templates",
- null, out);
+ jData.gui().html().drawEndActionMenu(formBean, true, out);
}
if (isFormOK) {
@@ -245,9 +243,7 @@
</table>
</form>
<%
- jData.gui().html().drawEndActionMenu(fieldsBean , null,
- null, true,
"","jahiatemplates.Corporate_portal_templates",
- null, out);
+ jData.gui().html().drawEndActionMenu(fieldsBean, true,
out);
if (storePostedValues) {
// display tables
%>
@@ -308,8 +304,7 @@
}
}
}
- jData.gui().html().drawEndActionMenu(formsBean ,
- null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ jData.gui().html().drawEndActionMenu(formsBean, true, out);
}
}
