Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 53 → Rev 54

/impl/conf/language/MessageResourcesAnnouncements.properties
28,4 → 28,5
announcement.protocol.error.https=https
announcement.protocol.error.ftp=ftp
 
announcements.loading=carregando anúncio...
announcements.loading=carregando anúncio...
 
/impl/src/web/css/style.css
8,9 → 8,9
 
#body
{
width:950px;
margin-left: auto;
margin-right: auto;
width:950px;
margin-left: auto;
margin-right: auto;
}
 
#pageStructure
114,16 → 114,16
 
.block P,.navLeftMenu h2
{
background-color:#ededed;
padding-left:10px;
margin:0;
background-color:#ededed;
padding-left:10px;
margin:0;
 
}
 
.block UL
{
LIST-STYLE-TYPE: none;
padding-left:10px;
padding-left:10px;
}
 
.block a:link
153,40 → 153,40
 
.portalRightAnnouncements table
{
table-layout:fixed;
width:250px;
table-layout:fixed;
width:250px;
}
 
.portalAnnouncement a:link,.portalAnnouncement a:visited
{
font-size:10pt;
margin:0;
font-size:10pt;
margin:0;
}
 
.portalAnnouncementTitle a
{
color:#000000;
color:#000000;
}
 
.portalAnnouncement a
{
text-decoration :none;
text-decoration :none;
}
 
.portalAnnouncementText a:link,.portalAnnouncementText a:visited
{
color:#4d4d4d;
color:#4d4d4d;
}
 
.navleftMenu
{
width:180px;
padding-left:10px;
padding-left:10px;
}
 
#portalMenu li.selected a
{
color:#8EC73F;
color:#8EC73F;
}
/**********************************************************************************/
 
232,8 → 232,8
 
.pageBlock a:hover
{
color:#8EC73F;
text-decoration :underline;
color:#8EC73F;
text-decoration :underline;
}
 
.pageColumnTableSolid
243,28 → 243,28
 
.listClean UL /*Lista sem nada*/
{
LIST-STYLE-TYPE: none;
padding:0;
LIST-STYLE-TYPE: none;
padding:0;
}
 
.listCircleWhite UL/*Lista circulo branco*/
{
LIST-STYLE-TYPE: circle;
LIST-STYLE-TYPE: circle;
}
 
.listDecimal UL/*Lista decimal*/
{
LIST-STYLE-TYPE: decimal;
LIST-STYLE-TYPE: decimal;
}
 
.listDisc UL/*Lista circulo preto*/
{
LIST-STYLE-TYPE: disc;
LIST-STYLE-TYPE: disc;
}
 
.listSquare UL/*Lista quadrado preto*/
{
LIST-STYLE-TYPE: square;
LIST-STYLE-TYPE: square;
}
 
.pageSection
273,7 → 273,7
 
.sectionTitle h2
{
color:#000000;
color:#000000;
}
 
.pageText,.pageBlock a,.pageBlock a:visited
281,121 → 281,157
color:#4d4d4d;
text-decoration:none;
}
/*********************************************************************************/
 
/******************************* Index Page***************************************/
.indexPage Table
/*PASSA PARA AQUI TUDO O QUE SEJA DE BLOCOS E VAMOS LIMPAR TUDO */
 
/*Isto tem de ser generico o H1 jáe um header nao necessita da classe .header para nada*/
/*Block Titles*/
.content h1, #lastnews h1
{
width:100%;
border-collapse: collapse;
margin-bottom:1px;
color:#FFFFFF;
background-color:#8EC73F;
padding-left:10px;
}
 
.header
/*********************************************************************************/
/******************************* Index Page***************************************/
#flashTopNews * td, #flashCenterNews * td, #flashBottomNews * td
{
color:#FFFFFF;
background-color:#8EC73F;
padding-left:10px;
vertical-align:top;
}
 
.flashTopNews
/*FlashTopNews*/
#flashTopNews
{
text-align :right;
padding:0;
margin:0;
}
 
.flashTopNews tr
#flashTopNews .container
{
background-color:#4d4d4d;
height:100px;
width:100%;
margin:0;
}
 
#flashTopNews table
#flashTopNews .container .textContainer
{
width:100%;
margin:0;
text-align :justify;
}
#flashTopNews, #flashTopNews table
#flashTopNews .container .imageContainer
{
background-color:#4d4d4d;
height:100px;
padding:0;
margin:0;
text-align :right;
}
#flashTopNews img
{
height:100px;
}
.imageNewsTop
#flashTopNews * td
{
text-align:right;
vertical-align:top;
}
 
