christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changement Architecture de la page. Disclaimer-Menu

Browse Source
This commit is contained in:
Nicolas Michard
2008-01-24 15:24:51 +00:00
parent 11fbc6e030
commit 0a7f675aa4
19 changed files with 116 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
YACOSWeb/WebContent/WEB-INF/classes/messages.properties
View File

@@ -1,5 +1,10 @@
title=Yacos
###################
# DISCLAIMER
disclaimer.text=Copyrights <20> 2008. Yacos Team. All rights reserved.
disclaimer.link.about=About
submission.title=Article's submission
form.submission.article.title=Article's title

10
YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp
View File

@@ -1,11 +1,15 @@
<%@ include file="/WEB-INF/decorators/include.jsp"%>
<html>
<head></head>
<body>
<!-- Footer with credits -->
<div id="globalfooter">
Copyright Yacos Team 2008
</div>
<div id="globalfooter">
<hr />
<fmt:message key="disclaimer.text" /> - <a href="#"><fmt:message key="disclaimer.link.about" /></a>
</div>
</body>
</html>

19
YACOSWeb/WebContent/WEB-INF/decorators/headermainchoice.jsp → YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp
View File

@@ -1,18 +1,17 @@
<%@ include file="/WEB-INF/decorators/include.jsp"%>
<html>
<head></head>
<body>
<!-- containerheader -->
<div id="containerheader">
<div id="leftdescription">
<p>Application pour gérer les conférences. Outil libre dans le programme universitaire</p>
</div>
<div id="header">
<div id="logoimage"><img src="./images/logo-yacos.png" alt="Logo Yacos Image" /></div>
<div id="bar">
<div id="rightchoice">
<div id="rightchoice">
<c:choose>
<c:choose>
<c:when test="${idCurrentConference!=null}">
La conférence courante est : ${idCurrentConference}.<br />
<a href="<c:url value="listConference.htm"/>"><fmt:message key="conference.linkMenu.change" /></a>
@@ -23,8 +22,10 @@
</c:otherwise>
</c:choose>
</div>
</div><!--containerheader-->
</div>
<div id="rightborder"></div>
</div>
</div><!--containerheader-->
</body>
</html>

15
YACOSWeb/WebContent/WEB-INF/decorators/headermenu.jsp
View File

@@ -1,15 +0,0 @@
<html>
<head></head>
<body>
<!-- Globar bar navigation -->
<div id="globalheader">
<ul id="globalnav">
<li><a href="#">HOME</a></li>
<li><a href="#">INFOS</a></li>
<li><a href="#">POST</a></li>
</ul>
</div>
</body>
</html>

13
YACOSWeb/WebContent/WEB-INF/decorators/headeruser.jsp Normal file
View File

@@ -0,0 +1,13 @@
<%@ include file="/WEB-INF/decorators/include.jsp"%>
<html>
<head></head>
<body>
<!-- User Information -->
<div id="userlogin">
User Login
</div><!-- User Information -->
</body>
</html>

21
YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
View File

@@ -15,14 +15,18 @@
<body>
<!-- headermenu -->
<div><page:applyDecorator name="empty" page="/WEB-INF/decorators/headermenu.jsp" /></div>
<!-- Main bloc -->
<!-- Container -->
<div id="container">
<!-- main header with choice conference -->
<page:applyDecorator name="empty" page="/WEB-INF/decorators/headermainchoice.jsp" />
<div id="logotexte"><img src="./images/logo-yacos-texte.png" alt="Logo Yacos Texte" /></div>
<!-- User Information -->
<page:applyDecorator name="empty" page="/WEB-INF/decorators/headeruser.jsp" />
<!-- headermenu -->
<page:applyDecorator name="empty" page="/WEB-INF/decorators/headerchoose.jsp" />
<!-- Main bloc -->
<div id="main">
@@ -36,10 +40,11 @@
</div><!--maincontent-->
</div><!--main-->
</div><!--container-->
<!-- footer -->
<div><page:applyDecorator name="empty" page="/WEB-INF/decorators/footer.jsp" /></div>
<page:applyDecorator name="empty" page="/WEB-INF/decorators/footer.jsp" />
</div><!--container-->
</body>
</html>

BIN
YACOSWeb/WebContent/images/background.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 830 B

BIN
YACOSWeb/WebContent/images/box-content.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 142 B

BIN
YACOSWeb/WebContent/images/box-footer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 920 B

BIN
YACOSWeb/WebContent/images/box-header.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 939 B

