Author: fdesbois Date: 2010-07-09 09:37:01 +0000 (Fri, 09 Jul 2010) New Revision: 600 Log: Evo #2352 : Cartography for contacts : - Improve css and style Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.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 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-09 09:37:01 UTC (rev 600) @@ -172,9 +172,9 @@ district.getCode(); StringBuilder description = new StringBuilder("\n"). - append(" <p>"). + append(" <h3>"). append(title). - append("</p>\n"). + append("</h3>\n"). append(" <p>"). append(serviceChart.getHtmlImgTag(data, title, false)). append("</p>\n"). 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 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-09 09:37:01 UTC (rev 600) @@ -2,6 +2,7 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.service.ServiceCartography; import fr.ifremer.wao.service.ServiceUser; @@ -26,7 +27,7 @@ * @author fdesbois <fdesbois at codelutin.com> * @version $Id$ */ - at RequiresAuthentication + at RequiresAuthentication({UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) public class Cartography { @SessionState @@ -114,6 +115,11 @@ } void onSuccessFromFilters() { + if (!user.isAdmin()) { + throw new WaoException("Vous n'avez pas les droits nécessaires" + + " pour filtrer sur une société", null); + } + company = companySelectModel.findObject(companyId); } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-07-09 09:37:01 UTC (rev 600) @@ -41,7 +41,7 @@ private static final String PIE_CHART_MINI_TYPE = PROPERTY_TYPE + "p3"; private static final String PIE_CHART_MAXI_TYPE = PROPERTY_TYPE + "p3"; - private static final String PIE_CHART_MINI_SIZE = PROPERTY_SIZE + "32x32"; + private static final String PIE_CHART_MINI_SIZE = PROPERTY_SIZE + "28x28"; private static final String PIE_CHART_MAXI_SIZE = PROPERTY_SIZE + PIE_CHART_MAXI_WIDTH + "x" + PIE_CHART_MAXI_HEIGHT; 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 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-07-09 09:37:01 UTC (rev 600) @@ -71,9 +71,11 @@ <a t:type="pagelink" t:page="index" title="Page d'accueil"> <img src="${asset:context:img/home.png}" alt="Accueil" title="Page d'accueil" /> </a> - <a t:type="pagelink" t:page="cartography" title="Cartes" target="blank"> - <img src="${asset:context:img/cartography.png}" alt="Cartes" title="Cartes"/> - </a> + <t:unless t:test="currentUser.guest"> + <a t:type="pagelink" t:page="cartography" title="Cartes" target="blank"> + <img src="${asset:context:img/cartography.png}" alt="Cartes" title="Cartes"/> + </a> + </t:unless> <a t:type="pagelink" t:page="userProfile" title="Gestion profil"> <img src="${asset:context:img/user.png}" alt="Preferences" title="Gestion profil"/> </a> Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-09 09:37:01 UTC (rev 600) @@ -39,7 +39,6 @@ </head> <body id="so-cartography" onload="init('${url}', '${title}');"> - <div class="clearfix"> <div id="so-cartography-border" class="fleft"> Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-09 09:37:01 UTC (rev 600) @@ -34,10 +34,20 @@ } #so-cartography-map { - width: 1024px; - height: 768px; + width: 700px; + height: 700px; } +#so-cartography-map h3 { + font-size: 0.9em; + font-weight: normal; +} + +#so-cartography-map p { + font-size: 0.7em; +} + + #so-footer { color: white; } Modified: trunk/wao-ui/src/main/webapp/js/cartography.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-09 09:37:01 UTC (rev 600) @@ -49,7 +49,8 @@ // Center on Chateauroux var center = new OpenLayers.LonLat(1.032715,46.637368); - map.setCenter(center, 7); + map.setCenter(center, 6); +// map.zoomToMaxExtent(); } function onPopupClose(event) {