Author: chatellier Date: 2011-01-24 17:12:10 +0000 (Mon, 24 Jan 2011) New Revision: 560 Log: Fix maps size and r?\195?\169partition Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/indicator.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/indicator.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/com/indicator.jsp 2011-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/indicator.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -32,7 +32,7 @@ <h2><s:text name="message.com.title" /></h2> - <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" /> + <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/com/zone.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -36,7 +36,7 @@ <s:iterator value="zonesPictures.entrySet()"> <div id="coserzonemap<s:property value='%{key}' />" style="display:none"> <div> - <img src="<s:url value='/images/zones/' /><s:property value='%{value}' />" style="width: 590px; heigth: 812px"/> + <img src="<s:url value='/images/zones/' /><s:property value='%{value}' />" /> </div> <s:property value='%{zonesMetaInfo.get(key)}' /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/map.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -32,6 +32,8 @@ <h2><s:text name="message.map.title" /></h2> + <p><s:property value='facade' /> - <s:property value='survey' /> - <s:property value='speciesDisplayName' /></p> + <img src="<s:url action='map-data'> <s:param name="survey" value="%{survey}" /> <s:param name="species" value="%{species}" /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp 2011-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -32,7 +32,9 @@ <h2><s:text name="message.map.title" /></h2> - <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" /> + <img src="<s:url action='map-data'> + <s:param name="survey" value="%{survey}" /> + </s:url>" /> <br /> @@ -42,6 +44,7 @@ <s:else> <s:form action="map" method="get"> <s:select name="species" list="species" label="%{getText('message.common.selectspecies')}" /> + <s:hidden name="facade" property="facade"/> <s:hidden name="survey" property="survey"/> <s:submit label="Suite"/> </s:form> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/map/survey.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -42,6 +42,7 @@ <s:else> <s:form action="species" method="get"> <s:select name="survey" list="surveys" label="%{getText('message.common.selectzone')}" /> + <s:hidden name="facade" property="facade"/> <s:submit label="Suite"/> </s:form> </s:else> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp 2011-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/indicator.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -33,7 +33,7 @@ <h2><s:text name="message.pop.title" /></h2> - <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" /> + <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp 2011-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/species.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -33,7 +33,7 @@ <h2><s:text name="message.pop.title" /></h2> - <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" style="width: 590px; heigth: 812px" /> + <img src="<s:url value='/images/zones/' /><s:property value='zonePicture' />" /> <br /> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-01-24 17:11:44 UTC (rev 559) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/pop/zone.jsp 2011-01-24 17:12:10 UTC (rev 560) @@ -36,7 +36,7 @@ <s:iterator value="zonesPictures.entrySet()"> <div id="coserzonemap<s:property value='%{key}' />" style="display:none"> <div> - <img src="<s:url value='/images/zones/' /><s:property value='%{value}' />" style="width: 590px; heigth: 812px"/> + <img src="<s:url value='/images/zones/' /><s:property value='%{value}' />" /> </div> <s:property value='%{zonesMetaInfo.get(key)}' />