BIN
YACOSWeb/WebContent/images/header-background-repeat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 183 B

BIN
YACOSWeb/WebContent/images/header-right-border.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 340 B

BIN
YACOSWeb/WebContent/images/logo-yacos-texte.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
YACOSWeb/WebContent/images/logo-yacos.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

BIN
YACOSWeb/WebContent/images/minibox-content.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 131 B

BIN
YACOSWeb/WebContent/images/minibox-footer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 353 B

BIN
YACOSWeb/WebContent/images/minibox-header.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
YACOSWeb/WebContent/images/yacos.logo.blancLQ.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 39 KiB

127
YACOSWeb/WebContent/stylesheets/base.css
View File

@@ -3,7 +3,7 @@
html,body,div,ul,ol,li,dl,dt,dd,h1,h2,h3,h4,h5,h6,pre,form,p,blockquote,fieldset,input { margin: 0; padding: 0; }
h1,h2,h3,h4,h5,h6,pre,code,address,caption,cite,code,em,strong,th { font-size: 1em; font-weight: normal; font-style: normal; }
ul,ol { list-style: none; }
img { border: none; }
fieldset,img { border: none; }
caption,th { text-align: left; }
table { border-collapse: collapse; border-spacing: 0; }
@@ -12,81 +12,72 @@ table { border-collapse: collapse; border-spacing: 0; }
body {
color:#333;
font: 12px/18px "Ludida Grande", Geneva, Arial, Verdana, sans-serif;
background: #fff url(images/background-repeat.png) repeat-x scroll left top;
background: #fff url(../images/background-repeat.png) repeat-x scroll left top;
}
/* @group globalHeader */
#globalheader {
width: 980px;
height: 38px;
margin: 18px auto;
position: relative;
z-index: 9998;
background-color: #ceffeb;
}
#globalheader #globalnav {
margin: 0;
padding: 0;
}
#globalheader #globalnav li {
display: inline;
}
#globalheader #globalnav li a {
float: left;
width: 117px;
height: 0;
padding-top:10px;
padding-right: 0px;
background-color: #40ff8f;
text-decoration: none;
color: #3800ff;
font-size: 16px;
}
/* @end */
#container {
width: 980px;
margin: 0 auto;
position: relative;
background-color: #f7fbff;
}
/* @group containerheader */
#containerheader {
background-color: #ff9b9b;
padding: 8px;
position: relative;
height: 70px;
margin-bottom: 15px;
#userlogin{
background-color: #28fffd;
margin-left: 500px;
height: 100px;
}
#containerheader #leftdescription {
width: 280px;
background-color: #ff4e47;
/* @group header */
#header {
width: 980px;
margin: 0 auto 20px;
}
#header #logoimage img{
width: 190px;
height: 210px;
z-index: 1;
position: absolute;
top: 0;
}
#logotexte img{
float: left;
width: 304px;
height: 78px;
margin-left: 170px;
margin-top: 10px;
}
#containerheader #leftdescription p {
font-size: x-small;
#header #bar{
width: 880px;
display: table;
margin-left: 100px;
}
#containerheader #rightchoice {
background-color: #da1107;
margin-left: 300px;
#header #bar #rightchoice {
height: 70px;
width: 874px;
background: url(../images/header-background-repeat.png) repeat-x;
display: table-cell;
padding-left: 100px;
}
#header #bar #rightborder {
width: 6px;
height: 70px;
background: url(../images/header-right-border.png) no-repeat left top;
display: table-cell;
}
/* @end */
#main {
position: relative;
background-color: #8bff74;
/*background-color: #8bff74;*/
padding: 15px 0 0;
width: 100%;
display: table;
@@ -139,7 +130,7 @@ body {
/* @group maincontent */
#main #maincontent {
background-color: #f5e5ff;
/*background-color: #f5e5ff;*/
margin-left: 160px;
}
@@ -147,13 +138,29 @@ body {
/* @group globalfooter */
#globalfooter {
width: 980px;
height: 38px;
#globalfooter {
margin: 18px auto;
position: relative;
z-index: 9998;
background-color: #ff7eff;
color: #b8b8b8;
font-size: 8px;
text-align: center;
}
#globalfooter a{
color: #b8b8b8;
text-decoration: none;
}
#globalfooter a:hover{
color: #555;
}
#globalfooter hr{
width: 80%;
border : 0;
background-color: #D1CACA;
height: 1px;
color: #898989;
}
/* @end */