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

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

16 May '14

Author: bleny Date: 2014-05-16 12:14:25 +0200 (Fri, 16 May 2014) New Revision: 1947 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1947 Log: init filter values 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 08:55:59 UTC (rev 1946) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-16 10:14:25 UTC (rev 1947) @@ -37,28 +37,28 @@ var filterMappings = [ { - filterName: 'filter.fishingZoneFacadeNames', + filterName: 'fishingZoneFacadeNames', filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>", filterValuesField: 'fishingZoneFacadeNames', }, { - filterName: 'filter.fishingZoneSectorNames', + filterName: 'fishingZoneSectorNames', filterLabel: "<s:text name="wao.ui.field.FishingZone.sectorName"/>", filterValuesField: 'fishingZoneSectorNames', }, { - filterName: 'filter.fishingGearDcfIds', + filterName: 'fishingGearDcfIds', filterLabel: "<s:text name="wao.ui.entity.fishingGearDCF"/>", filterValuesField: 'fishingGearDcfs', }, { - filterName: 'filter.targetSpeciesDcfIds', + filterName: 'targetSpeciesDcfIds', filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>", filterValuesField: 'targetSpeciesDcfs', } ]; - var filter = <s:property value="filter" escapeHtml="false"/>; + filter = <s:property value="filter" escapeHtml="false"/>; sampleRowsFilterController2 = new FilterController2(filterMappings, filter, WAO.OBSMER_SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form fieldset.toto')); sampleRowsFilterController2.init(); Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-05-16 08:55:59 UTC (rev 1946) +++ trunk/wao-web/src/main/webapp/wao.js 2014-05-16 10:14:25 UTC (rev 1947) @@ -226,7 +226,25 @@ oneFilterModel.setOptions(options); } WAO.get(this.filterValuesUrl, filter, successCallback); + }; + + this.onSelectedOptionsUpdated = function (oneFilterModel) { + var filterValues = []; + $.each(oneFilterModel.selectedOptions, function (index, selectedOption) { + filterValues.push(selectedOption.value); + }); + this.filter[oneFilterModel.filterMapping.filterName] = filterValues; + }; + + this.setFilter = function (filter) { + this.filter = filter; + $(self).trigger('filter-updated', [ this.filter ]); + }; + + this.init = function () { + } + }; var FilterView2 = function (filterModel, $filtersForm) { @@ -252,6 +270,9 @@ this.init = function () { + this.model.init(); + this.view.init(); + $.each(this.model.filterMappings, function (index, filterMapping) { var oneFilterController = new OneFilterController(filterMapping, self.model); @@ -259,8 +280,18 @@ self.view.$filtersForm.append(oneFilterController.view.$container); + $(oneFilterController.model).on('selected-options-updated', function (event, oneFilterModel) { + self.model.onSelectedOptionsUpdated(oneFilterModel); + }); + + $(self.model).on('filter-updated', function (event, filter) { + oneFilterController.model.onFilterUpdated(filter); + }); + }); + $(this.model).trigger('filter-updated', [ this.model.filter ]); + }; }; @@ -280,22 +311,18 @@ this.setOptions = function (options) { this.options = options; - $(self).trigger('options-updated'); - } + $(self).trigger('options-updated', [ self ]); + }; this.setSelectedOptions = function (selectedOptions) { this.selectedOptions = selectedOptions; - var filterValue = []; - $.each(selectedOptions, function (index, selectedOption) { - filterValue.push(selectedOption.value); - }); - this.filterModel.filter[this.filterMapping.filterName] = filterValue; - } + $(self).trigger('selected-options-updated', [ self ]); + }; - this.init = function () { - var filterValues = WAO.getNestedPropertyValue(this.filterMapping.filterName, this.filterModel); + this.onFilterUpdated = function (filter) { + var selectedOptions = []; + var filterValues = WAO.getNestedPropertyValue(this.filterMapping.filterName, filter); if (filterValues) { - var selectedOptions = []; $.each(filterValues, function (index, filterValue) { selectedOptions.push({ value: filterValue, @@ -303,8 +330,13 @@ label: filterValue, }); }); - this.selectedOptions = selectedOptions; } + this.selectedOptions = selectedOptions; + $(self).trigger('selected-options-updated2', [ self ]); + }; + + this.init = function () { + //this.onFilterUpdated(); } }; @@ -324,7 +356,7 @@ + ' <div class="controls">' + ' <span class="selected-options-container"></span>' + ' <span class="select-container">' - + ' <select name="' + this.model.filterMapping.filterName + '" multiple="multiple" class="input-large">' + + ' <select name="filter.' + this.model.filterMapping.filterName + '" multiple="multiple" class="input-large">' + ' </select>' + ' <button type="button" class="btn btn-link close-button">' + ' <i class="fa fa-check"></i>' @@ -354,6 +386,10 @@ self.updateOptions(); }); + $(this.model).on('selected-options-updated2', function () { + self.updateSelectedOptions(); + }); + this.hide(); };

1 0

r1946 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com 16 May '14

16 May '14

Author: bleny Date: 2014-05-16 10:55:59 +0200 (Fri, 16 May 2014) New Revision: 1946 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1946 Log: init filter values Modified: trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-05-15 16:11:05 UTC (rev 1945) +++ trunk/wao-web/src/main/webapp/wao.js 2014-05-16 08:55:59 UTC (rev 1946) @@ -292,6 +292,21 @@ this.filterModel.filter[this.filterMapping.filterName] = filterValue; } + this.init = function () { + var filterValues = WAO.getNestedPropertyValue(this.filterMapping.filterName, this.filterModel); + if (filterValues) { + var selectedOptions = []; + $.each(filterValues, function (index, filterValue) { + selectedOptions.push({ + value: filterValue, + // TODO brendan 16/05/14 get label + label: filterValue, + }); + }); + this.selectedOptions = selectedOptions; + } + } + }; var OneFilterView = function (oneFilterModel) { @@ -387,6 +402,7 @@ this.init = function () { + this.model.init(); this.view.init(); this.view.$select.change(function () {

1 0

r1945 - in trunk/wao-web/src/main: resources/fr/ifremer/wao/web/action/obsmer webapp webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 15 May '14

15 May '14

Author: bleny Date: 2014-05-15 18:11:05 +0200 (Thu, 15 May 2014) New Revision: 1945 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1945 Log: refs #4483 trying a new filtering UX Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/wao.js Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties (rev 0) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties 2014-05-15 16:11:05 UTC (rev 1945) @@ -0,0 +1 @@ +filter=org.nuiton.web.struts2.converters.JsonConverter 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 14:55:00 UTC (rev 1944) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-15 16:11:05 UTC (rev 1945) @@ -32,9 +32,37 @@ $(document).ready(function () { - var sampleRowsFilterController = new FilterController(WAO.OBSMER_SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); - sampleRowsFilterController.init(); + // var sampleRowsFilterController = new FilterController(WAO.OBSMER_SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); + // sampleRowsFilterController.init(); + var filterMappings = [ + { + filterName: 'filter.fishingZoneFacadeNames', + filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>", + filterValuesField: 'fishingZoneFacadeNames', + }, + { + filterName: 'filter.fishingZoneSectorNames', + filterLabel: "<s:text name="wao.ui.field.FishingZone.sectorName"/>", + filterValuesField: 'fishingZoneSectorNames', + }, + { + filterName: 'filter.fishingGearDcfIds', + filterLabel: "<s:text name="wao.ui.entity.fishingGearDCF"/>", + filterValuesField: 'fishingGearDcfs', + }, + { + filterName: 'filter.targetSpeciesDcfIds', + filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>", + filterValuesField: 'targetSpeciesDcfs', + } + ]; + + var filter = <s:property value="filter" escapeHtml="false"/>; + + sampleRowsFilterController2 = new FilterController2(filterMappings, filter, WAO.OBSMER_SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form fieldset.toto')); + sampleRowsFilterController2.init(); + $('#switch-estimated-real').click(function () { $('#switch-estimated-real').toggleClass('show-estimated').toggleClass('show-real'); $('table.sampling-plan').toggleClass('show-estimated').toggleClass('show-real'); @@ -84,6 +112,7 @@ </fieldset> +<%-- <fieldset class="filters-group"> <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> @@ -151,7 +180,12 @@ dataBinding="targetSpeciesDcfs" /> </fieldset> +--%> + <fieldset class="toto"> + + </fieldset> + <div class="form-actions"> <s:submit type="button" cssClass="btn btn-primary"> Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-05-15 14:55:00 UTC (rev 1944) +++ trunk/wao-web/src/main/webapp/wao.js 2014-05-15 16:11:05 UTC (rev 1945) @@ -208,6 +208,221 @@ }; +var FilterModel2 = function (filterMappings, filter, filterValuesUrl) { + + var self = this; + + this.filterMappings = filterMappings; + this.filter = filter; + this.filterValuesUrl = filterValuesUrl; + + this.updateOptions = function (oneFilterModel) { + 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]; + + var successCallback = function (data) { + var options = WAO.getNestedPropertyValue(oneFilterModel.filterMapping.filterValuesField, data.filterValues); + oneFilterModel.setOptions(options); + } + WAO.get(this.filterValuesUrl, filter, successCallback); + } +}; + +var FilterView2 = function (filterModel, $filtersForm) { + + var self = this; + + this.model = filterModel; + this.$filtersForm = $filtersForm; + + this.init = function () { + + } + +}; + + +var FilterController2 = function (filterMappings, filter, filterValuesUrl, $filtersForm) { + + var self = this; + + this.model = new FilterModel2(filterMappings, filter, filterValuesUrl); + this.view = new FilterView2(this.model, $filtersForm); + + this.init = function () { + + $.each(this.model.filterMappings, function (index, filterMapping) { + + var oneFilterController = new OneFilterController(filterMapping, self.model); + oneFilterController.init(); + + self.view.$filtersForm.append(oneFilterController.view.$container); + + }); + + }; + +}; + +var OneFilterModel = function (filterMapping, filterModel) { + + var self = this; + + this.filterMapping = filterMapping; + this.options = []; + this.selectedOptions = []; + this.filterModel = filterModel; + + this.updateOptions = function () { + this.filterModel.updateOptions(self); + }; + + this.setOptions = function (options) { + this.options = options; + $(self).trigger('options-updated'); + } + + this.setSelectedOptions = function (selectedOptions) { + this.selectedOptions = selectedOptions; + var filterValue = []; + $.each(selectedOptions, function (index, selectedOption) { + filterValue.push(selectedOption.value); + }); + this.filterModel.filter[this.filterMapping.filterName] = filterValue; + } + +}; + +var OneFilterView = function (oneFilterModel) { + + var self = this; + + this.model = oneFilterModel; + + this.init = function () { + + var html = '<div class="control-group">' + + ' <label class="control-label">' + + ' ' + this.model.filterMapping.filterLabel + + ' </label>' + + ' <div class="controls">' + + ' <span class="selected-options-container"></span>' + + ' <span class="select-container">' + + ' <select name="' + this.model.filterMapping.filterName + '" multiple="multiple" class="input-large">' + + ' </select>' + + ' <button type="button" class="btn btn-link close-button">' + + ' <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>' + ; + + this.$container = $(html); + + this.$selectContainer = this.$container.find('.select-container'); + this.$select = this.$container.find('select'); + this.$select.select2(); + + this.$selectedOptionsContainer = this.$container.find('.selected-options-container'); + + this.$openButton = this.$container.find('button.open-button'); + this.$closeButton = this.$container.find('button.close-button'); + + this.updateSelectedOptions(); + + $(this.model).on('options-updated', function () { + self.updateOptions(); + }); + + this.hide(); + }; + + this.show = function () { + this.$selectedOptionsContainer.hide(); + this.$openButton.hide(); + this.$selectContainer.show(); + }; + + this.hide = function () { + this.$selectedOptionsContainer.show(); + this.$openButton.show(); + this.$selectContainer.hide(); + }; + + 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.updateSelectedOptions = function () { + var selectedOptions = self.model.selectedOptions; + self.$selectedOptionsContainer.empty(); + if (selectedOptions.length === 0) { + self.$selectedOptionsContainer.append("Pas de filtrage"); + } else { + var $ul = $('<ul></ul>'); + $.each(selectedOptions, function (index, selectedOption) { + $ul.append('<li>' + selectedOption.label + '</li>'); + }); + self.$selectedOptionsContainer.append($ul); + } + } + +}; + +var OneFilterController = function (filterMapping, filterModel) { + + var self = this; + + this.model = new OneFilterModel(filterMapping, filterModel); + this.view = new OneFilterView(this.model); + + this.init = function () { + + this.view.init(); + + this.view.$select.change(function () { + var val = self.view.$select.val(); + var selectedOptions = []; + $.each(self.model.options, function (index, option) { + if ($.inArray(option.value, val) !== -1) { + selectedOptions.push(option); + } + }); + self.model.setSelectedOptions(selectedOptions); + }); + + this.view.$closeButton.click(function () { + self.close(); + }); + + this.view.$openButton.click(function () { + self.open(); + }); + + }; + + this.open = function () { + this.model.updateOptions(); + this.view.show(); + } + + this.close = function () { + this.view.updateSelectedOptions(); + this.view.hide(); + } + +}; + + var Wao = function () { var self = this;

1 0

r1944 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer
by lkaufmann＠users.forge.codelutin.com 15 May '14

15 May '14

Author: lkaufmann Date: 2014-05-15 16:55:00 +0200 (Thu, 15 May 2014) New Revision: 1944 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1944 Log: Refs #4997 : Update display for boats screen Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-05-15 14:33:21 UTC (rev 1943) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-05-15 14:55:00 UTC (rev 1944) @@ -222,6 +222,7 @@ </div> <div> + <div class="arrow-right"></div> <h2> <s:text name="wao.ui.boats.title"> <s:param value="%{pagination.nbRecords}"/> @@ -349,6 +350,7 @@ <s:if test="authenticatedWaoUser.authorizedToViewBoatDetails"> <div> + <div class="arrow-right"></div> <div id="boat-details"> <div class="alert alert-info"> <s:text name="wao.ui.tip.youMustChooseBoat" /> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-15 14:33:21 UTC (rev 1943) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-15 14:55:00 UTC (rev 1944) @@ -544,17 +544,38 @@ } #boats-filters-list-details-layout > div { - margin-left: 50px; + padding: 0 20px 0 30px; + border-right: 1px solid #AAA; + position: relative; } #boats-filters-list-details-layout > div:nth-child(1) { padding-top: 60px; + background: #DEDEDE; } +#boats-filters-list-details-layout > div:nth-child(2) { + background: #E6E6E6; +} + #boats-filters-list-details-layout > div:nth-child(3) { /*max-width: 35%;*/ flex: 1; + background: #EEEEEE; + border-right: 0; } + +#boats-filters-list-details-layout .arrow-right { + position: absolute; + top: 20px; + left: 0; + width: 0; + height: 0; + border-top: 10px solid transparent; + border-bottom: 10px solid transparent; + border-left: 10px solid #BBB; +} + #editor { max-height: 250px; height: 250px;

1 0

r1943 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/administration WEB-INF/content/obsmer WEB-INF/decorators
by lkaufmann＠users.forge.codelutin.com 15 May '14

15 May '14

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

1 0

r1942 - trunk/wao-web/src/main/webapp
by lkaufmann＠users.forge.codelutin.com 15 May '14

15 May '14

Author: lkaufmann Date: 2014-05-15 15:42:22 +0200 (Thu, 15 May 2014) New Revision: 1942 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1942 Log: Refs #4997 Sticky notifications Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-15 13:28:50 UTC (rev 1941) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-15 13:42:22 UTC (rev 1942) @@ -412,6 +412,28 @@ display: inherit; } +/** + * Les notifications + */ +#notifications { + position: fixed; + right: 0; + top: 40px; +} + +#notifications .alert { + margin: 2px 10px 5px; + 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; +} + /****************************************************************************** * Styles spécifiques pour certaines pages de l'appli *****************************************************************************/

1 0

r1941 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer
by lkaufmann＠users.forge.codelutin.com 15 May '14

15 May '14

Author: lkaufmann Date: 2014-05-15 15:28:50 +0200 (Thu, 15 May 2014) New Revision: 1941 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1941 Log: Refs #4997 Add fixed icons for sampling plans table 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/sampling-plan.jsp trunk/wao-web/src/main/webapp/wao.css 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-14 15:25:19 UTC (rev 1940) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-05-15 13:28:50 UTC (rev 1941) @@ -37,6 +37,7 @@ }); }); </script> + <content tag="mainClass">news</content> </head> 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-14 15:25:19 UTC (rev 1940) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-15 13:28:50 UTC (rev 1941) @@ -156,23 +156,28 @@ </div> </s:form> - - <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> - - <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> - <button type="button" id="switch-estimated-real" class="btn show-estimated"> - <i class="icon-adjust"></i> - <span class="estimated"><s:text name="wao.ui.action.viewReal" /></span> - <span class="real"><s:text name="wao.ui.action.viewEstimated" /></span> + + <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> - </s:if> + + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + <button type="button" id="switch-estimated-real" class="btn show-estimated"> + <span class="estimated"> + <i class="fa fa-adjust"></i><span class="only-on-hover"> <s:text name="wao.ui.action.viewReal" /></span> + </span> + <span class="real"> + <i class="fa fa-adjust"></i><span class="only-on-hover"> <s:text name="wao.ui.action.viewEstimated" /></span> + </span> + </button> + </s:if> + </div> <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> <s:url action="edit-sample-row!input" id="createSampleRow" /> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-14 15:25:19 UTC (rev 1940) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-15 13:28:50 UTC (rev 1941) @@ -153,7 +153,8 @@ max-width: 100%; } -main.home { +main.home, +main.news { background-color:#efefef; max-width: 100%; } @@ -184,10 +185,9 @@ color: #00b2b2; display: block; float: left; - font-size: 30px; + font-size: 27px; font-weight: 200; - margin-left: -20px; - padding: 10px 20px; + padding: 9px 40px; font-family: 'Roboto', sans-serif; font-weight:bold; text-decoration: none; @@ -288,8 +288,9 @@ padding: 2px; } .large-table thead th { - border: 1px solid #CCCCCC; - color: #4A4A4A; + border: 1px solid #666; + color: #EEE; + background-color: #888; padding: 10px 0; } @@ -300,7 +301,7 @@ } .large-table thead th.firstline { - color: #2F4F4F; + color: #b2f0b2; letter-spacing: 0.5px; text-transform: uppercase; } @@ -352,7 +353,7 @@ } /** - * Les bouttons + * Les boutons */ button.#sampling-plan-filters-form_0 { font-family: Arial, Helvetica, sans-serif; @@ -388,6 +389,29 @@ background-color: #007070; } +.sticky-buttons { + position: fixed; + left: 20px; + bottom: 20px; +} +.sticky-buttons button.btn { + background: rgba(0,0,0,0.45); + color: #FFF; + outline: none; +} +.sticky-buttons button.btn:hover { + background: rgba(0,0,0,0.65); +} +.sticky-buttons button.btn i.fa { + font-size: 18px; +} +.sticky-buttons button.btn .only-on-hover { + display: none; +} +.sticky-buttons button.btn:hover .only-on-hover { + display: inherit; +} + /****************************************************************************** * Styles spécifiques pour certaines pages de l'appli *****************************************************************************/ @@ -584,3 +608,27 @@ main.home .buttons-area a { float: right; } + +/** + * News edition + */ +main.news form { + background-color: #FFF; + border-left: 1px solid #BBB; + border-right: 1px solid #BBB; + border-bottom: 1px solid #EEE; + margin: 0 auto; + max-width: 968px; + padding-top: 40px; +} + +main.news form .control-group { + padding: 0 20px; +} + +main.news form .form-actions { + margin: 20px 0 0 0; +} +main.news form .form-actions button.btn { + float: right; +}

1 0

r1940 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com 14 May '14

14 May '14

Author: bleny Date: 2014-05-14 17:25:19 +0200 (Wed, 14 May 2014) New Revision: 1940 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1940 Log: refs #4481 do not remove tms_version in 4.0 migration, wait for 4.1 Added: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql Removed: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql Deleted: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql 2014-05-14 13:28:09 UTC (rev 1939) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql 2014-05-14 15:25:19 UTC (rev 1940) @@ -1,18 +0,0 @@ - --- we no longer user topia migration service -drop table tms_version; - --- Il y a des doublons dans la table qui stocke les informations sur le lien entre ligne du plan et navires éligibles. --- Un même navire peut être associé en tant qu'éligible plusieurs fois. --- On rectifie le tir en supprimant les doublons et en ajoutant une contrainte d'unicité - -delete from elligibleboat -where topiaId in ( select eb.topiaId - from elligibleboat eb - where eb.sampleRow in (select eb2.samplerow from elligibleboat eb2 group by samplerow, boat having count(topiaId) > 1) - and eb.boat in (select eb2.boat from elligibleboat eb2 group by samplerow, boat having count(topiaId) > 1) - and eb.topiaId not in (select eb2.topiaId from elligibleboat eb2 where eb2.boat = eb.boat and eb2.sampleRow = eb.sampleRow order by topiacreatedate desc limit 1)); - -alter table elligibleboat add constraint samplerow_boat_uniqueness unique (boat, samplerow); - - Copied: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql (from rev 1927, trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql) =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql (rev 0) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-14 15:25:19 UTC (rev 1940) @@ -0,0 +1,12 @@ +-- Il y a des doublons dans la table qui stocke les informations sur le lien entre ligne du plan et navires éligibles. +-- Un même navire peut être associé en tant qu'éligible plusieurs fois. +-- On rectifie le tir en supprimant les doublons et en ajoutant une contrainte d'unicité + +delete from elligibleboat +where topiaId in ( select eb.topiaId + from elligibleboat eb + where eb.sampleRow in (select eb2.samplerow from elligibleboat eb2 group by samplerow, boat having count(topiaId) > 1) + and eb.boat in (select eb2.boat from elligibleboat eb2 group by samplerow, boat having count(topiaId) > 1) + and eb.topiaId not in (select eb2.topiaId from elligibleboat eb2 where eb2.boat = eb.boat and eb2.sampleRow = eb.sampleRow order by topiacreatedate desc limit 1)); + +alter table elligibleboat add constraint samplerow_boat_uniqueness unique (boat, samplerow); Added: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql (rev 0) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-05-14 15:25:19 UTC (rev 1940) @@ -0,0 +1,3 @@ + +-- we no longer user topia migration service +drop table tms_version;

1 0

r1939 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 14 May '14

14 May '14

Author: bleny Date: 2014-05-14 15:28:09 +0200 (Wed, 14 May 2014) New Revision: 1939 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1939 Log: refs #4487 remove duplicate filters Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 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-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-05-14 10:26:38 UTC (rev 1938) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-05-14 13:28:09 UTC (rev 1939) @@ -58,8 +58,6 @@ protected SampleRowsFilterValues sampleRowsFilterValues; - protected SortedSet<FilterOption> boatNames = new TreeSet<>(); - protected SortedSet<FilterOption> boatRegistrationCodes = new TreeSet<>(); protected SortedSet<FilterOption> contactStates = new TreeSet<>(); @@ -94,8 +92,7 @@ Boat boat = contact.getBoat(); boatsFilterValues.addBoat(boat); - boatNames.add(FilterOption.forValueAndLabel(boat.getTopiaId(), boat.getDescription())); - boatRegistrationCodes.add(FilterOption.forValueAndLabel(boat.getTopiaId(), String.valueOf(boat.getImmatriculation()))); + boatRegistrationCodes.add(FilterOption.forValueAndLabel(String.valueOf(boat.getImmatriculation()), boat.getDescription())); SampleRow sampleRow = contact.getSampleRow(); sampleRowsFilterValues.addSampleRow(sampleRow); @@ -171,10 +168,6 @@ return sampleRowsFilterValues; } - public SortedSet<FilterOption> getBoatNames() { - return boatNames; - } - public SortedSet<FilterOption> getBoatRegistrationCodes() { return boatRegistrationCodes; } 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-14 10:26:38 UTC (rev 1938) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-14 13:28:09 UTC (rev 1939) @@ -126,16 +126,8 @@ <fieldset> - <s:select name="filter.boatFilter.boatIds" - label="%{getText('wao.ui.contacts.boatName')}" - list="filterValues.boatNames" - listKey="value" - listValue="label" - multiple="true" - dataBinding="boatNames"/> - <s:select name="filter.boatFilter.registrationCode" - label="%{getText('wao.ui.field.Boat.immatriculation')}" + label="%{getText('wao.ui.field.Contact.boat')}" list="filterValues.boatRegistrationCodes" listKey="value" listValue="label" 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-14 10:26:38 UTC (rev 1938) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-14 13:28:09 UTC (rev 1939) @@ -54,7 +54,7 @@ var showHideContactStateMotif = function () { var contactState = $contactStateSelect.val(); - if (contactState === 'CONTACT_REFUSED' || contactState == 'CONTACT_DEFINITELY_REFUSED') { + if (contactState === 'CONTACT_REFUSED' || contactState === 'CONTACT_DEFINITELY_REFUSED') { $contactStateMotif.show(); } else { $contactStateMotif.hide();

1 0

r1938 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 14 May '14

14 May '14

Author: bleny Date: 2014-05-14 12:26:38 +0200 (Wed, 14 May 2014) New Revision: 1938 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1938 Log: remove some fixed todo tags Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-14 08:13:27 UTC (rev 1937) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-14 10:26:38 UTC (rev 1938) @@ -202,11 +202,9 @@ } else { - //TODO Contact contact = new ContactImpl(); - contact.setObsProgram(ObsProgram.OBSMER); - contact.setDataReliability(DataReliability.UNKNOWN); + contact.setObsProgram(authenticatedWaoUser.getObsProgram()); updateContactCommand.setContact(contact); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-05-14 08:13:27 UTC (rev 1937) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-05-14 10:26:38 UTC (rev 1938) @@ -34,7 +34,6 @@ import fr.ifremer.wao.services.service.ObsMerContactsService; import fr.ifremer.wao.services.service.PaginationBean; import fr.ifremer.wao.web.WaoJspActionSupport; -import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.time.DateUtils; import org.nuiton.topia.persistence.pager.TopiaPagerBean; @@ -144,14 +143,6 @@ return ContactState.OBSERVATION_DONE == contact.getContactState(); } - //FIXME Use ellipse - public String getCommentDisplayText(String comment) { - if (comment != null && comment.length() > 20) { - return comment.substring(0, 20) + "..."; - } - return comment; - } - public String getDivision(SampleRow sampleRow) { String result = ""; for (FishingZone zone : sampleRow.getFishingZone()) { @@ -160,14 +151,6 @@ return result; } - //FIXME - public String getTooltipText(String input) { - if (input != null) { - return input.replaceAll("\n", "<br />").replaceAll("\r", ""); - } - return ""; - } - /** * Devrait résoudre un problème que pose le composant ck/tooltip. * <p/> @@ -182,29 +165,6 @@ return result; } - public String getContactCssClass(Contact contact) { - // TODO brendan 23/04/14 revoir la logique - boolean admin = getAuthenticatedWaoUser().isAdmin(); - String result = ""; - boolean accepted = BooleanUtils.isTrue(contact.getValidationProgram()) || - (!admin && BooleanUtils.isTrue(contact.getValidationCompany())); - - ContactState state = contact.getContactState(); - if (BooleanUtils.isFalse(contact.getValidationProgram()) || - (!admin && BooleanUtils.isFalse(contact.getValidationCompany()))) { - result = "refused"; - } else if (accepted && state.equals(ContactState.OBSERVATION_DONE)) { - result = "accepted"; - } else if (accepted && state.isUnfinishedState()) { - result = "unfinished"; - } else if (state.isFinalState()) { - result = "even"; - } else { - result = "odd"; - } - return result; - } - public String getContactToHighlightId() { return session.getContactToHighlightId(); } 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-14 08:13:27 UTC (rev 1937) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-14 10:26:38 UTC (rev 1938) @@ -355,7 +355,7 @@ <tbody> <s:iterator value="contacts" var="contact"> - <tr class="contact-row <s:property value="getContactCssClass(#contact)"/><s:if test="topiaId.equals(contactToHighlightId)"> highlight</s:if>"> + <tr class="contact-row<s:if test="topiaId.equals(contactToHighlightId)"> highlight</s:if>"> <td> <s:property value="creationDate"/> </td>

1 0