- Timestamp:
- 03/20/15 16:16:46 (9 years ago)
- Location:
- tapas
- Files:
-
- 1 added
- 11 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
tapas/service/implementation/com/ether/TapasServiceImpl.java
r816 r817 81 81 String oneTransmission; 82 82 83 84 83 while ( indice <= iii ) 85 84 { -
tapas/web/project/formTapas_script.jsp
r816 r817 371 371 input4.attr( {id: inputId4,class:"containerText",size:4} ); 372 372 373 input1.attr( {disabled: true} ); 374 input2.attr( {disabled: true} ); 375 input3.attr( {disabled: true} ); 376 input4.attr( {disabled: true} ); 377 378 input1.css("backgroundColor", "#bfafd6"); 379 input2.css("backgroundColor", "#bfafd6"); 380 input3.css("backgroundColor", "#bfafd6"); 381 input4.css("backgroundColor", "#bfafd6"); 382 373 383 input1.bind( "change", ["2"], jQuery.proxy(this.locationChoice,this)); 374 384 input2.bind( "change", ["2"], jQuery.proxy(this.locationChoice,this)); … … 383 393 384 394 395 /* 385 396 var img = $( document.createElement( "img" ) ); 386 397 var a = $( document.createElement( "a" ) ); … … 390 401 img.bind( "click", ["spectral_range",450,100,this], this.onClickInfos ); 391 402 a.append( img ); 392 td1.append( a ); 403 td1.append( a );*/ 393 404 td1.append( texte1 ); 405 394 406 395 407 //img.onclick(this.onClickInfos("spectral_range",1200,440)); … … 1178 1190 this.createTrList( tapasTexts["label.observatory"], "iobservatory_" + this.nbRequest, this.nbRequest, tabObservation, 'observatories', true, "" ); 1179 1191 this.createTrTxt( tapasTexts["label.or"], tabObservation ); 1180 this.createTr3Input( tapasTexts["label.locality"], tapasTexts["label.altitude"], tapasTexts["label.latitude"],tapasTexts["label.longitude"],"ilocality_" + this.nbRequest, "ialtitude_" + this.nbRequest, "ilatitude_" + this.nbRequest, "ilongitude_" + this.nbRequest , tabObservation, "[decimal]"," m" );1192 this.createTr3Input( tapasTexts["label.locality"], tapasTexts["label.altitude"], tapasTexts["label.latitude"],tapasTexts["label.longitude"],"ilocality_" + this.nbRequest, "ialtitude_" + this.nbRequest, "ilatitude_" + this.nbRequest, "ilongitude_" + this.nbRequest , tabObservation, "[decimal]"," <b>m</b>" ); 1181 1193 1182 1194 this.createCalendar( tabObservation, tapasTexts["label.datemesure"], tapasTexts["label.cpydatemesure"], "iobservation_date_" + this.nbRequest, "iobservation_cpydate_" + this.nbRequest, false, true ); -
tapas/web/resources/css/backoffice.css
r523 r817 16 16 17 17 .containerTitle { 18 color: # be0026;18 color: #000000; 19 19 padding-left: 236px; 20 font-size: 24px; 21 font-family: Comic Sans MS; 20 22 } 21 23 … … 27 29 float: right; 28 30 position: relative; 29 width: 800px;30 31 height: 39px; 31 32 color: #969696; 32 top: 4px;33 33 margin-bottom: 18px; 34 padding-left: 10px;35 34 font-size: 11px; 36 35 } … … 38 37 .containerTitleContent { 39 38 background-image: none; 39 border-radius: 8px 8px 0 0; 40 40 -moz-border-radius: 4px 4px 0 0; 41 41 -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); … … 43 43 -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); 44 44 box-shadow: 0 0 4px rgba(0, 0, 0, 0.3); 45 background: -moz-linear-gradient(#778899, white) repeat scroll 0 0 transparent;46 background: -ms-linear-gradient(#778899, white) repeat scroll 0 0 transparent; /*For IE10*/45 background: -moz-linear-gradient(#778899, #000000) repeat scroll 0 0 transparent; 46 background: -ms-linear-gradient(#778899, #000000) repeat scroll 0 0 transparent; /*For IE10*/ 47 47 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#778899', endColorstr = 'white'); /*For IE7-8-9*/ 48 48 float: right; 49 49 position: relative; 50 width: 800px;50 width: 90px; 51 51 height: 26px; 52 52 color: white; … … 54 54 padding-left: 10px; 55 55 padding-top: 4px; 56 margin : 0;57 top: 0;56 margin-right: -1px; 57 top: 51px; 58 58 text-decoration: none; 59 59 } 60 60 61 61 .containerCenter { 62 background: -moz-linear-gradient(white, #778899); 62 background: -moz-linear-gradient(#000000, #778899); 63 top: 59px; 63 64 } 64 65 … … 66 67 background-image: none; 67 68 background-color: #778899; 69 top:53px; 68 70 } 69 71 -
tapas/web/resources/css/button.css
r816 r817 74 74 button.negative { 75 75 color: #d12f19; 76 border-radius:8px; 76 77 } 77 78 … … 80 81 border: 1px solid #fbc2c4; 81 82 color: #d12f19; 83 82 84 } 83 85 … … 193 195 194 196 button.tapas1:hover { 195 background-color: # bfafd6;196 197 } 198 199 197 background-color: #574176; 198 199 } 200 201 -
tapas/web/resources/css/mainEther.css
r816 r817 42 42 43 43 input { 44 -moz-border-radius: 4px 4px 4px 4px; 45 -webkit-border-radius: 4px 4px 4px 4px; 44 //-moz-border-radius: 4px 4px 4px 4px; 45 //-webkit-border-radius: 4px 4px 4px 4px; 46 border-radius: 6px 6px 6px 6px; 46 47 } 47 48 -
tapas/web/resources/css/select.css
r409 r817 11 11 width: 6px; 12 12 float: left; 13 border-radius: 8px 0px 2px 8px; 14 13 15 } 14 16 … … 32 34 width: 20px; 33 35 float: left; 36 border-radius: 0px 8px 5px 0px; 34 37 } 35 38 -
tapas/web/resources/css/tapas.css
r816 r817 153 153 padding-left: 0px; 154 154 background-color: white; 155 border-radius: 6px 6px 6px 6px; 155 156 156 157 … … 163 164 background-color: #cccccc; 164 165 font-weight:bold; 166 border-radius: 6px 6px 6px 6px; 165 167 166 168 … … 261 263 margin-left: 31px; 262 264 width: 120px; 263 top: 5 4px;265 top: 50px; 264 266 position: absolute; 265 267 } … … 307 309 z-index: 1; 308 310 left: -10px; 309 width: 810px;311 width: 100px; 310 312 } 311 313 … … 329 331 padding-left: 10px; 330 332 padding-top: 4px; 331 top: 9px;333 top: 15px; 332 334 margin-right: 600px; 333 335 text-decoration: underline; … … 343 345 font-weight: bold; 344 346 font-size: 14px; 345 347 border-radius: 6px 6px 6px 6px; 346 348 347 349 } … … 372 374 text-align: justify; 373 375 position: relative; 374 top: 6px;376 top: 11px; 375 377 padding: 10px; 376 378 width: 1028px; … … 569 571 background-image: url(../../resources/icons/transparent_loading.gif); 570 572 height: 37px; 571 margin-left: 21px; 572 margin-top: -169px; 573 position: absolute; 573 margin-top: 462px; 574 //margin-top: 1046px; 575 //margin-left: 21px; 576 margin-left: 1046px; 577 position: relative; 574 578 width: 36px; 575 579 } -
tapas/web/resources/js/library/jquery-ui-1.8.16.custom/development-bundle/demos/demos.css
r416 r817 115 115 background: #f3f3f3; 116 116 color:#000; 117 -moz-border-radius: 5px; -webkit-border-radius: 5px;117 //-moz-border-radius: 5px; -webkit-border-radius: 5px; 118 118 } 119 119 .demos-nav dd a.selected { -
tapas/web/resources/templates/templateBackoffice.jsp
r816 r817 61 61 <div id="tools" align="right"> 62 62 <div id="loginModule" align="right"></div> 63 <div id="menuBO" class="containerMenu"></div> 63 64 </div> 64 65 … … 67 68 <%-- ****************** LOGO ****************** --%> 68 69 <div id="logo" class="containerLogo"> 69 70 <a href="#"><img src="resources/images/logo_tapas.gif" height="60px" width="60px"></a> 70 71 </div> 71 72 72 73 <%-- ****************** MENU ****************** --%> 73 < div id="menuBO" class="containerMenu"></div>74 <!--<div id="menuBO" class="containerMenu"></div>--> 74 75 75 76 <%-- ****************** TITLE CONTENT ****************** --%> -
tapas/web/resources/templates/templateEther.jsp
r816 r817 65 65 <%-- ****************** LOGO ****************** --%> 66 66 <div id="logo" class="containerLogo"> 67 <a href="#"><img src="resources/images/logo_tapas.gif" height=" 70px" width="70px"></a>67 <a href="#"><img src="resources/images/logo_tapas.gif" height="82px" width="86px"></a> 68 68 </div> 69 69
Note: See TracChangeset
for help on using the changeset viewer.