Changeset 258

Timestamp:

03/23/10 17:41:09 (3 years ago)

Author:

fabio.montefuscolo

Message:

put the lxml for decsclient; start scratch for xml upload; change css for stepmenu

Location:

trunk/clinicaltrials

Files:

• decsclient/views.py (modified) (2 diffs)
• load.py (added)
• registry/views.py (modified) (1 diff)
• static/css/style.css (modified) (1 diff)

trunk/clinicaltrials/decsclient/views.py

@@ -2 +2 @@
 from django.http import HttpResponse
 from django.shortcuts import render_to_response
-from xml.etree.ElementTree import ElementTree
+from lxml.etree import ElementTree
 import urllib
 
@@ -19 +19 @@
     result = tree.find("decsws_response/tree/self/term_list/term")
     if result is None:
-        lists = tree.findall('decsws_response/tree/term_list')
-        term_list = [l for l in lists if l.attrib['lang'] == lang].pop()
-        result = term_list.getiterator('term')
+        result = tree.findall('decsws_response/tree/term_list[@lang="%s"]/term' % lang)
 
         json = '[%s]' % ','.join((JSON_TERM % (r.text.capitalize(),r.attrib['tree_id']) for r in result))

trunk/clinicaltrials/registry/views.py

@@ -361 +361 @@
     ct = get_object_or_404(ClinicalTrial, id=int(trial_pk))
 
-    contact_type = {'PublicContact':PublicContact,
-                    'ScientificContact':ScientificContact,
-                    'SiteContact':SiteContact}
-    
     contact_type = {
         'PublicContact': (PublicContact,PublicContactForm),

trunk/clinicaltrials/static/css/style.css

@@ -119 +119 @@
     display: inline-block;
     width: 9%;
-    border: 2px solid transparent;
+    border: 1px solid transparent;
+    text-align: center;
+}
+
+.stepmenu li.current {
+    border: 1px inset white;
 }