Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorRogelio Mita <rogeliomita@activitycentral.com>2013-04-04 15:39:29 (GMT)
committer Rogelio Mita <rogeliomita@activitycentral.com>2013-04-04 15:39:29 (GMT)
commit47b76a2a4e927deb89eabb9953119bae444d8072 (patch)
treee7210f3657101dd497acdbed091bac3b6eaac902 /webapp
parent1cbf299f27884a50e59b5befd7270fc581204730 (diff)
Cosmetic
Diffstat (limited to 'webapp')
-rw-r--r--webapp/polls/templates/mustache/field.html11
-rw-r--r--webapp/webapp/static/js/dynamic_structure.js32
2 files changed, 38 insertions, 5 deletions
diff --git a/webapp/polls/templates/mustache/field.html b/webapp/polls/templates/mustache/field.html
index ecb6a58..6343aff 100644
--- a/webapp/polls/templates/mustache/field.html
+++ b/webapp/polls/templates/mustache/field.html
@@ -1,16 +1,18 @@
<!-- Template: dependence value -->
<script type="text/x-mustache-template" name="dependence_value">
+ <span class="_parentesis _parentesis_open">(</span><span class="_parentesis _parentesis_close">)</span>
<input
- class="span2 droppable"
+ class="span2 droppable dependence_value"
type="text"
name="groups.[[ group_order ]].fields.[[ order ]].dependence.values"
value="[[ value ]]"
placeholder="nro. ID" />
+ <span class="_parentesis _parentesis_open">(</span><span class="_parentesis _parentesis_close">)</span>
</script>
<!-- Template: dependence logic operator -->
<script type="text/x-mustache-template" name="dependence_logic_operator">
- <select class="span1" name="groups.[[ group_order ]].fields.[[ order ]].dependence.values">
+ <select class="input-mini" name="groups.[[ group_order ]].fields.[[ order ]].dependence.values">
[[ #operators ]]
<option value="[[ key ]]" [[ #selected ]]selected="selected"[[ /selected ]]>[[ val ]]</option>
[[ /operators ]]
@@ -58,7 +60,7 @@
</select>
<label><b>formas de dependencia</b>:</label>
- <select class="" name="groups.[[ group_order ]].fields.[[ order ]].dependence.form">
+ <select class="dependence_form" name="groups.[[ group_order ]].fields.[[ order ]].dependence.form">
[[ #dependence_forms ]]
<option value="[[ key ]]" [[ #selected ]]selected="selected"[[ /selected ]]>[[ value ]]</option>
[[ /dependence_forms ]]
@@ -68,8 +70,7 @@
<label><b>Dependencia</b>:</label>
-
- <div class="input-append dependence"></div>
+ <div class="dependence"></div>
<div class="WFieldAddOptionButton_container" style="margin: 5px;"></div>
diff --git a/webapp/webapp/static/js/dynamic_structure.js b/webapp/webapp/static/js/dynamic_structure.js
index 60b378a..8fed8e9 100644
--- a/webapp/webapp/static/js/dynamic_structure.js
+++ b/webapp/webapp/static/js/dynamic_structure.js
@@ -298,6 +298,18 @@ var factoryDependences = function(container, values, field_order, group_order) {
});
}
+var change_dependence_form = function(widget, field_widget) {
+
+ var value_selected = $(widget).attr('value'),
+ field_widget = field_widget || $('.field').has(widget),
+ all_parentesis = field_widget.find('._parentesis')
+
+ all_parentesis.hide();
+
+ _parentesis = field_widget.find("._parentesis." + value_selected);
+ _parentesis.show();
+}
+
var factoryField = function(order, value) {
// Get field.widget_type
var widget_type = value['widget_type'],
@@ -411,6 +423,26 @@ var factoryField = function(order, value) {
$(dependence).addClass("ui-state-highlight");
});
+ 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');
+ }
+
+ 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({
drop: function( event, ui ) {