Show
Ignore:
Timestamp:
20-09-11 15:38:40 (3 years ago)
Author:
kostas.karasavvas@…
Message:

Improved the UI (added logos, tooltips, changed colours).

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • t2-web/trunk/views/form.haml

    r150 r153  
    44    %title Workflow: #{@my_exp_wkf.title} 
    55    %link(rel="stylesheet" href="/css/form.css") 
     6    %link(rel="stylesheet" href="/css/tipsy.css") 
    67    %script{:type => "text/javascript", :src => "/scripts/jquery-1.6.1.js"} 
     8    %script{:type => "text/javascript", :src => "/scripts/jquery.tipsy.js"} 
    79    %script{:type => "text/javascript", :src => "/scripts/form.js"} 
    810 
    911  %body 
    1012 
    11     #header 
     13    = generate_header_table(@my_exp_wkf) 
     14 
     15    -# TODO: should move coding to controller and not use haml's "-" for logic inside the template!!! 
     16    -#header 
    1217      %table.header 
    1318        %tr 
    14           %td.header Workflow: #{@my_exp_wkf.title} 
     19          %td 
     20            %img{:src => "/images/nbic_logo.gif", :alt => "NBIC logo"} 
     21          %td 
     22            %table.header-title 
     23              %tr 
     24                %td.header-title Workflow: #{@my_exp_wkf.title} 
     25              - if #{@my_exp_wkf.user.name} 
     26                %tr 
     27                  %td.right workflow by #{@my_exp_wkf.user.name} 
     28          %td 
     29            %img.right{:src => "/images/lumc_logo2.png", :alt => "LUMC logo"} 
    1530 
    1631    %br 
     
    3853      - if @my_exp_wkf.inputs.size >=1 
    3954        - @my_exp_wkf.inputs.each do |input| 
    40           - input_label_tooltip = "" 
     55          -# TODO: make helper create_input_tooltip(input) to return proper tooltip html string!!! 
    4156          - if input.descriptions.size >=1 
    42             - input.descriptions.each do |descr| 
    43               - input_label_tooltip << CGI::unescapeHTML(descr) + " " 
     57            - input_label_tooltip = generate_label_tooltip(input) 
    4458          - input_textarea_tooltip = "" 
    4559          - if input.examples.size >=1 
    46             - input.examples.each do |ex| 
    47               - input_textarea_tooltip << CGI::unescapeHTML(ex) + " " 
     60            - input_textarea_tooltip = generate_textarea_tooltip(input) 
    4861          %div{:id => "#{input.name}-upload-form-div"} 
    4962            %form{:id => "#{input.name}-upload-form", :enctype => "multipart/form-data", :target => "hidden-iframe", :action => "/t2web/upload", :method => "post"} 
    50               %label{:for => "#{input.name}-upload-label", :class => "tooltip", :title => "#{input_label_tooltip}"} Select file for #{input.name} 
     63              %label{:for => "#{input.name}-upload-label", :title => "#{input_label_tooltip}"} Select file for #{input.name} 
    5164              %input{:type => "file", :name => "file", :onchange => "uploadFile('#{input.name}')"} 
    5265          %div{:id => "#{input.name}-manual-group"} 
    53             %label{:for => "#{input.name}-label", :class => "tooltip", :title => "#{input_label_tooltip}"} Enter #{input.name}: 
     66            %label{:for => "#{input.name}-label", :title => "#{input_label_tooltip}"} Enter #{input.name}: 
    5467            %br 
    55             %textarea{:name => "#{input.name}-input", :rows => 3, :cols => 50, :class => "tooltip", :title => "#{input_textarea_tooltip}"} 
     68            %textarea{:name => "#{input.name}-input", :rows => 3, :cols => 50, :title => "#{input_textarea_tooltip}"} 
    5669              - if input.examples.size >= 1 
    5770                = CGI::unescapeHTML(input.examples[0]) 
     
    129142        %tr 
    130143          %th.inputs 
     144          %th.inputs 
    131145            Please Note 
     146          %th.inputs 
    132147        %tr 
     148          %td.inputs 
     149            %img{:src => "/images/info.png", :alt => "Important!" } 
    133150          %td.inputs 
    134151            Some workflows are not up-to-date or have dependencies that cannot be met by the specific Taverna server that you specified during generation of this tool. You can make sure that the workflow is valid by running it in the Taverna Workbench first to confirm that it works before running it via the Web. 
    135152        %tr 
    136153          %td.inputs 
     154            %img{:src => "/images/info.png", :alt => "Important!" } 
     155          %td.inputs 
    137156            There might be some repetitions in the workflow description in some of the generated workflows. This is due to a backwards compatibility issue on the myExperiment repository which keeps the old descriptions to make sure that no information is lost. 
    138157        %tr 
    139158          %td.inputs 
     159            %img{:src => "/images/info.png", :alt => "Important!" } 
     160          %td.inputs 
    140161            For more information on this workflow please visit the 
    141162            %a{ :href => "http://www.myExperiment.org/workflows/#{@wid}" } myExperiment website 
     163        - if #{@my_exp_wkf.user.email} 
     164          %tr 
     165            %td.inputs 
     166              %img{:src => "/images/info.png", :alt => "Important!" } 
     167            %td.inputs 
     168              For questions/comments you can also contact the workflow creator at: 
     169              %a{ :href => "mailto:#{@my_exp_wkf.user.email}" } #{@my_exp_wkf.user.email} 
     170 
    142171    %br 
     172    %br