Author: fdesbois Date: 2010-07-08 17:17:46 +0000 (Thu, 08 Jul 2010) New Revision: 595 Log: Evo #2352 : Cartography for contacts : - Improve css Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/webapp/Cartography.tml trunk/wao-ui/src/main/webapp/css/cartography.css trunk/wao-ui/src/main/webapp/js/cartography.js Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java 2010-07-08 17:17:46 UTC (rev 595) @@ -0,0 +1,23 @@ +package fr.ifremer.wao.ui.components; + +import fr.ifremer.wao.WaoProperty; + +import java.util.Calendar; + +/** + * Created: 8 juil. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + * @version $Id$ + */ +public class Footer { + + public String getVersion() { + return WaoProperty.APP_VERSION.getValue(); + } + + public int getCurrentYear() { + Calendar calendar = Calendar.getInstance(); + return calendar.get(Calendar.YEAR); + } +} Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-07-08 17:17:46 UTC (rev 595) @@ -98,11 +98,6 @@ return true; } - public int getCurrentYear() { - Calendar calendar = Calendar.getInstance(); - return calendar.get(Calendar.YEAR); - } - public boolean isDevEnvironment() { return manager.isDevEnvironment(); } @@ -122,10 +117,6 @@ public String getContextPath() { return request.getContextPath(); } - - public String getVersion() { - return WaoProperty.APP_VERSION.getValue(); - } public ConnectedUser getCurrentUser() { return serviceAuthentication.getConnectedUser(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-08 17:17:46 UTC (rev 595) @@ -1,17 +1,24 @@ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.service.ServiceCartography; +import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.ui.data.GenericSelectModel; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.commons.lang.RandomStringUtils; import org.apache.tapestry5.Link; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.services.PageRenderLinkSource; import org.slf4j.Logger; import java.io.IOException; +import java.util.List; /** * Created: 6 juil. 2010 @@ -23,18 +30,44 @@ public class Cartography { @SessionState + @Property private ConnectedUser user; @Inject + private Logger logger; + + @Inject private PageRenderLinkSource pageRender; @Inject - private Logger logger; + private PropertyAccess propertyAccess; + @Inject + private ServiceUser serviceUser; + + @Persist + private GenericSelectModel<Company> companySelectModel; + + @Property + private String companyId; + + @Persist private Company company; private String url; + void setupRender() { + + if (logger.isDebugEnabled()) { + String companyName = getCompany() != null ? getCompany().getName() : null; + logger.debug("Company selected : " + companyName); + } + + if (getCompany() != null) { + companyId = getCompany().getTopiaId(); + } + } + public Company getCompany() { if (company == null && !user.isAdmin() && !user.isGuest()) { company = user.getCompany(); @@ -42,9 +75,22 @@ return company; } + public GenericSelectModel<Company> getCompanySelectModel() throws WaoException { + if (companySelectModel == null) { + List<Company> companies = serviceUser.getCompanies(true); + companySelectModel = new GenericSelectModel<Company>( + companies, + Company.class, + Company.NAME, + Company.TOPIA_ID, + propertyAccess + ); + } + return companySelectModel; + } + public String getUrl() throws IOException { if (url == null) { - String companyId = getCompany() != null ? getCompany().getTopiaId() : null; Link link = pageRender.createPageRenderLinkWithContext( KmlLoader.class, KmlLoader.StrategyValues.CONTACTS, @@ -58,4 +104,17 @@ public String getTitle() { return "Contacts"; } + + public String getPageTitle() { + String title = "Répartition des contacts par quartier des navires"; + if (company != null) { + title += "pour la société " + company.getName(); + } + return title; + } + + void onSuccessFromFilters() { + company = companySelectModel.findObject(companyId); + } } + Added: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml (rev 0) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2010-07-08 17:17:46 UTC (rev 595) @@ -0,0 +1,37 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + <div id="so-footer"> + <p> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" title="Documentation de l'application" target="blank"> + WAO + </a> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" title="Modifications faites pour cette version" target="blank"> + ${version} + </a> - + <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer" target="blank"> + Obsmer + </a> - + <a href="http://www.ifremer.fr/sih" title="Page d'accueil du SIH" target="blank"> + Ifremer SIH + </a> - + <a href="http://www.gnu.org/licenses/gpl.html" title="License GPL v3" target="blank"> + GPLv3 + </a> - Copyright 2009-${currentYear} + <a href="http://www.ifremer.fr" title="Ifremer" target="blank"> + Ifremer</a>, + <a href="http://www.codelutin.com" title="Code Lutin" target="blank"> + Code Lutin + </a> + <!--   - + <a href="https://labs.libre-entreprise.org/tracker/?atid=692&group_id=154&func=browse" title="Bug Tracker"> + Bugs + </a>--> + </p> + <p class="cnil"> + Le site de "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" a fait l'objet d'une déclaration à + la CNIL sous le numéro suivant : 1414476 + </p> + </div> + + +</html> \ No newline at end of file Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-07-08 17:17:46 UTC (rev 595) @@ -136,37 +136,8 @@ <t:body /> </t:if> </div> - <div id="so-footer"> - <p> - <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" title="Documentation de l'application" target="blank"> - WAO - </a> - <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" title="Modifications faites pour cette version" target="blank"> - ${version} - </a> - - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer" target="blank"> - Obsmer - </a> - - <a href="http://www.ifremer.fr/sih" title="Page d'accueil du SIH" target="blank"> - Ifremer SIH - </a> - - <a href="http://www.gnu.org/licenses/gpl.html" title="License GPL v3" target="blank"> - GPLv3 - </a> - Copyright 2009-${currentYear} - <a href="http://www.ifremer.fr" title="Ifremer" target="blank"> - Ifremer</a>, - <a href="http://www.codelutin.com" title="Code Lutin" target="blank"> - Code Lutin - </a> - <!--   - - <a href="https://labs.libre-entreprise.org/tracker/?atid=692&group_id=154&func=browse" title="Bug Tracker"> - Bugs - </a>--> - </p> - <p class="cnil"> - Le site de "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" a fait l'objet d'une déclaration à - la CNIL sous le numéro suivant : 1414476 - </p> - </div> + + <t:footer /> + </body> </html> Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-08 17:17:46 UTC (rev 595) @@ -30,15 +30,50 @@ <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>WAO - Web Applicatif Obsmer : Cartes</title> + <title>WAO - Web Applicatif Obsmer : ${pageTitle}</title> <link rel="stylesheet" type="text/css" href="${asset:context:css/common.css}" /> + <link rel="stylesheet" type="text/css" href="${asset:context:css/main.css}" /> <link rel="stylesheet" type="text/css" href="${asset:context:css/cartography.css}" /> <script type="text/javascript" src="${asset:context:js/cartography.js}"/> <script type="text/javascript" src="${asset:context:js/OpenLayers/OpenLayers.js}"></script> </head> <body id="so-cartography" onload="init('${url}', '${title}');"> - <div id="map"></div> + <div class="clearfix"> + + <div id="so-cartography-border" class="fleft"> + + <div id="so-cartography-icons"> + <span> + <a t:type="pagelink" t:page="index" title="Page d'accueil"> + <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur l'application Wao"/> + </a>  + </span> + <span> + <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> + <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> + </a> + </span> + </div> + + <h1>${pageTitle}</h1> + + <t:if t:test="user.admin"> + <div id="so-cartography-filters"> + <form t:type="form" t:id="filters" action="tapestry"> + <p><label for="company">Société</label> : </p> + <p><input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" onchange="this.form.submit();"/></p> + </form> + </div> + </t:if> + + </div> + + <div id="so-cartography-map" class="fleft"></div> + </div> + + <t:footer /> + </body> </html> Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-08 17:17:46 UTC (rev 595) @@ -5,11 +5,47 @@ Description: Style cheets for cartography page */ -#map { + +#so-cartography { + background: url(../img/background.jpg) repeat-x top left; + background-color: #080824; +} + +#so-cartography-border { + width: 220px; +} + +#so-cartography-border h1 { + font-size: 1.2em; + text-align: center; + color: white; + margin-bottom: 20px; +} + +#so-cartography-icons { + text-align: center; + margin: 20px; + background-color: white; + border: 1px solid black; +} + +#so-cartography-filters { + color: white; +} + +#so-cartography-map { width: 1024px; height: 768px; - border: 1px solid #ccc; - /*width: 100%; - height: 100%; - border: 1px solid #ccc;*/ +} + +#so-footer { + color: white; +} + +#so-footer a { + color: grey !important; +} + +#so-footer a:hover { + color: white !important; } \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/js/cartography.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-08 17:17:46 UTC (rev 595) @@ -4,7 +4,7 @@ var map; function init(url, title) { - map = new OpenLayers.Map('map'); + map = new OpenLayers.Map('so-cartography-map'); var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",