details: http://www.bx.psu.edu/hg/galaxy/rev/2590120aed68 changeset: 3545:2590120aed68 user: jeremy goecks jeremy.goecks@emory.edu date: Thu Mar 18 12:57:29 2010 -0400 description: Style and functional fixes for embedded items.
diffstat:
static/june_2007_style/blue/embed_item.css | 4 ++-- static/june_2007_style/embed_item.css.tmpl | 4 ++-- templates/display_base.mako | 18 ++++++++++++++++++ templates/history/display.mako | 7 +------ templates/history/view.mako | 2 +- templates/page/display.mako | 10 +++++++++- templates/workflow/display.mako | 8 +------- 7 files changed, 34 insertions(+), 19 deletions(-)
diffs (147 lines):
diff -r cb9b4a967ff2 -r 2590120aed68 static/june_2007_style/blue/embed_item.css --- a/static/june_2007_style/blue/embed_item.css Wed Mar 17 20:59:47 2010 -0400 +++ b/static/june_2007_style/blue/embed_item.css Thu Mar 18 12:57:29 2010 -0400 @@ -4,8 +4,8 @@ .embedded-item.history p{background:#C1C9E5 no-repeat 2px 2px;margin-top:0;margin-bottom:0;} .embedded-item.dataset{background-color:#CFC} .embedded-item.dataset p{background:#CFC no-repeat 2px 2px;margin-top:0;margin-bottom:0;} -.embedded-item.workflow{background-color:#EBD9B2} -.embedded-item.workflow p{background:#EBD9B2 no-repeat 2px 2px;margin-top:0;margin-bottom:0;} +.embedded-item.workflow{background-color:#FBDDB3} +.embedded-item.workflow p{background:#FBDDB3 no-repeat 2px 2px;margin-top:0;margin-bottom:0;} .embedded-item.placeholder{} .embedded-item .item-content{max-height:25em;overflow:auto;display:none;} .embedded-item .title{vertical-align:top;text-align:center;font-weight:bold;} diff -r cb9b4a967ff2 -r 2590120aed68 static/june_2007_style/embed_item.css.tmpl --- a/static/june_2007_style/embed_item.css.tmpl Wed Mar 17 20:59:47 2010 -0400 +++ b/static/june_2007_style/embed_item.css.tmpl Thu Mar 18 12:57:29 2010 -0400 @@ -32,11 +32,11 @@ }
.embedded-item.workflow { - background-color:#EBD9B2 + background-color:#FBDDB3 }
.embedded-item.workflow p { - background:#EBD9B2 no-repeat 2px 2px; + background:#FBDDB3 no-repeat 2px 2px; margin-top:0; margin-bottom:0; } diff -r cb9b4a967ff2 -r 2590120aed68 templates/display_base.mako --- a/templates/display_base.mako Wed Mar 17 20:59:47 2010 -0400 +++ b/templates/display_base.mako Thu Mar 18 12:57:29 2010 -0400 @@ -92,6 +92,24 @@ border: 2px solid #DDDDDD; border-top: 4px solid #DDDDDD; } + + ## Make sure that history items and workflow steps do not get too long. + .historyItemContainer, .toolForm { + max-width: 500px; + } + + ## Space out tool forms in workflows. + div.toolForm{ + margin-top: 10px; + margin-bottom: 10px; + } + + ## Add border to history item container. + .historyItemContainer { + padding-right: 3px; + border-right-style: solid; + border-right-color: #66AA66; + } </style> </%def>
diff -r cb9b4a967ff2 -r 2590120aed68 templates/history/display.mako --- a/templates/history/display.mako Wed Mar 17 20:59:47 2010 -0400 +++ b/templates/history/display.mako Thu Mar 18 12:57:29 2010 -0400 @@ -208,11 +208,6 @@ ${parent.stylesheets()} ${h.css( "history" )} <style type="text/css"> - .visible-right-border { - padding-right: 3px; - border-right-style: solid; - border-right-color: #66AA66; - } .historyItemBody { display: none; } @@ -252,7 +247,7 @@ %else: ## Render requested datasets, ordered from newest to oldest, including annotations. <table class="annotated-item"> - <tr><th>Dataset</th><th class="annotation">Description/Notes</th></tr> + <tr><th>Dataset</th><th class="annotation">Annotation</th></tr> %for data in datasets: <tr> %if data.visible: diff -r cb9b4a967ff2 -r 2590120aed68 templates/history/view.mako --- a/templates/history/view.mako Wed Mar 17 20:59:47 2010 -0400 +++ b/templates/history/view.mako Thu Mar 18 12:57:29 2010 -0400 @@ -269,7 +269,7 @@ ${parent.stylesheets()} ${h.css( "history", "autocomplete_tagging" )} <style type="text/css"> - .visible-right-border { + .historyItemContainer { padding-right: 3px; border-right-style: solid; border-right-color: #66AA66; diff -r cb9b4a967ff2 -r 2590120aed68 templates/page/display.mako --- a/templates/page/display.mako Wed Mar 17 20:59:47 2010 -0400 +++ b/templates/page/display.mako Thu Mar 18 12:57:29 2010 -0400 @@ -47,6 +47,15 @@ container.find(".item-content").html(item_content).show("fast"); container.find(".toggle-expand").hide(); container.find(".toggle-contract").show(); + + // Init needed for history items. + setupHistoryItem( container.find("div.historyItemWrapper") ); + container.find( "div.historyItemBody:visible" ).each( function() { + if ( $.browser.mozilla ) { + $(this).find( "pre.peek" ).css( "overflow", "hidden" ); + } + $(this).hide(); + }); } }); else @@ -218,7 +227,6 @@ ${h.css( "base", "history", "autocomplete_tagging" )} <style type="text/css"> .toggle-contract { display: none; } - .item-content { overflow: auto; } .embedded-item h4 { margin: 0px; } diff -r cb9b4a967ff2 -r 2590120aed68 templates/workflow/display.mako --- a/templates/workflow/display.mako Wed Mar 17 20:59:47 2010 -0400 +++ b/templates/workflow/display.mako Thu Mar 18 12:57:29 2010 -0400 @@ -8,12 +8,6 @@ <%def name="stylesheets()"> ${parent.stylesheets()} ${h.css( "workflow" )} - <style type="text/css"> - div.toolForm{ - margin-top: 10px; - margin-bottom: 10px; - } - </style> </%def>
<%def name="do_inputs( inputs, values, prefix, step, other_values=None )"> @@ -87,7 +81,7 @@ trans.get_history( create=True ) %> <table class="annotated-item"> - <tr><th>Step</th><th class="annotation">Description/Notes</th></tr> + <tr><th>Step</th><th class="annotation">Annotation</th></tr> %for i, step in enumerate( steps ): <tr><td> %if step.type == 'tool' or step.type is None: