- Wao-commits - mailman.cloud.codelutin.com

Jenkins build is back to normal : wao-nightly » Wao :: Services #49
by admin+ci-codelutin.com＠codelutin.com May 16, 2014

May 16, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/49/>

1 0

Jenkins build is back to normal : wao-nightly » Wao :: Persistence #49
by admin+ci-codelutin.com＠codelutin.com May 16, 2014

May 16, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…>

1 0

Jenkins build is back to normal : wao-nightly » Wao :: Web #49
by admin+ci-codelutin.com＠codelutin.com May 16, 2014

May 16, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/49/chang…>

1 0

Jenkins build is back to normal : wao-nightly » Wao #49
by admin+ci-codelutin.com＠codelutin.com May 16, 2014

May 16, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao/49/>

1 0

r1954 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer WEB-INF/decorators
by lkaufmann＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: lkaufmann Date: 2014-05-16 17:59:16 +0200 (Fri, 16 May 2014) New Revision: 1954 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1954 Log: Refs #4997 Display updates Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.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/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-16 15:59:16 UTC (rev 1954) @@ -243,7 +243,7 @@ <s:text name="wao.ui.boatDetails.boatContactsCounts.title"/> </h3> -<table id="boat-contacts-counts-table" class="table"> +<table id="boat-contacts-counts-table" class="table no-border-top"> <thead> <tr> <td> @@ -292,10 +292,10 @@ <table class="table"> <tbody> <tr> - <th> + <th class="no-border-top"> <s:text name="wao.ui.field.Boat.shipOwner"/> </th> - <td> + <td class="no-border-top"> <s:property value="boatDetails.boatInfos.boat.shipOwner.firstName"/> <s:property value="boatDetails.boatInfos.boat.shipOwner.lastName"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-16 15:59:16 UTC (rev 1954) @@ -447,7 +447,7 @@ <s:text name="%{observedDataControl.i18nKey}"/> </s:if> </td> - <td> + <td class="align-center"> <s:if test="mammalsObservation"> <i class="fa fa-eye" title="<s:text name="wao.ui.field.Contact.mammalsObservation"/>"></i>  @@ -476,14 +476,14 @@ <td> <s:if test=" ! commentCoordinator.empty"> <span data-original-title="<s:property value="commentCoordinator" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> - <i class="icon-comment"></i> + <i class="fa fa-comment"></i> </span> </s:if> </td> <td> <s:if test=" ! commentAdmin.empty"> <span data-original-title="<s:property value="commentAdmin" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> - <i class="icon-comment"></i> + <i class="fa fa-comment"></i> </span> </s:if> </td> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-05-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-05-16 15:59:16 UTC (rev 1954) @@ -64,14 +64,14 @@ <s:url action="delete-news" id="deleteNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{deleteNewsUrl}" cssClass="btn-delete" title="%{getText('wao.ui.action.delete')}" > + <s:a href="%{deleteNewsUrl}" cssClass="btn-link" title="%{getText('wao.ui.action.delete')}" > <i class="fa fa-trash-o"></i> </s:a> <s:url action="edit-news!input" id="editNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{editNewsUrl}" cssClass="btn-edit" title="%{getText('wao.ui.action.edit')}"> + <s:a href="%{editNewsUrl}" cssClass="btn-link btn-link-edit" title="%{getText('wao.ui.action.edit')}"> <i class="fa fa-edit"></i> </s:a> </s:if> 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-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-16 15:59:16 UTC (rev 1954) @@ -52,7 +52,7 @@ <div class="navbar"> <div class="navbar-inner"> - <a class="brand" href="#">WAO <span><s:text name="%{obsProgram.getI18nKey()}"/></span></a> + <a class="brand" href="#"><span>WAO</span> <s:text name="%{obsProgram.getI18nKey()}"/></a> <%--<a class="brand" href="#">Wao <s:property value="%{getText(#obsProgram.getI18nKey())}" /></a>--%> <ul class="nav"> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-16 15:59:16 UTC (rev 1954) @@ -117,7 +117,16 @@ .float-right { float: right; } +.align-center { + text-align: center; +} +.btn-link { + color: #2f4f4f !important; +} +.no-border-top { + border-top: 0 !important; +} /****************************************************************************** * Styles globaux à l'application @@ -212,6 +221,7 @@ } .navbar .nav > li > a:hover { color: #FFF; + background-color: #00b2b2; } .navbar .nav > .active > a, .navbar .nav > .active > a:hover, @@ -674,7 +684,7 @@ } /* Fix a 1px gap between icons in fontawesome */ -main.home .news a.btn-edit { +main.home .news a.btn-link-edit { padding-top: 1px; } @@ -687,13 +697,9 @@ float: right; margin-left: 10px; text-decoration: none; - color: #2f4f4f; font-weight: bold; font-size: 15px; } -main.home .news p.publication > a i.fa { - color: #2f4f4f; -} main.home .news p.publication > a:hover, main.home .news p.publication > a:hover i.fa { @@ -710,7 +716,19 @@ float: right; } + /** + * Contatcs + */ +#edit-contact > fieldset { + width: 100%; +} +#edit-contact > fieldset legend { + padding: 0 2%; + width: 96%; +} + +/** * Form edition */ main.form > form,

