Merge branch 'hotfix/1.2.2'

MieuxVoter · Sep 17, 2018 · 9a4d727 · 9a4d727
2 parents 40eb00a + a29bb4e
commit 9a4d727
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,11 @@ That's all...
 
 ## Versions
 
-### 1.2.1
+#### 1.2.2
+- hotfix : Barchart height
+- hotfix : maxlength to 150 chars for label choice
+
+#### 1.2.1
 - hotfix : reverse label on Barchart
 
 ### 1.2.0

diff --git a/templates/start-a-vote/form.html.twig b/templates/start-a-vote/form.html.twig
@@ -98,10 +98,10 @@
                                     <h3 id="choice_number_{{ num }}">{{ num }}</h3>
                                 </div>
                                 <div class="flex-grow-1 pl-4 pr-4">
-                                    <label id="choice_label_{{ num }}" for="choice_value_{{ num }}">Choix : <span class="text-muted">(50 car. max.)</span></label>
+                                    <label id="choice_label_{{ num }}" for="choice_value_{{ num }}">Choix : <span class="text-muted">(150 car. max.)</span></label>
                                     <input type="hidden" class="form-control fieldRemoveChoice" id="remove_choice_init"
                                            name="remove_choice_{{ num }}" value="{{ choice.isDeleted }}">
-                                    <input type="text" class="form-control" id="choice_value_{{ num }}" maxlength="50"
+                                    <input type="text" class="form-control" id="choice_value_{{ num }}" maxlength="150"
                                            name="choice_value_{{ num }}" placeholder="Proposition ..." value="{{ choice.label }}" {% if choice.isDeleted==1 %}readonly{% endif %}>
                                     <textarea class="form-control" rows="5" maxlength="500" id="choice_explanation_{{ num }}" name="choice_explanation_{{ num }}" {% if choice.isDeleted==1 %}readonly{% endif %}
                                               placeholder="Explication supplémentaire sur ce choix"></textarea>

diff --git a/templates/vote/result.html.twig b/templates/vote/result.html.twig
@@ -116,7 +116,7 @@
             <div class="row mt-5 ">
                 <div class="col-12">
                     <h4>Histogramme :</h4>
-                    <div id="chart" style="height:600px"></div>
+                    <div id="chart" style="height:{{ (proposal.choices|length)*80 }}px"></div>
                 </div>
                {# <div class="col-12 m-2">
                     <div class="alert alert-secondary">