Author: bleny Date: 2014-04-16 13:38:40 +0200 (Wed, 16 Apr 2014) New Revision: 1893 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1893 Log: change label for filter action and show button as btn-primary Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.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/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-16 11:38:40 UTC (rev 1893) @@ -57,7 +57,7 @@ wao.ui.action.editOrDeleteSampleRow=Edit or delete sample row wao.ui.action.enlargeView=Enlarge view wao.ui.action.exportBoats=Export boats with private infos -wao.ui.action.filter=Filter +wao.ui.action.filter=Apply filters wao.ui.action.goBackToSamplingPlan=Back to sampling plan wao.ui.action.hideFilters=Hide filters wao.ui.action.login=Connection Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-16 11:38:40 UTC (rev 1893) @@ -57,7 +57,7 @@ wao.ui.action.editOrDeleteSampleRow=Modifier ou supprimer la ligne wao.ui.action.enlargeView=Agrandir la vue wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations privées -wao.ui.action.filter=Filtrer +wao.ui.action.filter=Appliquer les filtres wao.ui.action.goBackToSamplingPlan=Retourner au plan d'échantillonnage wao.ui.action.hideFilters=Masquer les filtres wao.ui.action.login=Connexion 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-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-16 11:38:40 UTC (rev 1893) @@ -152,14 +152,14 @@ <div class="form-actions"> + <s:submit type="button" cssClass="btn btn-primary"> + <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> + </s:submit> + <s:submit action="reset-boats-filter" type="button" cssClass="btn"> <i class="icon-reset"></i> <s:text name="wao.ui.action.reset" /> </s:submit> - <s:submit type="button" cssClass="btn"> - <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> - </s:submit> - <s:submit action="export-boats" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> </s:submit> 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-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-04-16 11:38:40 UTC (rev 1893) @@ -250,14 +250,14 @@ <div class="form-actions"> + <s:submit type="button" cssClass="btn btn-primary"> + <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> + </s:submit> + <s:submit action="reset-contacts-filter" type="button" cssClass="btn"> <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit type="button" cssClass="btn"> - <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> - </s:submit> - <s:submit action="export-contacts" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> </s:submit> 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-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-16 11:38:40 UTC (rev 1893) @@ -141,14 +141,14 @@ <div class="form-actions"> + <s:submit type="button" cssClass="btn btn-primary"> + <i class="icon-filter"></i> <s:text name="wao.ui.action.filter" /> + </s:submit> + <s:submit action="reset-sample-rows-filter" type="button" cssClass="btn"> <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit type="button" cssClass="btn"> - <i class="icon-filter"></i> <s:text name="wao.ui.action.filter" /> - </s:submit> - <s:submit action="export-sampling-plan" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport" /> </s:submit> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/webapp/wao.css 2014-04-16 11:38:40 UTC (rev 1893) @@ -126,10 +126,7 @@ } main.large { - width: 100%; max-width: 100%; - margin-left: 10px; - margin-right: 10px; } /** @@ -147,6 +144,7 @@ margin-top: 0px; border: none; background-color: inherit; + padding-left: 5px; } textarea {