Author: tchemit Date: 2012-04-03 13:23:18 +0200 (Tue, 03 Apr 2012) New Revision: 469 Url: http://forge.codelutin.com/repositories/revision/echobase/469 Log: fixes #1047: Finaliser la charte graphique Modified: trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css =================================================================== --- trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css 2012-04-03 09:00:44 UTC (rev 468) +++ trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css 2012-04-03 11:23:18 UTC (rev 469) @@ -585,4 +585,33 @@ * http://docs.jquery.com/UI/Progressbar#theming */ .ui-progressbar { height:2em; text-align: left; overflow: hidden; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } + +/* + * jQuery grid + */ +.ui-jqgrid-view tr.odd { + background-attachment: scroll; + background-clip: border-box; + /*background-color: white !important;*/ + background-image: none; + background-origin: padding-box; + background-position: 0 0; + background-repeat: repeat; + background-size: auto auto; +} +.ui-jqgrid-view tr.ui-state-highlight td { + font-weight: bold!important; + background: #ffd200 url(images/ui-bg_glass_55_ffd200_1x400.png) 50% 50% repeat-x!important; +} +.ui-jqgrid-view tr.even { + background-attachment: scroll; + background-clip: border-box; + background-color: #bddfff; + background-image: none; + background-origin: padding-box; + background-position: 0 0; + background-repeat: repeat; + background-size: auto auto; +} + Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2012-04-03 09:00:44 UTC (rev 468) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2012-04-03 11:23:18 UTC (rev 469) @@ -25,6 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> +<br/> <hr/> <div id='footer'> <ul class="clearfix"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-04-03 09:00:44 UTC (rev 468) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-04-03 11:23:18 UTC (rev 469) @@ -42,37 +42,37 @@ <div class='displayBlock top'> <%@ include file="/WEB-INF/includes/i18n.jsp" %> <div class='floatLeft'> - <s:a action="home" cssClass="logo" namespace="/">Echobase</s:a> + <s:a action="home" cssClass="logo" namespace="/">Echobase</s:a> </div> <div id='headerRight'> </div> </div> <div class="cleanBoth"></div> -<div class="containerHomeSize"> -<%-- content --%> -<div class="containerHome ui-corner-all containerHomeSize"> +<div class="bodyHomeSize"> + <div class="containerHomeSize"> + <%-- content --%> + <div class="containerHome ui-corner-all containerHomeSize"> - <h2><s:text name="echobase.title.login"/></h2> + <h2><s:text name="echobase.title.login"/></h2> - <s:form method="POST" namespace="/user"> - <fieldset class="ui-corner-all"> - <legend> - <s:text name="echobase.title.login"/> - </legend> - <s:hidden key="redirectAction" label=""/> - <s:textfield name="email" key="echobase.common.email" required="true"/> - <s:password name="password" key="echobase.common.password" - required="true"/> - </fieldset> - <br/> - <s:submit action="login" key="echobase.action.login" align="right"/> - </s:form> + <s:form method="POST" namespace="/user"> + <fieldset class="ui-corner-all"> + <%--<legend><s:text name="echobase.title.login"/></legend>--%> + <s:hidden key="redirectAction" label=""/> + <s:textfield name="email" key="echobase.common.email" + required="true" size="60"/> + <s:password name="password" key="echobase.common.password" + required="true" size="60"/> + </fieldset> + <br/> + <s:submit action="login" key="echobase.action.login" align="right"/> + </s:form> + </div> + <%-- footer --%> + <%@ include file="/WEB-INF/includes/footer.jsp" %> + </div> </div> - -<%-- footer --%> -<%@ include file="/WEB-INF/includes/footer.jsp" %> -</div> </body> </html> Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 09:00:44 UTC (rev 468) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 11:23:18 UTC (rev 469) @@ -30,26 +30,7 @@ padding:0; font-size:10px; } -.ui-jqgrid-view tr.odd { - background-attachment: scroll; - background-clip: border-box; - background-color: white !important; - background-image: none; - background-origin: padding-box; - background-position: 0 0; - background-repeat: repeat; - background-size: auto auto; -} -.ui-jqgrid-view tr.even { - background-attachment: scroll; - background-clip: border-box; - background-color: #ffec3e!important; - background-image: none; - background-origin: padding-box; - background-position: 0 0; - background-repeat: repeat; - background-size: auto auto; -} + .inline { display: inline; } @@ -60,18 +41,19 @@ font-family: monospace; font-size: 9pt; } -.ui-tabs .ui-tabs-nav li a { -/* -moz-text-blink: none; - -moz-text-decoration-color: -moz-use-text-color; - -moz-text-decoration-line: none; - -moz-text-decoration-style: solid;*/ - float: left; - font-size: 11px; - padding-bottom: 0.5em; - padding-left: 0.1em; - padding-right: 0.1em; - padding-top: 0.5em; -} + +/*.ui-tabs .ui-tabs-nav li a {*/ +/* -moz-text-blink: none;*/ + /*-moz-text-decoration-color: -moz-use-text-color;*/ + /*-moz-text-decoration-line: none;*/ + /*-moz-text-decoration-style: solid;*/ + /*float: left;*/ + /*font-size: 11px;*/ + /*padding-bottom: 0.5em;*/ + /*padding-left: 0.1em;*/ + /*padding-right: 0.1em;*/ + /*padding-top: 0.5em;*/ +/*}*/ #body { padding-bottom: 10px; padding-left: 10px; @@ -209,6 +191,7 @@ width: 350px; margin:5px 0; } + .wwctrl { float: left; } @@ -294,6 +277,10 @@ padding-top: 0; float:right; } + +div.toolbar { + min-height: 55px; +} ul.toolbar { /*clear: both;*/ display: block; @@ -393,7 +380,6 @@ #body{ /*margin:3em 8em;*/ background:#03497c; - min-width:655px; min-height:415px; /*padding:20px;*/ min-width:655px; @@ -409,37 +395,33 @@ color:#FFF; } -.containerHomeSize { +.bodyHomeSize { margin:3em 8em; - /*padding:20px;*/ - position:relative; - clear:both; - width:665px; } +.containerHomeSize { + width:645px; +} + +form#login .wwlbl { + width: 150px; +} + .containerHome { - /*margin:3em 8em;*/ background:#03497c; padding:20px; - /*position:relative;*/ - /*clear:both;*/ + position:relative; + clear:both; color:#FFF; - /*width:655px;*/ } -/*form#login{*/ - /*width:615px; */ -/*}*/ -form#login legend{ - font-size:0px; -} form{ color:#FFF; } fieldset{ border:1px solid #ffec3e; padding:15px 30px; - color:#FFFFFF; + color:#FFFFFF; margin:20px 0; } legend{ @@ -486,7 +468,7 @@ padding:0 10px; border:5px solid #023b66; width:auto; - padding:0 10px; + padding:0 10px; } .ui-tabs input[type="submit"]{ border:2px solid #023b66; @@ -537,17 +519,17 @@ #wwctrl_configure_model_voyageIds br{ line-height:25px; } -#wwlbl_login_email, -#wwlbl_login_password{ - padding-bottom:5px; -} -#wwgrp_login_password{ - margin-top:20px; -} -form#login fieldset input{ - height:35px; - width:390px; -} +/*#wwlbl_login_email,*/ +/*#wwlbl_login_password{*/ + /*padding-bottom:5px;*/ +/*}*/ +/*#wwgrp_login_password{*/ + /*margin-top:20px;*/ +/*}*/ +/*form#login fieldset input{*/ + /*height:35px;*/ + /*width:390px;*/ +/*}*/ input#login_echobase_action_login{ background:url(../images/bt_jaune.jpg) repeat-x 0 0; height: 48px; @@ -587,7 +569,7 @@ background-color:#ffe810; color:#635a08; z-index:100; - + /* Text properties */ font-family:'Myriad Pro',Arial, Helvetica, sans-serif; font-size:14px; @@ -595,10 +577,10 @@ letter-spacing:0.6px; white-space:nowrap; line-height:48px; - + /* CSS3 Transition: */ -webkit-transition: 0.25s; - + /* Future proofing (these do not work yet): */ /* -moz-transition: 0.25s;*/ transition: 0.25s; @@ -610,11 +592,11 @@ width:48px; display:block; position:relative; -} +} .menu a:hover span{ width:auto; padding:0 20px;overflow:visible; } .menu a:hover{ text-decoration:none; - + /* CSS outer glow with the box-shadow property */ /* -moz-box-shadow:0 0 5px #9ddff5;*/ -webkit-box-shadow:0 0 5px #9ddff5;