Author: lkaufmann Date: 2014-05-15 16:33:21 +0200 (Thu, 15 May 2014) New Revision: 1943 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1943 Log: Refs #4997 : Update display on form pages, responsive display for sample plan filters Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-contacts-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.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-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -25,71 +25,76 @@ <head> <title><s:text name="wao.ui.page.companies.title" /></title> + <content tag="mainClass">form</content> </head> - <h1><s:text name="wao.ui.page.companies.title" /></h1> + <form> + <h1><s:text name="wao.ui.page.companies.title" /></h1> - <table class="table table-bordered"> - <tr> - <th> - <s:text name="wao.ui.field.Company.name" /> - </th> - <th> - <s:text name="wao.ui.field.Company.active" /> - </th> - <th class="actions"> - <s:text name="wao.ui.actions" /> - </th> - </tr> - <s:iterator value="companies"> + <table class="table table-bordered"> <tr> - <td<s:if test=" ! active"> class="inactive"</s:if>> - <s:property value="name" /> - </td> - <td> - <s:if test="active"> - <s:text name="wao.ui.misc.yes" /> - </s:if> - <s:else> - <s:text name="wao.ui.misc.no" /> - </s:else> - </td> - <td class="actions"> - <s:url action="edit-company!input" id="editCompanyUrl"> - <s:param name="companyId" value="topiaId" /> - </s:url> - <s:a href="%{editCompanyUrl}"> - <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> - </s:a> - - <s:url action="delete-company" id="deleteCompanyUrl"> - <s:param name="companyId" value="topiaId" /> - </s:url> - <s:a href="%{deleteCompanyUrl}"> - <i class="icon-trash"></i> <s:text name="wao.ui.action.delete" /> - </s:a> + <th> + <s:text name="wao.ui.field.Company.name" /> + </th> + <th> + <s:text name="wao.ui.field.Company.active" /> + </th> + <th class="actions"> + <s:text name="wao.ui.actions" /> + </th> + </tr> + <s:iterator value="companies"> + <tr> + <td<s:if test=" ! active"> class="inactive"</s:if>> + <s:property value="name" /> + </td> + <td> + <s:if test="active"> + <s:text name="wao.ui.misc.yes" /> + </s:if> + <s:else> + <s:text name="wao.ui.misc.no" /> + </s:else> + </td> + <td class="actions"> + <s:url action="edit-company!input" id="editCompanyUrl"> + <s:param name="companyId" value="topiaId" /> + </s:url> + <s:a href="%{editCompanyUrl}"> + <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> + </s:a> - <s:url action="wao-users" id="waoUsersUrl"> - <s:param name="companyId" value="topiaId" /> - </s:url> - <s:a href="%{waoUsersUrl}"> - <i class="icon-user"></i> <s:text name="wao.ui.action.viewCompanyWaoUsers" /> - </s:a> + <s:url action="delete-company" id="deleteCompanyUrl"> + <s:param name="companyId" value="topiaId" /> + </s:url> + <s:a href="%{deleteCompanyUrl}"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.delete" /> + </s:a> - <s:url action="edit-wao-user!input" id="createWaoUserUrl"> - <s:param name="companyId" value="topiaId" /> - </s:url> - <s:a href="%{createWaoUserUrl}"> - <i class="icon-plus"></i> <s:text name="wao.ui.action.createWaoUser" /> - </s:a> - </td> - </tr> - </s:iterator> - </table> + <s:url action="wao-users" id="waoUsersUrl"> + <s:param name="companyId" value="topiaId" /> + </s:url> + <s:a href="%{waoUsersUrl}"> + <i class="icon-user"></i> <s:text name="wao.ui.action.viewCompanyWaoUsers" /> + </s:a> - <s:url action="edit-company!input" id="createCompanyUrl" /> - <s:a href="%{createCompanyUrl}"> - <i class="icon-plus"></i> <s:text name="wao.ui.action.createCompany" /> - </s:a> + <s:url action="edit-wao-user!input" id="createWaoUserUrl"> + <s:param name="companyId" value="topiaId" /> + </s:url> + <s:a href="%{createWaoUserUrl}"> + <i class="icon-plus"></i> <s:text name="wao.ui.action.createWaoUser" /> + </s:a> + </td> + </tr> + </s:iterator> + </table> + <div class="form-actions"> + <s:url action="edit-company!input" id="createCompanyUrl" /> + <s:a href="%{createCompanyUrl}" cssClass="btn float-right"> + <i class="icon-plus"></i> <s:text name="wao.ui.action.createCompany" /> + </s:a> + </div> + </form> + </html> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -67,19 +67,20 @@ <s:property value="%{t('wao.ui.form.updateWaoUserCommand.title.edition', updateWaoUserCommand.waoUser.fullName)}" /> </s:else> </title> + <content tag="mainClass">form</content> </head> - <h1> - <s:if test="waoUserId == null"> - <s:text name="wao.ui.form.updateWaoUserCommand.title.creation" /> - </s:if> - <s:else> - <s:property value="%{t('wao.ui.form.updateWaoUserCommand.title.edition', updateWaoUserCommand.waoUser.fullName)}" /> - </s:else> - </h1> - <s:form> + <h1> + <s:if test="waoUserId == null"> + <s:text name="wao.ui.form.updateWaoUserCommand.title.creation" /> + </s:if> + <s:else> + <s:property value="%{t('wao.ui.form.updateWaoUserCommand.title.edition', updateWaoUserCommand.waoUser.fullName)}" /> + </s:else> + </h1> + <s:hidden name="waoUserId" value="%{waoUserId}" /> <fieldset> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -25,22 +25,24 @@ <head> <title><s:text name="wao.ui.page.ReferentialManagement.title" /></title> + <content tag="mainClass">form</content> </head> - <h1><s:text name="wao.ui.page.ReferentialManagement.title" /></h1> - <div class="alert alert-info"> - <s:text name="wao.ui.import.disclaimer" /> - </div> - <s:form action="import-fishing-zones" method="POST" enctype="multipart/form-data"> + + <h1><s:text name="wao.ui.page.ReferentialManagement.title" /></h1> + <div class="alert alert-info"> + <s:text name="wao.ui.import.disclaimer" /> + </div> + <fieldset> <legend> <s:text name="wao.import.fishingZones.prompt" /> </legend> - <s:file name="csvFile" /> + <s:file name="csvFile" cssClass="float-left" /> <s:submit type="button"> <i class="icon-upload"></i> Importer @@ -56,7 +58,7 @@ <s:text name="wao.import.terrestrialLocations.prompt" /> </legend> - <s:file name="csvFile" /> + <s:file name="csvFile" cssClass="float-left" /> <s:submit type="button"> <i class="icon-upload"></i> Importer @@ -72,7 +74,7 @@ <s:text name="wao.import.boats.prompt" /> </legend> - <s:file name="csvFile" /> + <s:file name="csvFile" cssClass="float-left"/> <s:submit type="button"> <i class="icon-upload"></i> Importer @@ -89,7 +91,7 @@ <s:text name="wao.import.contactStateMotives.prompt" /> </legend> - <s:file name="csvFile" /> + <s:file name="csvFile" cssClass="float-left" /> <s:submit type="button"> <i class="icon-upload"></i> Importer 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-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -26,66 +26,70 @@ <head> <title><s:text name="wao.ui.page.waoUsers.title" /></title> - + <content tag="mainClass">form</content> </head> - <h1><s:text name="wao.ui.page.waoUsers.title" /></h1> + <form> + <h1><s:text name="wao.ui.page.waoUsers.title" /></h1> - <table class="table table-bordered"> - <tr> - <th> - <s:text name="wao.ui.field.WaoUser.login" /> - </th> - <th> - <s:text name="wao.ui.field.WaoUser.fullName" /> - </th> - <th> - <s:text name="wao.ui.field.WaoUser.active" /> - </th> - <th> - <s:text name="wao.ui.actions" /> - </th> - </tr> - <s:iterator value="waoUsers"> + <table class="table table-bordered"> <tr> - <td<s:if test=" ! active"> class="inactive"</s:if>> - <s:property value="login" /> - </td> - <td> - <s:property value="fullName" /> - </td> - <td> - <s:if test="active"> - <s:text name="wao.ui.misc.yes" /> - </s:if> - <s:else> - <s:text name="wao.ui.misc.no" /> - </s:else> - </td> - <td> - <s:url action="edit-wao-user!input" id="editWaoUserUrl"> - <s:param name="waoUserId" value="topiaId" /> - </s:url> - <s:a href="%{editWaoUserUrl}"> - <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> - </s:a> - - <s:url action="delete-wao-user" id="deleteWaoUserUrl"> - <s:param name="waoUserId" value="topiaId" /> - </s:url> - <s:a href="%{deleteWaoUserUrl}"> - <i class="icon-trash"></i> <s:text name="wao.ui.action.delete" /> - </s:a> - </td> + <th> + <s:text name="wao.ui.field.WaoUser.login" /> + </th> + <th> + <s:text name="wao.ui.field.WaoUser.fullName" /> + </th> + <th> + <s:text name="wao.ui.field.WaoUser.active" /> + </th> + <th> + <s:text name="wao.ui.actions" /> + </th> </tr> - </s:iterator> - </table> + <s:iterator value="waoUsers"> + <tr> + <td<s:if test=" ! active"> class="inactive"</s:if>> + <s:property value="login" /> + </td> + <td> + <s:property value="fullName" /> + </td> + <td> + <s:if test="active"> + <s:text name="wao.ui.misc.yes" /> + </s:if> + <s:else> + <s:text name="wao.ui.misc.no" /> + </s:else> + </td> + <td> + <s:url action="edit-wao-user!input" id="editWaoUserUrl"> + <s:param name="waoUserId" value="topiaId" /> + </s:url> + <s:a href="%{editWaoUserUrl}"> + <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> + </s:a> - <s:url action="edit-wao-user!input" id="createWaoUserUrl"> - <s:param name="companyId" value="%{companyId}" /> - </s:url> - <s:a href="%{createWaoUserUrl}"> - <i class="icon-plus"></i> <s:text name="wao.ui.action.createWaoUser" /> - </s:a> + <s:url action="delete-wao-user" id="deleteWaoUserUrl"> + <s:param name="waoUserId" value="topiaId" /> + </s:url> + <s:a href="%{deleteWaoUserUrl}"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.delete" /> + </s:a> + </td> + </tr> + </s:iterator> + </table> + <div class="form-actions"> + <s:url action="edit-wao-user!input" id="createWaoUserUrl"> + <s:param name="companyId" value="%{companyId}" /> + </s:url> + <s:a href="%{createWaoUserUrl}" cssClass="btn float-right"> + <i class="icon-plus"></i> <s:text name="wao.ui.action.createWaoUser" /> + </s:a> + </div> + </form> + </html> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -37,7 +37,7 @@ }); }); </script> - <content tag="mainClass">news</content> + <content tag="mainClass">form</content> </head> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -87,18 +87,11 @@ }); </script> + + <content tag="mainClass">form</content> </head> - <h1> - <s:if test="updateSampleRowCommand.creation"> - <s:text name="wao.ui.sampleRow.creation" /> - </s:if> - <s:else> - <s:property value="t('wao.ui.sampleRow.edition', updateSampleRowCommand.sampleRow.code)" /> - </s:else> - </h1> - <s:if test="updateSampleRowCommand.observationAlreadyStarted"> <div class="alert"> <s:text name="wao.ui.form.SampleRow.warn.observationAlreadyStarted" /> @@ -107,6 +100,14 @@ <s:form> + <h1> + <s:if test="updateSampleRowCommand.creation"> + <s:text name="wao.ui.sampleRow.creation" /> + </s:if> + <s:else> + <s:property value="t('wao.ui.sampleRow.edition', updateSampleRowCommand.sampleRow.code)" /> + </s:else> + </h1> <s:hidden name="sampleRowId" value="%{sampleRowId}" /> <fieldset> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-contacts-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-contacts-input.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-contacts-input.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -25,15 +25,16 @@ <head> <title><s:text name="wao.ui.import.contacts" /></title> + <content tag="mainClass">form</content> </head> -<h1><s:text name="wao.ui.import.contacts" /></h1> +<s:form action="import-contacts" method="POST" enctype="multipart/form-data"> -<div class="alert alert-info"> - <s:text name="wao.ui.import.disclaimer" /> -</div> + <h1><s:text name="wao.ui.import.contacts" /></h1> -<s:form action="import-contacts" method="POST" enctype="multipart/form-data"> + <div class="alert alert-info"> + <s:text name="wao.ui.import.disclaimer" /> + </div> <fieldset> <legend> @@ -42,9 +43,11 @@ <s:file name="csvFile" /> - <s:submit type="button"> - <i class="icon-upload"></i> <s:text name="wao.ui.action.csvImport"/> - </s:submit> + <div class="form-actions"> + <s:submit type="button" cssClass="btn"> + <i class="icon-upload"></i> <s:text name="wao.ui.action.csvImport"/> + </s:submit> + </div> </fieldset> </s:form> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan-input.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan-input.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -25,16 +25,17 @@ <head> <title><s:text name="wao.ui.import.samplingPlan" /></title> + <content tag="mainClass">form</content> </head> - <h1><s:text name="wao.ui.import.samplingPlan" /></h1> + <s:form action="import-sampling-plan" method="POST" enctype="multipart/form-data"> - <div class="alert alert-info"> - <s:text name="wao.ui.import.disclaimer" /> - </div> + <h1><s:text name="wao.ui.import.samplingPlan" /></h1> - <s:form action="import-sampling-plan" method="POST" enctype="multipart/form-data"> - + <div class="alert alert-info"> + <s:text name="wao.ui.import.disclaimer" /> + </div> + <fieldset> <legend> <s:text name="wao.ui.import.samplingPlan" /> @@ -42,9 +43,11 @@ <s:file name="csvFile" /> - <s:submit type="button"> - <i class="icon-upload"></i> <s:text name="wao.ui.action.csvImport"/> - </s:submit> + <div class="form-actions"> + <s:submit type="button" cssClass="btn"> + <i class="icon-upload"></i> <s:text name="wao.ui.action.csvImport"/> + </s:submit> + </div> </fieldset> </s:form> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -54,10 +54,23 @@ <content tag="mainClass">large</content> <content tag="samplingPlanMenuItemClass">active</content> - + + <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> + <s:url action="edit-sample-row!input" id="createSampleRow" /> + <content tag="additionnalLinks"> + <li> + <s:a href="%{createSampleRow}"> + <i class="icon-plus"></i> <s:text name="wao.ui.action.createSampleRow" /> + </s:a> + </li> + </content> + + + </s:if> + <s:form method="GET" id="sampling-plan-filters-form" cssClass="filters-form"> - <fieldset> + <fieldset class="filters-group"> <s:textfield name="filter.periodFrom" label="%{getText('wao.ui.form.periodFrom')}" @@ -71,7 +84,7 @@ </fieldset> - <fieldset> + <fieldset class="filters-group"> <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> @@ -103,7 +116,7 @@ </fieldset> - <fieldset> + <fieldset class="filters-group"> <s:select name="filter.fishingZoneFacadeNames" label="%{getText('wao.ui.field.FishingZone.facadeName')}" @@ -179,13 +192,6 @@ </s:if> </div> - <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> - <s:url action="edit-sample-row!input" id="createSampleRow" /> - <s:a href="%{createSampleRow}" cssClass="btn"> - <i class="icon-plus"></i> <s:text name="wao.ui.action.createSampleRow" /> - </s:a> - </s:if> - <s:set var="estimatedTides" value="true" /> <s:set var="fullView" value="%{fullView}" /> <s:set var="displayTidesReal" value="true" /> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-15 14:33:21 UTC (rev 1943) @@ -94,6 +94,8 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> + <decorator:getProperty property="page.additionnalLinks"/> + <s:if test="authenticatedWaoUser.authorizedToImportSamplingPlan"> <li> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="import-sampling-plan!input" id="importSamplingPlanUrl" /> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-15 13:42:22 UTC (rev 1942) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-15 14:33:21 UTC (rev 1943) @@ -111,7 +111,14 @@ color : green; } +.float-left { + float: left; +} +.float-right { + float: right; +} + /****************************************************************************** * Styles globaux à l'application *****************************************************************************/ @@ -154,7 +161,7 @@ } main.home, -main.news { +main.form { background-color:#efefef; max-width: 100%; } @@ -352,6 +359,11 @@ border-bottom:1px solid #CCC; } + form.filters-form .filters-group { + float: left; + margin-right: 30px; + } + /** * Les boutons */ @@ -632,9 +644,9 @@ } /** - * News edition + * Form edition */ -main.news form { +main.form > form { background-color: #FFF; border-left: 1px solid #BBB; border-right: 1px solid #BBB; @@ -642,15 +654,30 @@ margin: 0 auto; max-width: 968px; padding-top: 40px; + padding-bottom: 10px; } +main.form > table { + background-color: #FFF; + margin: 0 auto; + max-width: 968px; + margin-top: 40px; + border-left: 1px solid #BBB; + border-right: 1px solid #BBB; +} -main.news form .control-group { +main.form form h1 { + padding: 5px 20px; + border-bottom: 2px solid #00B2B2; +} + +main.form form .control-group, +main.form form legend { padding: 0 20px; } -main.news form .form-actions { +main.form form .form-actions { margin: 20px 0 0 0; } -main.news form .form-actions button.btn { +main.form form .form-actions button.btn { float: right; }