- Timestamp:
- 04/18/12 11:28:17 (12 years ago)
- Location:
- tapas/web
- Files:
-
- 2 added
- 19 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
tapas/web/init.jsp
r480 r481 20 20 <div id="errors"><spring:message code="${errors}"/></div> 21 21 </c:if> 22 23 24 22 Home 25 23 </tiles:put> 26 24 -
tapas/web/project/formTapas.jsp
r480 r481 23 23 </tiles:put> 24 24 25 <tiles:put name="title" type="string"><spring:message code="app.title"/> - <spring:message code="title.home"/></tiles:put> 26 <tiles:put name="nav" type="string"><a href=""><spring:message code="label.home"/></a></tiles:put> 25 <tiles:put name="title" type="string"><spring:message code="app.title"/> - <spring:message code="title.form"/></tiles:put> 26 <!-- file d'ariane --> 27 <tiles:put name="nav" type="string"><a href=""><spring:message code="label.form"/></a></tiles:put> 27 28 28 29 29 30 <%-- ****************** CONTENT ****************** --%> 30 <tiles:put name="bodytitle" type="string"><spring:message code="title. home"/></tiles:put>31 <tiles:put name="bodytitle" type="string"><spring:message code="title.form"/></tiles:put> 31 32 32 33 <tiles:put name="body" type="string"> 33 34 34 <div id="formulaire"></div>35 <div class="containerForm" id="formulaire"></div> 35 36 36 37 <div id="errors"></div> -
tapas/web/project/formTapas_script.jsp
r480 r481 7 7 this.containerForm = $( "#formulaire" ); 8 8 this.containerErrors = $( "#errors" ); 9 this.containerCenter = $( "#containerCenter" ); 9 10 10 11 this.jSonFileFormats = jsonFileFormats || null; … … 35 36 36 37 td1.html( texte ); 38 td1.attr( { class:"containerLabel" } ); 39 37 40 tr.append( td1 ); 41 42 43 td2.attr({colspan:3}); 38 44 td2.append( inputDate ); 39 45 tr.append( td2 ); … … 60 66 var input = $( document.createElement( "input" ) ); 61 67 62 input.attr( {id: inputId } );68 input.attr( {id: inputId, class:"containerText"} ); 63 69 64 70 td1.html( texte ); 71 td1.attr( {class:"containerLabel"} ); 65 72 tr.append( td1 ); 66 73 td2.append( input ); … … 97 104 98 105 99 input1.attr( {id: inputId1 } );100 input2.attr( {id: inputId2 } );106 input1.attr( {id: inputId1,class:"containerText"} ); 107 input2.attr( {id: inputId2,class:"containerText"} ); 101 108 102 109 td1.html( texte1 ); 103 110 td3.html( texte2 ); 111 td1.attr({class:"containerLabel"}); 112 td3.attr({class:"containerLabel"}); 104 113 td2.append( input1 ); 114 //td2.html( texte2 ); 105 115 td3.append( input2 ); 106 116 … … 123 133 124 134 td1.html( texte ); 135 td1.attr( {class:"containerLabel", width:"140px"} ); 125 136 tr.append( td1 ); 126 137 if( type == 'format' ) this.displayFileFormats( td2 ); … … 138 149 else if( type == 'climatoReference' ) this.displayClimatoReferences( td2 ); 139 150 151 td2.attr({colspan:3}); 140 152 tr.append( td2 ); 141 153 container.append( tr ); … … 276 288 var divAtmosphere = $( document.createElement( "div" ) ); 277 289 var tabAtmosphere = $( document.createElement( "table" ) ); 290 291 292 var fieldSetObservation = $( document.createElement( "fieldset" ) ); 293 fieldSetObservation.addClass("cfs1"); 294 divObservation.append(fieldSetObservation); 295 296 var legendObservation = $( document.createElement( "legend" ) ); 297 legendObservation.html("Observation"); 298 fieldSetObservation.append(legendObservation); 299 legendObservation.addClass("containerField"); 300 301 var fieldSetPreference = $( document.createElement( "fieldset" ) ); 302 fieldSetPreference.addClass("cfs2"); 303 divPreference.append(fieldSetPreference); 304 305 var legendPreference = $( document.createElement( "legend" ) ); 306 legendPreference.html("Preferences"); 307 fieldSetPreference.append(legendPreference); 308 legendPreference.addClass("containerField"); 278 309 279 310 … … 305 336 this.createTrList( "Climatologic reference", "icr", tabAtmosphere, "climatoReference" ); 306 337 307 divPreference.append( tabPreference ); 338 339 340 fieldSetObservation.append( tabObservation ); 341 divObservation.addClass("divObservation"); 342 this.containerForm.append( divObservation ); 343 344 divAtmosphere.append( tabAtmosphere ); 345 //divAtmosphere.addClass("divAtmosphere"); 346 //this.containerForm.append( divAtmosphere ); 347 fieldSetObservation.append( divAtmosphere ); 348 349 fieldSetPreference.append( tabPreference ); 350 divPreference.addClass("divPreference"); 308 351 this.containerForm.append( divPreference ); 309 310 divObservation.append( tabObservation );311 this.containerForm.append( divObservation );312 313 divAtmosphere.append( tabAtmosphere );314 this.containerForm.append( divAtmosphere );315 352 316 353 // Ajout du calendrier APRES la création du formulaire … … 318 355 319 356 //jQuery.proxy permet d'envoyer le contexte this courant 320 var submitButton = new Button( {value:tapasTexts["label.submitButton"], parent:this.container Form, id:"button_submit", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickSubmit, this )} );357 var submitButton = new Button( {value:tapasTexts["label.submitButton"], parent:this.containerCenter, id:"button_submit", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickSubmit, this )} ); 321 358 322 359 }, -
tapas/web/resources/css/TwitterLogin/front.css
r409 r481 25 25 26 26 #topnav a.signin { 27 /*background:#88bbd4;*/ 27 28 28 padding: 4px 6px 6px; 29 29 text-decoration: none; … … 36 36 37 37 #topnav a.signin:hover { 38 /*background: #59B;*/ 38 39 39 *background: transparent url("images/signin-nav-bg-hover-ie.png") no-repeat 0 0; 40 40 *padding: 4px 12px 6px; 41 color: #bfafd6; 41 42 } 42 43 43 44 #topnav a.signin, #topnav a.signin:hover { 44 45 *background-position: 0 3px !important; 46 //color: #bfafd6; 45 47 } 46 48 … … 60 62 -moz-border-radius-topleft: 4px; 61 63 -moz-border-radius-topright: 4px; 62 background: #ddeef6!important;63 color: #666!important;64 background: white !important; 65 color: black !important; 64 66 outline: none; 65 67 } … … 75 77 a.signin.menu-open span { 76 78 background-image: url("images/toggle_up_dark.png"); 77 color: #789;79 color: black; 78 80 } 79 81 … … 84 86 -webkit-border-bottom-right-radius: 4px; 85 87 display: none; 86 background-color: # ddeef6;88 background-color: #bfafd6; 87 89 position: absolute; 88 90 width: 210px; … … 96 98 margin-right: 0px; 97 99 *margin-right: -1px; 98 color: # 789;100 color: #574176; 99 101 font-size: 11px; 100 102 } … … 104 106 -moz-border-radius: 4px; 105 107 -webkit-border-radius: 4px; 106 border: 1px solid # ACE;108 border: 1px solid #574176; 107 109 font-size: 13px; 108 110 margin: 0 0 5px; … … 115 117 } 116 118 117 #signin_menu a {118 color: # 6AC;119 } 119 /*#signin_menu a { 120 color: #574176; 121 } */ 120 122 121 123 #signin_menu label { … … 132 134 } 133 135 134 #signin_menu p a { 135 color: #27B !important; 136 /*#signin_menu a { 137 color: #574176 !important; 138 } */ 139 140 #signin_menu a:hover{ 141 color:white; 136 142 } 137 143 … … 139 145 -moz-border-radius: 4px; 140 146 -webkit-border-radius: 4px; 141 background: # 39durl('images/bg-btn-blue.png') repeat-x scroll 0 0;142 border: 1px solid # 39D;147 background: #574176 url('images/bg-btn-blue.png') repeat-x scroll 0 0; 148 border: 1px solid #574176; 143 149 color: #fff; 144 text-shadow: 0 -1px 0 #39d;150 //text-shadow: 0 -1px 0 #39d; 145 151 padding: 4px 10px 5px; 146 152 font-size: 11px; … … 157 163 background-position: 0 -5px; 158 164 cursor: pointer; 165 color: #bfafd6; 159 166 } 160 167 … … 181 188 -webkit-border-radius: 4px; 182 189 border-radius: 4px; 183 background-color: # 000;190 background-color: #574176; 184 191 color: white; 185 192 text-align: left; -
tapas/web/resources/css/apycom.com-5-red/menu.css
r480 r481 27 27 _background: url(images/left.gif) no-repeat; 28 28 width: auto; 29 padding-top:20px; 29 30 } 30 31 … … 142 143 143 144 div#menu ul.menu>li:hover>a span { 144 color: # 881714;145 color: #574176; 145 146 } 146 147 … … 192 193 div#menu ul ul a:hover span { 193 194 background: none; 194 color: # 881714;195 color: #574176; 195 196 } 196 197 -
tapas/web/resources/css/mainEther.css
r480 r481 23 23 24 24 a { 25 color: #5 81700;25 color: #574176; 26 26 text-decoration: none; 27 27 } -
tapas/web/resources/css/tapas.css
r480 r481 16 16 /** ********************** CONTAINER ******************** **/ 17 17 /** ***************************************************** **/ 18 .cfs1 { 19 border:2px solid white ; 20 -moz-border-radius:8px; 21 -webkit-border-radius:8px; 22 border-radius:8px; 23 padding-right:40px; 24 margin-left:30px; 25 padding-bottom:30px; 26 } 27 28 .cfs2 { 29 border:2px solid white ; 30 -moz-border-radius:8px; 31 -webkit-border-radius:8px; 32 border-radius:8px; 33 padding-right:40px; 34 padding-bottom:30px; 35 } 36 37 38 .containerForm { 39 40 float:left; 41 width:1000px; 42 43 } 44 45 .divPreference { 46 margin-top:20px; 47 float:left; 48 } 49 50 #button_submit { 51 margin-right:30px; 52 53 } 54 55 .divObservation { 56 margin-top:20px; 57 margin-left:30px; 58 margin-right:80px; 59 float:left; 60 } 61 18 62 .containerLinkLogoEther { 63 19 64 position: absolute; 20 65 top: 0; … … 24 69 background-image: url("../images/link_logo_Ether.png"); 25 70 background-repeat: repeat-y; 71 26 72 } 27 73 … … 40 86 } 41 87 88 .containerText { 89 font-size: 12px; 90 color: #574176; 91 // float: left; 92 //margin-top: 10px; 93 padding-left: 0px; 94 width:100px; 95 96 } 97 98 .containerLabel { 99 font-size: 12px; 100 color: white; 101 font-weight: bold; 102 //margin-bottom: 10px; 103 padding-left: 20px; 104 text-align:right; 105 } 106 107 42 108 .containerTapas { 43 109 -moz-border-radius: 4px 4px 4px 4px; … … 68 134 padding-left: 30px; 69 135 width: 120px; 70 top: - 32px;136 top: -22px; 71 137 position: relative; 72 138 } … … 91 157 float: left; 92 158 position: relative; 93 width: 400px;159 width: 330px; 94 160 height: 33px; 95 161 color: #04155D; … … 99 165 padding-left: 10px; 100 166 font-size: 11px; 167 top:12px; 101 168 } 102 169 … … 121 188 -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); 122 189 box-shadow: 0 0 4px rgba(0, 0, 0, 0.3); 123 background: -moz-linear-gradient(#574176, #bfafd6) repeat scroll 0 0 transparent; 124 background: -ms-linear-gradient(#574176, #bfafd6) repeat scroll 0 0 transparent; /*For IE10*/ 190 background: -moz-linear-gradient(#574176, #574176) repeat scroll 0 0 transparent; 191 background: -ms-linear-gradient(#574176, #574176) repeat scroll 0 0 transparent; /*For IE10*/ 192 background: -webkit-linear-gradient(#574176, #574176) repeat scroll 0 0 transparent; /*For IE10*/ 125 193 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#574176', endColorstr = 'white'); /*For IE7-8-9*/ 126 194 float: left; … … 132 200 padding-left: 10px; 133 201 padding-top: 4px; 202 top:19px; 203 text-decoration:underline; 204 205 } 206 207 .containerField { 208 color: white; 209 font-weight: bold; 210 font-size:14px; 134 211 } 135 212 … … 137 214 -moz-border-radius-topright: 0; 138 215 -webkit-border-radius: 0; /*#E8EFF3*//* #618EAC*/ 139 background: -moz-linear-gradient(# bfafd6, #574176);140 background: -webkit-linear-gradient(# bfafd6, #574176);216 background: -moz-linear-gradient(#574176, #bfafd6); 217 background: -webkit-linear-gradient(#574176, #bfafd6); 141 218 background: -ms-linear-gradient(white,#C03000 ) repeat scroll 0 0 transparent; /*For IE10*/ 142 219 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#574176'); /*For IE7-8-9*/ … … 150 227 151 228 .containerBottom { 229 background: #574176; 152 230 background: -moz-linear-gradient(left center, white, #574176); 153 background: -webkit-linear-gradient(white, #574176);231 /*background: -webkit-linear-gradient(white, #574176);*/ 154 232 background: -ms-linear-gradient(white, #574176) repeat scroll 0 0 transparent; /*For IE10*/ 155 233 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#574176'); /*For IE7-8-9*/ … … 167 245 168 246 .containerErrors, #errors { 169 background: #FEF1EC;247 background: white; 170 248 -moz-border-radius: 4px 4px 4px 4px; 171 249 -webkit-border-radius: 4px 4px 4px 4px; -
tapas/web/resources/templates/templateEther.jsp
r480 r481 70 70 <div id="menu" class="containerMenu"> 71 71 <ul class="menu"> 72 <li><a href=" data?methodName=viewForm" class="parent"><span>Formulaire</span></a>72 <li><a href="project?methodName=home" class="parent"><span><spring:message code="title.home"/></span></a> 73 73 74 <div> 75 <ul> 76 <li><a href="#" class="parent"><span>Sub Item 1</span></a> 74 </li> 75 <li id="liamenu"><a href="data?methodName=viewForm" id="amenu" class="parent"><span><spring:message code="title.form"/></span></a> 77 76 78 <div> 79 <ul> 80 <li><a href="#"><span>Sub Item 1.1</span></a></li> 81 <li><a href="#"><span>Sub Item 1.2</span></a></li> 82 <li><a href="#"><span>Sub Item 1.3</span></a></li> 83 </ul> 84 </div> 85 </li> 86 <li><a href="#"><span>Sub Item 2</span></a></li> 87 <li><a href="#"><span>Sub Item 3</span></a></li> 88 </ul> 89 </div> 77 90 78 </li> 91 <li><a href="#" class="parent"><span>Product Info</span></a> 92 93 <div> 94 <ul> 95 <li><a href="#" class="parent"><span>Sub Item 1</span></a> 96 97 <div> 98 <ul> 99 <li><a href="#"><span>Sub Item 1.1</span></a></li> 100 <li><a href="#"><span>Sub Item 1.2</span></a></li> 101 </ul> 102 </div> 103 </li> 104 <li><a href="#"><span>Sub Item 3</span></a></li> 105 <li><a href="#"><span>Sub Item 4</span></a></li> 106 </ul> 107 </div> 108 </li> 109 <li><a href="#"><span>Help</span></a></li> 79 <li><a href="#"><span><spring:message code="title.legals"/></span></a></li> 110 80 </ul> 111 81 </div> … … 113 83 <%-- ****************** TITLE CONTENT ****************** --%> 114 84 <div id="titleContent" class="containerTitleContent"><tiles:insert attribute="bodytitle"/> 115 <div id="titleContentBorder" class="containerTitleContentBorder"></div> 85 116 86 </div> 117 87 -
tapas/web/resources/templates/templateEther_old.jsp
r480 r481 70 70 <div id="menu" class="containerMenu"> 71 71 <ul class="menu"> 72 <li><a href="data?methodName=viewForm" class="parent"><span> Formulaire</span></a>72 <li><a href="data?methodName=viewForm" class="parent"><span><spring:message code="app.title"/> - <spring:message code="title.home"/></span></a> 73 73 74 74 <div> … … 113 113 <%-- ****************** TITLE CONTENT ****************** --%> 114 114 <div id="titleContent" class="containerTitleContent"><tiles:insert attribute="bodytitle"/> 115 <div id="titleContentBorder" class="containerTitleContentBorder"></div> 115 116 116 </div> 117 117 -
tapas/web/resources/templates/templateEther_script.jsp
r480 r481 20 20 this.createLogin(); 21 21 this.createTools(); 22 //onclick="javascript:desactiveOnglet();" 23 $( "#amenu" ).bind( 'click', this, jQuery.proxy( this.desactiveOnglet, this ) ); 24 22 25 }, 23 26 … … 29 32 var mailButton = new Button( {value:'<spring:message code="label.mail"/>', parent:this.containerTools, id:"button_mail", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickMail, this )} ); 30 33 var languageButton = new Button( {value:'<spring:message code="label.language.to.switch"/>', parent:this.containerTools, id:"button_language", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickLanguage, this )} ); 31 var homeButton = new Button( {value:'<spring:message code="label.home"/>', parent:this.containerTools, id:"button_home", className: "red_button", classNameText:"red_button_text", onClick:this.onClickHome} );34 //var homeButton = new Button( {value:'<spring:message code="label.home"/>', parent:this.containerTools, id:"button_home", className: "red_button", classNameText:"red_button_text", onClick:this.onClickHome} ); 32 35 }, 33 36 … … 90 93 } ); 91 94 $dialog.dialog( 'open' ); 95 }, 96 97 desactiveOnglet:function() { 98 //alert("toto"); 99 //$("#liamenu").addClass("hover"); 92 100 } 93 101 -
tapas/web/src/messages_en.properties
r480 r481 11 11 app.no=No 12 12 13 title.home=Tapas data 13 title.home=Home 14 title.form=Request form 15 title.legals=Legals 14 16 15 17 label.home=Home … … 17 19 label.mail=Email 18 20 label.backoffice=Backoffice 21 label.form=Request form 19 22 20 23 label.role.administrator=Administrateur … … 24 27 25 28 label.submitButton=RUN 26 label.confirm=ARE YOU SURE TO SUBMITTHIS REQUEST ?29 label.confirm=ARE YOU SURE YOU WANT TO SEND THIS REQUEST ? 27 30 28 31 label.spectralUnit.NM_STANDARD=Standard Wavelength (nm) -
tapas/web/src/messages_fr.properties
r480 r481 11 11 app.no=Non 12 12 13 title.home=Les données Tapas 13 title.home=Accueil 14 title.form=Formulaire reqête 15 title.legals=Mentions légales 14 16 15 17 label.home=Accueil … … 17 19 label.mail=Email 18 20 label.backoffice=Backoffice 21 label.form=Formulaire requête 19 22 20 23 label.role.administrator=Administrator
Note: See TracChangeset
for help on using the changeset viewer.