Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 237 → Rev 238

/impl/src/web/css/style.css
462,6 → 462,7
.block
{
margin-bottom:10px;
border-left: 1px solid #8EC73F;
}
 
.block .zerofound, .block table
484,7 → 485,7
padding-left: 10px;
}
.block p, .navLeftMenu h2 {
background-color: #ededed;
background-color: #8EC73F;
padding-left: 10px;
margin: 0;
 
730,7 → 731,7
/*FlashCenterNews*/
#flashCenterNews {
margin-top: 2px;
border-top-style: dotted;
/* border-top-style: dotted;*/
border-top-color: gray;
}
 
744,7 → 745,7
}
 
#flashCenterNews h2 a{
color: #8EC73F;
color: #589A2C;
font-weight: bold;
text-decoration: none;
}
766,7 → 767,7
}
 
#flashBottomNews h2 a {
color: #8EC73F;
color: #589A2C;
font-weight: bold;
}
 
777,26 → 778,46
text-align:justify;
}
 
#flashCenterNews td, #flashBottomNews td
.flashNew
{
width:100%;
 
}
.flashNew td
{
background-color: #D3D3D3;
}
#flashCenterNews .container td, #flashBottomNews .container td
{
padding:2px;
 
}
#flashCenterNews .container td.cont
{
width:50%;
}
#flashBottomNews .container td.cont
{
width:25%;
}
#flashCenterNews .flashNew td, #flashBottomNews .flashNew td
{
border-right: 1px solid black;
border-bottom: 1px solid black;
border-top: 1px solid black;
padding: 2px;
padding: 4px;
width:80%;
 
}
 
#flashCenterNews th, #flashBottomNews th
#flashCenterNews .flashNew th, #flashBottomNews .flashNew th
{
border-left: 1px solid black;
border-bottom: 1px solid black;
border-top: 1px solid black;
border-right: 1px solid gray;
padding: 10px;
padding: 4px;
}
#flashCenterNews tr, #flashBottomNews tr
{
}
 
 
/*Last News Block*/
/impl/src/web/layout/layoutintranet.jsp
5,6 → 5,8
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html:html locale="true">
<head>
<title><bean:message key="site.title"/> - <tiles:getAsString name="title"/></title>
/impl/src/web/public/index.jsp
51,7 → 51,7
{
%>
<div id="flashCenterNews">
<table class="container" cellpadding="0" cellspacing="0">
<table class="container" cellspacing="0">
<tr>
<%
int i;
59,7 → 59,8
{
AnnouncementView announcementView = announcementViews.get(i);
request.setAttribute("item",announcementView);
%>
%> <td class="cont">
<table class="flashNew" cellpadding="0" cellspacing="0"><tr>
<th class="imageContainer">
<logic:present name="item" property="smallImage">
<img alt="${item.title}" src="<%=request.getContextPath()%>/imageStream/${item.smallImage.id}">
93,6 → 94,7
</logic:equal>
</logic:notEmpty>
</td>
</tr></table>
<%
}
%>
104,7 → 106,7
{
%>
<div id="flashBottomNews">
<table class="container" cellpadding="0" cellspacing="0">
<table class="container" cellspacing="0">
<%
while(i < announcementViews.size())
{
117,44 → 119,49
AnnouncementView announcementView = announcementViews.get(j);
request.setAttribute("item",announcementView);
%>
<th class="imageContainer">
<logic:present name="item" property="smallImage">
<img alt="${item.title}" src="<%=request.getContextPath()%>/imageStream/${item.smallImage.id}">
</logic:present>
</th>
<td class="textContainer">
<logic:empty name="item" property="url">
<h2>
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link>
</h2>
<p>
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.textSummarySmall}</html:link>
</p>
</logic:empty>
<logic:notEmpty name="item" property="url">
<logic:equal value="false" name="item" property="haveAllText">
<td class="cont">
<table class="flashNew" cellpadding="0" cellspacing="0"><tr>
<th class="imageContainer">
<logic:present name="item" property="smallImage">
<img alt="${item.title}" src="<%=request.getContextPath()%>/imageStream/${item.smallImage.id}">
</logic:present>
</th>
<td class="textContainer">
<logic:empty name="item" property="url">
<h2>
<html:link href="${item.url}">${item.title}</html:link>
</h2>
<p>
<html:link href="${item.url}">${item.textSummarySmall}</html:link>
</p>
</logic:equal>
<logic:equal value="true" name="item" property="haveAllText">
<h2>
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link>
</h2>
<p>
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.textSummarySmall}</html:link>
</p>
</logic:equal>
</logic:notEmpty>
</logic:empty>
<logic:notEmpty name="item" property="url">
<logic:equal value="false" name="item" property="haveAllText">
<h2>
<html:link href="${item.url}">${item.title}</html:link>
</h2>
<p>
<html:link href="${item.url}">${item.textSummarySmall}</html:link>
</p>
</logic:equal>
<logic:equal value="true" name="item" property="haveAllText">
<h2>
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link>
</h2>
<p>
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.textSummarySmall}</html:link>
</p>
</logic:equal>
</logic:notEmpty>
</td>
</tr></table>
<%
}
i = j;
%>
</td>
<%
}
i = j;
%>
</tr>
 
<%
}
%>