From a641202ffae44b7299ed5f0cdcbb2bf1783472a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 14 Mar 2013 17:03:48 +0100
Subject: [PATCH] add app parameters to add form

---
 univcloud/static/css/style.css    |  9 +++++++++
 univcloud/templates/apps/add.html | 21 ++++++++++++++++++++-
 univcloud/views.py                |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/univcloud/static/css/style.css b/univcloud/static/css/style.css
index 5644498..af67630 100644
--- a/univcloud/static/css/style.css
+++ b/univcloud/static/css/style.css
@@ -182,3 +182,12 @@ li:hover .close {
 .welcome {
   padding: 1ex;
 }
+
+#dialog-confirm form {
+  margin-left: 24px;
+}
+
+#dialog-confirm form label {
+  display: inline-block;
+  width: 6em;
+}
diff --git a/univcloud/templates/apps/add.html b/univcloud/templates/apps/add.html
index 51bd3ec..f3c0a4a 100644
--- a/univcloud/templates/apps/add.html
+++ b/univcloud/templates/apps/add.html
@@ -13,6 +13,23 @@ Nouvelle application :
 <div id="dialog-confirm" title="Ajouter une application" style="display: none">
   <p><span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
   Cela ajoutera une application <span class="appname"></span> à votre portail.</p>
+
+  <form id="form-feed">
+   <label>URL</label>
+   <input name="feed_url"/>
+  </form>
+
+  <form id="form-launcher">
+   <label>Libellé</label>
+   <input name="label"/><br/>
+   <label>URL</label>
+   <input name="url"/>
+  </form>
+
+  <form id="form-weather">
+   <label>Lieu</label>
+   <select name="location"><option>Paris</option></select>
+  </form>
 </div>
 
 <script>
@@ -20,6 +37,8 @@ $(function(){ //DOM Ready
   $('#{{app_id}} select').change(
     function() {
       var appid = $(this).val();
+      $('#dialog-confirm form').hide();
+      $('#dialog-confirm form#form-' + appid).show();
       $('#dialog-confirm span.appname').text($(this).find(':selected').text());
       $("#dialog-confirm").dialog({
         resizable: false,
@@ -27,7 +46,7 @@ $(function(){ //DOM Ready
         width: '30em',
         buttons: {
           "Ajouter": function() {
-            window.location = window.location + 'add/' + appid;
+            window.location = window.location + 'add/' + appid + '?' + $('#dialog-confirm form#form-' + appid).serialize();
             $( this ).dialog( "close" );
           },
           "Annuler": function() {
diff --git a/univcloud/views.py b/univcloud/views.py
index 58bd429..90feaf8 100644
--- a/univcloud/views.py
+++ b/univcloud/views.py
@@ -48,7 +48,7 @@ class Add(RedirectView):
     def get_redirect_url(self, appid):
         profile = self.request.user.get_profile()
         layout = profile.get_layout()
-        layout['app%s' % random.randint(0, 10000)] = (appid, {})
+        layout['app%s' % random.randint(0, 10000)] = (appid, self.request.GET)
         profile.set_layout(layout)
         return reverse('homepage')