diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 8b1bea0..6addd85 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -1,5 +1,10 @@ title=Yacos +################### +# DISCLAIMER +disclaimer.text=Copyrights © 2008. Yacos Team. All rights reserved. +disclaimer.link.about=About + submission.title=Article's submission form.submission.article.title=Article's title diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp index e063325..14774b6 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp @@ -1,11 +1,15 @@ +<%@ include file="/WEB-INF/decorators/include.jsp"%> + + - + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/headermainchoice.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp similarity index 68% rename from YACOSWeb/WebContent/WEB-INF/decorators/headermainchoice.jsp rename to YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp index eb94d3e..94cdf3f 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/headermainchoice.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp @@ -1,18 +1,17 @@ <%@ include file="/WEB-INF/decorators/include.jsp"%> + -
-
-

Application pour gérer les conférences. Outil libre dans le programme universitaire

-
- -
- - + +
+
+
\ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/headermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/headermenu.jsp deleted file mode 100644 index a22f599..0000000 --- a/YACOSWeb/WebContent/WEB-INF/decorators/headermenu.jsp +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/headeruser.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/headeruser.jsp new file mode 100644 index 0000000..d49c60d --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/decorators/headeruser.jsp @@ -0,0 +1,13 @@ +<%@ include file="/WEB-INF/decorators/include.jsp"%> + + + + + + +
+ + User Login +
+ + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp index 336625c..21ce25b 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp @@ -15,14 +15,18 @@ - -
- - +
- - +
Logo Yacos Texte
+ + + + + + + +
@@ -36,10 +40,11 @@
- + -
+ + \ No newline at end of file diff --git a/YACOSWeb/WebContent/images/background.png b/YACOSWeb/WebContent/images/background.png deleted file mode 100644 index 493ded7..0000000 Binary files a/YACOSWeb/WebContent/images/background.png and /dev/null differ diff --git a/YACOSWeb/WebContent/images/box-content.png b/YACOSWeb/WebContent/images/box-content.png deleted file mode 100644 index 1791044..0000000 Binary files a/YACOSWeb/WebContent/images/box-content.png and /dev/null differ diff --git a/YACOSWeb/WebContent/images/box-footer.png b/YACOSWeb/WebContent/images/box-footer.png deleted file mode 100644 index 5adc801..0000000 Binary files a/YACOSWeb/WebContent/images/box-footer.png and /dev/null differ diff --git a/YACOSWeb/WebContent/images/box-header.png b/YACOSWeb/WebContent/images/box-header.png deleted file mode 100644 index bda20e5..0000000 Binary files a/YACOSWeb/WebContent/images/box-header.png and /dev/null differ diff --git a/YACOSWeb/WebContent/images/header-background-repeat.png b/YACOSWeb/WebContent/images/header-background-repeat.png new file mode 100644 index 0000000..21b13d4 Binary files /dev/null and b/YACOSWeb/WebContent/images/header-background-repeat.png differ diff --git a/YACOSWeb/WebContent/images/header-right-border.png b/YACOSWeb/WebContent/images/header-right-border.png new file mode 100644 index 0000000..a686ee4 Binary files /dev/null and b/YACOSWeb/WebContent/images/header-right-border.png differ diff --git a/YACOSWeb/WebContent/images/logo-yacos-texte.png b/YACOSWeb/WebContent/images/logo-yacos-texte.png new file mode 100644 index 0000000..34d1d6a Binary files /dev/null and b/YACOSWeb/WebContent/images/logo-yacos-texte.png differ diff --git a/YACOSWeb/WebContent/images/logo-yacos.png b/YACOSWeb/WebContent/images/logo-yacos.png new file mode 100644 index 0000000..9a8ac1f Binary files /dev/null and b/YACOSWeb/WebContent/images/logo-yacos.png differ diff --git a/YACOSWeb/WebContent/images/minibox-content.png b/YACOSWeb/WebContent/images/minibox-content.png deleted file mode 100644 index f9f1c6c..0000000 Binary files a/YACOSWeb/WebContent/images/minibox-content.png and /dev/null differ diff --git a/YACOSWeb/WebContent/images/minibox-footer.png b/YACOSWeb/WebContent/images/minibox-footer.png deleted file mode 100644 index 473e7b8..0000000 Binary files a/YACOSWeb/WebContent/images/minibox-footer.png and /dev/null differ diff --git a/YACOSWeb/WebContent/images/minibox-header.png b/YACOSWeb/WebContent/images/minibox-header.png deleted file mode 100644 index 10591bb..0000000 Binary files a/YACOSWeb/WebContent/images/minibox-header.png and /dev/null differ diff --git a/YACOSWeb/WebContent/images/yacos.logo.blancLQ.png b/YACOSWeb/WebContent/images/yacos.logo.blancLQ.png deleted file mode 100644 index 0c7539e..0000000 Binary files a/YACOSWeb/WebContent/images/yacos.logo.blancLQ.png and /dev/null differ diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css index e0e3a73..baac1da 100644 --- a/YACOSWeb/WebContent/stylesheets/base.css +++ b/YACOSWeb/WebContent/stylesheets/base.css @@ -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 */