diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index ca63159..5e3790f 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -153,8 +153,10 @@ conference.title=Title conference.description=Description conference.otherInformations=Complementary information conference.linkMenu.title=Adding Conference -conference.linkMenu.choose=Choosing current conference -conference.linkMenu.change=Change current conference +conference.linkMenu.choose=Select a conference +conference.linkMenu.change=Change conference +noCurrentConferenceText=No conference selected +currentConferenceText=You have selected : conference.errors.dateStartNonValid=This date is not valid conference.errors.dateStartSuperiorEnd=The start date must be earlier than the end date diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp index 43d672e..1089b8f 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp @@ -15,13 +15,17 @@ - La conférence courante est :
- ${currentConference.title} - "> + +
+ "> +
+

${currentConference.title}

 - Il n'y a pas de conférence courante.
- "> +
+ "> +
+

diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp index bc2656c..2441a6f 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp @@ -29,26 +29,41 @@ -
+ +
+ +
+ -
+ +
+ +
-
+ +
+ +
+ -
+ +
+ +
+ diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp index b03d2a0..29f8801 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp @@ -75,4 +75,4 @@ - \ No newline at end of file + diff --git a/YACOSWeb/WebContent/javascripts/rounded_boxes.js b/YACOSWeb/WebContent/javascripts/rounded_boxes.js index a85a8a9..b792221 100644 --- a/YACOSWeb/WebContent/javascripts/rounded_boxes.js +++ b/YACOSWeb/WebContent/javascripts/rounded_boxes.js @@ -2,6 +2,29 @@ cbb function by Roger Johansson, http://www.456bereastreet.com/ */ var cbb = { + mouseOver : function(event) { + var element = Event.findElement(event,'.cb'); + element.select("div").invoke('addClassName','hover'); + }, + mouseOut : function(event) { + var element = Event.findElement(event,'.cb'); + element.select("div").invoke('removeClassName','hover'); + }, + mouseDown : function(event) { + var element = Event.findElement(event,'.cb'); + element.select("div").invoke('addClassName','down'); + event.stop(); + }, + mouseUp : function(event) { + var element = Event.findElement(event,'.cb'); + element.select("div").invoke('removeClassName','down'); + event.stop(); + }, + mouseClick : function(event) { + var element = Event.findElement(event,'.cb'); + document.location = element.select("a").first().href; + event.stop(); + }, init : function() { // Check that the browser supports the DOM methods used if (!document.getElementById || !document.createElement || !document.appendChild) return false; @@ -40,6 +63,11 @@ var cbb = { cbb.insertBottom(oOuter); } } + $$(".button").invoke('observe','mouseover',cbb.mouseOver); + $$(".button").invoke('observe','mouseout',cbb.mouseOut); + $$(".button").invoke('observe','mousedown',cbb.mouseDown); + $$(".button").invoke('observe','mouseup',cbb.mouseUp); + $$(".button").invoke('observe','click',cbb.mouseClick); }, insertTop : function(obj) { var oOuter, oInner; diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css index 1efdab5..52264a3 100644 --- a/YACOSWeb/WebContent/stylesheets/base.css +++ b/YACOSWeb/WebContent/stylesheets/base.css @@ -48,10 +48,6 @@ form > table > thead th { background-color: #ffedbb; } -textarea { - display: block; -} - .formHelp { min-height: 30px; padding: 5px; @@ -179,6 +175,14 @@ textarea { padding-left: 100px; } +#header #bar h1 { + font-variant: small-caps; + font-size: large; + font-weight: bold; + padding-top: 10px; + color: #4d2410; +} + #header #bar #rightborder { width: 6px; height: 70px; @@ -456,7 +460,7 @@ table.content_table { border-bottom: 2px solid #df9b7b; } -/* Normal styling */ +/* cbb : Normal styling */ .cb { margin:0.5em 0; } @@ -519,7 +523,88 @@ table.content_table { } .i3 {display:inline-block;} .i3 {display:block;} -/* Default CSS ends here */ + + +/* cbb button styling */ +.button { + margin: 0; + max-width: 400px; + display: block; +} + /* Top corners and border */ +.button .bt { + height:5px; + margin:0 0 0 5px; + background:url(../images/button-box.png) no-repeat 100% 0; +} + +.button .bt div { + position:relative; + left:-5px; + width:5px; + height:5px; + background:url(../images/button-box.png) no-repeat 0 0; + font-size:0; + line-height:0; +} + + /* Bottom corners and border */ +.button .bb { + height:5px; + margin:0 0 0 5px; + background:url(../images/button-box.png) no-repeat 100% 100%; +} +.button .bb div { + position:relative; + left:-5px; + width:5px; + height:5px; + background:url(../images/button-box.png) no-repeat 0 100%; + font-size:0; + line-height:0; +} + + /* Left border */ +.button .i1 { + padding:0; + margin-left: 0; + background-color: #a75500; +} + /* Right border */ +.button .i2 { + padding:0; + margin-right: 0; + background-color: #a75500; +} + /* Wrapper for the content. Use it to set the background colour and insert some padding between the borders and the content. */ +.button .i3 { + display:block; + margin:0; + padding:1px 10px; + background: url(../images/button-box.png) no-repeat 1px -5px; +} + /* Make the content wrapper auto clearing so it will contain floats (see http://positioniseverything.net/easyclearing.html). */ +.button .i3:after { + content:"."; + display:block; + height:0; + clear:both; + visibility:hidden; +} +.button .i3 {display:inline-block;} +.button .i3 {display:block;} + +.button .hover { + background-image: url(../images/button-box-hover.png); +} + +.button .down { + background-image: url(../images/button-box-down.png); +} + +.to-right { + float: right; +} /* @end */ @@ -536,4 +621,8 @@ table.content_table { .yacos_button:hover { background-image: url(../images/button_background_hover.png); } -/* @end */ \ No newline at end of file +/* @end */ + +#loginFull_forgotPassword { + float: right; +} \ No newline at end of file