t2-web 0.0.7 → 0.0.8

data/CHANGES

@@ -1,5 +1,12 @@
 = Changes log for the Taverna via the Web Gem
 
+== Version 0.0.8
+* Removed "Workflow: " from form's header
+* Changed image for please not bullet points
+* Cleaned form.haml from old comments
+* Added footer in form.haml with acknowledgements
+* Made "workflow by USER" a link to point to user in myExperiment
+
 == Version 0.0.7
 * Updated sinatra dependency
 * Updated copyright year

data/README

@@ -2,7 +2,7 @@
 
 
 Authors::     Konstantinos Karasavvas
-Gem Version:: 0.0.7
+Gem Version:: 0.0.8
 Contact::     mailto:kostas.karasavvas@nbic.nl
 Licence::     MIT (See LICENCE or http://www.opensource.org/licenses/mit-license)
 Copyright::   (c) 2012 Netherlands Bioinformatics Centre, The Netherlands

data/Rakefile

@@ -12,7 +12,7 @@ require 'rdoc/task'
 
 spec = Gem::Specification.new do |s|
   s.name = 't2-web'
-  s.version = '0.0.7'
+  s.version = '0.0.8'
   s.extra_rdoc_files = ['README', 'LICENSE', 'CHANGES']
   s.summary = 'Web application that generates a Web UI form for a Taverna2 workflow, given its myExperiment id, for ease of execution. The only requirement for the user is a web browser.'
   s.description = s.summary

data/bin/t2_webapp.rb

@@ -8,8 +8,9 @@ require 'rest-client'
 require 't2-server'
 require 'myexperiment-rest'
 require 'cgi'
-#require "web-t2" TODO: move whole of WebT2App in lib
+#require "t2-web" TODO: move whole of WebT2App in lib
 
+# TODO: add constants.rb file in lib for all constants (e.g. myExp user URL, other URLs
 
 class WebT2App < Sinatra::Base
 
@@ -18,7 +19,7 @@ class WebT2App < Sinatra::Base
 
   set :port, 9494
   set :views, File.dirname(__FILE__) + '/../views'
-  set :public, File.dirname(__FILE__) + '/../public'
+  set :public_folder, File.dirname(__FILE__) + '/../public'
 
   # can be used from routes and views (haml)
   helpers do
@@ -76,17 +77,16 @@ END
     <div id='header'>
       <table class='header'>
         <tr>
-          <td>
+          <td class='left'>
             <img alt='NBIC logo' src='/images/nbic_logo.gif' />
           </td>
           <td>
             <table class='header-title'>
               <tr>
-                <td class='header-title'>Workflow: #{@my_exp_wkf.title}</td>
+                <td class='header-title'>#{@my_exp_wkf.title}</td>
               </tr>
               <tr>
-                <td class='right'>workflow by #{@my_exp_usr.name}</td>
-
+                <td class='right'>workflow by <a href="http://www.myexperiment.org/users/#{@my_exp_usr.id}.html" target="_blank">#{@my_exp_usr.name}</a></td>
               </tr>
             </table>
           </td>

data/doc/rdoc/CHANGES.html

@@ -76,6 +76,19 @@
     
 <h1>Changes log for the Taverna via the Web Gem</h1>
 
+<h2>Version 0.0.8</h2>
+<ul><li>
+<p>Removed “Workflow: ” from form’s header</p>
+</li><li>
+<p>Changed image for please not bullet points</p>
+</li><li>
+<p>Cleaned form.haml from old comments</p>
+</li><li>
+<p>Added footer in form.haml with acknowledgements</p>
+</li><li>
+<p>Made “workflow by USER” a link to point to user in myExperiment</p>
+</li></ul>
+
 <h2>Version 0.0.7</h2>
 <ul><li>
 <p>Updated sinatra dependency</p>

data/doc/rdoc/README.html

@@ -80,7 +80,7 @@
 <p>Konstantinos Karasavvas</p>
 </td></tr><tr><td class="rdoc-term"><p>Gem Version</p></td>
 <td>
-<p>0.0.7</p>
+<p>0.0.8</p>
 </td></tr><tr><td class="rdoc-term"><p>Contact</p></td>
 <td>
 <p><a href="mailto:kostas.karasavvas@nbic.nl">kostas.karasavvas@nbic.nl</a></p>

data/doc/rdoc/created.rid

@@ -1,4 +1,4 @@
-Tue, 13 Mar 2012 14:19:31 +0100
+Tue, 20 Mar 2012 17:19:23 +0100
 LICENSE	Fri, 22 Jul 2011 16:33:48 +0200
-README	Tue, 13 Mar 2012 14:18:56 +0100
-CHANGES	Tue, 13 Mar 2012 14:19:07 +0100
+README	Tue, 20 Mar 2012 17:19:01 +0100
+CHANGES	Tue, 20 Mar 2012 17:18:51 +0100

data/doc/rdoc/index.html

@@ -29,7 +29,7 @@
 <p>Konstantinos Karasavvas</p>
 </td></tr><tr><td class="rdoc-term"><p>Gem Version</p></td>
 <td>
-<p>0.0.7</p>
+<p>0.0.8</p>
 </td></tr><tr><td class="rdoc-term"><p>Contact</p></td>
 <td>
 <p><a href="mailto:kostas.karasavvas@nbic.nl">kostas.karasavvas@nbic.nl</a></p>

data/public/css/form.css

@@ -32,6 +32,17 @@ table.inputs {
   margin-right: auto;
 }
 
+table.acknowledgements {
+  width: 500px;
+  border-collapse: collapse;
+  /* With equal left-right margins table will be aligned in the centre */
+  margin-left: auto;
+  margin-right: auto;
+  font-size: 10pt;
+  font-style: italic;
+  text-align: center;
+}
+
 th.inputs {
   font-size: 120%;
   background-color: #f0f0f0;
@@ -42,7 +53,11 @@ th.inputs {
 
 td.inputs {
   padding: 5px;
-  vertical-align: top;
+  vertical-align: middle;
+}
+
+td.left {
+  text-align: left;
 }
 
 td.right {

data/views/form.haml

@@ -12,21 +12,7 @@
 
     = generate_header_table(@my_exp_wkf, @my_exp_usr)
 
-    -# TODO: should move coding to controller and not use haml's "-" for logic inside the template!!!
-    -#header
-      %table.header
-        %tr
-          %td
-            %img{:src => "/images/nbic_logo.gif", :alt => "NBIC logo"}
-          %td
-            %table.header-title
-              %tr
-                %td.header-title Workflow: #{@my_exp_wkf.title}
-              - if #{@my_exp_wkf.user.name}
-                %tr
-                  %td.right workflow by #{@my_exp_wkf.user.name}
-          %td
-            %img.right{:src => "/images/lumc_logo2.png", :alt => "LUMC logo"}
+    -# TODO: should move coding to controller and reduce haml's "-" for logic inside the template!!!
 
     %br
     #inputs
@@ -81,32 +67,6 @@
           %td.inputs
             = @my_exp_wkf.description
 
-    -# %br
-    -# %br
-    -#inputs
-      - if @my_exp_wkf.inputs.size >=1
-        %table.inputs
-          %tr
-            %th.inputs
-              Input
-            %th.inputs
-              Description
-            %th.inputs
-              Examples
-          - @my_exp_wkf.inputs.each do |input|
-            %tr
-              %td.inputs
-                = input.name
-              %td.inputs
-                - if input.descriptions.size >=1
-                  - input.descriptions.each do |descr|
-                    = descr
-                    %br
-              %td.inputs
-                - if input.examples.size >=1
-                  - input.examples.each do |ex|
-                    = ex
-                    %br
 
     %br
     %br
@@ -147,27 +107,33 @@
           %th.inputs
         %tr
           %td.inputs
-            %img{:src => "/images/info.png", :alt => "Important!" }
+            %img{:src => "/images/bullet_go.png", :alt => "Important!" }
           %td.inputs
             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.
         %tr
           %td.inputs
-            %img{:src => "/images/info.png", :alt => "Important!" }
+            %img{:src => "/images/bullet_go.png", :alt => "Important!" }
           %td.inputs
             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.
         %tr
           %td.inputs
-            %img{:src => "/images/info.png", :alt => "Important!" }
+            %img{:src => "/images/bullet_go.png", :alt => "Important!" }
           %td.inputs
             For more information on this workflow please visit the
             %a{ :href => "http://www.myExperiment.org/workflows/#{@wid}" } myExperiment website
-        - if #{@my_exp_wkf.user.email}
+        -# if #{@my_exp_wkf.user.email}
           %tr
             %td.inputs
-              %img{:src => "/images/info.png", :alt => "Important!" }
+              %img{:src => "/images/bullet_go.png", :alt => "Important!" }
             %td.inputs
               For questions/comments you can also contact the workflow creator at:
               %a{ :href => "mailto:#{@my_exp_usr.email}" } #{@my_exp_usr.email}
 
     %br
-    %br
+
+    #footer
+      %table.acknowledgements
+        %tr
+          %td.inputs
+            The work to generate a web form from a Taverna workflow was based on a collaboration between NBIC, myExperiment, and myGrid.
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: t2-web
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Kostas Karasavvas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-13 00:00:00 Z
+date: 2012-03-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -216,6 +216,7 @@ files:
 - public/css/results_navigation.css
 - public/images/nbic_logo.gif
 - public/images/snake_transparent.gif
+- public/images/bullet_go.png
 - public/images/tipsy.gif
 - public/images/info.png
 - public/images/lumc_logo2.png
@@ -250,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Web application that generates a Web UI form for a Taverna2 workflow, given its myExperiment id, for ease of execution. The only requirement for the user is a web browser.