From greg@bx.psu.edu Thu Mar 18 14:30:34 2010 From: Greg Von Kuster To: galaxy-dev@lists.galaxyproject.org Subject: [galaxy-dev] [hg] galaxy 3545: Style and functional fixes for embedded items. Date: Thu, 18 Mar 2010 14:30:30 -0400 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1085537476316206459==" --===============1085537476316206459== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable details: http://www.bx.psu.edu/hg/galaxy/rev/2590120aed68 changeset: 3545:2590120aed68 user: jeremy goecks 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.c= ss --- a/static/june_2007_style/blue/embed_item.css Wed Mar 17 20:59:47 2010 -04= 00 +++ b/static/june_2007_style/blue/embed_item.css Thu Mar 18 12:57:29 2010 -04= 00 @@ -4,8 +4,8 @@ .embedded-item.history p{background:#C1C9E5 no-repeat 2px 2px;margin-top:0;m= argin-bottom:0;} .embedded-item.dataset{background-color:#CFC}=20 .embedded-item.dataset p{background:#CFC no-repeat 2px 2px;margin-top:0;marg= in-bottom:0;} -.embedded-item.workflow{background-color:#EBD9B2}=20 -.embedded-item.workflow p{background:#EBD9B2 no-repeat 2px 2px;margin-top:0;= margin-bottom:0;} +.embedded-item.workflow{background-color:#FBDDB3}=20 +.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.tm= pl --- a/static/june_2007_style/embed_item.css.tmpl Wed Mar 17 20:59:47 2010 -04= 00 +++ b/static/june_2007_style/embed_item.css.tmpl Thu Mar 18 12:57:29 2010 -04= 00 @@ -32,11 +32,11 @@ } =20 .embedded-item.workflow {=20 - background-color:#EBD9B2 + background-color:#FBDDB3 } =20 .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; } + =20 + ## Make sure that history items and workflow steps do not get too lo= ng. + .historyItemContainer, .toolForm { + max-width: 500px; + } + =20 + ## Space out tool forms in workflows. + div.toolForm{ + margin-top: 10px; + margin-bottom: 10px; + } + =20 + ## Add border to history item container. + .historyItemContainer { + padding-right: 3px; + border-right-style: solid; + border-right-color: #66AA66; + } =20 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" )} =20 <%def name=3D"do_inputs( inputs, values, prefix, step, other_values=3DNone )= "> @@ -87,7 +81,7 @@ trans.get_history( create=3DTrue )=20 %> - + %for i, step in enumerate( steps ):
StepDescription/Notes
StepAnnotation
%if step.type =3D=3D 'tool' or step.type is None: --===============1085537476316206459==--