Reorganized latino sub-module to make the lowest possible effect to dev branch

mothra/settings.py

@@ -170,6 +170,7 @@ if USE_CONCURRENCY:
         'django.contrib.admin',
         'south',
         'workflows',
+        'workflows.latino',
         'website',
         'signuplogin',
         'django_extensions',
@@ -188,6 +189,7 @@ else:
         'django.contrib.admin',
         'south',
         'workflows',
+        'workflows.latino',
         'website',
         'signuplogin',
         'django_extensions',

workflows/latino/latino.py

@@ -530,7 +530,7 @@ def CrossValidationPredefSplits(csf, ds, sets):
 # ADC visualisation
 def adcView(request, input_dict, output_dict, widget):
     import django.shortcuts
-    view = django.shortcuts.render(request, 'visualizations_latino/adc.html', {'widget': widget,
+    view = django.shortcuts.render(request, 'visualizations/adc.html', {'widget': widget,
                                                                                'input_dict': input_dict,
                                                                                'output_dict': output_dict})
     return view
@@ -547,6 +547,7 @@ def ShowTable(request, input_dict, output_dict, widget):
     import django.shortcuts
     tbl= input_dict['tbl']
     output_dict = {'attrs':list(tbl.items()[0][0]), 'metas':[], 'data':tbl.values()[0], 'title':'Vocabulary Table'}
+    templ = django.template.loader.get_template('visualizations/table_viewer.html')
     view = django.shortcuts.render(request, 'visualizations/table_viewer.html',{'widget':widget,'input_dict':input_dict,'output_dict':output_dict})
     return view
 

workflows/latino/urls.py

 from django.conf.urls.defaults import patterns, include, url
 
 urlpatterns_latino = patterns('',
-    url(r'^get-adc-index/widget(?P<widget_id>[0-9]+)/nx/Index.html$', 'workflows.views.get_adc_index', name='get adc index'),
-    url(r'^get-adc-index/widget(?P<widget_id>[0-9]+)/(?P<narrow_doc>n?)x/Index.html$', 'workflows.views.get_adc_index', name='get adc index'),
-    url(r'^get-adc-index/widget(?P<widget_id>[0-9]+)/(?P<narrow_doc>n?)x/Index(?P<document_id_from>[0-9]+)-(?P<document_id_to>[0-9]+).html$', 'workflows.views.get_adc_index', name='get adc index'),
-    url(r'^get-adc-index/widget(?P<widget_id>[0-9]+)/(?P<narrow_doc>n?)x/Document(?P<document_id>[0-9]+).html', 'workflows.views.get_adc_page', name='get adc page'),
+    url(r'^get-adc-index/widget(?P<widget_id>[0-9]+)/nx/Index.html$', 'workflows.latino.views.get_adc_index', name='get adc index'),
+    url(r'^get-adc-index/widget(?P<widget_id>[0-9]+)/(?P<narrow_doc>n?)x/Index.html$', 'workflows.latino.views.get_adc_index', name='get adc index'),
+    url(r'^get-adc-index/widget(?P<widget_id>[0-9]+)/(?P<narrow_doc>n?)x/Index(?P<document_id_from>[0-9]+)-(?P<document_id_to>[0-9]+).html$', 'workflows.latino.views.get_adc_index', name='get adc index'),
+    url(r'^get-adc-index/widget(?P<widget_id>[0-9]+)/(?P<narrow_doc>n?)x/Document(?P<document_id>[0-9]+).html', 'workflows.latino.views.get_adc_page', name='get adc page'),
 )
\ No newline at end of file

workflows/latino/visualization_views.py

 from django.shortcuts import render
 
 #latino
+import os
 import latino
 import logging
 

workflows/library.py

@@ -869,3 +869,4 @@ def alter_table_finished(postdata, input_dict, output_dict):
             except: # Catch orange exception and give a proper error message.
                 raise Exception("Illegal value '%s' for discrete attribute '%s', legal values are: %s." % (new_value, att, new_table.domain[att].values))
     return {'altered_data' : new_table}
+

workflows/static/js/new-script.js

@@ -689,8 +689,7 @@ function updateWidgetListeners() {
             }
         }
     });
-
-
+    
     $("#dialogs div.widgetrenamedialog").dialog({
     autoOpen: false,
     modal: false,

workflows/templates/parameters.html

@@ -6,7 +6,7 @@
         <input id="pref-{{p.pk}}" name="pref-{{p.pk}}" type="checkbox" value="true" {% ifequal p.value 'true' %}checked {% endifequal%} style="width:15px;display:inline;float:left;" />
     {% endif %}<label for="pref-{{p.pk}}" {% if p.parameter_type == "checkbox" %} style="float:left;"{% endif %}>{{p.name}}</label>
     {% if p.parameter_type == "checkbox" %}<div class="clear"><!----></div>{% endif %}
-    {% if p.parameter_type == "text" or p.parameter_type == None %}
+    {% if p.parameter_type == "text" %}
         <input id="pref-{{p.pk}}" name="pref-{{p.pk}}" type="text" value="{{p.value}}" onchange="" class="text ui-widget-content ui-corner-all" />
     {% endif %}
     {% if p.parameter_type == "select" %}

workflows/views.py

@@ -22,6 +22,8 @@ from django.contrib.auth.decorators import login_required
 #settings
 from mothra.settings import DEBUG, FILES_FOLDER
 
+
+
 #ostalo
 import os
 

workflows/visualization_views.py

@@ -218,3 +218,4 @@ def term_candidate_viewer(request, input_dict, output_dict, widget):
                       })
     terms = sorted(terms, key = lambda x: x['score'], reverse=True)
     return render(request, 'visualizations/terms.html', {'widget' : widget, 'terms' : terms})
+