X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Fedit_vote.html;h=c5dde3d1e26a4647d2822141642696a8d91d8393;hb=09d46c3c1c476da11f48f953d257c9fc6e31b8cd;hp=431963189c92843dfea175a50dae650098394a78;hpb=f42b7613c22add2650031ac5fa04065d82393436;p=cavote.git

diff --git a/templates/edit_vote.html b/templates/edit_vote.html
index 4319631..c5dde3d 100644
--- a/templates/edit_vote.html
+++ b/templates/edit_vote.html
@@ -15,7 +15,7 @@
       <div class="control-group">
         <label class="control-label" for="description">Description</label>
         <div class="controls">
-          <textarea class="input-xlarge" name="description" id="description" value="{{ vote.description }}"></textarea>
+          <textarea class="input-xlarge" name="description" id="description">{{ vote.description }}</textarea>
         </div>
       </div>
       <div class="accordion">
@@ -28,60 +28,57 @@
               <div class="control-group">
                 <label class="control-label" for="category">Catégorie</label>
                 <div class="controls">
-                  <input type="text" data-provide="typeahead" data-source='["ca","membres"]' size=30 name="category" id="category" value="{{ request.form.category }}" />
+                  <input type="text" data-provide="typeahead" data-source='["ca","membres"]' size=30 name="category" id="category" value="{{ vote.category }}" />
                 </div>
               </div>
               <div class="control-group">
                 <label class="control-label" for="role">Groupe</label>
                 <div class="controls">
                   <select name="role" id="role" disabled>
-                    <option selected>Tous</option>
-                    <option>CA</option>
-                    <option>Membres</option>
+                    <option>{{ group.name }}</option>
                   </select>
                   <p class="help-block">Groupe d'utilisateur concernés par le vote et ayant le droit de voter</p>
                 </div>
               </div>
-            </div>
-          </div>
-        </div>
-        <div class="accordion-group">
-          <div class="accordion-heading">
-            <a class="accordion-toggle" data-toggle="collapse" href="#options">+ Options</a>
-          </div>
-          <div id="options" class="accordion-body collapse">
-            <div class="accordion-inner">
               <div class="control-group">
                 <label class="control-label" for="days">Durée (jours)</label>
                 <div class="controls">
                   <select class="span1" name="days" id="days">
                     {% for i in range(1, 31) %}
-                    {% if i == 20 %}
+                    {% if i == vote.duration %}
                     <option selected>{{ i }}</option>
                     {% else %}
                     <option>{{ i }}</option>
                     {% endif %}
                     {% endfor %}
                   </select>
+                  <span class="help-inline">Du {{ vote.date_begin }} au {{ vote.date_end }}</span>
                 </div>
               </div>
+            </div>
+          </div>
+        </div>
+        <div class="accordion-group">
+          <div class="accordion-heading">
+            <a class="accordion-toggle" data-toggle="collapse" href="#options">+ Options</a>
+          </div>
+          <div id="options" class="accordion-body collapse">
+            <div class="accordion-inner">
               <div class="control-group">
                 <label class="control-label">Options</label>
                 <div class="controls">
                   <label class="checkbox">
-                    <input type="checkbox" name="transparent" />
+                    <input type="checkbox" name="transparent" {% if vote.is_transparent == 1 %} checked {% endif %} />
                     Les votants peuvent-ils voir le choix des autres ?
                   </label>
                   <label class="checkbox">
-                    <input type="checkbox" name="public" />
+                    <input type="checkbox" name="public" {% if vote.is_public == 1 %} checked {% endif %}/>
                     Le vote est-il visible par tous ?
                   </label>
-                  {% if not vote.is_open %}
                   <label class="checkbox">
-                    <input type="checkbox" name="multiplechoice" disabled/>
+                    <input type="checkbox" name="multiplechoice" {% if vote.is_multiplechoice == 1 %} checked {% endif %} disabled/>
                     Les votants peuvent-ils choisir plusieurs options ?
                   </label>
-                  {% endif %}
                 </div>
               </div>
             </div>
@@ -110,7 +107,7 @@
     </form>
   </div>
 
-  <div class="span5 well">
+  <div class="span5 well pull-right">
     <fieldset><legend>Choix</legend>
       <table class="table table-stripped table-condensed">
         <thead>