Galaxy |

Changeset 114:4f0ed3b5ae46 (2014-07-09)

Previous changeset 113:5d3840a1635e (2014-07-09) Next changeset 115:0c2a03f9740b (2014-07-14)

Commit message:
update test results

modified:
test-data/blast xml example1.html
test-data/blast xml example2.html
test-data/blast xml example3.html
test-data/blast xml example3b.html
test-data/blast xml example4.html
test-data/blast xml example4b.html

diff -r 5d3840a1635e -r 4f0ed3b5ae46 test-data/blast xml example1.html
--- a/test-data/blast xml example1.html Wed Jul 09 15:19:53 2014 +0200
+++ b/test-data/blast xml example1.html Wed Jul 09 15:20:38 2014 +0200

@@ -40,20 +40,28 @@
       }

       h1 {
-      border-bottom: 1px solid #CCCCCC;
-      font-size: 150%;
-      padding-bottom: 0.1em;
+      font-size: 200%;
       }

       h2 {
+      font-size: 150%;
+      }
+
+      h1, h2 {
+      border-bottom: 1px solid #CCCCCC;
+      padding-bottom: 0.1em;
+      }
+
+      h3 {
       font-size: 120%;
       font-weight: bold;
       }

-      h4.darkHeader {
+      h5.darkHeader {
       color: #4D4D4D;
       letter-spacing: 0;
       font-weight: bold;
+      font-size: 108%;
       }

       #nodata {
@@ -385,38 +393,48 @@

     <div id=content>

+      <section class=header>
+
+        <h1>Nucleotide Blast results</h1>
+
+        <table class=headerdata>
+          <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>
+          <tr><td class=param>Database:</td><td>pdb</td></tr>
+        </table>
+
+      </section>
+


       <section class=match id=match1>

-        <h1>Nucleotide Sequence (16 letters)</h1>
+        <h2>Nucleotide Sequence (16 letters)</h2>

         <section class=header>

           <table class=headerdata>
+            <tr><td class=param>Query number:</td><td>1</td></tr>
             <tr><td class=param>Query ID:</td><td>106397</td></tr>
-            <tr><td class=param>Query definition:</td><td>No definition line</td></tr>
-            <tr><td class=param>Query length:</td><td>16</td></tr>
-            <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>
-            <tr><td class=param>Database:</td><td>pdb</td></tr>
+            <tr><td class=param>Definition line:</td><td>No definition line</td></tr>
+            <tr><td class=param>Length:</td><td>16</td></tr>
           </table>

         </section>

         <section class=graphics>
-          <h2>Graphic Summary</h2>
+          <h3>Graphic Summary</h3>

           <div class=grey>
-            <h3 class=centered>Distribution of 1 Blast Hits on the Query Sequence</h3>
+            <h4 class=centered>Distribution of 1 Blast Hits on the Query Sequence</h4>

             <div class=defline id=defline1>
               Mouse-over to show defline and scores, click to show alignments
             </div>

             <div class=graphic>
-              <h4 class=darkHeader>Color key for alignment scores</h4>
+              <h5 class=darkHeader>Color key for alignment scores</h5>
               <div class=legend><div class=graphicrow>
                   <div class=graphicitem style="background-color: black"><40</div>
                   <div class=graphicitem style="background-color: blue">40–50</div>
@@ -1823,10 +1841,10 @@

         <section class=descriptions>
-          <h2>Descriptions</h2>
+          <h3>Descriptions</h3>

           <div class=grey><div class=white>
-              <h4 class=darkHeader>Sequences producing significant alignments:</h4>
+              <h5 class=darkHeader>Sequences producing significant alignments:</h5>

               <table class=descriptiontable>
                 <col/><col/><col/><col/><col/><col/><col/>
@@ -3147,7 +3165,7 @@

         <section class=alignments>
-          <h2>Alignments</h2>
+          <h3>Alignments</h3>

           <div class=grey><div class=white>
               <div class=alignment id=hit1-1>

diff -r 5d3840a1635e -r 4f0ed3b5ae46 test-data/blast xml example2.html
--- a/test-data/blast xml example2.html Wed Jul 09 15:19:53 2014 +0200
+++ b/test-data/blast xml example2.html Wed Jul 09 15:20:38 2014 +0200

@@ -40,20 +40,28 @@
       }

       h1 {
+      font-size: 200%;
+      }
+
+      h2 {
+      font-size: 150%;
+      }
+
+      h1, h2 {
       border-bottom: 1px solid #CCCCCC;
-      font-size: 150%;
       padding-bottom: 0.1em;
       }