#flashTopNews td,.flashCenterNews td,.flashBottomNews td
#flashTopNews .container .textContainer h2
{
vertical-align:top;
margin:0;
margin-top:1px;
}
#flashTopNews .container .textContainer p
{
margin:0;
margin-top:1px;
}
#flashTopNews h2 a:link,#flashTopNews h2 a:visited
{
color:#8EC73F;
font-weight:bold;
}
#flashTopNews p a:link, #flashTopNews p a:visited
{
color:#FFFFFF;
}
 
.flashCenterNews
/*FlashCenterNews*/
#flashCenterNews
{
margin-top:2px;
border-top-style: dotted;
border-top-color:#DEDEDD;
border-top-color:gray;
}
 
.textNewsTop
#flashCenterNews .container
{
text-align :left;
width:100%;
margin:0;
}
 
.textNewsCenter,.textNewsBottom
#flashCenterNews .textContainer
{
padding-top :10px;
}
 
.titleNewsTop a,.titleNewsCenter a,.titleNewsBottom a,.titleLastNews a:hover,.copyRightLink a:hover,.linkLeftMenu a:hover,#leftMenuModule h2
#flashCenterNews h2 a:link,#flashCenterNews h2 a:visited
{
color:#8EC73F;
font-weight:bold;
}
 
.titleNewsTop a,.titleNewsCenter a,.titleNewsBottom a
#flashCenterNews p a:link, #flashCenterNews p a:visited
{
font-weight:bold;
color:#4d4d4d;
}
 
.flashCenterNews a,.descriptionNewsBottom a,.linkLeftMenu a,.flashTopNews a
#flashCenterNews img
{
text-decoration:none;
width:100px;
}
 
.descriptionNewsCenter a:link,.descriptionNewsCenter a:visited,.descriptionNewsBottom a:link,.descriptionNewsBottom a:visited,.titleLastNews a,.copyRightLink a,.linkLeftMenu a
/*FlashBottomNews*/
#flashBottomNews img
{
color:#4d4d4d;
width:50px;
}
 
.descriptionNewsTop a:link,.descriptionNewsTop a:visited
/*Last News Block*/
#lastnews ul
{
color:#FFFFFF;
list-style: none;
width:160px;
LIST-STYLE-TYPE: none;
padding:0;
margin:0;
}
 
.imageNewsCenter
#lastnews li
{
width:50px;
margin:0;
padding:0;
}
 
.titleNewsTop,.titleNewsCenter,.titleNewsBottom,.descriptionNewsCenter,.descriptionNewsBottom,.descriptionNewsTop
#lastnews li h2
{
padding-left :10px;
padding:0;
padding-left:2px;
margin:1px;
}
 
.lastnews ul
#lastnews li h2 a,.linkLeftMenu a
{
list-style: none;
padding-left:5px;
padding-right:5px;
width:160px;
text-decoration:none;
}
#lastnews li h2 a:link,.linkLeftMenu a:link
{
color:#4d4d4d;
}
#lastnews li h2 a:visited,.linkLeftMenu a:visited
{
color:#4d4d4d;
}
#lastnews li h2 a:hover,.linkLeftMenu a:hover
{
color:#8EC73F;
}
 
/**/
 
/*LEFT MENUS*/
#leftMenuModule h2
{
MARGIN: 0;
color:#8EC73F;
}
 
#leftMenuModule UL
{
MARGIN: 0;
521,7 → 557,7
/*************************Staff Links Structure***************************************/
.staffLinks P
{
font-weight :bold;
font-weight :bold;
}
/*************************************************************************************/
 
688,50 → 724,50
 
/********************************************** Navigation Menu ********************************/
ul.menubar{
margin: 0px;
padding: 0px;
background-color: #FFFFFF; /* IE6 Bug */
font-size: 100%;
margin: 0px;
padding: 0px;
background-color: #FFFFFF; /* IE6 Bug */
font-size: 100%;
 
}
.submenu
{
font: bold 16px sans;
font: bold 16px sans;
}
 
.menu
{
font: normal 14px sans;
font: normal 14px sans;
}
 
ul.menubar .submenu{
margin: 0px;
padding: 0px;
list-style: none;
background-color: #FFFFFF;
float:left;
margin: 0px;
padding: 0px;
list-style: none;
background-color: #FFFFFF;
float:left;
}
 
ul.menubar ul.menu{
display: none;
position: absolute;
margin: 0px;
display: none;
position: absolute;
margin: 0px;
}
 
ul.menubar a{
padding: 5px;
display:block;
text-decoration: none;
color: #4D4D4D;
padding: 5px;
padding: 5px;
display:block;
text-decoration: none;
color: #4D4D4D;
padding: 5px;
}
 
ul.menubar a:hover{
padding: 5px;
display:block;
text-decoration: none;
color: #4D4D4D;
padding: 5px;
padding: 5px;
display:block;
text-decoration: none;
color: #4D4D4D;
padding: 5px;
}
 
.menuTop
740,43 → 776,43
}
 
