[Suiviobsmer-commits] r727 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp webapp/css
Author: bleny Date: 2010-11-02 21:17:33 +0000 (Tue, 02 Nov 2010) New Revision: 727 Log: add print css for global synthesis Added: trunk/wao-ui/src/main/webapp/css/synthesis-print.css Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-02 19:59:41 UTC (rev 726) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-02 21:17:33 UTC (rev 727) @@ -24,17 +24,17 @@ package fr.ifremer.wao.ui.pages; -import fr.ifremer.wao.bean.GlobalIndicatorValue; -import fr.ifremer.wao.bean.GlobalSynthesisResult; -import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoardingResult; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactAverageReactivity; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStateStatistics; +import fr.ifremer.wao.bean.GlobalIndicatorValue; +import fr.ifremer.wao.bean.GlobalSynthesisResult; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Indicator; @@ -48,6 +48,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.Block; import org.apache.tapestry5.ComponentResources; +import org.apache.tapestry5.RenderSupport; +import org.apache.tapestry5.annotations.Environmental; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; @@ -57,9 +59,9 @@ import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.annotations.Inject; import org.jfree.chart.JFreeChart; -import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; + import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; @@ -81,6 +83,9 @@ @IncludeStylesheet("context:css/synthesis.css") public class Synthesis extends AbstractFilteredPage { + @Environmental + private RenderSupport renderSupport; + @Inject private WaoManager manager; @@ -112,6 +117,8 @@ void setupRender() { // The company of connected user will be contributed to abstractFilteredPage initCompanyFilter(); + + renderSupport.addStylesheetLink("css/synthesis-print.css", "print"); } public SynthesisId getActiveSynthesis() { Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-02 19:59:41 UTC (rev 726) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-02 21:17:33 UTC (rev 727) @@ -354,7 +354,7 @@ </t:block> <!-- GLOBAL SYNTHESIS --> <t:block t:id="globalSynthesis"> - <div > + <div class="print"> <h2>Synthèse globale</h2> <br /> Added: trunk/wao-ui/src/main/webapp/css/synthesis-print.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/synthesis-print.css (rev 0) +++ trunk/wao-ui/src/main/webapp/css/synthesis-print.css 2010-11-02 21:17:33 UTC (rev 727) @@ -0,0 +1,22 @@ + + +* { + font-size: 9pt; +} + +#so-session, #so-menu, #so-footer { + display: none; +} + +#so-synthesis fieldset, /* hide filters */ +#so-synthesis #so-synthesis-menu { + display: none; +} + +td.selected { + background-color: yellow; +} + +td.highlight { + border-width: 3px; +} \ No newline at end of file
participants (1)
-
bleny@users.labs.libre-entreprise.org