1 0

r1953 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer img
by lkaufmann＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: lkaufmann Date: 2014-05-16 17:36:38 +0200 (Fri, 16 May 2014) New Revision: 1953 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1953 Log: Refs #4997 Update icons in contacts screen Added: trunk/wao-web/src/main/webapp/img/hook-22px.png Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-16 15:23:46 UTC (rev 1952) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-16 15:36:38 UTC (rev 1953) @@ -449,25 +449,27 @@ </td> <td> <s:if test="mammalsObservation"> - <img src="<s:url value="/img/eye-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsObservation"/>"/>  + <i class="fa fa-eye" + title="<s:text name="wao.ui.field.Contact.mammalsObservation"/>"></i>  </s:if> <s:if test="mammalsCapture"> <s:if test="mammalsInfo"> - <img src="<s:url value="/img/fishing-net-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> + <img src="<s:url value="/img/hook-22px.png"/>" + alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" + title="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> <%--TODO<s:text name="wao.ui.field.Contact.mammalsInfo"><s:param value="%{getMammalsInfo(#contact)}"/></s:text>--%> </s:if> <s:else> - <img src="<s:url value="/img/fishing-net-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> + <img src="<s:url value="/img/hook-22px.png"/>" + alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" + title="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> </s:else> </s:if> </td> <td> <s:if test=" ! comment.empty"> <span data-original-title="<s:property value="comment" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> - <i class="icon-comment"></i> + <i class="fa fa-comment"></i> </span> </s:if> </td> @@ -494,28 +496,37 @@ </td> <td> <s:if test="validationCompany == null"> - <img src="<s:url value="/img/help-22px.png"/>" - alt="<s:text name="wao.ui.misc.notValidated"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.notValidated"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + </span> </s:if> <s:elseif test="validationCompany"> - <img src="<s:url value="/img/true-22px.png"/>" - alt="<s:text name="wao.ui.misc.validated"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.validated"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + <i class="fa fa-check fa-stack-1x" ></i> + </span> </s:elseif> <s:else> - <img src="<s:url value="/img/false-22px.png"/>" - alt="<s:text name="wao.ui.misc.refused"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.refused"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + <i class="fa fa-times fa-stack-1x" ></i> + </span> </s:else> <s:if test="validationProgram == null"> - <img src="<s:url value="/img/help-22px.png"/>" - alt="<s:text name="wao.ui.misc.notValidated"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.notValidated"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + </span> </s:if> <s:elseif test="validationProgram"> - <img src="<s:url value="/img/true-22px.png"/>" - alt="<s:text name="wao.ui.misc.validated"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.validated"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + <i class="fa fa-check fa-stack-1x" ></i> + </span> </s:elseif> - <s:else> - <img src="<s:url value="/img/false-22px.png"/>" - alt="<s:text name="wao.ui.misc.refused"/>"/> + <s:else><span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.refused"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + <i class="fa fa-times fa-stack-1x" ></i> + </span> </s:else> </td> <td class="actions"> Added: trunk/wao-web/src/main/webapp/img/hook-22px.png =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/img/hook-22px.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-16 15:23:46 UTC (rev 1952) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-16 15:36:38 UTC (rev 1953) @@ -204,7 +204,7 @@ color:#FFF; } .navbar .nav > li > a { - color: #00b2b2; + color: #FFFFFF; float: none; padding: 10px 15px; text-decoration: none; @@ -218,13 +218,14 @@ .navbar .nav > .active > a:focus { background-color: #00b2b2; /*box-shadow: 0 3px 8px #009090;*/ - color: #294545; + color: #FFF; text-decoration: none; } .navbar .nav > li > a i.fa { color: #FFF; margin-right: 4px; + font-sie: 1.1em; } .navbar .nav > li ul.dropdown-menu li a:hover { @@ -449,6 +450,7 @@ position: fixed; right: 0; top: 40px; + z-index: 5; } #notifications .alert { @@ -456,13 +458,33 @@ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); } -#notifications .alert-info { - background: #00B2B2; - background: rgba(0, 178, 178, 0.7); - border-color: #299; - color: #444; - text-shadow: none; + + +/** + * Les icones + */ +.fa-stack.fa-lg { + font-size: 12px; } +.fa-stack.fa-lg .fa-square-o { + color: #AAA; +} +.fa-stack.fa-lg .fa-check { + color: #468847; + font-size: 1.4em; +} +.fa-stack.fa-lg .fa-times { + color: #B94A48; + font-size: 1.5em; +} +.fa-eye { + font-size: 1.7em; + color: #2F4F4F; +} +.fa-comment { + font-size: 1.5em; + color: #2F4F4F; +} /****************************************************************************** * Styles spécifiques pour certaines pages de l'appli

1 0

