Changeset 386
- Timestamp:
- 03/01/12 17:22:49 (12 years ago)
- Location:
- tapas/web/resources
- Files:
-
- 8 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
tapas/web/resources/css/button.css
r376 r386 5 5 /* BUTTONS */ 6 6 7 .buttons a, .buttons button { 8 display:block; 9 float:left; 10 margin:0 11px 0 0; 11 background-color:#f5f5f5; 12 border:1px solid #dedede; 13 border-top:1px solid #eee; 14 border-left:1px solid #eee; 7 button { 8 -moz-border-radius: 4px 4px 4px 4px; 9 -webkit-border-radius: 4px 4px 4px 4px; 15 10 16 font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif; 17 font-size:100%; 18 line-height:130%; 19 text-decoration:none; 20 font-weight:bold; 21 color:#565656; 22 cursor:pointer; 23 padding:5px 10px 6px 7px; /* Links */ 24 } 25 .buttons button{ 26 width:auto; 27 overflow:visible; 28 padding:4px 6px 3px 6px; /* IE6 */ 29 } 30 .buttons button[type]{ 31 padding:5px 10px 5px 7px; /* Firefox */ 32 line-height:17px; /* Safari */ 33 } 34 *:first-child+html button[type]{ 35 padding:4px 10px 3px 7px; /* IE7 */ 36 } 37 .buttons button img, .buttons a img{ 38 margin:0 3px -3px 0 !important; 39 padding:0; 40 border:none; 41 width:16px; 42 height:16px; 11 display: block; 12 float: left; 13 margin: 0 11px 0 0; 14 background-color: #f5f5f5; 15 border: 1px solid #dedede; 16 border-top: 1px solid #eee; 17 border-left: 1px solid #eee; 18 19 font-family: "Lucida Grande", Tahoma, Arial, Verdana, sans-serif; 20 font-size: 100%; 21 line-height: 130%; 22 text-decoration: none; 23 font-weight: bold; 24 color: #565656; 25 cursor: pointer; 26 27 width: auto; 28 overflow: visible; 29 padding: 4px 6px 3px 6px; /* IE6 */ 43 30 } 44 31 32 button[type] { 33 padding: 5px 10px 5px 7px; /* Firefox */ 34 line-height: 17px; /* Safari */ 35 } 36 37 *:first-child+html button[type] { 38 padding: 4px 10px 3px 7px; /* IE7 */ 39 } 40 41 .small { 42 font-size: 80%; 43 } 44 45 button img { 46 margin: 0 3px -3px 0 !important; 47 padding: 0; 48 border: none; 49 width: 16px; 50 height: 16px; 51 } 45 52 46 53 /* STANDARD */ 47 48 button:hover, .buttons a:hover{ 49 background-color:#dff4ff; 50 border:1px solid #c2e1ef; 51 color:#336699; 52 } 53 .buttons a:active{ 54 background-color:#6299c5; 55 border:1px solid #6299c5; 56 color:#fff; 54 button:hover { 55 background-color: #dff4ff; 56 border: 1px solid #c2e1ef; 57 color: #336699; 57 58 } 58 59 59 60 /* POSITIVE */ 61 button.positive { 62 background-color: #F0FFF0; 63 color: #529214; 64 } 60 65 61 button.positive, .buttons a.positive{ 62 color:#529214; 63 } 64 .buttons a.positive:hover, button.positive:hover{ 65 background-color:#E6EFC2; 66 border:1px solid #C6D880; 67 color:#529214; 68 } 69 .buttons a.positive:active{ 70 background-color:#529214; 71 border:1px solid #529214; 72 color:#fff; 66 button.positive:hover { 67 background-color: #E6EFC2; 68 border: 1px solid #C6D880; 69 color: #529214; 73 70 } 74 71 75 72 /* NEGATIVE */ 73 button.negative { 74 color: #d12f19; 75 } 76 76 77 .buttons a.negative, button.negative{ 78 color:#d12f19; 79 } 80 .buttons a.negative:hover, button.negative:hover{ 81 background:#fbe3e4; 82 border:1px solid #fbc2c4; 83 color:#d12f19; 84 } 85 .buttons a.negative:active{ 86 background-color:#d12f19; 87 border:1px solid #d12f19; 88 color:#fff; 77 button.negative:hover { 78 background: #fbe3e4; 79 border: 1px solid #fbc2c4; 80 color: #d12f19; 89 81 } 90 82 91 83 /* DISABLE */ 92 93 .buttons a.disable, .buttons a.disable:hover, .buttons button.disable, .buttons button.disable:hover 94 { 95 background-color:#CCCCCC; 96 border:1px solid #dedede; 97 color:#565656; 84 button.disable, button.disable:hover { 85 background-color: #CCCCCC; 86 border: 1px solid #dedede; 87 color: #565656; 98 88 } 99 89 90 /* BLUE BUTTON */ 91 button.blue_button { 92 background-image: url("../images/elements/button_middle_3.png"); 93 background-repeat: repeat-x; 94 height: 39px; 95 float: right; 96 margin-right: 0; 97 border: 0; 98 } 99 100 .blue_button_text, .big_blue_button_text { 101 color: white; 102 font-size: 11px; 103 font-weight: bold; 104 } 105 106 button.big_blue_button { 107 /*background-image: url("../images/logoNat_small.png");*/ 108 background-image: url("../images/elements/big_button_middle_3.png"); 109 background-repeat: repeat-x repeat-y; 110 height: 50px; 111 width: 50px; 112 float: right; 113 margin-right: 0; 114 border: 0; 115 } 116 117 .big_blue_button_text { 118 position: relative; 119 top: -3px; 120 font-size: 44px; 121 } 122 123 /* GRAY BUTTON */ 124 button.gray_button { 125 background-image: url("../images/elements/button_middle_gray.png"); 126 background-repeat: repeat-x; 127 height: 41px; 128 float: right; 129 margin-right: 0; 130 position: relative; 131 top: -1px; 132 } 133 134 button.action_button { 135 margin-left: 5px; 136 margin-right: -3px; 137 } -
tapas/web/resources/css/mainEther.css
r383 r386 13 13 14 14 .pageWrapper { 15 width: 980px; 16 /*text-align: left;*/ 15 width: 980px; /*text-align: left;*/ 17 16 margin: auto; 17 margin-top: -15px; 18 18 } 19 19 … … 92 92 border: none; 93 93 } 94 95 /** ************************************ **/96 /** ************ LOADING *************** **/97 /** ************************************ **/98 .loading-classic {99 background-image: url(../../resources/icons/transparent_loading.gif);100 height: 16px;101 width: 16px;102 } -
tapas/web/resources/css/tapas.css
r384 r386 16 16 /** ********************** CONTAINER ******************** **/ 17 17 /** ***************************************************** **/ 18 .containerLinkLogoEther {19 position: absolute;20 top: 0;21 left: 127px;22 width: 10px;23 height: 99px;24 background-image: url("../images/link_logo_Ether.png");25 background-repeat: repeat-y;26 }27 28 .containerLogoEther {29 position: absolute;30 top: 100px;31 left: 50px;32 -moz-border-radius: 4px 4px 4px 4px;33 -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);34 -webkit-border-radius: 4px 4px 4px 4px;35 -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);36 box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);37 width: 80px;38 height: 80px;39 padding: 15px;40 }41 42 .containerSmallLogoEther {43 float: right;44 margin-right: 15px;45 }46 47 18 .containerTapas { 48 19 -moz-border-radius: 4px 4px 4px 4px; … … 57 28 58 29 .containerTitle { 59 /*background: url("../images/nuage_bleu.png") no-repeat scroll 0 0 transparent;*/60 30 font-size: 20px; 61 31 color: #165076; … … 67 37 68 38 .containerLogo { 69 -moz-border-radius: 4px 4px 4px 4px; /*-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);*/39 -moz-border-radius: 4px 4px 4px 4px; 70 40 -webkit-border-radius: 4px 4px 4px 4px; 71 41 float: left; … … 101 71 color: #04155D; 102 72 top: 4px; 103 margin-bottom: 20px; /*margin-right: 15px;*/73 margin-bottom: 20px; 104 74 padding-top: 6px; 105 75 padding-left: 10px; … … 154 124 } 155 125 156 .containerCenterContent {157 padding: 10px;158 }159 160 126 .containerBottom { 161 127 background-image: url("../images/elements/button_middle_3.png"); … … 194 160 } 195 161 196 .containerElement {197 color: #6178BC;198 }199 200 .containerElement:hover {201 -moz-border-radius: 4px 4px 4px 4px;202 -webkit-border-radius: 4px 4px 4px 4px;203 text-decoration: none;204 background: #70739C;205 color: #FFFFFF;206 }207 208 .containerElement_plateform {209 width: 84px;210 float: left;211 }212 213 #containerMobilePlateforms .containerElement_main_plateform .containerElement_plateform:hover {214 -moz-border-radius: 4px 0 0 4px;215 -webkit-border-radius: 4px 0 0 4px;216 }217 218 .containerElement_plateform_dates {219 display: none;220 -moz-border-radius: 0 4px 4px 4px;221 -webkit-border-radius: 0 4px 4px 4px;222 background: #70739C;223 color: white;224 float: left;225 }226 227 .containerElement_main_plateform {228 float: left;229 width: 900px;230 }231 232 #containerMobilePlateforms {233 padding-bottom: 117px;234 }235 236 162 /** ***************************************************** **/ 237 163 /** ************************ OTHER ********************** **/ 238 164 /** ***************************************************** **/ 239 #tools .complexButton {240 float: right;241 }242 243 .colborder {244 border-right: 1px solid #96A1BA;245 margin-right: 15px;246 padding-right: 29px;247 }248 249 .mainContent {250 padding: 15px;251 }252 253 165 .roundTable { 254 166 -moz-border-radius: 4px; … … 290 202 } 291 203 292 .parameter_name_subMenu, .parameter_name_subMenu:hover {293 position: relative;294 margin-left: 10px;295 margin-right: 10px;296 }297 298 .parameter_name_subMenu:hover {299 -moz-border-radius: 4px 4px 4px 4px;300 -webkit-border-radius: 4px 4px 4px 4px;301 background-color: #DDEEF6;302 }303 304 .plateform_selected, .plateform_selected:hover,305 .parameter_selected, .parameter_selected:hover {306 -moz-border-radius: 4px 4px 4px 4px;307 -webkit-border-radius: 4px 4px 4px 4px;308 background: #70739C;309 color: #E1DEF1;310 text-decoration: none;311 }312 313 204 /** ***************************************************** **/ 314 205 /** ************************ PAGES ********************** **/ … … 324 215 } 325 216 326 #level2 .title {327 color: #165076;328 font-weight: bold;329 padding: 0.5em;330 }331 332 .level2_more {333 padding-bottom: 16px;334 }335 336 .elementExtract {337 position: relative;338 top: -2px;339 340 }341 342 .jeuxElement {343 position: relative;344 float: left;345 margin-left: 30px346 }347 348 #level1 {349 margin-bottom: 20px;350 }351 352 #level2 {353 margin-left: 20px;354 }355 356 #level2 table {357 border: 0 none;358 padding: 0;359 text-align: left;360 width: 100%;361 }362 363 #level2 th {364 background-color: #E9E6D9;365 color: #596F80;366 text-align: center;367 }368 369 #level2 td {370 vertical-align: top;371 }372 373 table .pair, table .pairTable {374 background-color: #F5F3EC;375 }376 377 table .impair, table .impairTable {378 background-color: #FFFDF6;379 }380 381 .dataProtocolButton {382 /*margin-left: 140px;*/383 }384 385 217 .dataProtocolDownloadButton { 386 218 float: right; … … 396 228 margin-top: 4px; 397 229 } 398 399 .parameterElement, .plateformElement {400 margin-left: 50px;401 margin-right: 50px;402 }403 404 .loadingForParameters_meta, .loadingForPlateforms_meta {405 margin: auto;406 } -
tapas/web/resources/templates/templateEther.jsp
r384 r386 14 14 <link rel="shortcut icon" type="image/x-icon" href="resources/images/logo_Ether.jpg"/> 15 15 16 < %--<ether:htmlCss cssFile="apycom.com-4-steel-blue/menu"/>--%>16 <ether:htmlCss cssFile="apycom.com-5-red/menu"/> 17 17 <%--<ether:htmlCss cssFile="TwitterLogin/front"/>--%> 18 18 <ether:htmlCss cssFile="jquery-ui-1.8.16.custom/jquery-ui-1.8.16.custom"/> … … 28 28 <ether:htmlJs jsFile="classesForJQuery/Button"/> 29 29 <ether:htmlJs jsFile="classesForJQuery/LoginButton"/> 30 < %--<ether:htmlJs jsFile="apycom.com-4-steel-blue/menu"/>--%>30 <ether:htmlJs jsFile="apycom.com-5-red/menu"/> 31 31 <%--<ether:htmlJs jsFile="TwitterLogin/javascripts/jquery.tipsy"/>--%> 32 32 <%--<ether:htmlJs jsFile="jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min"/>--%> … … 66 66 <div id="menu" class="containerMenu"> 67 67 <ul class="menu"> 68 <li> 69 <html:link page="/data?methodName=viewCatalogResume" paramName="access" paramId="source"> 70 <span><bean:message key="data.access"/></span> 71 </html:link> 68 <li><a href="#" class="parent"><span>Home</span></a> 72 69 73 70 <div> 74 71 <ul> 75 <li><html:link page="/JeuxAccess.do"><span><bean:message key="data.access.jeux"/></span></html:link></li> 76 <li><html:link page="/data?methodName=viewParameters"><span><bean:message key="data.access.param"/></span></html:link></li> 77 <li><html:link page="/CapteursAccess.do"><span><bean:message key="data.access.capt"/></span></html:link></li> 78 <li><html:link page="/data?methodName=viewPlateforms"><span><bean:message key="data.access.plat"/></span></html:link></li> 72 <li><a href="#" class="parent"><span>Sub Item 1</span></a> 73 74 <div> 75 <ul> 76 <li><a href="#"><span>Sub Item 1.1</span></a></li> 77 <li><a href="#"><span>Sub Item 1.2</span></a></li> 78 <li><a href="#"><span>Sub Item 1.3</span></a></li> 79 </ul> 80 </div> 81 </li> 82 <li><a href="#"><span>Sub Item 2</span></a></li> 83 <li><a href="#"><span>Sub Item 3</span></a></li> 79 84 </ul> 80 85 </div> 81 86 </li> 82 83 <li> 84 <html:link page="/data?methodName=viewDataResume" paramName="access" paramId="source"> 85 <span><bean:message key="app.data"/></span> 86 </html:link> 87 88 <div id="menuData"></div> 89 </li> 90 91 <li class="last"> 92 <html:link page="/visualization?methodName=view"><span><bean:message key="visualization"/></span></html:link> 87 <li><a href="#" class="parent"><span>Product Info</span></a> 93 88 94 89 <div> 95 90 <ul> 96 <li><html:link page="/visualization?methodName=viewParametersByPlateform"><span><bean:message key="visualization"/></span></html:link></li> 97 <li><html:link page="/visualization?methodName=viewInWork"><span><bean:message key="simulation.visualization"/></span></html:link></li> 91 <li><a href="#" class="parent"><span>Sub Item 1</span></a> 92 93 <div> 94 <ul> 95 <li><a href="#"><span>Sub Item 1.1</span></a></li> 96 <li><a href="#"><span>Sub Item 1.2</span></a></li> 97 </ul> 98 </div> 99 </li> 100 <li><a href="#"><span>Sub Item 3</span></a></li> 101 <li><a href="#"><span>Sub Item 4</span></a></li> 98 102 </ul> 99 103 </div> 100 104 </li> 101 105 <li><a href="#"><span>Help</span></a></li> 102 106 </ul> 103 107 </div> … … 117 121 © 2010-2011 <html:link href="http://ether.ipsl.jussieu.fr" target="help">ETHER </html:link>/ CNRS 118 122 </div> 119 120 121 <%--<%– ****************** LOGO, TITLE, TOOLS, MENU ****************** –%>--%>122 <%--<div id="title_tools" class="containerTitleTools">--%>123 <%--<div class="containerLogoTitleNav">--%>124 <%--<div class="containerLogoTitle">--%>125 <%--<div id="logoEther" class="containerLogoEther">--%>126 <%--<a href=""><img src="resources/images/logo_Ether.jpg" width="80px" height="80px"/></a>--%>127 <%--</div>--%>128 129 <%--<div id="title" class="containerTitle">--%>130 <%--<spring:message code="home.title.part1"/><BR/>--%>131 132 <%--<div class="containerTitlePart2"><spring:message code="home.title.part2"/></div>--%>133 <%--</div>--%>134 <%--</div>--%>135 136 <%--<div id="nav" class="containerNav"><tiles:insert attribute="nav"/></div>--%>137 <%--</div>--%>138 139 <%--<div class="containerToolsMenus">--%>140 <%--<div id="tools" class="containerTools" align="right"></div>--%>141 142 <%--<div id="menu" class="containerMenu"></div>--%>143 <%--<div id="subMenu" class="containerSubMenu"></div>--%>144 <%--</div>--%>145 146 <%--</div>--%>147 148 <%--<%– ****************** BODY CONTENT ****************** –%>--%>149 <%--<tiles:insert attribute="body"/>--%>150 151 <%--<%– ****************** BOTTOM ****************** –%>--%>152 <%--<div id="bottom" class="containerEther containerBottom" align="right">guiliguili</div>--%>153 154 <%--<div class="containerWhite"></div>--%>155 156 123 </div> 157 124 … … 177 144 templateTexts["label.informations"] = '<spring:message code="label.informations"/>'; 178 145 179 // templateTexts["app.en"] = '<bean:message key="app.en"/>';180 // templateTexts["app.fr"] = '<bean:message key="app.fr"/>';146 // templateTexts["app.en"] = '<bean:message key="app.en"/>'; 147 // templateTexts["app.fr"] = '<bean:message key="app.fr"/>'; 181 148 <%--templateTexts["data.upload.metadata.contact.mail"] = '<bean:message key="data.upload.metadata.contact.mail"/>';--%> 182 149 <%--templateTexts["data.access.extract.short"] = '<bean:message key="data.access.extract.short"/>';--%>
Note: See TracChangeset
for help on using the changeset viewer.