opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Style updates for history annotation feature in pages and a minor bug fix for grid_base.

Browse Source
This commit is contained in:
Jeremy Goecks
2009-12-17 15:36:51 -05:00
parent 7d9dde7235
commit ccb6c518e0
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/wymeditor/skins/galaxy/icons.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

static/wymeditor/skins/galaxy/skin.css
+2 -1
View File
@@ -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;}
templates/grid_base.mako
+7 -1
View File
@@ -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">
templates/page/history_annotation_table.mako
+5 -5
View File
@@ -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}">