.menu a:hover{
padding: 5px;
display:block;
/* border-left: none;
padding: 5px;
display:block;
/* border-left: none;
border-right: none;
border-top: none;
border-bottom: none; */
padding: 5px;
padding: 5px;
}
 
ul.menu, ul.menu ul{
margin: 0;
padding: 2px;
/* border-left: 1px solid #ccc;
border-bottom: 1px solid #ccc;
border-top: 1px solid #ccc;
border-right: 1px solid #ccc; */
background-color: #FFFFFF; /* IE6 Bug */
margin: 0;
padding: 2px;
/* border-left: 1px solid #ccc;
border-bottom: 1px solid #ccc;
border-top: 1px solid #ccc;
border-right: 1px solid #ccc; */
background-color: #FFFFFF; /* IE6 Bug */
}
 
ul.menu li{
position: relative;
list-style: none;
/*border: 0px;*/
opacity:0.9;
background-color: #4D4D4D;
width:250px;
position: relative;
list-style: none;
/*border: 0px;*/
opacity:0.9;
background-color: #4D4D4D;
width:250px;
}
 
ul.menu li a{
display: block;
text-decoration: none;
/* border-bottom: 0px;*/
/*color: #4D4D4D;*/
/* background-color: #FFFFFF; */
color: #4d4d4d;
background-color: #CCCCCC;
padding: 5px 10px 5px 5px;
display: block;
text-decoration: none;
/* border-bottom: 0px;*/
/*color: #4D4D4D;*/
/* background-color: #FFFFFF; */
color: #4d4d4d;
background-color: #CCCCCC;
padding: 5px 10px 5px 5px;
}
 
/*
798,9 → 834,9
}
 
ul.menu li sup{
font-weight:bold;
font-size:7px;
color: red;
font-weight:bold;
font-size:7px;
color: red;
}
 
/* Fix IE. Hide from IE Mac \*/
809,10 → 845,10
/* End */
 
ul.menu ul{
position: absolute;
display: none;
left: 149px; /* Set 1px less than menu width */
top: 0px;
position: absolute;
display: none;
left: 149px; /* Set 1px less than menu width */
top: 0px;
}
 
ul.menu li.submenu ul
/impl/src/web/public/index.jsp
29,101 → 29,103
-->
</script>
 
<div class="indexPage" >
<div class="indexPage">
 
<div class="header">
<h1> <bean:message key="mainAnnouncements"/></h1>
</div>
<h1><bean:message key="mainAnnouncements"/></h1>
 
<div id="flashTopNews">
<table>
<table class="container">
<tr>
<td>
<div class="textNewsTop">
<bean:message key="announcements.loading"/>
</div>
<td class="textContainer">
<bean:message key="announcements.loading"/>
</td>
<td class="imageNewsTop">
<td class="imageContainer">
</td>
</tr>
</table>
</div>
 
<table class="flashCenterNews">
<tr>
<div class="textNewsCenter">
<logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
<logic:equal value="bottom.flash.news" name="item" property="type">
<%if(centerAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS_INDEX)
{
%>
<td class="imageNewsCenter">
<img src="<%=request.getContextPath()%>/imgs/destaque_2_1.jpg"/>
</td>
<td>
<div class="titleNewsCenter">
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.title}</html:link>
</div>
<div class="descriptionNewsCenter">
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.text}</html:link>
</div>
</td>
<%
}
else{
}
centerAnnouncements++;
%>
</logic:equal>
</logic:iterate>
</div>
</table>
 
