diff options
| author | gebele <gebele@in-silico.ch> | 2011-09-16 12:50:40 +0200 |
|---|---|---|
| committer | gebele <gebele@in-silico.ch> | 2011-09-16 12:50:40 +0200 |
| commit | d42303e9b4a6ea06b15ae997645071f19acb6eef (patch) | |
| tree | bd39b7afbf7dfc2fd83dd6575e2c9e16d6dee58a | |
| parent | cb44e8cd2bd6f510460a36b57d181a66cd2141af (diff) | |
| parent | 038c4563032f65f935f38ef6bffe426b2dd14c0c (diff) | |
Merge branch 'development' into feature/policy
| -rw-r--r-- | helper.rb | 21 | ||||
| -rw-r--r-- | views/create.haml | 2 | ||||
| -rw-r--r-- | views/endpoint.haml | 2 | ||||
| -rw-r--r-- | views/model_echa.haml | 2 | ||||
| -rw-r--r-- | views/style.sass | 10 |
5 files changed, 35 insertions, 2 deletions
@@ -101,5 +101,24 @@ helpers do haml :models_navigation, :layout => false end + def endpoint_option_list(max_time=3600) + out = "" + tmpfile = File.join(TMP_DIR, "endpoint_option_list") + if File.exists? tmpfile + if Time.now-File.mtime(tmpfile) <= max_time + f = File.open(tmpfile, 'r+') + f.each{|line| out << line} + return out + else + File.unlink(tmpfile) + end + end + result = OpenTox::Ontology::Echa.endpoint_option_list() + if result.lines.count > 3 + f = File.new(tmpfile,"w") + f.print result + f.close + end + return result + end end - diff --git a/views/create.haml b/views/create.haml index 5dbd71d..da85382 100644 --- a/views/create.haml +++ b/views/create.haml @@ -24,6 +24,8 @@ = link_to "SDF", '/help' format: %input{:type => 'file', :name => 'file', :id => 'file', :size => '41'} + %br + -# = haml :model_echa, :layout => false %input{ :type => "submit", :value => "Create model"} =# link_to "Cancel", '/create' diff --git a/views/endpoint.haml b/views/endpoint.haml index af06b80..9c250ca 100644 --- a/views/endpoint.haml +++ b/views/endpoint.haml @@ -9,4 +9,4 @@ %em in-vitro, or %em in-vivo - expriment, clinical trial or epidemiological study + experiment, clinical trial or epidemiological study diff --git a/views/model_echa.haml b/views/model_echa.haml new file mode 100644 index 0000000..257a28a --- /dev/null +++ b/views/model_echa.haml @@ -0,0 +1,2 @@ +Select an endpoint: += endpoint_option_list
\ No newline at end of file diff --git a/views/style.sass b/views/style.sass index 7be1787..95ae7f7 100644 --- a/views/style.sass +++ b/views/style.sass @@ -313,3 +313,13 @@ dl font-weight: bold .thin font-weight: 100 + +.level_1 + padding-left: 10px + font-weight: bold +.level_2 + padding-left: 20px +.level_3 + padding-left: 30px +.level_4 + padding-left: 40px |