r1952 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: bleny Date: 2014-05-16 17:23:46 +0200 (Fri, 16 May 2014) New Revision: 1952 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1952 Log: fix filter (un)locking Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/wao.js 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-16 14:12:49 UTC (rev 1951) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-16 15:23:46 UTC (rev 1952) @@ -36,7 +36,24 @@ // sampleRowsFilterController.init(); var filterMappings = [ + <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> + { + filterName: 'companyIds', + filterLabel: "<s:text name="wao.ui.entity.Company"/>", + filterValuesField: 'companies', + }, + </s:if> { + filterName: 'programNames', + filterLabel: "<s:text name="wao.ui.field.SampleRow.programName"/>", + filterValuesField: 'programNames', + }, + { + filterName: 'sampleRowCodes', + filterLabel: "<s:text name="wao.ui.field.SampleRow.code"/>", + filterValuesField: 'sampleRowCodes', + }, + { filterName: 'fishingZoneFacadeNames', filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>", filterValuesField: 'fishingZoneFacadeNames', Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-05-16 14:12:49 UTC (rev 1951) +++ trunk/wao-web/src/main/webapp/wao.js 2014-05-16 15:23:46 UTC (rev 1952) @@ -217,9 +217,20 @@ this.filterValuesUrl = filterValuesUrl; this.updateOptions = function (oneFilterModel) { - var filter = $.extend({}, self.filter); + +// var filter = $.extend({}, self.filter); +// // on lance la recherche mais on ne prend pas en compte le critère qu'on est en train de modifier comme un filtre +// delete filter[oneFilterModel.filterMapping.filterName]; +// delete filter['filled']; +// +// var data = {}; +// $.each(filter, function (key,value) { +// data['filter.' + key] = value; +// }); + + var filter = WAO.toData($('.filters-form')); // on lance la recherche mais on ne prend pas en compte le critère qu'on est en train de modifier comme un filtre - delete filter[oneFilterModel.filterMapping.filterName]; + delete filter['filter.' + oneFilterModel.filterMapping.filterName]; var successCallback = function (data) { var options = WAO.getNestedPropertyValue(oneFilterModel.filterMapping.filterValuesField, data.filterValues); @@ -346,12 +357,16 @@ var self = this; this.model = oneFilterModel; + this.useSelect2 = true; this.init = function () { var html = '<div class="control-group">' + ' <label class="control-label">' + ' ' + this.model.filterMapping.filterLabel + + ' <button type="button" class="btn btn-link open-button">' + + ' <i class="fa fa-edit"></i>' + + ' </button>' + ' </label>' + ' <div class="controls">' + ' <span class="selected-options-container"></span>' @@ -362,9 +377,6 @@ + ' <i class="fa fa-check"></i>' + ' </button>' + ' </span>' - + ' <button type="button" class="btn btn-link open-button">' - + ' <i class="fa fa-edit"></i>' - + ' </button>' + ' </div>' + '</div>' ; @@ -373,7 +385,6 @@ this.$selectContainer = this.$container.find('.select-container'); this.$select = this.$container.find('select'); - this.$select.select2(); this.$selectedOptionsContainer = this.$container.find('.selected-options-container'); @@ -397,20 +408,50 @@ this.$selectedOptionsContainer.hide(); this.$openButton.hide(); this.$selectContainer.show(); + if (this.useSelect2) { +// this.$select.hide(); + this.$select.select2(); + } }; this.hide = function () { + if (this.useSelect2) { + this.$select.select2('destroy'); + } this.$selectedOptionsContainer.show(); this.$openButton.show(); this.$selectContainer.hide(); }; + this.lockSelection = function () { + if (this.useSelect2) { + //this.$select.select2('destroy'); + this.$select.select2('readonly', true); + } else { + this.$select.attr('readonly', 'readonly'); + } + }; + + this.unlockSelection = function () { + if (this.useSelect2) { + var val = []; + $.each(this.model.selectedOptions, function (index, selectedOption) { + val.push(selectedOption.value); + }); + this.$select.select2('readonly', false); + this.$select.val(val).select2('open'); + } else { + this.$select.removeAttr('readonly'); + } + }; + this.updateOptions = function () { self.$select.empty(); $.each(this.model.options, function (index, option) { var optionHtml = '<option value="' + option.value + '">' + option.label + '</option>'; self.$select.append(optionHtml); }); + this.unlockSelection(); }; this.updateSelectedOptions = function () { @@ -465,6 +506,7 @@ this.open = function () { this.model.updateOptions(); this.view.show(); + this.view.lockSelection(); } this.close = function () {

1 0

r1951 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/administration
by lkaufmann＠users.forge.codelutin.com May 16, 2014

May 16, 2014

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; }

1 0

