From ccb6c518e026ea20ea5bcc8dd9510bd5e3da25ab Mon Sep 17 00:00:00 2001
From: Jeremy Goecks <jeremy.goecks@emory.edu>
Date: Thu, 17 Dec 2009 15:36:51 -0500
Subject: [PATCH] Style updates for history annotation feature in pages and a
 minor bug fix for grid_base.

---
 static/wymeditor/skins/galaxy/icons.png      | Bin 2940 -> 3041 bytes
 static/wymeditor/skins/galaxy/skin.css       |   3 ++-
 templates/grid_base.mako                     |   8 +++++++-
 templates/page/history_annotation_table.mako |  10 +++++-----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/static/wymeditor/skins/galaxy/icons.png b/static/wymeditor/skins/galaxy/icons.png
index a9cae0d9d028f7ef2b3a3cc1b6686cc2a525040a..8c8aed9f76f32360aec381e0ee9b4ffb1941968a 100644
GIT binary patch
delta 2254
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

delta 2152
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

diff --git a/static/wymeditor/skins/galaxy/skin.css b/static/wymeditor/skins/galaxy/skin.css
index 95bbe0a3db1..c28f03251ae 100644
--- a/static/wymeditor/skins/galaxy/skin.css
+++ b/static/wymeditor/skins/galaxy/skin.css
@@ -109,7 +109,8 @@
         .wym_skin_galaxy .wym_buttons li.wym_tools_paste a         { background-position: 0 -552px;}
         .wym_skin_galaxy .wym_buttons li.wym_tools_html a          { background-position: 0 -193px;}
         .wym_skin_galaxy .wym_buttons li.wym_tools_preview a       { background-position: 0 -408px;}
-        .wym_skin_galaxy .wym_buttons li.galaxy_tools_insert_history_link a   { background-position: 0 -622px;}
+        .wym_skin_galaxy .wym_buttons li.galaxy_tools_insert_history_link a   { background-position: 0 -646px;}
+        .wym_skin_galaxy .wym_buttons li.galaxy_tools_annotate_history a   { background-position: 0 -622px;}
 
 /*DECORATION*/
         .wym_skin_galaxy .wym_section h2             { background: #f0f0f0; border: solid gray; border-width: 0 0 1px;}
diff --git a/templates/grid_base.mako b/templates/grid_base.mako
index c2892cfd7b4..d45070afd1b 100644
--- a/templates/grid_base.mako
+++ b/templates/grid_base.mako
@@ -949,7 +949,13 @@ ${self.render_grid_table()}
         </tr>    
     %endif
     ## Grid operations.
-    %if grid.operations:
+    <%
+        num_allow_multiple_ops = 0
+        for operation in grid.operations:
+            if operation.allow_multiple:
+                num_allow_multiple_ops += 1
+    %>
+    %if num_allow_multiple_ops:
         <tr>
             <td></td>
             <td colspan="100">
diff --git a/templates/page/history_annotation_table.mako b/templates/page/history_annotation_table.mako
index b6c252751c2..27e6afdbbcb 100644
--- a/templates/page/history_annotation_table.mako
+++ b/templates/page/history_annotation_table.mako
@@ -8,7 +8,7 @@
     </tr>
     <tr>
         ## Status messages and tags.
-        <th colspan='2'>
+        <td colspan='2'>
             %if history.deleted:
                 <div class="warningmessagesmall">
                     ${_('This is a deleted history.')}
@@ -17,17 +17,17 @@
             %if trans.get_user() is not None:
                 Tags: ${render_tagging_element_html( tags=history.tags, editable=False, use_toggle_link=False )}
             %endif
-        </th>
+        </td>
     </tr>
     <tr>
-        <th colspan="2">Description of History: 
+        <td colspan="2" class="annotation">Description of History: 
             <ol>
                 <li>What was the motivation for this history?
                 <li>What is the outcome of this history?
                 <li>What are unresolved questions from this history?
                 <li>What new questions arise from this history?
             </ol>
-        </th>
+        </td>
     </tr>
     
     ## Table body. For each dataset, there is an area to annotate the dataset.
@@ -44,7 +44,7 @@
         %for data in datasets:
             %if data.visible:
             <tr>
-                <td valign="top"><span class="annotation">Describe this step: why was it done? what data does it produce?</span></td>
+                <td valign="top"><span class="annotation">Describe this step: why was it done? what data did it produce?</span></td>
                 ##<td valign="top" class="annotation">Describe this step: why was it done? what data does it produce?</td>
                 <td>
                     <div class="historyItemContainer" id="historyItemContainer-${data.id}">