mcardle 2005/06/23 11:28:18 CEST
Modified files:
src/view/jsp/include box_newslast5_cached.inc
Log:
corrected minor HTML display inconsistencies
Revision Changes Path
1.4 +16 -15
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.3&r2=1.4&f=h
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- box_newslast5_cached.inc 13 Jun 2005 09:13:05 -0000 1.3
+++ box_newslast5_cached.inc 23 Jun 2005 09:28:18 -0000 1.4
@@ -225,10 +225,10 @@
<td nowrap="nowrap" valign="top" align="left"><b>Scope : </b></td>
<td valign="top" align="left">
<input type="radio" name="searchScope" value="currentSite" <%
if ( searchScopeVal!=-1 ){%>checked<% }%>
- onchange="javascript:document.jahiapageform.submit()" >
Current site only
+ onchange="javascript:document.jahiapageform.submit()" />
Current site only
<br/>
<input type="radio" name="searchScope" value="allSites" <% if
( searchScopeVal==-1 ){%>checked<% }%>
- onchange="javascript:document.jahiapageform.submit()"> All sites
+ onchange="javascript:document.jahiapageform.submit()" /> All
sites
</td>
</tr>
@@ -244,7 +244,7 @@
<td nowrap="nowrap" align="left" valign="top"><b>Sort by :</b></td>
<td width="100%" align="left" valign="top">
<table border="0" cellpadding="0" cellspacing="0">
- <tr>
+ <tr><td style="white-space:nowrap;">
<a href="javascript:<%
%>document.jahiapageform.<%="newsContainerLast5"+id%>_sort.value='newsStartDate';<%
%>document.jahiapageform.<%="newsContainerLast5"+id%>_sort_order.value=<%
@@ -273,8 +273,11 @@
src="<%=theURL%>/images/sort_desc.gif" alt="sort"
border="0" width="5" height="7"/><img
src="<%=theURL%>/images/sort_asc.gif" alt=""
border="0" width="5" height="7"/></a>
- </table>
- </tr>
+
+ </td></tr>
+ </table>
+ </td>
+</tr>
<%//----------------------------------------------------------------------------------------------------------------------
%>
<%// END - SORT ORDER
%>
<%//----------------------------------------------------------------------------------------------------------------------
%>
@@ -297,9 +300,7 @@
while (newsEnumeration.hasMoreElements()) {
newsCount++;
- if (newsCount == 1){
- %><table border="0" cellpadding="0" cellspacing="0"><%
- }
+
JahiaContainer newsContainer =
(JahiaContainer)newsEnumeration.nextElement();
//Retrieve the current fieldname postfix for the current container
@@ -312,7 +313,8 @@
String newsEndDateStr = (String)
newsContainer.getFieldObject("newsEndDate" );
ContainerBean newsContainerBean = new
ContainerBean(newsContainer,jData.params());
- jData.gui().html().drawBeginActionMenu(newsContainerBean , null, null,
true, "", "jahiatemplates.Corporate_portal_templates", null, out);
+ jData.gui().html().drawBeginActionMenu(newsContainerBean , null, null,
true,
+ "", "jahiatemplates.Corporate_portal_templates", null, out);
%><span class="bold"><%=newsTitle%></span><br><%
if (! "".equals(newsDate)){
%><i>Posted on the <%=newsDate%></i><br/><%
@@ -322,18 +324,17 @@
}
%><%=newsDesc%><br/><%
if (myNewsLink != null){
- %><a
href="<%=myNewsLink.getUrl(jData.params())%>"><%=myNewsLink.getTitle()%></a><br><%
+ %><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 , null, null,
true,
+ "", "jahiatemplates.Corporate_portal_templates", null, out);
}
-if (newsCount >0){
- %></table><%
-} else {
+if (newsCount ==0){
%><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="noNews"/><br/><%
}
ContainerListBean newsContainerListBean = new
ContainerListBean(newsContainerList,jData.params());
-jData.gui().html().drawBeginActionMenu(newsContainerListBean , null, theURL
+ "/images/add.gif", false, "", "jahiatemplates.Corporate_portal_templates",
"addNew", out);
+//jData.gui().html().drawBeginActionMenu(newsContainerListBean , null,
theURL + "/images/add.gif", false, "",
"jahiatemplates.Corporate_portal_templates", "addNew", out);
//----------------------------------------------------------------------------------------------------------------------
// END - DISPLAY NEWS
ENTRIES