r1950 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by lkaufmann＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: lkaufmann Date: 2014-05-16 15:31:04 +0200 (Fri, 16 May 2014) New Revision: 1950 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1950 Log: Refs #4997 Contact edit screen layout update & add sticky button to contacts screen Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-16 13:29:12 UTC (rev 1949) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-16 13:31:04 UTC (rev 1950) @@ -303,18 +303,21 @@ <s:set var="fullView" value="%{fullView}"/> -<button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> - <span class="only-in-compact-view"> - <i class="icon-resize-full"></i> <s:text name="wao.ui.action.switchToFullView"/> - </span> - <span class="only-in-full-view"> - <i class="icon-resize-small"></i> <s:text name="wao.ui.action.switchToCompactView"/> - </span> -</button> +<div class="sticky-buttons"> + <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <span class="only-in-compact-view"> + <i class="fa fa-expand"></i><span class="only-on-hover"> <s:text name="wao.ui.action.switchToFullView" /></span> + </span> + <span class="only-in-full-view"> + <i class="fa fa-compress"></i><span class="only-on-hover"> <s:text name="wao.ui.action.switchToCompactView" /></span> + </span> + </button> +</div> + <s:property value="#pagination" escapeHtml="false"/> -<table id="contacts-list" class="contacts-list large-table <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> +<table id="contacts-list" class="contacts-list large-table table-striped <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> <thead> <tr> <th><s:text name="wao.ui.field.Contact.creationDate"/></th> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-16 13:29:12 UTC (rev 1949) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-16 13:31:04 UTC (rev 1950) @@ -67,263 +67,265 @@ }); </script> + <content tag="mainClass">form</content> </head> -<h1> - <s:if test="updateContactCommand.creation"> - <s:text name="wao.ui.contact.creation"/> - </s:if> - <s:else> - <s:text name="wao.ui.contact.edition"/> - </s:else> -</h1> + <div class="form-wrapper"> + <h1> + <s:if test="updateContactCommand.creation"> + <s:text name="wao.ui.contact.creation"/> + </s:if> + <s:else> + <s:text name="wao.ui.contact.edition"/> + </s:else> + </h1> -<aside class="well"> + <aside class="well"> - <h2><s:text name="wao.ui.misc.information"/></h2> + <h2><s:text name="wao.ui.misc.information"/></h2> - <s:text name="wao.ui.form.Contact.contactCreatedOn"> - <s:param value="%{formatDate(updateContactCommand.contact.creationDate)}"/> - </s:text> + <s:text name="wao.ui.form.Contact.contactCreatedOn"> + <s:param value="%{formatDate(updateContactCommand.contact.creationDate)}"/> + </s:text> - <h3><s:text name="wao.ui.field.Contact.boat"/></h3> + <h3><s:text name="wao.ui.field.Contact.boat"/></h3> - <table class="table"> - <tbody> - <tr> - <th> - <s:text name="wao.ui.field.Boat.name"/> - </th> - <td> - <s:property value="updateContactCommand.contact.boat.name"/> - </td> - </tr> - <tr> - <th> - <s:text name="wao.ui.field.Boat.immatriculation"/> - </th> - <td> - <s:property value="updateContactCommand.contact.boat.immatriculation"/> - </td> - </tr> - <tr> - <th> - <s:text name="wao.ui.field.Boat.districtCode"/> - </th> - <td> - <s:property value="updateContactCommand.contact.boat.districtCode"/> - </td> - </tr> - <tr> - <th> - <s:text name="wao.ui.field.Boat.boatLength"/> - </th> - <td> - <s:property value="%{'' + updateContactCommand.contact.boat.boatLength}"/> - </td> - </tr> - <tr> - <th> - <s:text name="wao.ui.field.Boat.buildYear"/> - </th> - <td> - <s:property value="%{'' + updateContactCommand.contact.boat.buildYear}"/> - </td> - </tr> - </tbody> - </table> + <table class="table"> + <tbody> + <tr> + <th> + <s:text name="wao.ui.field.Boat.name"/> + </th> + <td> + <s:property value="updateContactCommand.contact.boat.name"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.immatriculation"/> + </th> + <td> + <s:property value="updateContactCommand.contact.boat.immatriculation"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.districtCode"/> + </th> + <td> + <s:property value="updateContactCommand.contact.boat.districtCode"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.boatLength"/> + </th> + <td> + <s:property value="%{'' + updateContactCommand.contact.boat.boatLength}"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.buildYear"/> + </th> + <td> + <s:property value="%{'' + updateContactCommand.contact.boat.buildYear}"/> + </td> + </tr> + </tbody> + </table> - <h3><s:text name="wao.ui.field.Contact.sampleRow"/></h3> + <h3><s:text name="wao.ui.field.Contact.sampleRow"/></h3> - <table class="table"> - <tbody> - <tr> - <th> - <s:text name="wao.ui.field.SampleRow.profession"/> - </th> - <td> - <s:property value="updateContactCommand.contact.sampleRow.professionDescription"/> - </td> - </tr> - <tr> - <th> - <s:text name="wao.ui.field.SampleRow.programName"/> - </th> - <td> - <s:property value="updateContactCommand.contact.sampleRow.programName"/> - </td> - </tr> - <tr> - <th> - <s:text name="wao.ui.field.SampleRow.periodBegin"/> - </th> - <td> - <s:property value="%{formatMonth(updateContactCommand.contact.sampleRow.periodBegin)}"/> - </td> - </tr> - <tr> - <th> - <s:text name="wao.ui.field.SampleRow.periodEnd"/> - </th> - <td> - <s:property value="%{formatMonth(updateContactCommand.contact.sampleRow.periodEnd)}"/> - </td> - </tr> - </tbody> - </table> + <table class="table"> + <tbody> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.profession"/> + </th> + <td> + <s:property value="updateContactCommand.contact.sampleRow.professionDescription"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.programName"/> + </th> + <td> + <s:property value="updateContactCommand.contact.sampleRow.programName"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.periodBegin"/> + </th> + <td> + <s:property value="%{formatMonth(updateContactCommand.contact.sampleRow.periodBegin)}"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.SampleRow.periodEnd"/> + </th> + <td> + <s:property value="%{formatMonth(updateContactCommand.contact.sampleRow.periodEnd)}"/> + </td> + </tr> + </tbody> + </table> -</aside> + </aside> -<s:form> + <s:form> - <s:hidden name="contactId" value="%{contactId}"/> + <s:hidden name="contactId" value="%{contactId}"/> - <fieldset> - <legend><s:text name="wao.ui.misc.observers"/></legend> + <fieldset> + <legend><s:text name="wao.ui.misc.observers"/></legend> - <s:set name="editObservers" - value="%{authenticatedWaoUser.isAuthorizedToEditContactObservers(updateContactCommand.contact)}"/> + <s:set name="editObservers" + value="%{authenticatedWaoUser.isAuthorizedToEditContactObservers(updateContactCommand.contact)}"/> - <s:select name="updateContactCommand.contact.mainObserver.topiaId" - label="%{getText('wao.ui.field.Contact.mainObserver')}" - list="observers" - emptyOption="true" - disabled="%{!#editObservers}" - cssClass="select2 input-large" - /> + <s:select name="updateContactCommand.contact.mainObserver.topiaId" + label="%{getText('wao.ui.field.Contact.mainObserver')}" + list="observers" + emptyOption="true" + disabled="%{!#editObservers}" + cssClass="select2 input-large" + /> - <s:if test="authenticatedWaoUser.isAuthorizedToDisplayContactSecondaryObservers(updateContactCommand.contact)"> - <s:select name="updateContactCommand.contact.secondaryObservers" - value="%{updateContactCommand.contact.secondaryObserversTopiaIds}" - label="%{getText('wao.ui.field.Contact.secondaryObservers')}" - list="observers" - multiple="true" - disabled="%{!#editObservers}" - cssClass="select2 input-xlarge" - /> - </s:if> + <s:if test="authenticatedWaoUser.isAuthorizedToDisplayContactSecondaryObservers(updateContactCommand.contact)"> + <s:select name="updateContactCommand.contact.secondaryObservers" + value="%{updateContactCommand.contact.secondaryObserversTopiaIds}" + label="%{getText('wao.ui.field.Contact.secondaryObservers')}" + list="observers" + multiple="true" + disabled="%{!#editObservers}" + cssClass="select2 input-xlarge" + /> + </s:if> - </fieldset> + </fieldset> - <%--Do not remove the id (use by contacts page)--%> - <fieldset id="coordinatorOrObserverFocus"> - <legend><s:text name="wao.ui.misc.observationReport"/></legend> + <%--Do not remove the id (use by contacts page)--%> + <fieldset id="coordinatorOrObserverFocus"> + <legend><s:text name="wao.ui.misc.observationReport"/></legend> - <s:set name="editObservationReport" - value="%{authenticatedWaoUser.isAuthorizedToEditObservationReport(updateContactCommand.contact)}"/> + <s:set name="editObservationReport" + value="%{authenticatedWaoUser.isAuthorizedToEditObservationReport(updateContactCommand.contact)}"/> - <s:textfield name="updateContactCommand.contact.observationBeginDate" - label="%{getText('wao.ui.field.Contact.beginDate')}" - placeholder="%{getDateTimePlaceholder()}" - disabled="%{!#editObservationReport}"/> + <s:textfield name="updateContactCommand.contact.observationBeginDate" + label="%{getText('wao.ui.field.Contact.beginDate')}" + placeholder="%{getDateTimePlaceholder()}" + disabled="%{!#editObservationReport}"/> - <s:textfield name="updateContactCommand.contact.observationEndDate" - label="%{getText('wao.ui.field.Contact.endDate')}" - placeholder="%{getDateTimePlaceholder()}" - disabled="%{!#editObservationReport}"/> + <s:textfield name="updateContactCommand.contact.observationEndDate" + label="%{getText('wao.ui.field.Contact.endDate')}" + placeholder="%{getDateTimePlaceholder()}" + disabled="%{!#editObservationReport}"/> - <s:select name="updateContactCommand.contact.contactState" - label="%{getText('wao.ui.field.Contact.contactState')}" - requiredLabel="true" - list="contactStates" - disabled="%{!#editObservationReport}"/> + <s:select name="updateContactCommand.contact.contactState" + label="%{getText('wao.ui.field.Contact.contactState')}" + requiredLabel="true" + list="contactStates" + disabled="%{!#editObservationReport}"/> - <div id="contactStateMotif"> - <s:select name="updateContactCommand.contact.contactStateMotif" - value="%{updateContactCommand.contact.contactState.topiaId}" - label="%{getText('wao.ui.field.Contact.contactStateMotif')}" - list="contactStateMotives" - emptyOption="true" - disabled="%{!#editObservationReport}"/> - </div> + <div id="contactStateMotif"> + <s:select name="updateContactCommand.contact.contactStateMotif" + value="%{updateContactCommand.contact.contactState.topiaId}" + label="%{getText('wao.ui.field.Contact.contactStateMotif')}" + list="contactStateMotives" + emptyOption="true" + disabled="%{!#editObservationReport}"/> + </div> - <s:checkbox name="updateContactCommand.contact.mammalsObservation" - label="%{getText('wao.ui.field.Contact.mammalsObservation')}" - disabled="%{!#editObservationReport}"/> + <s:checkbox name="updateContactCommand.contact.mammalsObservation" + label="%{getText('wao.ui.field.Contact.mammalsObservation')}" + disabled="%{!#editObservationReport}"/> - <s:checkbox name="updateContactCommand.contact.mammalsCapture" - id="mammalsCaptureCheckbox" - label="%{getText('wao.ui.field.Contact.mammalsCapture')}" - disabled="%{!#editObservationReport}"/> + <s:checkbox name="updateContactCommand.contact.mammalsCapture" + id="mammalsCaptureCheckbox" + label="%{getText('wao.ui.field.Contact.mammalsCapture')}" + disabled="%{!#editObservationReport}"/> - <div id="mammalsInfo"> - <s:textarea name="updateContactCommand.contact.mammalsInfo" - label="%{getText('wao.ui.field.Contact.mammalsInfo')}" - disabled="%{!#editObservationReport}"/> - <div class="alert"> - <s:text name="wao.ui.page.ContactForm.mammalsInfo.disclaimer"/> - </div> - </div> + <div id="mammalsInfo"> + <s:textarea name="updateContactCommand.contact.mammalsInfo" + label="%{getText('wao.ui.field.Contact.mammalsInfo')}" + disabled="%{!#editObservationReport}"/> + <div class="alert"> + <s:text name="wao.ui.page.ContactForm.mammalsInfo.disclaimer"/> + </div> + </div> - <s:textfield name="updateContactCommand.contact.dataInputDate" - label="%{getText('wao.ui.field.Contact.dataInputDate')}" - placeholder="%{getDatePlaceholder()}" - disabled="%{!#editObservationReport}"/> + <s:textfield name="updateContactCommand.contact.dataInputDate" + label="%{getText('wao.ui.field.Contact.dataInputDate')}" + placeholder="%{getDatePlaceholder()}" + disabled="%{!#editObservationReport}"/> - <s:select name="updateContactCommand.contact.observedDataControl" - label="%{getText('wao.ui.field.Contact.observedDataControl')}" - list="observedDataControls" - emptyOption="true" - disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinator}"/> + <s:select name="updateContactCommand.contact.observedDataControl" + label="%{getText('wao.ui.field.Contact.observedDataControl')}" + list="observedDataControls" + emptyOption="true" + disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinator}"/> - <s:textfield name="updateContactCommand.contact.restitution" - label="%{getText('wao.ui.field.Contact.restitution')}" - placeholder="%{getDatePlaceholder()}" - disabled="%{!#editObservationReport}"/> + <s:textfield name="updateContactCommand.contact.restitution" + label="%{getText('wao.ui.field.Contact.restitution')}" + placeholder="%{getDatePlaceholder()}" + disabled="%{!#editObservationReport}"/> - <s:textarea name="updateContactCommand.contact.comment" - label="%{getText('wao.ui.field.Contact.comment')}" - placeholder="%{getText('wao.ui.misc.noComment')}" - disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinatorOrObserver}"/> + <s:textarea name="updateContactCommand.contact.comment" + label="%{getText('wao.ui.field.Contact.comment')}" + placeholder="%{getText('wao.ui.misc.noComment')}" + disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinatorOrObserver}"/> - <s:textarea name="updateContactCommand.contact.commentCoordinator" - label="%{getText('wao.ui.field.Contact.commentCoordinator')}" - placeholder="%{getText('wao.ui.misc.noComment')}" - disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinator}"/> + <s:textarea name="updateContactCommand.contact.commentCoordinator" + label="%{getText('wao.ui.field.Contact.commentCoordinator')}" + placeholder="%{getText('wao.ui.misc.noComment')}" + disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinator}"/> - </fieldset> + </fieldset> - <%--Do not remove the id (use by contacts page)--%> - <fieldset id="adminFocus"> - <legend><s:text name="wao.ui.form.programEvaluation"/></legend> + <%--Do not remove the id (use by contacts page)--%> + <fieldset id="adminFocus"> + <legend><s:text name="wao.ui.form.programEvaluation"/></legend> - <s:if test="authenticatedWaoUser.authorizedToDisplayContactDataReliability"> - <s:select name="updateContactCommand.contact.dataReliability" - label="%{getText('wao.ui.field.Contact.dataReliability')}" - list="dataReliabilities" - emptyOption="true" - disabled="%{!authenticatedWaoUser.isAuthorizedToEditContactDataReliability(updateContactCommand.contact)}"/> - </s:if> + <s:if test="authenticatedWaoUser.authorizedToDisplayContactDataReliability"> + <s:select name="updateContactCommand.contact.dataReliability" + label="%{getText('wao.ui.field.Contact.dataReliability')}" + list="dataReliabilities" + emptyOption="true" + disabled="%{!authenticatedWaoUser.isAuthorizedToEditContactDataReliability(updateContactCommand.contact)}"/> + </s:if> - <s:textarea name="updateContactCommand.contact.commentAdmin" - label="%{getText('wao.ui.field.Contact.commentAdmin')}" - placeholder="%{getText('wao.ui.misc.noComment')}" - disabled="%{!authenticatedWaoUser.admin}"/> - </fieldset> + <s:textarea name="updateContactCommand.contact.commentAdmin" + label="%{getText('wao.ui.field.Contact.commentAdmin')}" + placeholder="%{getText('wao.ui.misc.noComment')}" + disabled="%{!authenticatedWaoUser.admin}"/> + </fieldset> - <div class="form-actions"> - <s:url action="contacts" id="contactsUrl"/> - <s:a href="%{contactsUrl}" cssClass="btn"> - <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel"/> - </s:a> - <s:if test="authenticatedWaoUser.isAuthorizedToEditContact(updateContactCommand.contact)"> - <s:submit type="button" cssClass="btn"> - <i class="icon-hdd"></i> <s:text name="wao.ui.action.save"/> - </s:submit> - </s:if> + <div class="form-actions"> + <s:url action="contacts" id="contactsUrl"/> + <s:a href="%{contactsUrl}" cssClass="btn"> + <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel"/> + </s:a> + <s:if test="authenticatedWaoUser.isAuthorizedToEditContact(updateContactCommand.contact)"> + <s:submit type="button" cssClass="btn"> + <i class="icon-hdd"></i> <s:text name="wao.ui.action.save"/> + </s:submit> + </s:if> - <s:if - test=" ! updateContactCommand.creation && authenticatedWaoUser.isAuthorizedToDeleteContact(updateContactCommand.contact)"> - <s:url action="delete-contact" id="deleteContactUrl"> - <s:param name="contactId" value="contactId"/> - </s:url> - <s:a href="%{deleteContactUrl}" cssClass="btn pull-right"> - <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteContact"/> - </s:a> - </s:if> + <s:if + test=" ! updateContactCommand.creation && authenticatedWaoUser.isAuthorizedToDeleteContact(updateContactCommand.contact)"> + <s:url action="delete-contact" id="deleteContactUrl"> + <s:param name="contactId" value="contactId"/> + </s:url> + <s:a href="%{deleteContactUrl}" cssClass="btn pull-right"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteContact"/> + </s:a> + </s:if> + </div> + + </s:form> </div> - -</s:form> - </html>

