Author: bleny Date: 2014-03-27 17:51:58 +0100 (Thu, 27 Mar 2014) New Revision: 1769 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1769 Log: refs #4483 prepare compact/full view switch 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/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/css/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-03-27 16:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-27 16:51:58 UTC (rev 1769) @@ -69,12 +69,16 @@ wao.ui.action.save.success=Modifications saved wao.ui.action.showDetails=Show details wao.ui.action.showFilters=Show filters +wao.ui.action.switchToCompactView=Switch to compact view +wao.ui.action.switchToFullView=Switch to full view wao.ui.action.unvalidateContact=Unvalidate contact wao.ui.action.viewAssociatedContacts=View sample row contacts wao.ui.action.viewBoatsForRow=View the boats for this sample row wao.ui.action.viewCompanyWaoUsers=View users for this company wao.ui.action.viewElligibleBoats=View eligible boats +wao.ui.action.viewEstimated=View estimated observation effort wao.ui.action.viewIndicatorsHistory=View indicators historic +wao.ui.action.viewReal=View real observation effort wao.ui.action.viewSampleRowLog=View sample row log wao.ui.actions=Actions wao.ui.boatList=List of %s boats 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-03-27 16:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-27 16:51:58 UTC (rev 1769) @@ -69,12 +69,16 @@ wao.ui.action.save.success=Les informations ont bien été enregistrées wao.ui.action.showDetails=Voir les détails wao.ui.action.showFilters=Afficher les filtres +wao.ui.action.switchToCompactView=Réduire la vue +wao.ui.action.switchToFullView=Étendre la vue wao.ui.action.unvalidateContact=Invalider le contact wao.ui.action.viewAssociatedContacts=Voir les contacts associés à cette ligne wao.ui.action.viewBoatsForRow=Voir les navires présentis pour cette ligne wao.ui.action.viewCompanyWaoUsers=Voir les utilisateurs associés à cette société wao.ui.action.viewElligibleBoats=Consulter les navires éligibles +wao.ui.action.viewEstimated=Voir l'effort d'observation estimé wao.ui.action.viewIndicatorsHistory=Voir l'historique des modifications des indicateurs +wao.ui.action.viewReal=Voir l'effort d'observation réalisé wao.ui.action.viewSampleRowLog=Consulter l'historique de cette ligne wao.ui.actions=Actions wao.ui.boatList=Liste de %s navires 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-27 16:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-27 16:51:58 UTC (rev 1769) @@ -37,12 +37,19 @@ var sampleRowsFilterController = new SampleRowsFilterController(SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); sampleRowsFilterController.init(); + var fullView = <s:property value="fullView" />; + $('#switch-estimated-real').click(function () { $('#switch-estimated-real').toggleClass('show-estimated').toggleClass('show-real'); $('table.sampling-plan').toggleClass('show-estimated').toggleClass('show-real'); $('.estimated-differ-from-real').effect( "highlight", "slow" ) }); + $('#switch-compact-full-view').click(function () { + $('#switch-compact-full-view').toggleClass('full-view').toggleClass('compact-view'); + $('table.sampling-plan').toggleClass('full-view').toggleClass('compact-view'); + }); + }); </script> @@ -151,11 +158,20 @@ </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-full-view"> + <i class="icon-resize-small"></i> <s:text name="wao.ui.action.switchToFullView" /> + </span> + <span class="only-in-compact-view"> + <i class="icon-resize-full"></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-eye"></i> - <span class="estimated">Voir le réel</span> - <span class="real">Voir l'estimé</span> + <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> </button> </s:if> @@ -175,7 +191,7 @@ <s:set var="nbColumnsForOther" value="6"/> <s:set var="nbColumnsTotal" value="%{#nbColumnsForProfession + #nbColumnsForMonths + #nbColumnsForOther}"/> - <table id="sampling-plan" class="large-table sampling-plan show-estimated"> + <table id="sampling-plan" class="large-table sampling-plan show-estimated <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> <thead> <tr> <th colspan="${nbColumnsForProfession}"> <s:text name="wao.ui.samplingPlan.sampledProfessions" /></th> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-27 16:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-27 16:51:58 UTC (rev 1769) @@ -57,7 +57,7 @@ <li class="active"> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}"> - <i class="icon-tasks"></i> <s:text name="wao.ui.page.SamplingPlan.title" /> + <i class="icon-calendar"></i> <s:text name="wao.ui.page.SamplingPlan.title" /> </s:a> </li> <li> @@ -69,7 +69,7 @@ <li> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="contacts" id="contactsUrl" /> <s:a href="%{contactsUrl}"> - <s:text name="wao.ui.page.Contacts.title" /> + <i class="icon-tasks"></i> <s:text name="wao.ui.page.Contacts.title" /> </s:a> </li> <li> Modified: trunk/wao-web/src/main/webapp/css/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/css/wao.css 2014-03-27 16:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/webapp/css/wao.css 2014-03-27 16:51:58 UTC (rev 1769) @@ -214,7 +214,10 @@ background-color: beige; } -.show-estimated .real, .show-real .estimated { +.compact-view .only-in-full-view, +.full-view .only-in-compact-view, +.show-estimated .real, +.show-real .estimated { display: none; }