Author: lkaufmann Date: 2014-05-16 16:12:49 +0200 (Fri, 16 May 2014) New Revision: 1951 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1951 Log: Refs 4997 Update screens layout Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp 2014-05-16 13:31:04 UTC (rev 1950) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp 2014-05-16 14:12:49 UTC (rev 1951) @@ -28,7 +28,7 @@ <content tag="mainClass">form</content> </head> - <form> + <div class="form-wrapper"> <h1><s:text name="wao.ui.page.companies.title" /></h1> <table class="table table-bordered"> @@ -95,6 +95,6 @@ <i class="icon-plus"></i> <s:text name="wao.ui.action.createCompany" /> </s:a> </div> - </form> + </div> </html> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp 2014-05-16 13:31:04 UTC (rev 1950) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp 2014-05-16 14:12:49 UTC (rev 1951) @@ -31,19 +31,20 @@ <s:property value="%{t('wao.ui.form.Company.title.edition', company.name)}" /> </s:else> </title> + <content tag="mainClass">form</content> </head> - <h1> - <s:if test="companyId == null"> - <s:text name="wao.ui.form.Company.title.creation" /> - </s:if> - <s:else> - <s:property value="%{t('wao.ui.form.Company.title.edition', company.name)}" /> - </s:else> - </h1> - <s:form> + <h1> + <s:if test="companyId == null"> + <s:text name="wao.ui.form.Company.title.creation" /> + </s:if> + <s:else> + <s:property value="%{t('wao.ui.form.Company.title.edition', company.name)}" /> + </s:else> + </h1> + <s:hidden name="companyId" value="%{companyId}" /> <s:textfield name="company.name" label="%{getText('wao.ui.field.Company.name')}" requiredLabel="true" cssClass="input-xlarge" /> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp 2014-05-16 13:31:04 UTC (rev 1950) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp 2014-05-16 14:12:49 UTC (rev 1951) @@ -29,7 +29,7 @@ <content tag="mainClass">form</content> </head> - <form> + <div class="form-wrapper"> <h1><s:text name="wao.ui.page.waoUsers.title" /></h1> <table class="table table-bordered"> @@ -90,6 +90,6 @@ <i class="icon-plus"></i> <s:text name="wao.ui.action.createWaoUser" /> </s:a> </div> - </form> + </div> </html> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-16 13:31:04 UTC (rev 1950) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-16 14:12:49 UTC (rev 1951) @@ -538,6 +538,10 @@ width: 30px; } +#boats-list tbody { + background-color: #EAEAEA; +} + /** La colonne pour le nom de navire peut être plus large ques les autres */ #boats-list th:nth-child(2), #boats-list td:nth-child(2) { text-align: left; @@ -571,17 +575,17 @@ #boats-filters-list-details-layout > div:nth-child(1) { padding-top: 60px; - background: #DEDEDE; + background: #E6E6E6; } #boats-filters-list-details-layout > div:nth-child(2) { - background: #E6E6E6; + background: #EEE; } #boats-filters-list-details-layout > div:nth-child(3) { /*max-width: 35%;*/ flex: 1; - background: #EEEEEE; + background: #FFF; border-right: 0; }