Author: bleny Date: 2014-03-31 13:12:10 +0200 (Mon, 31 Mar 2014) New Revision: 1775 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1775 Log: refs #4483 some styles Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/css/wao.css Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-31 09:16:40 UTC (rev 1774) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-31 11:12:10 UTC (rev 1775) @@ -80,7 +80,7 @@ if (waoSession.getAuthenticatedWaoUser() == null) { - boolean loginCheat = true; + boolean loginCheat = getWaoApplicationContext(invocation).getApplicationConfig().isDevMode(); if (loginCheat) { // login à l'arrache WaoUser admin = serviceContext.getPersistenceContext().getWaoUserDao().forLoginEquals("admin").findUnique(); 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-03-31 09:16:40 UTC (rev 1774) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-31 11:12:10 UTC (rev 1775) @@ -76,63 +76,67 @@ <fieldset> - <s:select name="filter.companyIds" - label="%{getText('wao.ui.entity.Company')}" - list="filterValues.companies" - listKey="value" - listValue="label" - multiple="true" - dataBinding="companies" /> + <s:select name="filter.companyIds" + label="%{getText('wao.ui.entity.Company')}" + list="filterValues.companies" + listKey="value" + listValue="label" + multiple="true" + dataBinding="companies" /> - <s:select name="filter.programNames" - label="%{getText('wao.ui.field.SampleRow.programName')}" - list="filterValues.programNames" - listKey="value" - listValue="label" - multiple="true" - dataBinding="programNames" /> + <s:select name="filter.programNames" + label="%{getText('wao.ui.field.SampleRow.programName')}" + list="filterValues.programNames" + listKey="value" + listValue="label" + multiple="true" + dataBinding="programNames" /> - <s:select name="filter.fishingZoneFacadeNames" - label="%{getText('wao.ui.field.FishingZone.facadeName')}" - list="filterValues.fishingZoneFacadeNames" - listKey="value" - listValue="label" - multiple="true" - dataBinding="fishingZoneFacadeNames" /> + <s:select name="filter.sampleRowCodes" + label="%{getText('wao.ui.field.SampleRow.code')}" + list="filterValues.sampleRowCodes" + listKey="value" + listValue="label" + multiple="true" + dataBinding="sampleRowCodes" /> - <s:select name="filter.fishingZoneSectorNames" - label="%{getText('wao.ui.field.FishingZone.sectorName')}" - list="filterValues.fishingZoneSectorNames" - listKey="value" - listValue="label" - multiple="true" - dataBinding="fishingZoneSectorNames" /> + </fieldset> - <s:select name="filter.sampleRowCodes" - label="%{getText('wao.ui.field.SampleRow.code')}" - list="filterValues.sampleRowCodes" - listKey="value" - listValue="label" - multiple="true" - dataBinding="sampleRowCodes" /> + <fieldset> - <s:select name="filter.fishingGearDcfIds" - label="%{getText('wao.ui.entity.fishingGearDCF')}" - list="filterValues.fishingGearDcfs" - listKey="value" - listValue="label" - value="%getText(#value)" - multiple="true" - dataBinding="fishingGearDcfs" /> + <s:select name="filter.fishingZoneFacadeNames" + label="%{getText('wao.ui.field.FishingZone.facadeName')}" + list="filterValues.fishingZoneFacadeNames" + listKey="value" + listValue="label" + multiple="true" + dataBinding="fishingZoneFacadeNames" /> - <s:select name="filter.targetSpeciesDcfIds" - label="%{getText('wao.ui.entity.targetSpeciesDCF')}" - list="filterValues.targetSpeciesDcfs" - listKey="value" - listValue="label" - multiple="true" - dataBinding="targetSpeciesDcfs" /> + <s:select name="filter.fishingZoneSectorNames" + label="%{getText('wao.ui.field.FishingZone.sectorName')}" + list="filterValues.fishingZoneSectorNames" + listKey="value" + listValue="label" + multiple="true" + dataBinding="fishingZoneSectorNames" /> + <s:select name="filter.fishingGearDcfIds" + label="%{getText('wao.ui.entity.fishingGearDCF')}" + list="filterValues.fishingGearDcfs" + listKey="value" + listValue="label" + value="%getText(#value)" + multiple="true" + dataBinding="fishingGearDcfs" /> + + <s:select name="filter.targetSpeciesDcfIds" + label="%{getText('wao.ui.entity.targetSpeciesDCF')}" + list="filterValues.targetSpeciesDcfs" + listKey="value" + listValue="label" + multiple="true" + dataBinding="targetSpeciesDcfs" /> + </fieldset> <div class="form-actions"> Modified: trunk/wao-web/src/main/webapp/css/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/css/wao.css 2014-03-31 09:16:40 UTC (rev 1774) +++ trunk/wao-web/src/main/webapp/css/wao.css 2014-03-31 11:12:10 UTC (rev 1775) @@ -36,7 +36,6 @@ * Des classes à usage transverse *****************************************************************************/ -/* pour représente qu'une entité (société, utilisateur) est inactive */ .highlight { background-color: #ffff99; } @@ -46,6 +45,7 @@ background-color: #ffff99; } +/* pour représente qu'une entité (société, utilisateur) est inactive */ .inactive { text-decoration: line-through; } @@ -88,11 +88,11 @@ display: none; } -.effort .lower-than-expected { +.lower-than-expected { color : red; } -.effort .higher-than-expected { +.higher-than-expected { color : green; }