1 0

r1949 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/resources/i18n wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/webapp wao-web/src/main/webapp/WEB-INF/content/obsmer
by lkaufmann＠users.forge.codelutin.com May 16, 2014

May 16, 2014

Author: lkaufmann Date: 2014-05-16 15:29:12 +0200 (Fri, 16 May 2014) New Revision: 1949 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1949 Log: Refs #4997 Change date display in sampling plan table Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-05-16 10:19:41 UTC (rev 1948) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-05-16 13:29:12 UTC (rev 1949) @@ -43,6 +43,12 @@ protected static final String MONTH_PATTERN = "MM/yyyy"; @Deprecated + protected static final String MONTH_ONLY_PATTERN = "MM"; + + @Deprecated + protected static final String YEAR_ONLY_PATTERN = "yyyy"; + + @Deprecated protected static final String DATE_PATTERN = "dd/MM/yyyy"; @Deprecated @@ -92,6 +98,14 @@ public static String formatMonth(Locale locale, Date date) { return I18n.l(locale, "wao.month.formatter", date); } + + public static String formatDateMonth(Locale locale, Date date) { + return I18n.l(locale, "wao.datemonth.formatter", date); + } + + public static String formatDateYear(Locale locale, Date date) { + return I18n.l(locale, "wao.dateyear.formatter", date); + } public static Date parseMonth(Locale locale, String monthYear) throws ParseException { String pattern = I18n.l(locale, "wao.month.parser"); Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-05-16 10:19:41 UTC (rev 1948) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-05-16 13:29:12 UTC (rev 1949) @@ -140,8 +140,10 @@ wao.business.other= wao.date.formatter=%1$td-%1$tm-%1$tY wao.date.parser=dd-MM-yyyy +wao.datemonth.formatter=%1$tm wao.datetime.formatter=%1$td-%1$tm-%1$tY %1$tH\:%1$tM wao.datetime.parser=dd-MM-yyyy HH\:mm +wao.dateyear.formatter=%1$tY wao.month.formatter=%1$tm-%1$tY wao.month.parser=MM-yyyy wao.time.formatter=%1$tH\:%1$tM Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties 2014-05-16 10:19:41 UTC (rev 1948) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties 2014-05-16 13:29:12 UTC (rev 1949) @@ -139,8 +139,10 @@ wao.business.other= wao.date.formatter=%1$td/%1$tm/%1$tY wao.date.parser=dd/MM/yyyy +wao.datemonth.formatter=%1$tm wao.datetime.formatter=%1$td/%1$tm/%1$tY %1$tH\:%1$tM wao.datetime.parser=dd/MM/yyyy HH\:mm +wao.dateyear.formatter=%1$tY wao.month.formatter=%1$tm/%1$tY wao.month.parser=MM/yyyy wao.month.pattern=MM/yyyy Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-05-16 10:19:41 UTC (rev 1948) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-05-16 13:29:12 UTC (rev 1949) @@ -72,6 +72,14 @@ return date == null ? "" : WaoUtils.formatDate(getLocale(), date); } + public String formatDateMonth(Date date) { + return date == null ? "" : WaoUtils.formatDateMonth(getLocale(), date); + } + + public String formatDateYear(Date date) { + return date == null ? "" : WaoUtils.formatDateYear(getLocale(), date); + } + public String formatDateTime(Date date) { return date == null ? "" : WaoUtils.formatDateTime(getLocale(), date); } 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-16 10:19:41 UTC (rev 1948) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-16 13:29:12 UTC (rev 1949) @@ -294,7 +294,8 @@  <s:iterator value="samplingPlan.months" var="month"> <th class="effort <s:if test="isCurrentMonth(#month)"> now</s:if>"> - <s:property value="%{formatMonth(#month)}"/> + <span class="month"><s:property value="%{formatDateMonth(#month)}"/></span> + <span class="year"><s:property value="%{formatDateYear(#month)}"/></span> </th> </s:iterator> <th><s:text name="wao.ui.misc.total"/></th> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-16 10:19:41 UTC (rev 1948) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-16 13:29:12 UTC (rev 1949) @@ -272,6 +272,17 @@ font-size:24px; } +h3 { + background: none repeat scroll 0 0 #E5E5E5; + border-bottom: 1px solid #CCCCCC; + font-family: 'Roboto',sans-serif; + font-size: 18px; + font-weight: normal; + line-height: normal; + margin: 15px 0 5px; + padding: 5px 10px; +} + /** * .large-table */ @@ -295,9 +306,9 @@ padding: 2px; } .large-table thead th { - border: 1px solid #666; - color: #EEE; - background-color: #888; + border: 1px solid #444; + color: #FFF; + background-color: #777; padding: 10px 0; } @@ -311,6 +322,7 @@ color: #b2f0b2; letter-spacing: 0.5px; text-transform: uppercase; + background-color: #666; } /* @@ -332,13 +344,16 @@ </th> */ -.effort.now .mois { - font-size: 24px; +.effort .month { + font-size: 21px; letter-spacing: 1px; display: block; } +.effort .year { + color: #DDD; + padding: 0 3px; +} - /** * Les filtres */ @@ -353,7 +368,8 @@ margin-left: 5px; margin-right: 5px; } -#sampling-plan-filters-form{ +#sampling-plan-filters-form, +#contacts-filters-form { padding-top:20px; background:#f5f5f5 url(images/bg-filtres.jpg) repeat-x 0 bottom; border-bottom:1px solid #CCC; @@ -410,9 +426,11 @@ background: rgba(0,0,0,0.45); color: #FFF; outline: none; + display: block; + margin: 3px 0 0 0; } .sticky-buttons button.btn:hover { - background: rgba(0,0,0,0.65); + background: rgba(0,0,0,0.75); } .sticky-buttons button.btn i.fa { font-size: 18px; @@ -541,6 +559,8 @@ justify-content: space-around; align-items: stretch; flex-wrap: nowrap; + background-color: #F6F6F6; + border-bottom: 1px solid #EEEEEE; } #boats-filters-list-details-layout > div { @@ -667,7 +687,8 @@ /** * Form edition */ -main.form > form { +main.form > form, +main.form > .form-wrapper { background-color: #FFF; border-left: 1px solid #BBB; border-right: 1px solid #BBB; @@ -686,19 +707,24 @@ border-right: 1px solid #BBB; } -main.form form h1 { +main.form form h1, +main.form .form-wrapper h1 { padding: 5px 20px; border-bottom: 2px solid #00B2B2; } main.form form .control-group, -main.form form legend { +main.form .form-wrapper .control-group, +main.form form legend, +main.form .form-wrapper legend{ padding: 0 20px; } -main.form form .form-actions { +main.form form .form-actions, +main.form .form-wrapper .form-actions{ margin: 20px 0 0 0; } -main.form form .form-actions button.btn { +main.form form .form-actions button.btn, +main.form .form-wrapper .form-actions button.btn { float: right; }

1 0