Changeset 353
- Timestamp:
- 01/18/12 17:11:58 (12 years ago)
- Location:
- ether_2012/trunk
- Files:
-
- 3 added
- 18 deleted
- 18 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
ether_2012/trunk/service/test/com/ether/ServiceTestHelper.java
r330 r353 27 27 public static Class[] getAllKnownDomainClasses() 28 28 { 29 return new Class[] { 30 Plateform.class,}; 29 return new Class[] { }; 31 30 } 32 31 -
ether_2012/trunk/web/WEB-INF/servlet-context.xml
r330 r353 38 38 <property name="mappings"> 39 39 <props> 40 <prop key="/ visualization">controller</prop>40 <prop key="/project">controller</prop> 41 41 </props> 42 42 </property> … … 59 59 </bean> 60 60 61 <bean id="controller" class="com.ether.Controller" parent="controllerEther"> 62 <property name="etherService" ref="etherService"/> 63 </bean> 61 <bean id="controller" class="com.ether.Controller" parent="controllerEther"></bean> 64 62 65 63 </beans> -
ether_2012/trunk/web/WEB-INF/web.xml
r345 r353 16 16 <param-name>contextConfigLocation</param-name> 17 17 <param-value> 18 classpath:dao-context.xml,19 classpath:service-context.xml,20 classpath:hibernate.cfg.xml,18 <!--classpath:dao-context.xml,--> 19 <!--classpath:service-context.xml,--> 20 <!--classpath:hibernate.cfg.xml,--> 21 21 22 22 classpath:json/json-context.xml … … 42 42 <servlet-mapping> 43 43 <servlet-name>eponge</servlet-name> 44 <url-pattern>/visualization</url-pattern>45 </servlet-mapping>46 47 <servlet-mapping>48 <servlet-name>eponge</servlet-name>49 <url-pattern>/data</url-pattern>50 </servlet-mapping>51 52 <servlet-mapping>53 <servlet-name>eponge</servlet-name>54 44 <url-pattern>/project</url-pattern> 55 45 </servlet-mapping> -
ether_2012/trunk/web/index.jsp
r330 r353 1 1 <%--This redirect is used to allow messages sources in the index page--%> 2 <jsp:forward page=" visualization?methodName=home"/>2 <jsp:forward page="project?methodName=home"/> -
ether_2012/trunk/web/init.jsp
r352 r353 2 2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 3 3 <%@ taglib prefix="tiles" uri="/WEB-INF/tlds/struts-tiles.tld" %> 4 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 4 5 5 6 <tiles:insert page="/resources/templates/templateEther.jsp" flush="true"> 6 7 7 <tiles:put name="insertCss" type="string"></tiles:put> 8 <tiles:put name="insertJsOrJsp" type="string"></tiles:put> 8 <tiles:put name="insertCss" type="string"> 9 <ether:htmlCss cssFile="craftedpixelz-Craftyslide-4cd0adb/craftyslide"/> 10 <ether:htmlCss cssFile="verticalSlide"/> 11 </tiles:put> 12 13 <tiles:put name="insertJsOrJsp" type="string"> 14 <ether:htmlJs jsFile="craftedpixelz-Craftyslide-4cd0adb/js/craftyslide.min"/> 15 <ether:htmlJs jsFile="classesForJQuery/VerticalSlide"/> 16 17 <ether:htmlJsp jspFile="init_script"/> 18 </tiles:put> 9 19 10 20 <tiles:put name="title" type="string"><spring:message code="label.ether"/> - <spring:message code="label.home"/></tiles:put> … … 13 23 14 24 <%-- ****************** CONTENT ****************** --%> 15 <tiles:put name="body title" type="string"><spring:message code="label.home"/></tiles:put>25 <tiles:put name="body" type="string"> 16 26 17 <tiles:put name="body" type="string"> 18 zzzzzz 27 <%-- ****************** NEWS ****************** --%> 28 <div id="newsImages" class="containerEther containerNewsImages"> 29 <div id="slideshow"> 30 <jsp:include page="/project/imagesSlide.jsp"/> 31 </div> 32 </div> 33 34 <div id="newsTexts" class="containerEther containerNewsTexts"> 35 <div class="containerNewsTextsTitle"><spring:message code="home.news"/></div> 36 </div> 37 38 <%-- ****************** SLIDES ****************** --%> 39 <div id="slides" class="containerEtherWithBorder containerSlides"></div> 40 41 <script type="text/javascript"> 42 var initTexts = $A( "" ); 43 44 initTexts["home.main.activities"] = '<spring:message code="home.main.activities"/>'; 45 initTexts["home.data"] = '<spring:message code="home.data"/>'; 46 initTexts["home.databases"] = '<spring:message code="home.databases"/>'; 47 initTexts["home.services"] = '<spring:message code="home.services"/>'; 48 49 var interfaceInit = new InterfaceInit(); 50 </script> 19 51 </tiles:put> 20 52 -
ether_2012/trunk/web/init_script.jsp
r352 r353 1 <%@ page import="com.ether.Context" %>2 3 1 <script type="text/javascript"> 4 var Interface Template= Class.create( {2 var InterfaceInit = Class.create( { 5 3 6 4 initialize: function() 7 5 { 8 6 /** *********** CONTAINERS *********** **/ 9 this.containerTools = $( "#tools" ); 10 this.containerMenu = $( "#menu" ); 11 this.containerSubMenu = $( "#subMenu" ); 7 this.containerSlideshow = $( "#slideshow" ); 12 8 this.containerSlides = $( "#slides" ); 13 this.containerBottom = $( "#bottom" );14 9 15 /** *********** VARIABLES *********** **/ 16 this.path = "<%=request.getContextPath()%>"; 17 this.webmaster = "<%=Context.getWebmaster(request)%>"; 18 this.relativePageUri = <%=request.getQueryString() != null%> ? "<%=Context.getRelativePath( request )%>?<%=request.getQueryString()%>" : "<%=Context.getRelativePageURI(request)%>"; 19 <%--this.jSONUser = <%=Context.getJSONUser( request )%> ? <%=Context.getJSONUser( request )%> : false;--%> 20 21 /** ************ CREATE ************ **/ 22 this.createTools(); 23 this.createMenu(); 10 /** ************ EVENTS ************ **/ 11 this.launchSlideShow(); 24 12 this.createSlides(); 25 26 this.onClickMenu( "Atmosphere" );27 13 }, 28 14 29 15 // CREATES ******************************************************** 30 createTools: function()31 {32 var mapButton = new Button( {value:templateTexts["label.map"], parent:this.containerTools, id:"button_map", className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} );33 var languageButton = new Button( {value: templateTexts["language.to.<%=Context.getLocale( request )%>"], parent:this.containerTools, id:"button_language", className: "gray_button", classNameText:"gray_button_text", onClick:jQuery.proxy( this.onClickLanguage, this )} );34 var homeButton = new Button( {value: templateTexts["label.home"], parent:this.containerTools, id:"button_home", className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickHome} );35 36 // var divSmallLogoEther = $( document.createElement( "div" ) );37 // divSmallLogoEther.attr( {id:"smallLogoEther", class:"containerSmallLogoEther"} );38 // divSmallLogoEther.append( '<a href="http://ether.ipsl.jussieu.fr" target="help"><img src="resources/images/logo_Ether.jpg" width="40px" height="40px"/></a>' );39 // this.containerTools.append( divSmallLogoEther );40 // $( "#smallLogoEther" ).show();41 42 // this.updateLogoEther();43 },44 45 createMenu: function()46 {47 var ulMenu = $( document.createElement( "ul" ) );48 this.containerMenu.append( ulMenu );49 50 var liAtmosphere = $( document.createElement( "li" ) );51 liAtmosphere.html( templateTexts["label.atmosphere.chemistry"] );52 liAtmosphere.bind( "click", jQuery.proxy( this.onClickMenu, [this, "Atmosphere"] ) );53 ulMenu.append( liAtmosphere );54 55 var liActivities = $( document.createElement( "li" ) );56 liActivities.html( templateTexts["label.activities"] );57 liActivities.bind( "click", jQuery.proxy( this.onClickMenu, [this, "Activities"] ) );58 ulMenu.append( liActivities );59 60 var liData = $( document.createElement( "li" ) );61 liData.html( templateTexts["label.data.services"] );62 liData.bind( "click", jQuery.proxy( this.onClickMenu, [this, "Data"] ) );63 ulMenu.append( liData );64 65 var liCommunity = $( document.createElement( "li" ) );66 liCommunity.html( templateTexts["label.community"] );67 liCommunity.bind( "click", jQuery.proxy( this.onClickMenu, [this, "Community"] ) );68 ulMenu.append( liCommunity );69 },70 71 createSubMenuLi: function( container, subMenus )72 {73 jQuery.each( subMenus, jQuery.proxy( function( i, subMenu )74 {75 var liSubMenu = $( document.createElement( "li" ) );76 liSubMenu.addClass( "li" + i );77 liSubMenu.html( " " + subMenu );78 container.append( liSubMenu );79 }, this ) );80 },81 82 16 createSlides: function() 83 17 { 84 var slideEther = new VerticalSlide( {title:templateTexts["home.main.activities"], parent:this.containerSlides, id:"slide_activities", contentId:"slide_activities_content", 85 className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} ); 86 var slideData = new VerticalSlide( {title:templateTexts["home.data"], parent:this.containerSlides, id:"slide_activities", contentId:"slide_activities_content", 87 className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} ); 88 var slideDataBases = new VerticalSlide( {title:templateTexts["home.databases"], parent:this.containerSlides, id:"slide_activities", contentId:"slide_activities_content", 89 className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} ); 90 var slideServices = new VerticalSlide( {title:templateTexts["home.services"], parent:this.containerSlides, id:"slide_activities", contentId:"slide_activities_content", 91 className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} ); 18 var contentSlideActivities = "project?methodName=viewSlideContent"; 19 var contentSlideData = "project/slideData.jsp"; 20 var contentSlideDataBases = "project/slideDataBases.jsp"; 21 var contentSlideServices = "project/slideServices.jsp"; 22 23 var slideEther = new VerticalSlide( {title:initTexts["home.main.activities"], parent:this.containerSlides, id:"slide_activities", titleId:"slide_activities_title", contentId:"slide_activities_content", 24 contentPage:contentSlideActivities, timeToSlide:100, 25 onClick:this.onClickSlideActivities} ); 26 var slideData = new VerticalSlide( {title:initTexts["home.data"], parent:this.containerSlides, id:"slide_data", titleId:"slide_data_title", contentId:"slide_data_content", 27 contentPage:contentSlideData, 28 onClick:this.onClickSlideData} ); 29 var slideDataBases = new VerticalSlide( {title:initTexts["home.databases"], parent:this.containerSlides, id:"slide_databases", titleId:"slide_databases_title", contentId:"slide_databases_content", 30 contentPage:contentSlideDataBases, 31 onClick:this.onClickSlideDataBases} ); 32 var slideServices = new VerticalSlide( {title:initTexts["home.services"], parent:this.containerSlides, id:"slide_services", titleId:"slide_services_title", contentId:"slide_services_content", 33 contentPage:contentSlideServices, 34 onClick:this.onClickSlideServices} ); 35 36 slideEther.onClickTitle(); 92 37 }, 93 38 94 39 // EVENTS ******************************************************** 95 onClick Home: function()40 onClickSlideActivities: function() 96 41 { 97 document.location.href = "index.jsp"; 42 98 43 }, 99 44 100 onClick Language: function()45 onClickSlideData: function() 101 46 { 102 if( <%=Context.isFrench(request)%> ) 103 document.location.href = "?language=en"; 104 else 105 document.location.href = "?language=fr"; 47 106 48 }, 107 49 108 onClick Map: function()50 onClickSlideDataBases: function() 109 51 { 110 document.location.href = "index.jsp"; 52 111 53 }, 112 54 113 onClick Menu: function( liMenuVariable)55 onClickSlideServices: function() 114 56 { 115 var context = liMenuVariable instanceof Object ? this[0] : this;116 var liMenu = liMenuVariable instanceof Object ? this[1] : liMenuVariable;117 57 118 context.containerSubMenu.empty();58 }, 119 59 120 var ulMenu = $( document.createElement( "ul" ) ); 121 context.containerSubMenu.append( ulMenu ); 60 // OTHERS ******************************************************** 61 launchSlideShow: function() 62 { 63 // Launch slide 64 this.containerSlideshow.craftyslide( { 65 'width': 450, 66 'height': 140, 67 'pagination': false, 68 'fadetime': 1000, 69 'delay': 5000 70 } ); 71 } 122 72 123 switch( liMenu )124 {125 case "Atmosphere":126 context.createSubMenuLi( ulMenu, [templateTexts["label.pole.presentation"], templateTexts["label.users.committee"],templateTexts["label.laboratories"], templateTexts["label.workshops"], templateTexts["label.ether.letter"], templateTexts["label.informations"]] );127 break;128 case "Activities":129 context.createSubMenuLi( ulMenu, [templateTexts["label.pole.presentation"], templateTexts["label.users.committee"],templateTexts["label.laboratories"]] );130 break;131 case "Data":132 context.createSubMenuLi( ulMenu, [templateTexts["label.workshops"], templateTexts["label.ether.letter"]] );133 break;134 case "Community":135 context.createSubMenuLi( ulMenu, [templateTexts["label.informations"], templateTexts["label.pole.presentation"], templateTexts["label.users.committee"],templateTexts["label.laboratories"]] );136 break;137 default:138 break;139 }140 ;141 }142 73 } ); 143 74 </script> -
ether_2012/trunk/web/project/imagesSlide.jsp
r352 r353 1 <div id="slideshow"> 2 <ul> 3 <li><img src="http://farm6.static.flickr.com/5270/5627221570_afdd85f16a_z.jpg" alt="" title="Light Trails"/></li> 4 <li><img src="http://farm6.static.flickr.com/5146/5627204218_b83b2d25d6_z.jpg" alt="" title="Bokeh"/></li> 5 <li><img src="http://farm6.static.flickr.com/5181/5626622843_783739c864_z.jpg" alt="" title="Blossoms"/></li> 6 <li><img src="http://farm6.static.flickr.com/5183/5627213996_915aa49939_z.jpg" alt="" title="Funky Painting"/></li> 7 </ul> 8 </div> 9 <script> 10 $( "#slideshow" ).craftyslide( { 11 'width': 450, 12 'height': 140, 13 'pagination': false, 14 'fadetime': 1000, 15 'delay': 5000 16 } ); 17 </script> 1 <ul> 2 <li><img src="http://farm6.static.flickr.com/5270/5627221570_afdd85f16a_z.jpg" alt="" title="Light Trails"/></li> 3 <li><img src="http://farm6.static.flickr.com/5146/5627204218_b83b2d25d6_z.jpg" alt="" title="Bokeh"/></li> 4 <li><img src="http://farm6.static.flickr.com/5181/5626622843_783739c864_z.jpg" alt="" title="Blossoms"/></li> 5 <li><img src="http://farm6.static.flickr.com/5183/5627213996_915aa49939_z.jpg" alt="" title="Funky Painting"/></li> 6 </ul> -
ether_2012/trunk/web/project/slideActivities.jsp
r352 r353 1 <div id="slideshow"> 2 <ul> 3 <li><img src="http://farm6.static.flickr.com/5270/5627221570_afdd85f16a_z.jpg" alt="" title="Light Trails"/></li> 4 <li><img src="http://farm6.static.flickr.com/5146/5627204218_b83b2d25d6_z.jpg" alt="" title="Bokeh"/></li> 5 <li><img src="http://farm6.static.flickr.com/5181/5626622843_783739c864_z.jpg" alt="" title="Blossoms"/></li> 6 <li><img src="http://farm6.static.flickr.com/5183/5627213996_915aa49939_z.jpg" alt="" title="Funky Painting"/></li> 7 </ul> 8 </div> 9 <script> 10 $( "#slideshow" ).craftyslide( { 11 'width': 450, 12 'height': 140, 13 'pagination': false, 14 'fadetime': 1000, 15 'delay': 5000 16 } ); 17 </script> 1 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 2 3 <table class="slideTable" cellspacing="0"> 4 <tr> 5 <td class="borderTop"> 6 MIMOSA 7 </td> 8 <td rowspan="2" class="noBorder"></td> 9 <td class="borderTop"> 10 REPROBUS 11 </td> 12 <td rowspan="2" class="noBorder"></td> 13 <td class="borderTop"> 14 IASI 15 </td> 16 <td rowspan="2" class="noBorder"></td> 17 <td class="borderTop"> 18 TRO-pico 19 </td> 20 <td rowspan="2" class="noBorder"></td> 21 <td class="borderTop"> 22 GEISA 23 </td> 24 <td rowspan="2" class="noBorder"></td> 25 <td class="borderTop"> 26 Mozaic 27 </td> 28 <td rowspan="2" class="noBorder"></td> 29 <td class="borderTop"> 30 ECCAD 31 </td> 32 <td rowspan="2" class="noBorder"></td> 33 <td class="borderTop"> 34 MEGAPOLI 35 </td> 36 </tr> 37 <tr> 38 <td class="borderBottom"> 39 <img src="resources/images/logo_mimosa.png" width="80px" alt='<spring:message code="logo.mimosa.alt"/>' 40 title='<spring:message code="logo.mimosa.alt"/>'/> 41 </td> 42 <td class="borderBottom"> 43 <img src="resources/images/logo_O3_reprobus.png" width="80px" 44 alt='<spring:message code="logo.reprobus.alt"/>' title='<spring:message code="logo.reprobus.alt"/>'/> 45 </td> 46 <td class="borderBottom"> 47 <img src="resources/images/logo_iasi.jpg" width="80px" alt='<spring:message code="logo.iasi.alt"/>' 48 title='<spring:message code="logo.iasi.alt"/>'/> 49 </td> 50 <td class="borderBottom"> 51 <img src="resources/images/logo_tropico_small.jpg" width="80px" 52 alt='<spring:message code="logo.tropico.alt"/>' title='<spring:message code="logo.tropico.alt"/>'/> 53 </td> 54 <td class="borderBottom"> 55 <img src="resources/images/logo_Geisa76-50deform.jpg" width="80px" 56 alt='<spring:message code="logo.geisa.alt"/>' title='<spring:message code="logo.geisa.alt"/>'/> 57 </td> 58 <td class="borderBottom"> 59 <img src="resources/images/logo_mozaic.GIF" width="80px" alt='<spring:message code="logo.geisa.alt"/>' 60 title='<spring:message code="logo.geisa.alt"/>'/> 61 </td> 62 <td class="borderBottom"> 63 <img src="resources/images/logo_ECCAD_small.gif" width="80px" alt='<spring:message code="logo.eccad.alt"/>' 64 title='<spring:message code="logo.eccad.alt"/>'/> 65 </td> 66 <td class="borderBottom"> 67 <img src="resources/images/logo_Megapoli.png" width="80px" alt='<spring:message code="logo.megapoli.alt"/>' 68 title='<spring:message code="logo.megapoli.alt"/>'/> 69 </td> 70 </tr> 71 </table> 72 -
ether_2012/trunk/web/resources/css/button.css
r352 r353 10 10 float: left; 11 11 margin: 0 11px 0 0; 12 background-color: #f5f5f5; 13 border: 1px solid #dedede; 14 border-top: 1px solid #eee; 15 border-left: 1px solid #eee; 12 width: auto; 13 overflow: visible; 14 padding: 4px 6px 3px 6px; /* IE6 */ 16 15 17 16 font-family: Trebuchet MS, Arial, san-serif; 18 17 text-decoration: none; /*color: #565656;*/ 19 cursor: pointer; 20 21 width: auto; 22 overflow: visible; 23 padding: 4px 6px 3px 6px; /* IE6 */ 24 } 25 26 button[type] { 27 padding: 5px 10px 5px 7px; /* Firefox */ 28 line-height: 17px; /* Safari */ 29 } 30 31 *:first-child+html button[type] { 32 padding: 4px 10px 3px 7px; /* IE7 */ 18 cursor: pointer; /*border: 1px solid #dedede;*/ 33 19 } 34 20 35 21 .small { 36 22 font-size: 80%; 37 }38 39 button img {40 margin: 0 3px -3px 0 !important;41 padding: 0;42 border: none;43 width: 16px;44 height: 16px;45 }46 47 /* STANDARD */48 button:hover, .button.gray_button:hover {49 background-color: #81A0C3 !important;50 border: 1px solid #c2e1ef;51 color: white !important;52 }53 54 /* POSITIVE */55 button.positive {56 background-color: #F0FFF0;57 color: #529214;58 }59 60 button.positive:hover {61 background-color: #E6EFC2;62 border: 1px solid #C6D880;63 color: #529214;64 }65 66 /* NEGATIVE */67 button.negative {68 color: #d12f19;69 }70 71 button.negative:hover {72 background: #fbe3e4;73 border: 1px solid #fbc2c4;74 color: #d12f19;75 }76 77 /* DISABLE */78 button.disable, button.disable:hover {79 background-color: #CCCCCC;80 border: 1px solid #dedede;81 color: #565656;82 }83 84 /* ********************* BLUE BUTTON ********************* */85 button.blue_button {86 background-image: url("../images/elements/button_middle_3.png");87 background-repeat: repeat-x;88 height: 39px;89 float: right;90 margin-right: 0;91 border: 0;92 }93 94 .blue_button_text, .big_blue_button_text {95 color: white;96 font-size: 11px;97 font-weight: bold;98 }99 100 button.big_blue_button {101 background-image: url("../images/elements/big_button_middle_3.png");102 background-repeat: repeat-x repeat-y;103 height: 50px;104 width: 50px;105 float: right;106 margin-right: 0;107 border: 0;108 }109 110 .big_blue_button_text {111 position: relative;112 top: -3px;113 font-size: 44px;114 23 } 115 24 … … 123 32 position: relative; 124 33 top: -1px; 125 }126 34 127 .gray_button_text {128 35 color: gray; 129 36 font-size: 11px; 130 37 font-weight: bold; 38 131 39 } 132 40 133 .gray_button_text:hover { 41 button.gray_button:hover { 42 background-color: #003d6c; 134 43 color: white; 135 44 } 136 45 137 button.action_button { 138 margin-left: 5px; 139 margin-right: -3px; 140 } 46 /* ********************* POSITIVE BUTTON ********************* */ 47 /*button.positive {*/ 48 /*background-color: #F0FFF0;*/ 49 /*color: #529214;*/ 50 /*}*/ 51 52 /*button.positive:hover {*/ 53 /*background-color: #E6EFC2;*/ 54 /*border: 1px solid #C6D880;*/ 55 /*color: #529214;*/ 56 /*}*/ 57 58 /* ********************* NEGATIVE BUTTON ********************* */ 59 /*button.negative {*/ 60 /*color: #d12f19;*/ 61 /*}*/ 62 63 /*button.negative:hover {*/ 64 /*background: #fbe3e4;*/ 65 /*border: 1px solid #fbc2c4;*/ 66 /*color: #d12f19;*/ 67 /*}*/ 68 69 /* ********************* DISABLE BUTTON ********************* */ 70 /*button.disable, button.disable:hover {*/ 71 /*background-color: #CCCCCC;*/ 72 /*border: 1px solid #dedede;*/ 73 /*color: #565656;*/ 74 /*}*/ 75 -
ether_2012/trunk/web/resources/css/ether.css
r352 r353 14 14 15 15 /** ***************************************************** **/ 16 /** ********************** CONTAINER ******************** **/ 17 /** ***************************************************** **/ 16 /** ********************* CONTAINERS ******************** **/ 17 /** ***************************************************** **/ 18 .containerWhite { 19 position: relative; 20 left: 600px; 21 background-color: white; 22 width: 13px; 23 height: 108px; 24 } 25 18 26 .containerEther { 19 27 -moz-border-radius: 4px 4px 4px 4px; … … 38 46 /** ***************************************************** **/ 39 47 .containerTitleTools { 40 /*-moz-box-shadow: 8px -1px 7px -5px rgba(0, 0, 0, 0.3);*/41 /*-webkit-box-shadow: 8px -1px 7px -5px rgba(0, 0, 0, 0.3);*/42 48 width: 980px; 43 49 float: left; … … 67 73 .containerTitle { 68 74 font-size: 24px; 69 color: # 165076;75 color: #003d6c; 70 76 font-weight: bold; 71 77 float: left; … … 73 79 margin-left: 10px; 74 80 margin-bottom: 18px; 75 width: 483px;81 width: 483px; 76 82 } 77 83 78 84 .containerTitlePart2 { 79 /*margin-left: 224px;*/80 85 text-align: right; 81 86 margin-right: 10px; … … 95 100 } 96 101 97 .containerWhite {98 position: absolute;99 top: 8px;100 left: 953px;101 background-color: white;102 width: 13px;103 height: 108px;104 }105 106 102 .containerToolsMenus { 107 103 -moz-border-radius: 0 4px 4px 4px; … … 156 152 157 153 .containerNewsTexts { 158 background: -moz-linear-gradient(0deg, # 1E5799-9%, rgba(125, 185, 232, 0.48) 30%, rgba(125, 185, 232, 0) 83%) repeat scroll 0 0 transparent;154 background: -moz-linear-gradient(0deg, #003d6c -9%, rgba(125, 185, 232, 0.48) 30%, rgba(125, 185, 232, 0) 83%) repeat scroll 0 0 transparent; 159 155 float: right; 160 156 height: 150px; … … 163 159 164 160 .containerNewsTextsTitle { 165 color: # 165076;161 color: #003d6c; 166 162 font-size: 16px; 167 163 text-align: right; … … 174 170 /** ***************************************************** **/ 175 171 .containerBottom { 176 color: #165076; 172 background: -moz-linear-gradient(left center, white, #C0C0C0) repeat scroll 0 0 transparent; 173 color: #003D6C; 177 174 height: 26px; 178 175 padding-right: 10px; … … 184 181 185 182 /** ***************************************************** **/ 186 187 .containerUserLogout {188 float: left;189 margin-right: 5px;190 }191 192 .containerImgLogout {193 float: right;194 position: relative;195 top: 13px;196 }197 198 .containerTitleContentBorder {199 float: left;200 position: relative;201 height: 2px;202 border-bottom: 10px solid white;203 z-index: 1;204 left: -10px;205 width: 810px;206 }207 208 .containerTitleContent {209 -moz-border-radius: 4px 4px 0 0;210 -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);211 -webkit-border-radius: 4px 4px 0 0;212 -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);213 background-image: url("../images/fond_bleu2.png");214 background-repeat: repeat-x;215 float: left;216 position: relative;217 width: 800px;218 height: 26px;219 color: #165076;220 font-weight: bold;221 padding-left: 10px;222 padding-top: 4px;223 }224 225 .containerCenter {226 -moz-border-radius-topright: 0;227 -webkit-border-radius: 0; /*#E8EFF3*//* #618EAC*/228 background: -moz-linear-gradient(white, #E8EFF3);229 background: -webkit-linear-gradient(white, #E8EFF3);230 min-height: 400px;231 text-align: justify;232 position: relative;233 top: -32px;234 padding: 10px;235 width: 960px;236 }237 238 .containerCenterContent {239 padding: 10px;240 }241 242 .containerErrors, #errors {243 background: #FEF1EC;244 -moz-border-radius: 4px 4px 4px 4px;245 -webkit-border-radius: 4px 4px 4px 4px;246 border: 1px solid #CD0A0A;247 color: #CD0A0A;248 padding: 10px;249 margin: 10px;250 }251 252 .containerErrors {253 display: none;254 }255 256 .containerInfos {257 background: url("images/ui-bg_glass_95_fef1ec_1x400.png") repeat-x scroll 50% 50% #F0FFF0;258 -moz-border-radius: 4px 4px 4px 4px;259 -webkit-border-radius: 4px 4px 4px 4px;260 border: 1px solid #529214;261 color: #529214;262 padding: 10px;263 margin: 10px;264 display: none;265 }266 267 .containerElement {268 color: #6178BC;269 }270 271 .containerElement:hover {272 -moz-border-radius: 4px 4px 4px 4px;273 -webkit-border-radius: 4px 4px 4px 4px;274 text-decoration: none;275 background: #70739C;276 color: #FFFFFF;277 }278 279 .containerElement_plateform {280 width: 84px;281 float: left;282 }283 284 #containerMobilePlateforms .containerElement_main_plateform .containerElement_plateform:hover {285 -moz-border-radius: 4px 0 0 4px;286 -webkit-border-radius: 4px 0 0 4px;287 }288 289 .containerElement_plateform_dates {290 display: none;291 -moz-border-radius: 0 4px 4px 4px;292 -webkit-border-radius: 0 4px 4px 4px;293 background: #70739C;294 color: white;295 float: left;296 }297 298 .containerElement_main_plateform {299 float: left;300 width: 900px;301 }302 303 #containerMobilePlateforms {304 padding-bottom: 117px;305 }306 307 /** ***************************************************** **/308 /** ************************ OTHER ********************** **/309 /** ***************************************************** **/310 .colborder {311 border-right: 1px solid #96A1BA;312 margin-right: 15px;313 padding-right: 29px;314 }315 316 .mainContent {317 padding: 15px;318 }319 320 .roundTable {321 -moz-border-radius: 4px;322 -webkit-border-radius: 4px;323 border: 1px solid;324 width: 100%;325 }326 327 .smallRoundTable {328 -moz-border-radius: 4px;329 -webkit-border-radius: 4px;330 border: 1px solid;331 }332 333 .divMenu_arrow, .divMenu_arrow.deployed, .divMenu_arrow_left, .divMenu_arrow_left.deployed {334 height: 13px;335 width: 13px;336 position: relative;337 float: right;338 top: -17px;339 }340 341 .divMenu_arrow, .divMenu_arrow_left {342 background-image: url("../images/utils/toggle_down_dark.png");343 }344 345 .divMenu_arrow_left, .divMenu_arrow_left.deployed {346 float: left;347 top: 4px;348 margin-left: -19px;349 }350 351 .divMenu_arrow.deployed, .divMenu_arrow_left.deployed {352 background-image: url("../images/utils/toggle_up_dark.png");353 }354 355 .divMenu_content {356 display: none;357 }358 359 .parameter_name_subMenu, .parameter_name_subMenu:hover {360 position: relative;361 margin-left: 10px;362 margin-right: 10px;363 }364 365 .parameter_name_subMenu:hover {366 -moz-border-radius: 4px 4px 4px 4px;367 -webkit-border-radius: 4px 4px 4px 4px;368 background-color: #DDEEF6;369 }370 371 .plateform_selected, .plateform_selected:hover,372 .parameter_selected, .parameter_selected:hover {373 -moz-border-radius: 4px 4px 4px 4px;374 -webkit-border-radius: 4px 4px 4px 4px;375 background: #70739C;376 color: #E1DEF1;377 text-decoration: none;378 }379 380 /** ***************************************************** **/381 /** ************************ PAGES ********************** **/382 /** ***************************************************** **/383 /*#tools, #tools .links li a {*/384 /*height: 39px;*/385 /*}*/386 387 /*#tools {*/388 /*font: 12px/18px Trebuchet MS, Arial, san-serif;*/389 /*margin: 18px auto 12px;*/390 /*position: relative;*/391 /*}*/392 393 #level2 .title {394 color: #165076;395 font-weight: bold;396 padding: 0.5em;397 }398 399 .level2_more {400 padding-bottom: 16px;401 }402 403 .elementExtract {404 position: relative;405 top: -2px;406 407 }408 409 .jeuxElement {410 position: relative;411 float: left;412 margin-left: 30px413 }414 415 #level1 {416 margin-bottom: 20px;417 }418 419 #level2 {420 margin-left: 20px;421 }422 423 #level2 table {424 border: 0 none;425 padding: 0;426 text-align: left;427 width: 100%;428 }429 430 #level2 th {431 background-color: #E9E6D9;432 color: #596F80;433 text-align: center;434 }435 436 #level2 td {437 vertical-align: top;438 }439 440 table .pair, table .pairTable {441 background-color: #F5F3EC;442 }443 444 table .impair, table .impairTable {445 background-color: #FFFDF6;446 }447 448 .dataProtocolButton {449 margin-left: 51px;450 }451 452 .dataProtocolDownloadButton {453 float: right;454 }455 456 .dataProtocolCheckbox, .dataProtocolCheckboxText {457 float: left;458 margin-left: 3px;459 margin-top: 7px;460 }461 462 .dataProtocolCheckboxText {463 margin-top: 4px;464 }465 466 .parameterElement, .plateformElement {467 margin-left: 50px;468 margin-right: 50px;469 }470 471 .loadingForParameters_meta, .loadingForPlateforms_meta {472 margin: auto;473 }474 475 /** ***************************************************** **/476 183 /** ********************* LI SUBMENUS ******************* **/ 477 184 /** ***************************************************** **/ … … 504 211 color: #165076; 505 212 } 213 214 /** ***************************************************** **/ 215 216 /** ***************************************************** **/ 217 .roundTable { 218 -moz-border-radius: 4px; 219 -webkit-border-radius: 4px; 220 border: 1px solid; 221 width: 100%; 222 } 223 224 .slideTable { 225 float: left; 226 width: 99%; 227 margin: 5px 5px -15px; 228 } 229 230 .slideTable td { 231 -moz-border-radius: 4px; 232 -webkit-border-radius: 4px; 233 border: 2px solid #C0C0C0; 234 padding-right: 10px; 235 padding-left: 10px; 236 text-align: center; 237 color: #003D6C; 238 } 239 240 .slideTable td.noBorder { 241 border: none; 242 width: 2px; 243 padding: 0; 244 } 245 246 .slideTable td.borderTop { 247 -moz-border-radius: 4px 4px 0 0 !important; 248 -webkit-border-radius: 4px; 249 border-bottom: none; 250 } 251 252 .slideTable td.borderBottom { 253 -moz-border-radius: 0 0 4px 4px !important; 254 -webkit-border-radius: 4px; 255 border-top: none; 256 } 257 258 .slideTable td.borderTop:hover, .slideTable td.borderBottom:hover { 259 background-color: white; 260 } -
ether_2012/trunk/web/resources/css/mainEther.css
r351 r353 48 48 li:hover { 49 49 color: #ADEAEA; 50 }51 52 .pair:hover, .impair:hover {53 -moz-border-radius: 4px 4px 4px 4px;54 background: none repeat scroll 0 0 #70739C;55 color: #E1DEF1;56 text-decoration: none;57 }58 59 .bindedText {60 color: #6178BC;61 text-decoration: none;62 50 } 63 51 -
ether_2012/trunk/web/resources/css/verticalSlide.css
r352 r353 1 #slideTitle { 2 1 .containerSlide { 2 -moz-border-radius: 0 0 4px 4px; 3 background-color: #F5F5F5; 3 4 } 4 5 5 6 .containerSlideTitle { 6 /*-moz-border-radius: 4px 4px 4px 4px;*/7 /*-webkit-border-radius: 4px 4px 4px 4px;*/8 7 background: -moz-linear-gradient(white, #C0C0C0); 9 8 background: -webkit-linear-gradient(white, #COCOCO); 10 margin-top: 5px; 9 -moz-border-radius: 4px 4px 4px 4px; 10 -webkit-border-radius: 4px 4px 4px 4px; 11 float: left; 12 padding-top: 5px; 11 13 padding-left: 10px; 12 14 font-weight: bold; 15 width: 970px; 16 height: 24px; 13 17 } 14 18 15 19 .containerSlideTitle:hover { 16 background: -moz-linear-gradient(#3299CC, #3299CC);17 background: -webkit-linear-gradient(#236B8E, #236B8E);18 20 color: white; 19 21 } 22 23 .containerSlideTitle.activated { 24 -moz-border-radius: 4px 4px 0 0; 25 -webkit-border-radius: 4px 4px 0 0; 26 } 27 28 .containerSlideTitle_image { 29 float: left; 30 width: 15px; 31 height: 18px; 32 margin-top: 3px; 33 } 34 35 .containerSlideTitle_text { 36 float: left; 37 margin-top: -2px; 38 margin-left: 7px; 39 } 40 41 .containerSlideContent { 42 -moz-border-radius: 0 0 4px 4px; 43 -webkit-border-radius: 0 0 4px 4px; 44 background-color: #F5F5F5; 45 } 46 47 /** ***************************************************** **/ 48 /** *********************** INIT.JSP ******************** **/ 49 /** ***************************************************** **/ 50 #slide_activities_title:hover .containerSlideTitle_image, #slide_data_title:hover .containerSlideTitle_image, #slide_databases_title:hover .containerSlideTitle_image, #slide_services_title:hover .containerSlideTitle_image { 51 background-image: url("../../resources/icons/arrow_white_right.png"); 52 background-repeat: no-repeat; 53 } 54 55 #slide_activities_title.activated .containerSlideTitle_image, #slide_data_title.activated .containerSlideTitle_image, #slide_databases_title.activated .containerSlideTitle_image, #slide_services_title.activated .containerSlideTitle_image { 56 background-image: url("../../resources/icons/arrow_white_down.png"); 57 background-repeat: no-repeat; 58 margin-top: 0; 59 } 60 61 /** #slide_activities_title **/ 62 #slide_activities_title:hover, #slide_activities_title.activated { 63 background: -moz-linear-gradient(#9ac8ec, #003d6c); 64 background: -webkit-linear-gradient(#9ac8ec, #003d6c); 65 color: white; 66 } 67 68 #slide_activities_title .containerSlideTitle_image { 69 background-image: url("../../resources/icons/arrow_blue_right.png"); 70 background-repeat: no-repeat; 71 } 72 73 /** #slide_data_title **/ 74 #slide_data_title:hover, #slide_data_title.activated { 75 background: -moz-linear-gradient(#f9adad, #d51311) repeat scroll 0 0 transparent; 76 background: -webkit-linear-gradient(#f9adad, #d51311) repeat scroll 0 0 transparent; 77 color: white; 78 } 79 80 #slide_data_title .containerSlideTitle_image { 81 background-image: url("../../resources/icons/arrow_red_right.png"); 82 background-repeat: no-repeat; 83 } 84 85 /** #slide_databases_title **/ 86 #slide_databases_title:hover, #slide_databases_title.activated { 87 background: -moz-linear-gradient(#f8e38e, #ffcf02) repeat scroll 0 0 transparent; 88 background: -webkit-linear-gradient(#f8e38e, #ffcf02) repeat scroll 0 0 transparent; 89 color: white; 90 } 91 92 #slide_databases_title .containerSlideTitle_image { 93 background-image: url("../../resources/icons/arrow_yellow_right.png"); 94 background-repeat: no-repeat; 95 } 96 97 /** #slide_services_title **/ 98 #slide_services_title:hover, #slide_services_title.activated { 99 background: -moz-linear-gradient(#a6d1f8, #0569c7) repeat scroll 0 0 transparent; 100 background: -webkt-linear-gradient(#a6d1f8, #0569c7) repeat scroll 0 0 transparent; 101 color: white; 102 } 103 104 #slide_services_title .containerSlideTitle_image { 105 background-image: url("../../resources/icons/arrow_blue_2_right.png"); 106 background-repeat: no-repeat; 107 } 108 109 /** ***************************************************** **/ -
ether_2012/trunk/web/resources/js/classesForJQuery/VerticalSlide.js
r352 r353 15 15 this.parent = objectParameter.parent ? objectParameter.parent : document.body; 16 16 this.id = objectParameter.id; 17 this.titleId = objectParameter.titleId; 17 18 this.contentId = objectParameter.contentId; 18 // this.specificContentClass = objectParameter.specificContentClass ? objectParameter.specificContentClass : false; 19 // this.specificButtonClass = objectParameter.specificButtonClass ? objectParameter.specificButtonClass : false; 19 20 20 this.title = objectParameter.title ? objectParameter.title : false; 21 this.timeToSlide = objectParameter.timeToSlide ? objectParameter.timeToSlide : 1000; 22 this.contentSlide = objectParameter.contentSlide ? objectParameter.contentSlide : false; 23 this.contentPageSlide = objectParameter.contentPageSlide ? objectParameter.contentPageSlide : false; 24 this.contentButton = objectParameter.contentButton; 25 this.isIndexToChange = objectParameter.isIndexToChange ? objectParameter.isIndexToChange : false; 26 this.zIndex = this.parent.css( "z-index" ); 21 this.content = objectParameter.content ? objectParameter.content : false; 22 this.contentPage = objectParameter.contentPage ? objectParameter.contentPage : false; 23 this.timeToSlide = objectParameter.timeToSlide ? objectParameter.timeToSlide : 100; 24 25 // Slide div 26 this.divSlide = $( document.createElement( "div" ) ); 27 this.divSlide.attr( {id:this.id, class:"containerSlide"} ); 27 28 28 29 // Title div 29 30 this.divSlideTitle = $( document.createElement( "div" ) ); 30 this.divSlideTitle.attr( {id:this.id, class:"containerSlideTitle"} ); 31 // if( this.specificContentClass ) 32 // this.divSlideTitle.addClass( this.specificContentClass ); 31 this.divSlideTitle.attr( {id:this.titleId, class:"containerSlideTitle"} ); 32 33 this.divSlideTitleImage = $( document.createElement( "div" ) ); 34 this.divSlideTitleImage.addClass( "containerSlideTitle_image" ); 35 this.divSlideTitle.append( this.divSlideTitleImage ); 36 37 var divSlideTitleText = $( document.createElement( "div" ) ); 38 divSlideTitleText.addClass( "containerSlideTitle_text" ); 33 39 if( this.title ) 34 this.divSlideTitle.html( this.title ); 35 this.parent.append( this.divSlideTitle ); 40 divSlideTitleText.html( this.title ); 41 this.divSlideTitle.append( divSlideTitleText ); 42 this.divSlideTitle.bind( "click", jQuery.proxy( this.onClickTitle, this ) ); 43 this.divSlide.append( this.divSlideTitle ); 36 44 37 45 // Content div 38 // this.divSlideContent = $( document.createElement( "div" ) ); 39 // this.divSlideContent.attr( {id:this.buttonId} ); 40 // this.divSlideContent.attr( {id:this.buttonId, class:"containerSlideButton"} ); 41 // if( this.specificButtonClass ) 42 // this.divSlideButton.addClass( this.specificButtonClass ); 43 // this.divSlideContent.append( this.contentButton ); 44 // this.divSlideContent.bind( "click", jQuery.proxy( this.onClickButton, this ) ); 45 // this.parent.append( this.divSlideContent ); 46 }, 46 this.divSlideContent = $( document.createElement( "div" ) ); 47 this.divSlideContent.attr( {id:this.contentId, class:"containerSlideContent", style:"display:none"} ); 48 if( this.content ) 49 this.divSlideContent.append( this.content ); 50 this.divSlide.append( this.divSlideContent ); 47 51 48 getContent: function() 49 { 50 return this.divSlideTitle.html(); 51 }, 52 53 setContent: function( newContent ) 54 { 55 this.divSlideTitle.html( newContent ); 52 this.parent.append( this.divSlide ); 56 53 }, 57 54 58 55 isContentVisible: function() 59 56 { 60 return ( this.divSlideTitle.css( "display" ) == "block");57 return ("block" == this.divSlideContent.css( "display" )); 61 58 }, 62 59 63 60 // public 64 onClick Button: function()61 onClickTitle: function() 65 62 { 66 if( this.isIndexToChange && !this.isContentVisible() ) 67 this.parent.css( "z-index", 100 ); 68 69 this.divSlideTitle.animate( {width:"toggle"}, this.timeToSlide, jQuery.proxy( function() 63 this.divSlideContent.animate( {height:"toggle"}, this.timeToSlide, jQuery.proxy( function() 70 64 { 71 if( this.isIndexToChange && !this.isContentVisible() ) 72 this.parent.css( "z-index", this.zIndex ); 65 if( this.isContentVisible() ) 66 { 67 this.divSlideTitle.addClass( "activated" ); 68 } 69 else 70 { 71 this.divSlideTitle.removeClass( "activated" ); 72 } 73 73 }, this ) ); 74 74 75 if( this.contentPage Slide)76 this.divSlide Title.load( this.contentPageSlide );75 if( this.contentPage ) 76 this.divSlideContent.load( this.contentPage ); 77 77 } 78 78 } ); -
ether_2012/trunk/web/resources/templates/templateEther.jsp
r352 r353 1 <%@ page import="com.ether.Context" %>1 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 2 2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 3 <%@ taglib prefix="tiles" uri="/WEB-INF/tlds/struts-tiles.tld" %> 3 4 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 4 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>5 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>6 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>7 5 8 6 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> … … 20 18 <ether:htmlCss cssFile="mainEther"/> 21 19 <ether:htmlCss cssFile="ether"/> 22 <ether:htmlCss cssFile="craftedpixelz-Craftyslide-4cd0adb/craftyslide"/>23 <ether:htmlCss cssFile="verticalSlide"/>24 20 25 21 <ether:htmlJs jsFile="library/jquery-1.4.2.min"/> … … 28 24 <ether:htmlJs jsFile="classesForJQuery/etherHelper"/> 29 25 <ether:htmlJs jsFile="classesForJQuery/Button"/> 30 <ether:htmlJs jsFile="craftedpixelz-Craftyslide-4cd0adb/js/craftyslide.min"/>31 <ether:htmlJs jsFile="classesForJQuery/VerticalSlide"/>32 26 33 27 <jsp:include page="templateEther_script.jsp"/> … … 62 56 </div> 63 57 64 <div class="containerWhite"></div>65 66 58 <div class="containerToolsMenus"> 67 59 <div id="tools" class="containerTools" align="right"></div> … … 73 65 </div> 74 66 75 <%-- ****************** NEWS ****************** --%> 76 <div id="newsImage" class="containerEther containerNewsImages"> 77 <jsp:include page="/project/imagesSlide.jsp"/> 78 </div> 79 80 <div id="newsTexts" class="containerEther containerNewsTexts"> 81 <div class="containerNewsTextsTitle"><spring:message code="home.news"/></div> 82 </div> 83 84 <%-- ****************** SLIDES ****************** --%> 85 <div id="slides" class="containerEtherWithBorder containerSlides"> 86 <%--<div id="slideTitle">--%> 87 <%--<div>image</div>--%> 88 <%--<div><spring:message code="home.main.activities"/></div>--%> 89 <%--</div>--%> 90 </div> 67 <%-- ****************** BODY CONTENT ****************** --%> 68 <tiles:insert attribute="body"/> 91 69 92 70 <%-- ****************** BOTTOM ****************** --%> 93 <div id="bottom" class="containerEther containerBottom" align="right"> 94 </div> 71 <div id="bottom" class="containerEther containerBottom" align="right">guiliguili</div> 72 73 <div class="containerWhite"></div> 95 74 96 75 </div> 76 97 77 98 78 <script type="text/javascript"> … … 112 92 templateTexts["label.ether.letter"] = '<spring:message code="label.ether.letters"/>'; 113 93 templateTexts["label.informations"] = '<spring:message code="label.informations"/>'; 114 templateTexts["home.main.activities"] = '<spring:message code="home.main.activities"/>';115 templateTexts["home.data"] = '<spring:message code="home.data"/>';116 templateTexts["home.databases"] = '<spring:message code="home.databases"/>';117 templateTexts["home.services"] = '<spring:message code="home.services"/>';118 94 119 95 var interfaceTemplate = new InterfaceTemplate(); -
ether_2012/trunk/web/resources/templates/templateEther_script.jsp
r352 r353 10 10 this.containerMenu = $( "#menu" ); 11 11 this.containerSubMenu = $( "#subMenu" ); 12 this.containerSlides = $( "#slides" );13 12 this.containerBottom = $( "#bottom" ); 14 13 … … 17 16 this.webmaster = "<%=Context.getWebmaster(request)%>"; 18 17 this.relativePageUri = <%=request.getQueryString() != null%> ? "<%=Context.getRelativePath( request )%>?<%=request.getQueryString()%>" : "<%=Context.getRelativePageURI(request)%>"; 19 <%--this.jSONUser = <%=Context.getJSONUser( request )%> ? <%=Context.getJSONUser( request )%> : false;--%>20 18 21 19 /** ************ CREATE ************ **/ 22 20 this.createTools(); 23 21 this.createMenu(); 24 this.createSlides();25 22 26 23 this.onClickMenu( "Atmosphere" ); … … 30 27 createTools: function() 31 28 { 32 var mapButton = new Button( {value:templateTexts["label.map"], parent:this.containerTools, id:"button_map", className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} ); 33 var languageButton = new Button( {value: templateTexts["language.to.<%=Context.getLocale( request )%>"], parent:this.containerTools, id:"button_language", className: "gray_button", classNameText:"gray_button_text", onClick:jQuery.proxy( this.onClickLanguage, this )} ); 34 var homeButton = new Button( {value: templateTexts["label.home"], parent:this.containerTools, id:"button_home", className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickHome} ); 35 36 // var divSmallLogoEther = $( document.createElement( "div" ) ); 37 // divSmallLogoEther.attr( {id:"smallLogoEther", class:"containerSmallLogoEther"} ); 38 // divSmallLogoEther.append( '<a href="http://ether.ipsl.jussieu.fr" target="help"><img src="resources/images/logo_Ether.jpg" width="40px" height="40px"/></a>' ); 39 // this.containerTools.append( divSmallLogoEther ); 40 // $( "#smallLogoEther" ).show(); 41 42 // this.updateLogoEther(); 29 var mapButton = new Button( {value:templateTexts["label.map"], parent:this.containerTools, id:"button_map", className: "gray_button", onClick:this.onClickMap} ); 30 var languageButton = new Button( {value: templateTexts["language.to.<%=Context.getLocale( request )%>"], parent:this.containerTools, id:"button_language", className: "gray_button", onClick:jQuery.proxy( this.onClickLanguage, this )} ); 31 var homeButton = new Button( {value: templateTexts["label.home"], parent:this.containerTools, id:"button_home", className: "gray_button", onClick:this.onClickHome} ); 43 32 }, 44 33 … … 78 67 container.append( liSubMenu ); 79 68 }, this ) ); 80 },81 82 createSlides: function()83 {84 var slideEther = new VerticalSlide( {title:templateTexts["home.main.activities"], parent:this.containerSlides, id:"slide_activities", contentId:"slide_activities_content",85 className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} );86 var slideData = new VerticalSlide( {title:templateTexts["home.data"], parent:this.containerSlides, id:"slide_activities", contentId:"slide_activities_content",87 className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} );88 var slideDataBases = new VerticalSlide( {title:templateTexts["home.databases"], parent:this.containerSlides, id:"slide_activities", contentId:"slide_activities_content",89 className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} );90 var slideServices = new VerticalSlide( {title:templateTexts["home.services"], parent:this.containerSlides, id:"slide_activities", contentId:"slide_activities_content",91 className: "gray_button", classNameText:"gray_button_text", onClick:this.onClickMap} );92 69 }, 93 70 … … 140 117 ; 141 118 } 119 142 120 } ); 143 121 </script> -
ether_2012/trunk/web/src/com/ether/Controller.java
r330 r353 2 2 3 3 import com.ether.annotation.ControllerMethod; 4 import com.ether.annotation.Mandatory;5 import com.ether.annotation.ParamName;6 import net.sf.json.JSONObject;7 4 import org.apache.commons.logging.Log; 8 5 import org.apache.commons.logging.LogFactory; 9 import org.jetbrains.annotations.NotNull;10 import org.springframework.beans.factory.annotation.Required;11 import org.springframework.web.servlet.ModelAndView;12 6 13 import javax.servlet.http.HttpServletRequest;14 import javax.servlet.http.HttpServletResponse;15 7 import java.util.HashMap; 16 import java.util.List;17 8 import java.util.Map; 18 9 … … 26 17 /** *********************************************************** **/ 27 18 /** *********************** VIEWS ***************************** **/ 28 /** 29 * ********************************************************** * 30 */ 31 // Default view if url's methodName is unknown 32 @ControllerMethod(view = "init") 19 /** *********************************************************** **/ 20 @ControllerMethod(view = VIEW_INIT) 33 21 public Map<String, Object> home() 34 22 throws WebException 35 {36 return new HashMap<String, Object>();37 }38 39 @ControllerMethod(view = VIEW_VISUALIZATION)40 public Map<String, Object> view()41 throws ServiceException42 23 { 43 24 return new HashMap<String, Object>(); 44 25 } 45 26 46 @ControllerMethod(view = VIEW_ VISUALIZATION_PLATEFORM)47 public Map<String, Object> view AllPlateforms()48 throws ServiceException27 @ControllerMethod(view = VIEW_ACTIVITIES) 28 public Map<String, Object> viewSlideContent() 29 throws WebException 49 30 { 50 final List<Plateform> plateforms = _etherService.getAllPlateforms(); 51 52 final Map<String, Object> model = new HashMap<String, Object>(); 53 model.put( "plateforms", getJsonHelper().toJSON( plateforms ) ); 54 return model; 55 } 56 57 /** *********************************************************** **/ 58 /** *********************** CALLS ***************************** **/ 59 /** 60 * ********************************************************** * 61 */ 62 @ControllerMethod(jsonResult = true) 63 public JSONObject searchParametersByPlateform( @Mandatory @ParamName(ParameterConstants.PARAMETER_ID) final Integer plateformId ) 64 throws ServiceException, WebException 65 { 66 // final List<Parameter> parameters = new ArrayList<Parameter>( 3 ); 67 // parameters.add( new Parameter( Long.valueOf( 1 ), "parameter1" ) ); 68 // parameters.add( new Parameter( Long.valueOf( 2 ), "parameter2" ) ); 69 // parameters.add( new Parameter( Long.valueOf( 3 ), "parameter3" ) ); 70 71 final List<Parameter> parameters = _etherService.getAllParametersByPlateformId( plateformId ); 72 final JSONObject result = new JSONObject(); 73 result.put( "parameters", getJsonHelper().toJSON( parameters ) ); 74 return result; 75 } 76 77 @Required 78 public void setEtherService( @NotNull final EtherService etherService ) 79 { 80 _etherService = etherService; 31 return new HashMap<String, Object>(); 81 32 } 82 33 83 34 private static final Log LOGGER = LogFactory.getLog( Controller.class ); 84 35 85 private static final String VIEW_VISUALIZATION = "visualization/visu"; 86 private static final String VIEW_VISUALIZATION_PLATEFORM = "visualization/visu_plateform"; 87 88 private EtherService _etherService; 36 private static final String VIEW_INIT = "init"; 37 private static final String VIEW_ACTIVITIES = "project/slideActivities"; 89 38 } -
ether_2012/trunk/web/src/json/json-context.xml
r330 r353 7 7 <property name="mapping"> 8 8 <map> 9 <entry key="com.ether.Plateform" value-ref="plateformJsonSerializer"/>10 <entry key="com.ether.Parameter" value-ref="parameterJsonSerializer"/>11 9 </map> 12 10 </property> 13 11 </bean> 14 12 15 <bean id="parameterJsonSerializer" class="json.serializers.ParameterJsonSerializer"/>16 <bean id="plateformJsonSerializer" class="json.serializers.PlateformJsonSerializer"/>17 13 </beans> -
ether_2012/trunk/web/src/messages_en.properties
r352 r353 27 27 home.databases=DATABASES 28 28 home.services=SERVICES 29 30 logo.mimosa.alt=Potential vorticity, temperature analysis and forecasts 31 logo.reprobus.alt=Chemistry Transport Model in Polar Winters 32 logo.iasi.alt=Infrared Atmospheric Sounding Interferometer 33 logo.tropico.alt=TRO-pico campaign 34 logo.geisa.alt=Spectroscopic data 35 logo.mozaic.alt=Measurements of OZone, water vapour, carbon monoxide and nitrogen oxides by in-services AIrbus airCraft 36 logo.eccad.alt=Emissions data and ancillary data for emissions calculation 37 logo.megapoli.alt=Megacities: Emissions, urban, regional and Global Atmospheric POLlution and climate effects, and Integrated tools for assessment and mitigation -
ether_2012/trunk/web/src/messages_fr.properties
r352 r353 23 23 home.title.part2=de la Chimie de l'AtmosphÚre 24 24 home.news=A C T U A L I T E S 25 home.main.activities=PRINCIPALES ACTIVITES D $apos;ETHER25 home.main.activities=PRINCIPALES ACTIVITES D'ETHER 26 26 home.data=DONNEES 27 27 home.databases=BASES DE DONNEES 28 28 home.services=SERVICES 29 30 logo.mimosa.alt=Potential vorticity, temperature analysis and forecasts 31 logo.reprobus.alt=Chemistry Transport Model in Polar Winters 32 logo.iasi.alt=Infrared Atmospheric Sounding Interferometer 33 logo.tropico.alt=TRO-pico campaign 34 logo.geisa.alt=Spectroscopic data 35 logo.mozaic.alt=Measurements of OZone, water vapour, carbon monoxide and nitrogen oxides by in-services AIrbus airCraft 36 logo.eccad.alt=Emissions data and ancillary data for emissions calculation 37 logo.megapoli.alt=Megacities: Emissions, urban, regional and Global Atmospheric POLlution and climate effects, and Integrated tools for assessment and mitigation
Note: See TracChangeset
for help on using the changeset viewer.