BugFixing and cosmetic

5 files changed, 66 insertions, 55 deletions

diff --git a/webapp/polls/templates/poll-structure-form.html b/webapp/polls/templates/poll-structure-form.html
index b695395..6d5808d 100644
--- a/webapp/polls/templates/poll-structure-form.html
+++ b/webapp/polls/templates/poll-structure-form.html
@@ -14,17 +14,6 @@
 {% block main_container %}
     <script src="{{ STATIC_URL }}js/bootstrap-fileupload.js"></script>
 
-    <div class="alert alert-info">
-        <ul>
-            <li>
-                Para generar dependencias, arrastre el ID de la opci&oacute;n hacia el campo "Depende de la opci&oacute;n", o bien, escriba el ID indicado. <i class="icon-warning-sign"></i>&nbsp;En esta version no existen criterios sobre las dependecias, tenga cuidado de realizarlas correctamente y no generar inconsistencias (ej: no haga dependiente una pregunta de una opci&oacute;n perteneciente a la misma pregunta.)
-            </li>
-            <li>
-                La opciones con imagenes deber&aacute;n ser de dimensiones menores a 250px de ancho y 250px de alto. Formatos validos: GIF, JPG, PNG.
-            </li>
-        </ul>
-    </div>
-
     <center><h2>{{ poll.name|capfirst }}</h2></center>
 
     {% if errors %}
diff --git a/webapp/polls/templates/tags/structure.html b/webapp/polls/templates/tags/structure.html
index 7c49f7f..7f4c0d9 100644
--- a/webapp/polls/templates/tags/structure.html
+++ b/webapp/polls/templates/tags/structure.html
@@ -1,12 +1,25 @@
 {% load i18n poll_tags util_tags %}
 
+<a id="help" href="#"><i class="icon-question-sign"></i>&nbsp;Ayuda</a>
+
+<div class="alert alert-info help hide">
+    <ul>
+        <li>
+            Para generar dependencias, arrastre el ID de la opci&oacute;n hacia el campo "Depende de la opci&oacute;n", o bien, escriba el ID indicado. <i class="icon-warning-sign"></i>&nbsp;En esta version no existen criterios sobre las dependecias, tenga cuidado de realizarlas correctamente y no generar inconsistencias (ej: no haga dependiente una pregunta de una opci&oacute;n perteneciente a la misma pregunta.)
+        </li>
+        <li>
+            La opciones con imagenes deber&aacute;n ser de dimensiones menores a 250px de ancho y 250px de alto. Formatos validos: GIF, JPG, PNG.
+        </li>
+    </ul>
+</div>
+
+<div id="WGroupContainer"></div>
+
 <!-- Containers -->
 <button id="WGroup_add" class="btn btn-primary">
     <i class="icon-plus-sign icon-white"></i>&nbsp;{% trans 'Agregar grupo' %}
 </button>
 
-<div id="WGroupContainer"></div>
-
 
 <!-- Mustache templates -->
 {% include "mustache/group.html" %}
@@ -68,4 +81,14 @@
         });
 
     })(jQuery);
+</script>
+
+<script type="text/javascript">
+
+    jQuery(function ($) {
+        $("#help").on('click', function(){
+            $(".help").toggle();
+        });
+    });
+
 </script>
