details: http://www.bx.psu.edu/hg/galaxy/rev/eee2356f187b changeset: 3185:eee2356f187b user: jeremy goecks <jeremy.goecks@emory.edu> date: Thu Dec 17 15:36:51 2009 -0500 description: Style updates for history annotation feature in pages and a minor bug fix for grid_base. diffstat: static/wymeditor/skins/galaxy/icons.png | 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(-) diffs (75 lines): diff -r 2b632af1f56d -r eee2356f187b static/wymeditor/skins/galaxy/icons.png Binary file static/wymeditor/skins/galaxy/icons.png has changed diff -r 2b632af1f56d -r eee2356f187b static/wymeditor/skins/galaxy/skin.css --- a/static/wymeditor/skins/galaxy/skin.css Thu Dec 17 14:32:44 2009 -0500 +++ b/static/wymeditor/skins/galaxy/skin.css Thu Dec 17 15:36:51 2009 -0500 @@ -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 -r 2b632af1f56d -r eee2356f187b templates/grid_base.mako --- a/templates/grid_base.mako Thu Dec 17 14:32:44 2009 -0500 +++ b/templates/grid_base.mako Thu Dec 17 15:36:51 2009 -0500 @@ -949,7 +949,13 @@ </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 -r 2b632af1f56d -r eee2356f187b templates/page/history_annotation_table.mako --- a/templates/page/history_annotation_table.mako Thu Dec 17 14:32:44 2009 -0500 +++ b/templates/page/history_annotation_table.mako Thu Dec 17 15:36:51 2009 -0500 @@ -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}">