-      h2 {
+      h3 {
       font-size: 120%;
       font-weight: bold;
       }

-      h4.darkHeader {
+      h5.darkHeader {
       color: #4D4D4D;
       letter-spacing: 0;
       font-weight: bold;
+      font-size: 108%;
       }

       #nodata {
@@ -385,27 +393,37 @@

     <div id=content>

+      <section class=header>
+
+        <h1>Nucleotide Blast results</h1>
+
+        <table class=headerdata>
+          <tr><td class=param>Program:</td><td>BLASTN 2.2.28+</td></tr>
+          <tr><td class=param>Database:</td><td>/share/BlastDB/nt</td></tr>
+        </table>
+
+      </section>
+


       <section class=match id=match1>

-        <h1>Nucleotide Sequence (16 letters)</h1>
+        <h2>Nucleotide Sequence (16 letters)</h2>

         <section class=header>

           <table class=headerdata>
+            <tr><td class=param>Query number:</td><td>1</td></tr>
             <tr><td class=param>Query ID:</td><td>Query_1</td></tr>
-            <tr><td class=param>Query definition:</td><td>No definition line</td></tr>
-            <tr><td class=param>Query length:</td><td>16</td></tr>
-            <tr><td class=param>Program:</td><td>BLASTN 2.2.28+</td></tr>
-            <tr><td class=param>Database:</td><td>/share/BlastDB/nt</td></tr>
+            <tr><td class=param>Definition line:</td><td>No definition line</td></tr>
+            <tr><td class=param>Length:</td><td>16</td></tr>
           </table>

         </section>

         <section>
-          <h2>No Hits</h2>
+          <h3>No Hits</h3>
           <div class=grey>
             <table class=headerdata>
               <tr><td class=param>Message:</td><td>No hits found</td></tr>

diff -r 5d3840a1635e -r 4f0ed3b5ae46 test-data/blast xml example3.html
--- a/test-data/blast xml example3.html Wed Jul 09 15:19:53 2014 +0200
+++ b/test-data/blast xml example3.html Wed Jul 09 15:20:38 2014 +0200

b'@@ -40,20 +40,28 @@\n }\n \n h1 {\n- border-bottom: 1px solid #CCCCCC;\n- font-size: 150%;\n- padding-bottom: 0.1em;\n+ font-size: 200%;\n }\n \n h2 {\n+ font-size: 150%;\n+ }\n+ \n+ h1, h2 {\n+ border-bottom: 1px solid #CCCCCC;\n+ padding-bottom: 0.1em;\n+ }\n+\n+ h3 {\n font-size: 120%;\n font-weight: bold;\n }\n \n- h4.darkHeader {\n+ h5.darkHeader {\n color: #4D4D4D;\n letter-spacing: 0;\n font-weight: bold;\n+ font-size: 108%;\n }\n \n #nodata {\n@@ -385,9 +393,20 @@\n \n <div id=content>\n \n+ <section class=header>\n+\n+ <h1>Nucleotide Blast results</h1>\n+\n+ <table class=headerdata>\n+ <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>\n+ <tr><td class=param>Database:</td><td></td></tr>\n+ </table>\n+\n+ </section>\n+\n \n <section class=index>\n- <h1>Queries</h1>\n+ <h2>Queries</h2>\n \n <div class=indexentry><a href="#match1">\n Query_1: Forward_Primer|NOST-Spec_(Genetic_ID)\n@@ -619,22 +638,21 @@\n \n <section class=match id=match1>\n \n- <h1>Nucleotide Sequence (20 letters)</h1>\n+ <h2>Nucleotide Sequence (20 letters)</h2>\n \n <section class=header>\n \n <table class=headerdata>\n+ <tr><td class=param>Query number:</td><td>1</td></tr>\n <tr><td class=param>Query ID:</td><td>Query_1</td></tr>\n- <tr><td class=param>Query definition:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</td></tr>\n- <tr><td class=param>Query length:</td><td>20</td></tr>\n- <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>\n- <tr><td class=param>Database:</td><td></td></tr>\n+ <tr><td class=param>Definition line:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</td></tr>\n+ <tr><td class=param>Length:</td><td>20</td></tr>\n </table>\n \n </section>\n \n <section>\n- <h2>No Hits</h2>\n+ <h3>No Hits</h3>\n <div class=grey>\n <table class=headerdata>\n <tr><td class=param>Message:</td><td>No hits found</td></tr>\n@@ -645,22 +663,21 @@\n \n <section class=match id=match2>\n \n- <h1>Nucleotide Sequence (20 letters)</h1>\n+ <h2>Nucleotide Sequence (20 letters)</h2>\n \n <section class=header>\n \n <table class=headerdata>\n+ <tr><td class=param>Query number:</td><td>2</td></tr>\n <tr><td class=param>Query ID:</td><td>Query_1</td></tr>\n- <tr><td class=param>Query definition:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</td></tr>\n- <tr><td class=param>Query length:</td><td>20</td></tr>\n- <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>\n- <tr><td class=param>Database:</td><td></td></tr>\n+ <tr><td class=param>Definition line:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</td></tr>\n+ <tr><td class=param>Length:</td><td>20</td></tr>\n </table>\n \n </section>\n \n <section>\n- <h2>No Hits</h2>\n+ <h3>No Hits</h3>\n <div class=grey>\n <table class=headerdata>\n <tr><td class=param>Message:</td><td>No hits found</td></tr>\n@@ -671,33 +688,32 @@\n \n <section class=match id=match3>\n \n- <h1>Nucleotide Sequence (20 letters)</h1>\n+ <h2>Nucleotide Sequence (20 letters)</h2>\n \n <section class=header>\n \n <table class=headerdata>\n+ <tr><td class=param>Query number:</td><td>3</td></tr>\n <tr><td class=param>Query ID:</td><td>Query_1</td></tr>\n- <tr><td class=param>Query definition:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</td></tr>\n- <tr><td class=param>Query length:</td><td>20</td></tr>\n- <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>\n- '..b' <h3>Graphic Summary</h3>\n \n <div class=grey>\n- <h3 class=centered>Distribution of 56 Blast Hits on the Query Sequence</h3>\n+ <h4 class=centered>Distribution of 56 Blast Hits on the Query Sequence</h4>\n \n <div class=defline id=defline55>\n Mouse-over to show defline and scores, click to show alignments\n </div>\n \n <div class=graphic>\n- <h4 class=darkHeader>Color key for alignment scores</h4>\n+ <h5 class=darkHeader>Color key for alignment scores</h5>\n <div class=legend><div class=graphicrow>\n <div class=graphicitem style="background-color: black"><40</div>\n <div class=graphicitem style="background-color: blue">40\xe2\x80\x9350</div>\n@@ -3222,10 +3186,10 @@\n \n \n <section class=descriptions>\n- <h2>Descriptions</h2>\n+ <h3>Descriptions</h3>\n \n <div class=grey><div class=white>\n- <h4 class=darkHeader>Sequences producing significant alignments:</h4>\n+ <h5 class=darkHeader>Sequences producing significant alignments:</h5>\n \n <table class=descriptiontable>\n <col/><col/><col/><col/><col/><col/><col/>\n@@ -3259,7 +3223,7 @@\n \n \n <section class=alignments>\n- <h2>Alignments</h2>\n+ <h3>Alignments</h3>\n \n <div class=grey><div class=white>\n <div class=alignment id=hit55-1>\n@@ -3313,33 +3277,32 @@\n \n <section class=match id=match56>\n \n- <h1>Nucleotide Sequence (74 letters)</h1>\n+ <h2>Nucleotide Sequence (74 letters)</h2>\n \n <section class=header>\n \n <table class=headerdata>\n- <tr><td class=param>Query ID:</td><td>Query_1</td></tr>\n- <tr><td class=param>Query definition:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</td></tr>\n- <tr><td class=param>Query length:</td><td>20</td></tr>\n- <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>\n- <tr><td class=param>Database:</td><td></td></tr>\n+ <tr><td class=param>Query number:</td><td>56</td></tr>\n+ <tr><td class=param>Query ID:</td><td>Query_7</td></tr>\n+ <tr><td class=param>Definition line:</td><td>Amplicon|QL-ELE-Bt-F1(mod)/Bt-R</td></tr>\n+ <tr><td class=param>Length:</td><td>74</td></tr>\n </table>\n \n </section>\n \n \n <section class=graphics>\n- <h2>Graphic Summary</h2>\n+ <h3>Graphic Summary</h3>\n \n <div class=grey>\n- <h3 class=centered>Distribution of 56 Blast Hits on the Query Sequence</h3>\n+ <h4 class=centered>Distribution of 56 Blast Hits on the Query Sequence</h4>\n \n <div class=defline id=defline56>\n Mouse-over to show defline and scores, click to show alignments\n </div>\n \n <div class=graphic>\n- <h4 class=darkHeader>Color key for alignment scores</h4>\n+ <h5 class=darkHeader>Color key for alignment scores</h5>\n <div class=legend><div class=graphicrow>\n <div class=graphicitem style="background-color: black"><40</div>\n <div class=graphicitem style="background-color: blue">40\xe2\x80\x9350</div>\n@@ -3410,10 +3373,10 @@\n \n \n <section class=descriptions>\n- <h2>Descriptions</h2>\n+ <h3>Descriptions</h3>\n \n <div class=grey><div class=white>\n- <h4 class=darkHeader>Sequences producing significant alignments:</h4>\n+ <h5 class=darkHeader>Sequences producing significant alignments:</h5>\n \n <table class=descriptiontable>\n <col/><col/><col/><col/><col/><col/><col/>\n@@ -3447,7 +3410,7 @@\n \n \n <section class=alignments>\n- <h2>Alignments</h2>\n+ <h3>Alignments</h3>\n \n <div class=grey><div class=white>\n <div class=alignment id=hit56-1>\n'

diff -r 5d3840a1635e -r 4f0ed3b5ae46 test-data/blast xml example3b.html
--- a/test-data/blast xml example3b.html Wed Jul 09 15:19:53 2014 +0200
+++ b/test-data/blast xml example3b.html Wed Jul 09 15:20:38 2014 +0200

diff -r 5d3840a1635e -r 4f0ed3b5ae46 test-data/blast xml example4.html
--- a/test-data/blast xml example4.html Wed Jul 09 15:19:53 2014 +0200
+++ b/test-data/blast xml example4.html Wed Jul 09 15:20:38 2014 +0200

b'@@ -40,20 +40,28 @@\n }\n \n h1 {\n+ font-size: 200%;\n+ }\n+\n+ h2 {\n+ font-size: 150%;\n+ }\n+ \n+ h1, h2 {\n border-bottom: 1px solid #CCCCCC;\n- font-size: 150%;\n padding-bottom: 0.1em;\n }\n \n- h2 {\n+ h3 {\n font-size: 120%;\n font-weight: bold;\n }\n \n- h4.darkHeader {\n+ h5.darkHeader {\n color: #4D4D4D;\n letter-spacing: 0;\n font-weight: bold;\n+ font-size: 108%;\n }\n \n #nodata {\n@@ -385,9 +393,20 @@\n \n <div id=content>\n \n+ <section class=header>\n+\n+ <h1>Nucleotide Blast results</h1>\n+\n+ <table class=headerdata>\n+ <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>\n+ <tr><td class=param>Database:</td><td>/opt/galaxy/blastdbs/EUginius_plasmid_insert</td></tr>\n+ </table>\n+\n+ </section>\n+\n \n <section class=index>\n- <h1>Queries</h1>\n+ <h2>Queries</h2>\n \n <div class=indexentry><a href="#match1">\n Query_1: Forward_Primer|NOST-Spec_(Genetic_ID)\n@@ -423,33 +442,32 @@\n \n <section class=match id=match1>\n \n- <h1>Nucleotide Sequence (20 letters)</h1>\n+ <h2>Nucleotide Sequence (20 letters)</h2>\n \n <section class=header>\n \n <table class=headerdata>\n+ <tr><td class=param>Query number:</td><td>1</td></tr>\n <tr><td class=param>Query ID:</td><td>Query_1</td></tr>\n- <tr><td class=param>Query definition:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</td></tr>\n- <tr><td class=param>Query length:</td><td>20</td></tr>\n- <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>\n- <tr><td class=param>Database:</td><td>/opt/galaxy/blastdbs/EUginius_plasmid_insert</td></tr>\n+ <tr><td class=param>Definition line:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</td></tr>\n+ <tr><td class=param>Length:</td><td>20</td></tr>\n </table>\n \n </section>\n \n \n <section class=graphics>\n- <h2>Graphic Summary</h2>\n+ <h3>Graphic Summary</h3>\n \n <div class=grey>\n- <h3 class=centered>Distribution of 7 Blast Hits on the Query Sequence</h3>\n+ <h4 class=centered>Distribution of 7 Blast Hits on the Query Sequence</h4>\n \n <div class=defline id=defline1>\n Mouse-over to show defline and scores, click to show alignments\n </div>\n \n <div class=graphic>\n- <h4 class=darkHeader>Color key for alignment scores</h4>\n+ <h5 class=darkHeader>Color key for alignment scores</h5>\n <div class=legend><div class=graphicrow>\n <div class=graphicitem style="background-color: black"><40</div>\n <div class=graphicitem style="background-color: blue">40\xe2\x80\x9350</div>\n@@ -530,10 +548,10 @@\n \n \n <section class=descriptions>\n- <h2>Descriptions</h2>\n+ <h3>Descriptions</h3>\n \n <div class=grey><div class=white>\n- <h4 class=darkHeader>Sequences producing significant alignments:</h4>\n+ <h5 class=darkHeader>Sequences producing significant alignments:</h5>\n \n <table class=descriptiontable>\n <col/><col/><col/><col/><col/><col/><col/>\n@@ -580,7 +598,7 @@\n \n \n <section class=alignments>\n- <h2>Alignments</h2>\n+ <h3>Alignments</h3>\n \n <div class=grey><div class=white>\n <div class=alignment id=hit1-1>\n@@ -673,22 +691,21 @@\n \n <section class=match id=match2>\n \n- <h1>Nucleotide Sequence (20 letters)</h1>\n+ <h2>Nucleotide Sequence (20 letters)</h2>\n \n <section class=header>\n \n <table class=headerdata>\n- <tr><td class=param>Query ID:</td><td>Query_1</td></tr>\n- <tr><td class=param>Query definition:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</t'..b'\n <div class=grey>\n- <h3 class=centered>Distribution of 7 Blast Hits on the Query Sequence</h3>\n+ <h4 class=centered>Distribution of 7 Blast Hits on the Query Sequence</h4>\n \n <div class=defline id=defline6>\n Mouse-over to show defline and scores, click to show alignments\n </div>\n \n <div class=graphic>\n- <h4 class=darkHeader>Color key for alignment scores</h4>\n+ <h5 class=darkHeader>Color key for alignment scores</h5>\n <div class=legend><div class=graphicrow>\n <div class=graphicitem style="background-color: black"><40</div>\n <div class=graphicitem style="background-color: blue">40\xe2\x80\x9350</div>\n@@ -1177,10 +1190,10 @@\n \n \n <section class=descriptions>\n- <h2>Descriptions</h2>\n+ <h3>Descriptions</h3>\n \n <div class=grey><div class=white>\n- <h4 class=darkHeader>Sequences producing significant alignments:</h4>\n+ <h5 class=darkHeader>Sequences producing significant alignments:</h5>\n \n <table class=descriptiontable>\n <col/><col/><col/><col/><col/><col/><col/>\n@@ -1227,7 +1240,7 @@\n \n \n <section class=alignments>\n- <h2>Alignments</h2>\n+ <h3>Alignments</h3>\n \n <div class=grey><div class=white>\n <div class=alignment id=hit6-1>\n@@ -1320,33 +1333,32 @@\n \n <section class=match id=match7>\n \n- <h1>Nucleotide Sequence (74 letters)</h1>\n+ <h2>Nucleotide Sequence (74 letters)</h2>\n \n <section class=header>\n \n <table class=headerdata>\n- <tr><td class=param>Query ID:</td><td>Query_1</td></tr>\n- <tr><td class=param>Query definition:</td><td>Forward_Primer|NOST-Spec_(Genetic_ID)</td></tr>\n- <tr><td class=param>Query length:</td><td>20</td></tr>\n- <tr><td class=param>Program:</td><td>BLASTN 2.2.29+</td></tr>\n- <tr><td class=param>Database:</td><td>/opt/galaxy/blastdbs/EUginius_plasmid_insert</td></tr>\n+ <tr><td class=param>Query number:</td><td>7</td></tr>\n+ <tr><td class=param>Query ID:</td><td>Query_7</td></tr>\n+ <tr><td class=param>Definition line:</td><td>Amplicon|QL-ELE-Bt-F1(mod)/Bt-R</td></tr>\n+ <tr><td class=param>Length:</td><td>74</td></tr>\n </table>\n \n </section>\n \n \n <section class=graphics>\n- <h2>Graphic Summary</h2>\n+ <h3>Graphic Summary</h3>\n \n <div class=grey>\n- <h3 class=centered>Distribution of 7 Blast Hits on the Query Sequence</h3>\n+ <h4 class=centered>Distribution of 7 Blast Hits on the Query Sequence</h4>\n \n <div class=defline id=defline7>\n Mouse-over to show defline and scores, click to show alignments\n </div>\n \n <div class=graphic>\n- <h4 class=darkHeader>Color key for alignment scores</h4>\n+ <h5 class=darkHeader>Color key for alignment scores</h5>\n <div class=legend><div class=graphicrow>\n <div class=graphicitem style="background-color: black"><40</div>\n <div class=graphicitem style="background-color: blue">40\xe2\x80\x9350</div>\n@@ -1428,10 +1440,10 @@\n \n \n <section class=descriptions>\n- <h2>Descriptions</h2>\n+ <h3>Descriptions</h3>\n \n <div class=grey><div class=white>\n- <h4 class=darkHeader>Sequences producing significant alignments:</h4>\n+ <h5 class=darkHeader>Sequences producing significant alignments:</h5>\n \n <table class=descriptiontable>\n <col/><col/><col/><col/><col/><col/><col/>\n@@ -1478,7 +1490,7 @@\n \n \n <section class=alignments>\n- <h2>Alignments</h2>\n+ <h3>Alignments</h3>\n \n <div class=grey><div class=white>\n <div class=alignment id=hit7-1>\n'

diff -r 5d3840a1635e -r 4f0ed3b5ae46 test-data/blast xml example4b.html
--- a/test-data/blast xml example4b.html Wed Jul 09 15:19:53 2014 +0200
+++ b/test-data/blast xml example4b.html Wed Jul 09 15:20:38 2014 +0200