From aa7350e08081835bcf658023604cd478638a5346 Mon Sep 17 00:00:00 2001
From: Oscar Fonts <oscar.fonts@gmail.com>
Date: Wed, 1 Aug 2012 18:18:38 +0200
Subject: [PATCH] Feedback (#1), client side work

---
 pom.xml                                       |   7 +
 .../messages/messages.properties              |  19 +-
 .../messages/messages_en.properties           |  17 +-
 .../messages/messages_fr.properties           |  10 +-
 .../WEB-INF/default_config/static/unredd.css  |  33 +++
 src/main/webapp/WEB-INF/jsp/index.jsp         |  82 +++---
 src/main/webapp/WEB-INF/jsp/messages.jsp      |   2 +-
 .../unreddPortalApplicationContext.xml        |   2 +-
 src/main/webapp/css/toolbar.css               |  42 +++
 src/main/webapp/images/silk/add.png           | Bin 0 -> 733 bytes
 src/main/webapp/images/silk/down.png          | Bin 0 -> 462 bytes
 src/main/webapp/images/silk/pencil.png        | Bin 0 -> 450 bytes
 src/main/webapp/images/silk/readme.txt        |  22 ++
 src/main/webapp/js/toolbar.js                 | 133 +++++++++
 src/main/webapp/js/unredd.js                  | 271 +++++++++++-------
 15 files changed, 489 insertions(+), 151 deletions(-)
 create mode 100644 src/main/webapp/css/toolbar.css
 create mode 100644 src/main/webapp/images/silk/add.png
 create mode 100644 src/main/webapp/images/silk/down.png
 create mode 100644 src/main/webapp/images/silk/pencil.png
 create mode 100644 src/main/webapp/images/silk/readme.txt
 create mode 100644 src/main/webapp/js/toolbar.js

diff --git a/pom.xml b/pom.xml
index f6fda84..aac5299 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,13 @@
 			<scope>compile</scope>
 		</dependency>
 
+		<!-- ReCAPTCHA for Java -->
+		<dependency>
+			<groupId>net.tanesha.recaptcha4j</groupId>
+			<artifactId>recaptcha4j</artifactId>
+			<version>0.0.7</version>
+		</dependency>
+
 		<!-- Geostore -->
 		<dependency>
 			<groupId>it.geosolutions.geostore</groupId>
diff --git a/src/main/webapp/WEB-INF/default_config/messages/messages.properties b/src/main/webapp/WEB-INF/default_config/messages/messages.properties
index 4e34768..b2d5c5b 100644
--- a/src/main/webapp/WEB-INF/default_config/messages/messages.properties
+++ b/src/main/webapp/WEB-INF/default_config/messages/messages.properties
@@ -26,7 +26,6 @@ redd_plus_registry = REDD+ Registry
 biodiversity = Biodiversity
 national_parks = National Parks
 vegetation = Vegetation
-feedback_button = Feedback
 statistics_button = Statistics
 download_button = Download
 identify_button = Identify
@@ -89,9 +88,21 @@ active_fire = Active fire
 burnt_area = Burnt area
 deforestation_drivers = Deforestation drivers
 satisfaction_survey = Satisfaction survey
-feedback_info = Please click on the map to start drawing a polygon. Double click to end drawing and post feedback.
 intact_forest = Intact Forest
 information_note = Information note
 statistics_info = Please click on the map to start drawing a polygon
-survey_url=https://www.surveymonkey.com/s/W8Y38ZZ
-nfms_mailing_list=NFMS mailing list
\ No newline at end of file
+survey_url = https://www.surveymonkey.com/s/W8Y38ZZ
+nfms_mailing_list = NFMS mailing list
+feedback = feedback
+feedback_info = Please click on the map to post feedback
+feedback_button = Feedback
+feedback_text = Use the tools to draw a geographic extent over the map.
+feedback_year = Year
+feedback_title = Send feedback on map contents
+feedback_drawing_tools = Drawing tools
+feedback_query_tooltip = Get features from the selected layer
+feedback_addfeature_tooltip = Add Polygon
+feedback_editfeature_tooltip = Edit Polygon
+feedback_deletepolygon_confirm = Deleting polygon, are you sure?
+invalid_email_title = Invalid e-mail
+invalid_email_text = Your e-mail address is not valid. Please use a valid e-mail address.
diff --git a/src/main/webapp/WEB-INF/default_config/messages/messages_en.properties b/src/main/webapp/WEB-INF/default_config/messages/messages_en.properties
index e167427..231372f 100644
--- a/src/main/webapp/WEB-INF/default_config/messages/messages_en.properties
+++ b/src/main/webapp/WEB-INF/default_config/messages/messages_en.properties
@@ -25,7 +25,6 @@ redd_plus_registry = REDD+ Registry
 biodiversity = Biodiversity
 national_parks = National Parks
 vegetation = Vegetation
-feedback_button = Feedback
 statistics_button = Statistics
 download_button = Download
 identify_button = Identify
@@ -79,10 +78,8 @@ layer = Layer
 year = Year
 name = Name
 email = Email
-feedback = Feedback
 cancel = Cancel
 submit = Submit
-feedback_text = Please mind that feedback comments have to be written in French language to be considered.
 forest_area_and_forest_area_change = Forest area and forest area change
 forest_land_remaining_forest_land = Forest land remaining forest land
 degradation = Degradation
@@ -96,9 +93,19 @@ active_fire = Active fire
 burnt_area = Burnt area
 deforestation_drivers = Deforestation drivers
 satisfaction_survey = Satisfaction survey
-feedback_info = Please click on the map to start drawing a polygon. Double click to end drawing and post feedback.
 intact_forest = Intact Forest
 information_note = Information note
 statistics_info = Please click on the map to start drawing a polygon
 survey_url=https://www.surveymonkey.com/s/W8Y38ZZ
-nfms_mailing_list=NFMS mailing list
\ No newline at end of file
+nfms_mailing_list=NFMS mailing list
+feedback = feedback
+feedback_info = Please click on the map to post feedback
+feedback_button = Feedback
+feedback_text = Use the tools to draw a geographic extent over the map.
+feedback_year = Year
+feedback_title = Send feedback on map contents
+feedback_drawing_tools = Drawing tools
+feedback_query_tooltip = Get features from the selected layer
+feedback_addfeature_tooltip = Add Polygon
+feedback_editfeature_tooltip = Edit Polygon
+feedback_deletepolygon_confirm = Deleting polygon, are you sure?
diff --git a/src/main/webapp/WEB-INF/default_config/messages/messages_fr.properties b/src/main/webapp/WEB-INF/default_config/messages/messages_fr.properties
index f6ccde7..04a294d 100644
--- a/src/main/webapp/WEB-INF/default_config/messages/messages_fr.properties
+++ b/src/main/webapp/WEB-INF/default_config/messages/messages_fr.properties
@@ -24,7 +24,6 @@ redd_plus_registry = Registre REDD+
 biodiversity = Biodiversit\u00e9
 national_parks = Parcs nationauxs
 vegetation = Vegetation
-feedback_button = Retour d'information
 statistics_button = Statistiques
 download_button = T\u00e9l\u00e9charger
 identify_button = Information
@@ -77,10 +76,8 @@ layer = Couche
 year = Ann\u00e9e
 name = Nom
 email = Courrier email
-feedback = Commentaires
 cancel = Annuler
 submit = Envoyer
-feedback_text = Merci de bien consid\u00e9rer que seuls les commentaires en Fran\u00e7ais pourront \u00eatre trait\u00e9es.
 forest_area_and_forest_area_change = Superficie foresti\u00e8re et variation de la superficie des for\u00eats
 forest_land_remaining_forest_land = Terres foresti\u00e8res restant terres foresti\u00e8res
 degradation = D\u00e9gradation
@@ -94,10 +91,13 @@ active_fire = Feux actifs
 burnt_area = Surface br\u00fbl\u00e9e
 deforestation_drivers = Causes de la d\u00e9forestation
 satisfaction_survey = Enqu\u00eate de satisfaction
-feedback_info = Cliquer sur la carte pour poster des commentaires
 intact_forest = For\u00eats Intactes
 information_note = Note d'information
 disclaimer = Disclaimer
 statistics_info = Please click on the map to start drawing a polygon
 survey_url=https://www.surveymonkey.com/s/FD7GRCB
-nfms_mailing_list=NFMS mailing list
\ No newline at end of file
+nfms_mailing_list=NFMS mailing list
+feedback_button = Retour d'information
+feedback = Commentaires
+feedback_info = Cliquer sur la carte pour poster des commentaires
+feedback_text = Merci de bien consid\u00e9rer que seuls les commentaires en Fran\u00e7ais pourront \u00eatre trait\u00e9es.
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/default_config/static/unredd.css b/src/main/webapp/WEB-INF/default_config/static/unredd.css
index 9ff3274..9798a78 100644
--- a/src/main/webapp/WEB-INF/default_config/static/unredd.css
+++ b/src/main/webapp/WEB-INF/default_config/static/unredd.css
@@ -673,4 +673,37 @@ div.checkbox.checked.in.mousedown {
 
 table.second_level td:first-child {
     padding-left: 12px;
+}
+
+table.feedback {
+	font-size: 12px;
+	color: white;
+}
+
+table.feedback th {
+	vertical-align: top;
+	font-weight: bold;
+	width: 100px;
+}
+
+table.feedback select,
+table.feedback input,
+table.feedback textarea {
+	width: 100%;
+}
+
+table.feedback textarea {
+	resize: none;
+	height: 82px;
+}
+
+.recaptcha {
+	padding: 10px 0;
+}
+
+#feedback_cancel,
+#feedback_submit {
+	width: 45%;
+	float: right;
+	margin-left: 5px;
 }
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
index 75750d1..ac2a3c8 100644
--- a/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -4,6 +4,9 @@
 <%@page session="true"%>
 <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@ page import="net.tanesha.recaptcha.ReCaptcha" %>
+<%@ page import="net.tanesha.recaptcha.ReCaptchaFactory" %>
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!--
  nfms4redd Portal Interface - http://nfms4redd.org/
@@ -29,18 +32,21 @@
     
     <link type="text/css" href="css/custom-theme2/jquery-ui-1.8.16.custom.css" rel="stylesheet">
     <link rel="stylesheet" href="js/fancybox-2.0.5/source/jquery.fancybox.css" type="text/css" media="screen" />
-    <!-- link rel="stylesheet" href="js/OpenLayers-2.11/theme/default/style.css" type="text/css" /-->
+    <!--link rel="stylesheet" href="js/OpenLayers-2.11/theme/default/style.css" type="text/css" /-->
     <link rel="stylesheet" href="js/OpenLayers-2.12/theme/default/style.css" type="text/css" />
+    <link rel="stylesheet" href="css/toolbar.css" type="text/css" />
     <link rel="stylesheet" href="static/unredd.css" type="text/css">
     
     <script type="text/javascript">
         var languageCode = "${pageContext.response.locale}";
+        var messages = <jsp:include page="messages.jsp"/>;
     </script>
     <script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
     <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
     <script type="text/javascript" src="js/fancybox-2.0.5/source/jquery.fancybox.pack.js"></script>
-    <!-- script type="text/javascript" src="js/OpenLayers-2.11/OpenLayers.js"></script-->
+    <!--script type="text/javascript" src="js/OpenLayers-2.11/OpenLayers.js"></script-->
     <script type="text/javascript" src="js/OpenLayers-2.12/OpenLayers.debug.js"></script>
+    <script type='text/javascript' src='js/toolbar.js'></script>
     <script type='text/javascript' src='js/unredd.js?v=2'></script>
     <script type='text/javascript' src='static/custom.js'></script>
   </head>
@@ -59,6 +65,7 @@
           <div id="time_slider_label">2005</div>
         </div>
       </div>
+
     </div>
     
     <div id="layer_list_selector_pane">
@@ -87,69 +94,66 @@
     </div>
     
     <div id="info_popup"></div>
+	<div id="feedback-invalid-mail" title="<spring:message code="invalid_email_title"/>">
+		<p><spring:message code="invalid_email_text"/></p>
+	</div>
     <div id="feedback_popup" style="display:none;">
-      <table style="font-size:12px;color:white">
+      <table class="feedback">
         <tr>
-          <td></td>
+          <th>
+            <spring:message code="layer" />:
+          </th>
           <td>
-            Polygon: <span id="fb_polygon" style="display:none;"></span>
+            <select id="fb_layers"></select>
+            <div id="fb_time"></div>
           </td>
         </tr>
         <tr>
+          <th>
+            <spring:message code="feedback_drawing_tools" />:
+          </th>
           <td>
-            <b><spring:message code="layer" />:</b>
-          </td>
-          <td>
-            <select>
-              <option value="deforestation">Deforestation</option>
-            </select>
+             <div id="fb_toolbar" class="olControlPortalToolbar"></div>
+             <div style="margin-left:80px;"><i><spring:message code="feedback_text" /></i></div>
           </td>
         </tr>
         <tr>
+          <th>
+            <spring:message code="name" />:
+          </th>
           <td>
-            <b><spring:message code="year" />:</b>
-          </td>
-          <td>
-            <select>
-              <option value="2005">2000-2005</option>
-              <option value="2010">2005-2010</option>
-            </select>
+            <input name="name_" id="name_" type="text">
           </td>
         </tr>
         <tr>
+          <th>
+            <spring:message code="email" />:
+          </th>
           <td>
-            <span style="font-size:12px;color:white;font-weight:bold"><spring:message code="name" />:</span>
-          </td>
-          <td>
-            <input name="name_" id="name_" type="text" size="28">
+            <input name="email_" id="email_" type="text">
           </td>
         </tr>
         <tr>
+          <th>
+            <spring:message code="feedback" />:
+          </th>
           <td>
-            <span style="font-size:12px;color:white;font-weight:bold"><spring:message code="email" /></span>
-          </td>
-          <td>
-            <input name="email_" id="email_" type="text" size="28">
+            <textarea id="feedback_" name="feedback_text_"></textarea>
           </td>
         </tr>
-        <tr>
-          <td style="vertical-align: top">
-            <b><spring:message code="feedback" />:</b>
-          </td>
-          <td style="vertical-align: top">
-            <textarea id="feedback_" name="feedback_text_" rows="5" cols="28"></textarea>
+		<tr>
+          <td colspan="2" class="recaptcha">
+		    <%
+		        ReCaptcha c = ReCaptchaFactory.newReCaptcha("6Ld5ydQSAAAAAGtZJG67QkQM7Z13X6MGf72RtmDE", "6Ld5ydQSAAAAAJW3To_tN6czS7C-HCnsBVhENfD9", false);
+		        out.print(c.createRecaptchaHtml(null, null));
+		    %>
           </td>
         </tr>
         <tr>
           <td></td>
           <td colspan="2">
-            <input type="button" id="feedback_cancel" value="Cancel" />
-            <input id="feedback_submit" type="submit">
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <spring:message code="feedback_text" />
+            <input id="feedback_submit" type="submit" value="<spring:message code="submit" />" />
+            <input type="button" id="feedback_cancel" value="<spring:message code="cancel" />" />
           </td>
         </tr>
       </table>
diff --git a/src/main/webapp/WEB-INF/jsp/messages.jsp b/src/main/webapp/WEB-INF/jsp/messages.jsp
index 57dcc87..f781f2e 100644
--- a/src/main/webapp/WEB-INF/jsp/messages.jsp
+++ b/src/main/webapp/WEB-INF/jsp/messages.jsp
@@ -15,6 +15,6 @@
 --%><%@ page session="true"%><%@
 taglib uri="http://www.springframework.org/tags" prefix="spring"%><%@
 taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%><%@
-page contentType="application/json" pageEncoding="UTF-8"%>"messages":{
+page contentType="application/json" pageEncoding="UTF-8"%>{
 <c:forEach var="message" items="${config.messages}" varStatus="status">  "${message.key}":"${message.value}"<c:if test="${!status.last}">,</c:if>
 </c:forEach>}
diff --git a/src/main/webapp/WEB-INF/unreddPortalApplicationContext.xml b/src/main/webapp/WEB-INF/unreddPortalApplicationContext.xml
index 7c62f1e..682fc83 100644
--- a/src/main/webapp/WEB-INF/unreddPortalApplicationContext.xml
+++ b/src/main/webapp/WEB-INF/unreddPortalApplicationContext.xml
@@ -81,5 +81,5 @@ default-autowire="autodetect">
         <property name="username" ref="geostoreUsername"/>
         <property name="password" ref="geostorePassword"/>
     </bean>
-     
+
 </beans>
diff --git a/src/main/webapp/css/toolbar.css b/src/main/webapp/css/toolbar.css
new file mode 100644
index 0000000..5591a2e
--- /dev/null
+++ b/src/main/webapp/css/toolbar.css
@@ -0,0 +1,42 @@
+.olControlPortalToolbar div {
+    float: left;
+    background-repeat: no-repeat;
+    margin: 2px;
+    width: 20px;
+    height: 20px;
+    background-position: center; 
+    cursor: pointer;
+    -moz-border-radius: 5px;
+	border-radius: 5px;
+}
+
+.olControlPortalToolbarAddItemActive, .olControlPortalToolbarAddItemInactive {
+    background-image: url("../images/silk/add.png");
+    background-color: #555555;
+    border-color: #dddddd;
+}
+
+.olControlPortalToolbarEditItemActive, .olControlPortalToolbarEditItemInactive {
+    background-image: url("../images/silk/pencil.png");
+}
+
+.olControlPortalToolbarGetItemActive, .olControlPortalToolbarGetItemInactive {
+    background-image: url("../images/silk/down.png");
+}
+
+.olControlPortalToolbarAddItemInactive, .olControlPortalToolbarEditItemInactive, .olControlPortalToolbarGetItemInactive {
+    background-color: #445566;
+    border: 1px solid #444444;
+    display: ;
+}
+
+.olControlPortalToolbarAddItemActive, .olControlPortalToolbarEditItemActive, .olControlPortalToolbarGetItemActive {
+    background-color: #3388cc;
+    border: 1px solid #26b3f7;
+    display: ;
+}
+
+.olControlPortalToolbarGetItemHidden {
+    background-color: #ff0000;
+    display: none;
+}
diff --git a/src/main/webapp/images/silk/add.png b/src/main/webapp/images/silk/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..6332fefea4be19eeadf211b0b202b272e8564898
GIT binary patch
literal 733
zcmV<30wVp1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!Z%IT!R5;6}
zlj}>9VHk(~TedF+gQSL8D5xnVSSWAVY>J9b+m>@{iq7_KE}go~11+5s4;8hc+i0Xa
zI1j@EX5!S+Me6HNqKzU5YQwL;-W5$p%ZMKMeR<%zp69-~?<4?8|C8S?bklXr4v&Ov
zb&06v2|-x?qB`90yn>Qi%Sh2^G4n)$ZdyvTPf9}1)_buUT7>`e2G&2VU@~Bb(o+Mz
zi4)>IxlSY${Dj4k={-9RzU^W5g9|2V5RZ2Zu<x6&^l=W_1sO_5@*~{AJR(k@osu$W
zIOyKBVDIZThPU;2xYmJgUn>lL9s2xQbZ@r6eP9Ra5u(s|C0Nj#&4>wTSkb?%#=9?@
z^oxDy-O@tyN{L@by(WWvQ3%CyEu8x{+#Jb4-h&K9Owi)2p<DqQ{Z%tMS5;_RkwZ2s
ziU|ZZE*fUaAe}14z#AR(OU=04okqn3igEs-_q_}KZ*?@>gg+heWDyked|3R$$kL@A
z#sp1v-r+=G4B8D6DqsDH0@7OztA7aT9qc1Py{()w`m``?Y0&gi2=ROcc-9+nU^I6<
zT=e_Y=<?pf1$FXK3F5I5#ceAAN5BHvd?h5_(jPS+7l@o3)VYh{*frx)Pb%2=Sw~G2
znu{1!PYZ*jM}To^G}f>vSnG@?3Ue{BW5ONFttcE!R-R_W4O01|0-|K-YNXLo2`4Qv
z`r1LxR6#yf3FB%T95gJnaKKivA~Z}S9A(ZxE<qS_Liq!k=vg3Per<qx!vKx95m{X+
zQ8;uQPPk0h^qI`uo^&$1^CFd@NeQR5pADaHJwu&SvB+fQDdu0d@n7>DK}O3T04USJ
P00000NkvXXu0mjf^IS-S

literal 0
HcmV?d00001

diff --git a/src/main/webapp/images/silk/down.png b/src/main/webapp/images/silk/down.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3d54bed95bf085f3cdde56a32c3f020eb0b03ad
GIT binary patch
literal 462
zcmV;<0WtoGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iylA
z4FMa7)P~al00B-(L_t(I%hi*=OF~f`#m{|SFSn}@*$<>F!l0rdLW2km+G=i!Xl!a}
zX$Xnt#)gK*`VagE3^9l(i3%zz0yD)33xq^@@4oMAs7aI*r_OkW51jM;9_Ba>+L3`a
z)i!|FGnWp6q_|{~OGqxj4S~It6l)q#HBBssH^5ySE@mKcdqgcoFv)}_8!sPEupNR)
zy0s3f`UhZ<hD|n1t()s0xWmdyFoXlM%ytNxED#(F_(qMj!%$grf&JApPhCLI7VGeE
zmzo}$$IS2?3Z*P8+rnEZhsi(`ZthmO;(g-?#a*XTAv>6SOytwqQ~11o7=}QXrw`|u
zW8CF0VUkw009N~n{V_HsIFbwFi~i7H1Xr&ocz(YoC8RgLo~ir^_=QYJj$~vc+WSzr
zAjwr{YV-4}UWu&H76LIgr3BKFv+kR1DmA(S`~PG52HEU_2qvG=FaQ7m07*qoM6N<$
Ef<lkFxBvhE

literal 0
HcmV?d00001

diff --git a/src/main/webapp/images/silk/pencil.png b/src/main/webapp/images/silk/pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bfecd50ee9f5bc5828f0c0745aa3e0effcbe250
GIT binary patch
literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzR7pfZR5;76
zlRroTaTtbOTML7haH*C+1e;vsXo!XsT5>Rq1}l<=psl5*5Xz9i;M}s*NP=ugs7Q<M
zyx=M%I@IDaEW#S>#8Z;Dyx|}!`#}xw_C3!B-yaPC&0j)XcpuX@rNfq|q}N(wJOjA&
z>u+z?dfJEuLePrqzy!)73pvLjxk4d6XNZt?hm_iYES{i}J5y3l?}PPNYDBR7oPc~6
zL^d)Bi4Q2L3pnp!nFxN9c2E+=@XAl&+;2m6a~kZj1r3Mz3C=hmUG<{+vWR@t4q?fJ
zhFc(ozZD#Mx`^Q~g1v=K6!QnfuqyD4>U4Ej<hH?toW!sy@VeSj6d6<>F0eamL}Jx|
z%&`kR-H+3GBYr*Qx}frLU4`%n9(`uSomzw)t%%NagXkA*R5Mbv9VLDp1wMo$cOMa~
s3Wm%r7^bwK$2$}-<~D8p`#1iScU4^XCLAA~0ssI207*qoM6N<$g3sK(Qvd(}

literal 0
HcmV?d00001

diff --git a/src/main/webapp/images/silk/readme.txt b/src/main/webapp/images/silk/readme.txt
new file mode 100644
index 0000000..400a64d
--- /dev/null
+++ b/src/main/webapp/images/silk/readme.txt
@@ -0,0 +1,22 @@
+Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com
\ No newline at end of file
diff --git a/src/main/webapp/js/toolbar.js b/src/main/webapp/js/toolbar.js
new file mode 100644
index 0000000..b4b2b65
--- /dev/null
+++ b/src/main/webapp/js/toolbar.js
@@ -0,0 +1,133 @@
+/**
+ * @requires OpenLayers/Control/Panel.js
+ * @requires OpenLayers/Control/DrawFeature.js
+ * @requires OpenLayers/Control/ModifyFeature.js
+ * @requires OpenLayers/Control/WMSGetFeatureInfo.js
+ * @requires OpenLayers/Handler/Polygon.js
+ */
+
+/**
+ * Class: PortalToolbar 
+ * The PortalToolbar is a panel to create, retrieve, update and delete contents in a polygon vector layer.
+ * It is used in feedback and custom statistics to draw the area of interest.
+ * 
+ * Inherits from:
+ *  - <OpenLayers.Control.Panel>
+ */
+OpenLayers.Control.PortalToolbar = OpenLayers.Class(
+  OpenLayers.Control.Panel, {
+
+    citeCompliant: false,
+    
+    queryControl: null,
+
+    initialize: function(layer, options) {
+        OpenLayers.Control.Panel.prototype.initialize.apply(this, [options]);
+        
+        this.layer = layer;
+        
+        this.queryControl = new OpenLayers.Control.WMSGetFeatureInfo({
+            displayClass: 'olControlPortalToolbarGet',
+            title: messages.feedback_query_tooltip,
+            queryVisible: true,
+            infoFormat: 'application/vnd.ogc.gml',
+            hover: false,
+            drillDown: false,
+            maxFeatures: 5,
+            handlerOptions: {
+                "click": {
+                    'single': true,
+                    'double': false
+                }
+            },
+            eventListeners: {
+                getfeatureinfo: function (evt) {
+                    if (evt.features && evt.features.length) {
+                    	for(i in evt.features) {
+                    		evt.features[i].geometry.transform(UNREDD.map.displayProjection,UNREDD.map.projection);
+                    	}
+                    	this.layer.addFeatures(evt.features);
+                    }
+                },
+                scope: this
+            },
+            formatOptions: {
+                typeName: 'XXX', featureNS: 'http://www.openplans.org/unredd'
+            }
+        });
+        
+        var controls = [
+            new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Polygon, {
+                displayClass: 'olControlPortalToolbarAdd',
+                title: messages.feedback_addfeature_tooltip,
+                handlerOptions: {citeCompliant: this.citeCompliant}
+            }),
+            new OpenLayers.Control.ModifyFeature(layer, {
+            	displayClass: 'olControlPortalToolbarEdit',
+                title: messages.feedback_editfeature_tooltip,
+                handleKeypress: function(evt) {
+                    var code = evt.keyCode;
+                    
+                    // check for delete key
+                    if(this.feature &&
+                       OpenLayers.Util.indexOf(this.deleteCodes, code) != -1) {
+                        var vertex = this.dragControl.feature;
+                        if(vertex &&
+                           OpenLayers.Util.indexOf(this.vertices, vertex) != -1 &&
+                           !this.dragControl.handlers.drag.dragging &&
+                           vertex.geometry.parent) {
+                            // remove the vertex
+                            vertex.geometry.parent.removeComponent(vertex.geometry);
+                            this.layer.events.triggerEvent("vertexremoved", {
+                                vertex: vertex.geometry,
+                                feature: this.feature,
+                                pixel: evt.xy
+                            });
+                            this.layer.drawFeature(this.feature, this.standalone ?
+                                                   undefined :
+                                                   this.selectControl.renderIntent);
+                            this.modified = true;
+                            this.resetVertices();
+                            this.setFeatureState();
+                            this.onModification(this.feature);
+                            this.layer.events.triggerEvent("featuremodified", 
+                                                           {feature: this.feature});
+                        } else if (confirm(messages.feedback_deletepolygon_confirm)) {
+                        	this.feature.destroy();
+                        	this.feature = null;
+                        	this.resetVertices();
+                        } 
+                    }
+                }
+            }),
+            this.queryControl
+        ];
+        this.addControls(controls);
+    },
+
+    draw: function() {
+        var div = OpenLayers.Control.Panel.prototype.draw.apply(this, arguments);
+        if (this.defaultControl === null) {
+            this.defaultControl = this.controls[0];
+        }
+        return div;
+    },
+    
+    setQueryable: function(layer) {
+    	if(layer) {
+    		this.queryControl.layers = [layer];
+    		// show button
+    		var d = this.queryControl.panel_div;
+    		d.className = d.className.replace(/ItemHidden/, "ItemInactive");
+    	} else {
+    		if(this.queryControl.active) {
+    			this.activateControl(this.defaultControl);
+    		}
+    		// hide button
+   			var d = this.queryControl.panel_div;
+   			d.className = d.className.replace(/ItemInactive/, "ItemHidden");
+    	}
+    },
+
+    CLASS_NAME: "OpenLayers.Control.PortalToolbar"
+});
diff --git a/src/main/webapp/js/unredd.js b/src/main/webapp/js/unredd.js
index 3cf93be..068077f 100644
--- a/src/main/webapp/js/unredd.js
+++ b/src/main/webapp/js/unredd.js
@@ -53,13 +53,19 @@
 
 OpenLayers.ProxyHost = "proxy?url=";
 
+var RecaptchaOptions = {
+	lang: languageCode,
+	theme: 'blackglass'
+};
+
 var UNREDD = {
     //wmsLayers: {},
     allLayers: {},
     visibleLayers: [],
     queryableLayers: [],
     timeDependentLayers: [],
-    mapContexts: {}
+    mapContexts: {},
+    fb_toolbar: {}
 };
 
 UNREDD.wmsServers = [
@@ -867,6 +873,10 @@ $(window).load(function () {
 
             newDate = getClosestPastDate(selectedDate, dates);
             layer.olLayer.mergeNewParams({'time': isoDateString(newDate)});
+            UNREDD.map.events.triggerEvent("changelayer", {
+            	layer: layer.olLayer,
+            	property: "time"
+            });
         });
     };
 
@@ -964,59 +974,7 @@ $(window).load(function () {
     //  year = 2010;
     //}
     //deforestation.mergeNewParams({'styles': 'deforestation_temp_' + (year)}); // hack, couldn't do with time dimension in geoserver
-
-     OpenLayers.Control.Feedback = OpenLayers.Class(OpenLayers.Control, {
-    	initialize: function (options) {
-    		OpenLayers.Control.prototype.initialize.apply(this, [options]);
-    		this.handler = new OpenLayers.Handler.Polygon(
-                this, 						// control
-                {'done': this.openDialog}, // callbacks
-                {}     						// handlerOptions
-            );
-    	},
-    	
-    	openDialog: function (polygon) {
-    		$("#feedback_info_div").fadeOut(200);
-
-            $("#feedback_submit").click(function () {
-                $("#feedback_popup").dialog('close');
-                // TODO: add real submit action
-            });
-
-            $("#feedback_cancel").click(function () {
-                $("#feedback_popup").dialog('close');
-                // TODO: Destroy polygon
-            });
-
-            $("#feedback_popup").dialog({
-                closeOnEscape: false,
-                minHeight: 400,
-                maxHeight: 400,
-                width: 340,
-                height: 330,
-                zIndex: 2000,
-                resizable: false,
-                
-                open: function (event, ui) {
-                    $("#fb_polygon").text(polygon.transform(
-                    		UNREDD.map.projection,
-                    		UNREDD.map.displayProjection).toString());
-                    $('#name').val('');
-                    $('#email').val('');
-                    $('#feedback').val('');
-                    feedbackControl.deactivate();
-                },
-                
-                close: function (event, ui) {
-                    $("#button_feedback").removeClass('selected');
-                }
-            });
-    	}
-    });
-    
-    var feedbackControl = new OpenLayers.Control.Feedback();
-    UNREDD.map.addControl(feedbackControl);
-    
+   
     // Info click handler
     infoControl = new OpenLayers.Control.WMSGetFeatureInfo({
         url: UNREDD.wmsServers[0],
@@ -1079,47 +1037,24 @@ $(window).load(function () {
 
     loadBundles('es');
     */
-   
-    $("#button_feedback").bind(
-        'click',
-        function () {
-            if (feedbackControl.active) {
-                $(this).removeClass('selected');
-                $("#feedback_info_div").fadeOut(200);
-                feedbackControl.deactivate();
-                drawStatsPolygonControl.deactivate();
-                infoControl.activate();
-            } else {
-                $("#button_statistics").removeClass('selected');
-                $(this).addClass('selected');
-                $("#feedback_info_div").show();
-                infoControl.deactivate();
-                drawStatsPolygonControl.deactivate();
-                feedbackControl.activate();
-            }
-            
-            return false;
-        }
-    );
-        
+          
     $("#button_statistics").bind(
         'click',
         function () {
-            if (drawStatsPolygonControl.active) {
-                $(this).removeClass('selected');
-                drawStatsPolygonControl.deactivate();
-                feedbackControl.deactivate();
-                infoControl.activate();
-                $("#statistics_info_div").fadeOut(200);
-            } else {
-                $("#button_feedback").removeClass('selected');
-                $(this).addClass('selected');
-                                infoControl.deactivate();
-                feedbackControl.deactivate();
-                drawStatsPolygonControl.activate();
-                $("#statistics_info_div").show();
-            }
-            
+        	if (!$("#button_feedback").hasClass('selected')) { // Prevent activation if feedback is active
+	            if (drawStatsPolygonControl.active) {
+	                $(this).removeClass('selected');
+	                drawStatsPolygonControl.deactivate();
+	                infoControl.activate();
+	                $("#statistics_info_div").fadeOut(200);
+	            } else {
+	                $("#button_feedback").removeClass('selected');
+	                $(this).addClass('selected');
+	                infoControl.deactivate();
+	                drawStatsPolygonControl.activate();
+	                $("#statistics_info_div").show();
+	            }
+        	}
             return false;
         }
     );
@@ -1143,12 +1078,156 @@ $(window).load(function () {
     highlightLayer = new OpenLayers.Layer.Vector("Highlighted Features", {styleMap: styleMap});
     UNREDD.map.addLayer(highlightLayer);
 
-    // markers layer (used for feedback)
-    markers = new OpenLayers.Layer.Markers("markers");
-    markers.id = "markers";
-    UNREDD.map.addLayer(markers);
+    
+    /**************/
+    /** Feedback **/
+    /**************/
+
+    // Feedback button
+    $("#button_feedback").bind(
+        'click',
+        function () {
+        	if (!$("#button_statistics").hasClass('selected')) { // Prevent activation if statistics is active
+	            if ($(this).hasClass('selected')) {
+	                $(this).removeClass('selected');
+	            } else {
+	                $(this).addClass('selected');
+	            	$("#button_statistics").removeClass('selected');
+	                openDialog();
+	            }
+        	}
+            return false;
+        }
+    );
+    
+    // Feedback vector layer
+    feedbackLayer = new OpenLayers.Layer.Vector("Feedback");  
+    UNREDD.map.addLayer(feedbackLayer);
+    
+    // Feedback form
+	function openDialog() {
+
+		$("#feedback_submit").button();
+        $("#feedback_submit").click(function () {
+    	    var mailRegex = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    	    if(!mailRegex.test($("#email_").val())) {
+    			$("#feedback-invalid-mail").dialog({
+    				height: 140,
+    				modal: true,
+    	            resizable: false,
+    	            buttons: { "Ok": function () { $(this).dialog( "close" ); } }
+    			});
+    	    } else {
+    	    	// TODO submit!!!
+            	$("#feedback_popup").dialog('close');       	    	
+    	    }
+        });
+
+        $("#feedback_cancel").button();
+        $("#feedback_cancel").click(function () {
+            $("#feedback_popup").dialog('close');
+        });
+        
+        $("#fb_layers").change(function(evt) {
+        	var layerId = $("#fb_layers").val();
+        	
+        	// Determine if layer is queryable
+        	var queryable = false;
+        	$.each(UNREDD.mapContexts[layerId].layers, function(index, layer) {
+        		if(layer.configuration.queryable) {
+        			queryable = layer.olLayer;
+        		}
+        	});
+			UNREDD.fb_toolbar.setQueryable(queryable);
+			
+			// Determine if layer is time-varying
+			var olLayer = UNREDD.allLayers[layerId].olLayer;
+			if (olLayer.params && olLayer.params.TIME) {
+				var date = new Date(olLayer.params.TIME);
+				$("#fb_time").html(messages.feedback_year + date.getFullYear());
+			} else {
+				$("#fb_time").html("");
+			}
+			
+        });
+
+        $("#feedback_popup").dialog({
+            closeOnEscape: false,
+            width: 340,
+            height: 415,
+            zIndex: 2000,
+            resizable: false,
+            position: [270, 150],
+            title: messages.feedback_title,
+            
+            open: function (event, ui) {
+            	// Empty form
+                $('#name_').val('');
+                $('#email_').val('');
+                $('#feedback_').val('');
+            	$('#fb_layers').empty();
+            	
+            	// Add draw toolbar
+                infoControl.deactivate();
+                UNREDD.fb_toolbar = new OpenLayers.Control.PortalToolbar(feedbackLayer, {div: document.getElementById("fb_toolbar")});
+                UNREDD.map.addControl(UNREDD.fb_toolbar);
+                           	
+                // Inform layers combo
+            	$.each(UNREDD.allLayers, function(key, layer) {
+            		if(layer.olLayer.visibility == true && UNREDD.mapContexts[layer.name]) {
+            			var name = layer.name;
+            			var label = UNREDD.mapContexts[name].configuration.label;
+                		$("#fb_layers").append('<option value="'+name+'">'+label+'</option>');
+            		}
+            	});
+				$("#fb_layers").change();
+            	
+				// Sync layers combo with visible layers
+            	UNREDD.map.events.on({
+            		"changelayer": function(evt) {
+            			if (evt.property == "visibility") {
+            				var layer = evt.layer;
+        					var name = layer.name;
+            				if(evt.layer.visibility == false) {
+            					$("#fb_layers option[value='"+name+"']").remove();
+            				} else {
+            					var label = UNREDD.mapContexts[name].configuration.label;
+            					$("#fb_layers").append('<option value="'+name+'">'+label+'</option>');
+            				}
+            				$("#fb_layers").change();
+            			}
+            			if (evt.property == "time" && evt.layer.name == $("#fb_layers").val()) {
+            				var date = new Date(evt.layer.params.TIME);
+            				$("#fb_time").html(messages.feedback_year + date.getFullYear());
+            			}
+            		}
+            	});
+            },
+            
+            /*
+            function validateEmail(email) { 
+                var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\
+            ".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA
+            -Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+                return re.test(email);
+            }
+            */
+            
+            close: function (event, ui) {
+                $("#button_feedback").removeClass('selected');
+                UNREDD.map.removeControl(UNREDD.fb_toolbar);
+                UNREDD.fb_toolbar.deactivate();
+                UNREDD.fb_toolbar.destroy();
+                UNREDD.fb_toolbar=null;
+                infoControl.activate();
+                feedbackLayer.removeAllFeatures();
+            }
+        });
+	};
     
     UNREDD.map.setCenter(UNREDD.mapCenter, UNREDD.defaultZoomLevel);
+       
+    UNREDD.map.addControl(new OpenLayers.Control.Navigation());
     
     if (!UNREDD.map.getCenter()) {
         UNREDD.map.zoomToMaxExtent();