\ No newline at end of file
diff --git a/webapp/polls/views.py b/webapp/polls/views.py
index a5fb9c5..60ba025 100644
--- a/webapp/polls/views.py
+++ b/webapp/polls/views.py
@@ -147,20 +147,20 @@ class PollListView(ListView):
                 'status': poll.status,
                 'is_open': poll.is_open(),
                 'action_edit': {
-                    'disabled': not poll.is_open() or not user.is_superuser,
+                    'disabled': "disabled" if not user.is_superuser else "",
                     'url': reverse(
                         'polls:edit', kwargs={'id': str(poll.id)}
                     ),
                 },
                 'action_structure_builder': {
-                    'disabled': not poll.is_open(),
+                    'disabled': "disabled" if not poll.is_open() else "",
                     'url': reverse(
                         'polls:structure.builder',
                         kwargs={'poll_id': str(poll.id)}
                     )
                 },
                 'action_download': {
-                    'disabled': poll.is_open(),
+                    'disabled': "disabled" if poll.is_open() else "",
                     'url': reverse(
                         'polls:download',
                         kwargs={'poll_id': str(poll.id)}
diff --git a/webapp/webapp/static/js/dynamic_structure.js b/webapp/webapp/static/js/dynamic_structure.js
index 8fed8e9..270a89f 100644
--- a/webapp/webapp/static/js/dynamic_structure.js
+++ b/webapp/webapp/static/js/dynamic_structure.js
@@ -340,8 +340,10 @@ var factoryField = function(order, value) {
             {'key': "3", 'value': "( ID o/y ID ) o/y ID o/y ID"}
         ],
         dependence_forms = $.each(dependence_forms, function(i, v){
-            if ( value['dependence'].form == v['key']) {
-                $.extend(v, {"selected": true});
+            if (value.hasOwnProperty('dependence')){
+                if (value['dependence'].form == v['key']) {
+                    $.extend(v, {"selected": true});
+                }
             }
         }),
         field_widget = $(
@@ -405,43 +407,47 @@ var factoryField = function(order, value) {
         }
     }
 
-    // Show dependences
-    var values = [],
-        dependence_container = field_widget.find(".dependence"),
-        widget;
 
-    if (value['dependence'])
-        values = value['dependence'].values;
+    if (group_order != 0 || ( group_order == 0 && order != 0 ) ) {
 
-    for (var i=values.length; i < 7; i++)
-        values[i] = '';
-    factoryDependences(dependence_container, values, order, group_order);
+        // Show dependences
+        var values = [],
+            dependence_container = field_widget.find(".dependence"),
+            widget;
 
-    var dependences = field_widget.find('[name*=".dependence.values"]');
-    $.each(dependences, function(index, dependence){
-        if ($(dependence).attr("value") != '')
-            $(dependence).addClass("ui-state-highlight");
-    });
+        if (value['dependence'])
+            values = value['dependence'].values;
 
-    var parentesis_open = field_widget.find("._parentesis_open");
-    if (parentesis_open.length == 8) {
-        $(parentesis_open[0]).addClass('1 2 3');
-        $(parentesis_open[4]).addClass('1');
-    }
+        for (var i=values.length; i < 7; i++)
+            values[i] = '';
+        factoryDependences(dependence_container, values, order, group_order);
 
-    var parentesis_close = field_widget.find("._parentesis_close");
-    if (parentesis_close.length == 8) {
-        $(parentesis_close[3]).addClass('1 3');
-        $(parentesis_close[5]).addClass('2');
-        $(parentesis_close[7]).addClass('1');
-    }
+        var dependences = field_widget.find('[name*=".dependence.values"]');
+        $.each(dependences, function(index, dependence){
+            if ($(dependence).attr("value") != '')
+                $(dependence).addClass("ui-state-highlight");
+        });
 
-    var widget_selected_dependence_form = field_widget.find('.dependence_form');
-    $(widget_selected_dependence_form).on('change', function(event){
-        change_dependence_form(this, null);
-    });
+        var parentesis_open = field_widget.find("._parentesis_open");
+        if (parentesis_open.length == 8) {
+            $(parentesis_open[0]).addClass('1 2 3');
+            $(parentesis_open[4]).addClass('1');
+        }
+
+        var parentesis_close = field_widget.find("._parentesis_close");
+        if (parentesis_close.length == 8) {
+            $(parentesis_close[3]).addClass('1 3');
+            $(parentesis_close[5]).addClass('2');
+            $(parentesis_close[7]).addClass('1');
+        }
 
-    change_dependence_form(widget_selected_dependence_form[0], field_widget);
+        var widget_selected_dependence_form = field_widget.find('.dependence_form');
+        $(widget_selected_dependence_form).on('change', function(event){
+            change_dependence_form(this, null);
+        });
+
+        change_dependence_form(widget_selected_dependence_form[0], field_widget);
+    }
 
     var droppable = field_widget.find(".droppable");
     droppable.droppable({
diff --git a/webapp/webapp/templates/base-main.html b/webapp/webapp/templates/base-main.html
index 22d5d15..5d89242 100644
--- a/webapp/webapp/templates/base-main.html
+++ b/webapp/webapp/templates/base-main.html
@@ -118,13 +118,6 @@
 
 {% block main_footer %}{% endblock %}
 
-<script type="text/javascript">
-
-    jQuery(function ($) {
-        $("#lista_encuestas").tooltip({placement:"left"})
-    });
-
-</script>
 <script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
 </body>
 </html>
\ No newline at end of file