<table class="flashBottomNews">
<tr>
<div class="textNewsBottom">
<div id="flashCenterNews">
<table class="container">
<tr>
<logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
<logic:equal value="news" name="item" property="type">
<%if(bottomAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_NEW_INDEX)
<logic:equal value="bottom.flash.news" name="item" property="type">
<%if(centerAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_BOTTOM_FLASH_NEWS_INDEX)
{
%>
<td class="imageNewsBottom">
<img src="<%=request.getContextPath()%>/imgs/destaque_3_3.gif"/>
<td class="imageContainer">
<img alt="Tens de por sempre um alt boas praticas W3C. jm" src="<%=request.getContextPath()%>/imgs/destaque_2_1.jpg"/>
</td>
<td class="textContainer">
<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.text}</html:link>
</p>
</td>
<%
}
else{
else
{
//todo este else não tinha nada
}
bottomAnnouncements++;
centerAnnouncements++;
%>
</logic:equal>
</logic:iterate>
</div>
</tr>
<tr>
<%bottomAnnouncements=0;%>
<div class="textNewsBottom">
<logic:iterate length="5" id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
<logic:equal value="news" name="item" property="type">
<%
if(bottomAnnouncements<=4)
</tr>
</table>
</div>
 
<div id="flashBottomNews">
<table class="container">
<tr>
<div class="textNewsBottom">
<logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
<logic:equal value="news" name="item" property="type">
<%if(bottomAnnouncements<=Globals.NUMBER_ANNOUNCEMENT_TYPE_NEW_INDEX)
{
%>
<td width="50px">
<div class="titleNewsBottom">
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link>
</div>
<div class="descriptionNewsBottom">
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.text}</html:link>
</div>
</td>
<%
}
bottomAnnouncements++;
%>
</logic:equal>
</logic:iterate>
</div>
</tr>
</table>
%>
<td class="imageNewsBottom">
<img src="<%=request.getContextPath()%>/imgs/destaque_3_3.gif"/>
</td>
<%
}
else{
}
bottomAnnouncements++;
%>
</logic:equal>
</logic:iterate>
</div>
</tr>
<tr>
<%bottomAnnouncements=0;%>
<div class="textNewsBottom">
<logic:iterate length="5" id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
<logic:equal value="news" name="item" property="type">
<%
if(bottomAnnouncements<=4)
{
%>
<td width="50px">
<div class="titleNewsBottom">
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link>
</div>
<div class="descriptionNewsBottom">
<html:link action="/loadAnnouncement?id=${item.id}&dispatch=load" >${item.text}</html:link>
</div>
</td>
<%
}
bottomAnnouncements++;
%>
</logic:equal>
</logic:iterate>
</div>
</tr>
</table>
</div>
 
</div>
/impl/src/web/public/announcements/getFlashNews.jsp
20,19 → 20,17
Object[] arguments = new Object[]{};
AnnouncementView announcementView = (AnnouncementView) sm.execute(RequestUtils.getRequester(request), "LoadTopFlashNewsIterate", arguments, names);
%>
<table>
<table class="container">
<tr>
<td>
<div id="textNewsTop">
<div class="titleNewsTop">
<html:link action="/loadAnnouncement?id=<%=announcementView.getId()%>&dispatch=load"><%=announcementView.getTitle()%></html:link>
</div>
<div class="descriptionNewsTop">
<html:link action="/loadAnnouncement?id=<%=announcementView.getId()%>&dispatch=load"><%=announcementView.getTextSummary()%></html:link>
</div>
</div>
<td class="textContainer">
<h2>
<html:link action="/loadAnnouncement?id=<%=announcementView.getId()%>&dispatch=load"><%=announcementView.getTitle()%></html:link>
</h2>
<p>
<html:link action="/loadAnnouncement?id=<%=announcementView.getId()%>&dispatch=load"><%=announcementView.getTextSummary()%></html:link>
</p>
</td>
<td class="imageNewsTop">
<td class="imageContainer">
<%if(announcementView.getBigImage() != null){%><img alt="<%=announcementView.getTitle()%>" src="<%=request.getContextPath()%>/imageStream/<%=announcementView.getBigImage().getId()%>"><%}%>
</td>
</tr>
/impl/src/web/public/announcements/announcements.jsp
15,21 → 15,19
request.setAttribute("Announcements", announcementViews);
%>
 
<div class="lastNews">
<div class="header">
<h1><bean:message key="announcements"/></h1>
</div>
<div class="lastNewsBlock">
<div id="lastNews">
<h1><bean:message key="announcements"/></h1>
<div class="linkLeftMenu">
<logic:present name="Announcements">
<ul>
<logic:iterate id="item" name="Announcements" type="pt.estgp.estgweb.domain.views.AnnouncementView">
<logic:equal value="news" name="item" property="type">
<li>
<logic:empty name="item" property="url">
<div class="titleLastNews"><html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></div>
<h2><html:link action="/loadAnnouncement?id=${item.id}&dispatch=load">${item.title}</html:link></h2>
</logic:empty>
<logic:notEmpty name="item" property="url">
<div class="titleLastNews"><html:link href="${item.url}">${item.title}</html:link></div>
<h2><html:link href="${item.url}">${item.title}</html:link></h2>
</logic:notEmpty>
</li>
</logic:equal>