Diff
Modified: trunk/app/views/workflows/show.rhtml (2295 => 2296)
--- trunk/app/views/workflows/show.rhtml 2009-11-10 13:52:47 UTC (rev 2295)
+++ trunk/app/views/workflows/show.rhtml 2009-11-11 11:40:31 UTC (rev 2296)
@@ -155,16 +155,6 @@
<h3>
<%= info_icon_with_tooltip("This section shows the preview of this version of the Workflow (click on the image to expand)") %>
- Classification
- </h3>
-
- <p>
- <span class="classification">Sequence Analysis</span>
- <span class="classification">Gene Prediction</span>
- </p>
-
- <h3>
- <%= info_icon_with_tooltip("This section shows the preview of this version of the Workflow (click on the image to expand)") %>
Preview
</h3>
@@ -220,170 +210,8 @@
<br/>
-
<h3>
<%= info_icon_with_tooltip("This section provides links to the different downloads for this version of the Workflow") %>
- Inputs
- </h3>
-
- <h4 style="text-align: left">Input 1: chromosome_name</h4>
-
- <table class="simple">
- <tr>
- <td>Name</td>
- <td>chromosome_name</td>
- </tr>
- <tr>
- <td>Type</td>
- <td>Text</td>
- </tr>
- <tr>
- <td>Description</td>
- <td>A chromosome name or number.</td>
- </tr>
- <tr>
- <td>Example 1</td>
- <td>17</td>
- </tr>
- </table>
- <br />
- <br />
-
- <h4 style="text-align: left">Input 2: qtl_start_position</h4>
-
- <table class="simple">
- <tr>
- <td>Name</td>
- <td>qtl_start_position</td>
- </tr>
- <tr>
- <td>Type</td>
- <td>Text</td>
- </tr>
- <tr>
- <td>Description</td>
- <td>QTL start base pair position</td>
- </tr>
- <tr>
- <td>Example 1</td>
- <td>28500000</td>
- </tr>
- </table>
- <br />
- <br />
-
- <h4 style="text-align: left">Input 3: qtl_end_position</h4>
-
- <table class="simple">
- <tr>
- <td>Name</td>
- <td>qtl_end_position</td>
- </tr>
- <tr>
- <td>Type</td>
- <td>Text</td>
- </tr>
- <tr>
- <td>Description</td>
- <td>QTL end base pair position</td>
- </tr>
- <tr>
- <td>Example 1</td>
- <td>29500000</td>
- </tr>
- </table>
- <br />
- <br />
-
- <h3>
- <%= info_icon_with_tooltip("This section provides links to the different downloads for this version of the Workflow") %>
- Outputs
- </h3>
-
- <h4 style="text-align: left">Output 1: chromosome_name</h4>
-
- <table class="simple">
- <tr>
- <td>Name</td>
- <td>merged_pathways</td>
- </tr>
- <tr>
- <td>Type</td>
- <td><a href="" record</a></td>
- </tr>
- <tr>
- <td>Description</td>
- <td>The merged pathways</td>
- </tr>
- <tr>
- <td>Example 1</td>
- <td>17</td>
- </tr>
- </table>
- <br />
- <br />
-
-
- <h3><%= info_icon_with_tooltip("This section provides links to the different downloads for this version of the Workflow") %> Complete examples</h3>
-
- <h4 style="text-align: left">Complete example 1: Example given from the original description</h4>
-
- <table class="simple">
- <tr>
- <th>Input</th>
- <th>Value</th>
- </tr>
- <tr>
- <td>chromosome_name</td>
- <td>17</td>
- </tr>
- <tr>
- <td>qtl_start_position</td>
- <td>28500000</td>
- </tr>
- <tr>
- <td>qtl_end_position</td>
- <td>29500000</td>
- </tr>
- </table>
- <br />
- <br />
-
- <table class="simple">
- <tr>
- <th>Output</th>
- <th>Value</th>
- </tr>
- <tr>
- <td>merged_pathways</td>
- <td>Example output value.</td>
- </tr>
- </table>
- <br />
- <br />
-
-
- <h3><%= info_icon_with_tooltip("This section provides links to the different downloads for this version of the Workflow") %> Dependencies</h3>
-
- <div class="dependencies">
- <p>This workflow depends on the following:
- <br />
-
- <ul>
- <li>
- <%= icon('blob', nil, nil, nil, '') %>
- <a href="" Compounds to Inchi strings</a>
- </li>
- <li>
- <span class="icon"><img src="" /></span>
- <a href=""
- </li>
- </ul>
- </p>
- </div>
-
- <h3>
- <%= info_icon_with_tooltip("This section provides links to the different downloads for this version of the Workflow") %>
Download
</h3>
@@ -443,23 +271,6 @@
<%= render :partial => "contributions/credits_attributions_box", :locals => { :contributable => @workflow, :edit_path => edit_workflow_path(@workflow) } %>
-<div class="contribution_section_box">
- <p class="heading" style="margin-bottom: 0; padding-bottom: 0;">
- <%= info_icon_with_tooltip("Which people/groups get the credit for this?") %>
- Scope and Quality
- </p>
- <div style="font-size: 85%;">
- <p>The scope and quality of this Workflow has been classified by our curators as:</p>
- </div>
- <br />
- <div class="quality"><a href=""
- <div class="quality"><a href=""
- <br />
- <div style="font-size: 85%;">
- <a href="" breakdown</a>
- </div>
-</div>
-
<%= render :partial => "tags/tags_box", :locals => { :taggable => @workflow,
:owner_id => ((@workflow.contribution.contributor_type == 'User') ? @workflow.contribution.contributor_id : nil),
:add_path => tag_workflow_path(@workflow),
Modified: trunk/lib/explicit_versioning.rb (2295 => 2296)
--- trunk/lib/explicit_versioning.rb 2009-11-10 13:52:47 UTC (rev 2295)
+++ trunk/lib/explicit_versioning.rb 2009-11-11 11:40:31 UTC (rev 2296)
@@ -47,12 +47,6 @@
# create the dynamic versioned model
const_set(versioned_class_name, Class.new(ActiveRecord::Base)).class_eval do
def self.reloadable? ; false ; end
-
- after_update :sync_main_record
-
- def sync_main_record
- # If this is the current version, update the main record with it
- end
end
versioned_resource = self.to_s.demodulize.underscore.to_sym
Modified: trunk/public/stylesheets/styles.css (2295 => 2296)
--- trunk/public/stylesheets/styles.css 2009-11-10 13:52:47 UTC (rev 2295)
+++ trunk/public/stylesheets/styles.css 2009-11-11 11:40:31 UTC (rev 2296)
@@ -1985,23 +1985,3 @@
white-space: nowrap;
}
-.classification {
- border: 1px SOLID gray;
- padding: 3px;
- padding-left: 6px;
- padding-right: 6px;
- background: #ffffd0;
-}
-
-.quality {
- width: 90%;
- background: #EEA;
- border: 1px solid #CCCCAA;
- margin: 4px;
- padding: 4px;
-}
-
-.dependencies UL LI {
- list-style-type: none;
-}
-
Modified: trunk/test/functional/workflows_controller_test.rb (2295 => 2296)
--- trunk/test/functional/workflows_controller_test.rb 2009-11-10 13:52:47 UTC (rev 2295)
+++ trunk/test/functional/workflows_controller_test.rb 2009-11-11 11:40:31 UTC (rev 2296)
@@ -5,7 +5,6 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'workflows_controller'
-require 'xml/libxml'
# Re-raise errors caught by the controller.
class WorkflowsController; def rescue_action(e) raise e end; end
@@ -81,27 +80,4 @@
assert_equal old_count-1, Workflow.count
assert_redirected_to workflows_path
end
-
- def test_workflow_api
- login_as(:john)
-
- content = LibXML::XML::Node.new("content") <<
- Base64.encode64(File.read('test/fixtures/files/workflow_dilbert.xml'))
-
- content["encoding"] = "base64"
-
- doc = LibXML::XML::Document.new
- doc.root = LibXML::XML::Node.new("workflow")
-
- {
- "title" => "Test title",
- "description" => "Test description.",
- "license-type" => "by-sa",
- "content-type" => "application/vnd.taverna.scufl+xml",
- "content" => content
- }.each do |k, v|
- doc.root << (LibXML::XML::Node.new(k) << v)
- end
-
- end
end