From 663a94df7dfa436b328f3084769968cd96d306fb Mon Sep 17 00:00:00 2001
From: otto <otto@fsfe.org>
Date: Thu, 30 Aug 2012 13:38:54 +0000
Subject: [PATCH] Bugfixing

svn path=/trunk/; revision=24145
---
 fsfe.xsl                         |  3 +++
 support/portal.en.xhtml          | 32 +++++++++++++++++++++-----------
 support/support.en.xhtml         |  2 +-
 tools/xsltsl/static-elements.xsl | 20 ++++++++++++++++++--
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/fsfe.xsl b/fsfe.xsl
index f5e6dc17b9..ef53d9ae00 100644
--- a/fsfe.xsl
+++ b/fsfe.xsl
@@ -414,6 +414,9 @@
   </xsl:template>
 
   <!-- Apply support page -->
+  <xsl:template match="support-portal-javascript">
+    <xsl:call-template name="support-portal-javascript" />
+  </xsl:template>
   <xsl:template match="support-form-javascript">
     <xsl:call-template name="support-form-javascript" />
   </xsl:template>
diff --git a/support/portal.en.xhtml b/support/portal.en.xhtml
index 7f6bca407b..3b4315cff2 100644
--- a/support/portal.en.xhtml
+++ b/support/portal.en.xhtml
@@ -33,38 +33,48 @@
         <form method="post" action="" class="support">
             <p>
             <label id="firstname">First name
-              <input type="text" name="firstname" />
+              <input type="text" name="firstname" required="required"/>
             </label>
             </p>
             <p>
             <label id="lastname">Last name
-              <input type="text" name="lastname" />
+              <input type="text" name="lastname" required="required"/>
             </label>
             </p>
             <p>
-            <label id="email">E-mail (required)
-              <input type="email" name="email" required="required" />
+            <label id="zip">Zip code
+              <input type="text" name="zip" />
             </label>
             </p>
             <p>
-            <label id="country">Country (required)
+            <label id="city">City
+              <input type="text" name="city" />
+            </label>
+            </p>
+            <p>
+            <label id="country">Country
               <select name="country_code" required="required">
                 <option value="">Select..</option>
                 <optgroup label="Europe">
                   <country-list-europe/>
                 </optgroup>
-                <optgroup label="Europe">
+                <optgroup label="Other continents">
                   <country-list-other-continents/>
                 </optgroup>
               </select>
             </label>
             </p>
+            <!-- p>
+            <label id="lang">Language
+              <select name="lang" required="required">
+                <option value="">Select..</option>
+                 where to get a ISO 639-1 list here..?
+              </select>
+            </label>
+            </p -->
 
-          <p><input type="submit" name="submit" value="I Support the FSFE!" data-loading-text="Sending.."/></p>
-        
-          <input type="hidden" name="ref_url" value="" />
-          <input type="hidden" name="ref_id" value="" />
-          <input type="hidden" name="lang" value="en" />
+          <p><input type="submit" name="submit" value="Update" data-loading-text="Sending.."/></p>
+  
         </form>
 
         <p><em>Our privacy policy is simple: We will never share your data with anyone outside FSFE. Period.</em></p>
diff --git a/support/support.en.xhtml b/support/support.en.xhtml
index d7e1577b75..0657526e2b 100644
--- a/support/support.en.xhtml
+++ b/support/support.en.xhtml
@@ -48,7 +48,7 @@
                 <optgroup label="Europe">
                   <country-list-europe/>
                 </optgroup>
-                <optgroup label="Europe">
+                <optgroup label="Other continents">
                   <country-list-other-continents/>
                 </optgroup>
               </select>
diff --git a/tools/xsltsl/static-elements.xsl b/tools/xsltsl/static-elements.xsl
index 4f95059b4d..84380ef53e 100644
--- a/tools/xsltsl/static-elements.xsl
+++ b/tools/xsltsl/static-elements.xsl
@@ -108,8 +108,25 @@
     </xsl:copy>
   </xsl:template>
   
+  <xsl:template name="support-portal-javascript">
+    <script type="text/javascript">
+    /* <![CDATA[ */
+    function map_json_to_html(data) {
+        for (x in data) {
+            $(x).html(data[x]);
+        }
+    }
+    $(document).ready(function() {
+        var secret = window.location.search.slice(1);
+        $.getJSON('portal-backend?'+secret, function(data) {
+            map_json_to_html(data);
+        });
+    });
+    /* ]]> */
+    </script>
+  </xsl:template>
+  
   <xsl:template name="support-form-javascript">
-    
     <script type="text/javascript" src="/scripts/jquery.validate.min.js"></script>
     <script type="text/javascript">
     /* <![CDATA[ */
@@ -145,7 +162,6 @@
 
     /* ]]> */
     </script>
-
   </xsl:template>
 
     <!-- refactored these her from the support form -->