details: http://www.bx.psu.edu/hg/galaxy/rev/2f3c4dd6ff1a changeset: 2902:2f3c4dd6ff1a user: jeremy goecks <jeremy.goecks@emory.edu> date: Wed Oct 21 14:19:45 2009 -0400 description: Style updates to external view of history. 3 file(s) affected in this change: static/june_2007_style/autocomplete_tagging.css.tmpl static/june_2007_style/blue/autocomplete_tagging.css templates/history/view.mako diffs (211 lines): diff -r 2950f021fc0c -r 2f3c4dd6ff1a static/june_2007_style/autocomplete_tagging.css.tmpl --- a/static/june_2007_style/autocomplete_tagging.css.tmpl Wed Oct 21 14:16:38 2009 -0400 +++ b/static/june_2007_style/autocomplete_tagging.css.tmpl Wed Oct 21 14:19:45 2009 -0400 @@ -129,5 +129,5 @@ .delete-tag-img { - margin-left: 0.3em + margin-left: 0.3em; } \ No newline at end of file diff -r 2950f021fc0c -r 2f3c4dd6ff1a static/june_2007_style/blue/autocomplete_tagging.css --- a/static/june_2007_style/blue/autocomplete_tagging.css Wed Oct 21 14:16:38 2009 -0400 +++ b/static/june_2007_style/blue/autocomplete_tagging.css Wed Oct 21 14:19:45 2009 -0400 @@ -1,133 +1,18 @@ -/****************************************************************************/ -/* JQuery autocomplete code */ -/****************************************************************************/ - -.ac_results { - padding: 0px; - border: 1px solid black; - background-color: white; - overflow: hidden; - z-index: 99999; -} - -.ac_results ul { - width: 100%; - list-style-position: outside; - list-style: none; - padding: 0; - margin: 0; -} - -.ac_results li { - padding: 2px 5px; - cursor: default; - display: block; - /* - if width will be 100% horizontal scrollbar will apear - when scroll mode will be used - */ - /*width: 100%;*/ - /* font: menu; */ - font-size: 12px; - /* - it is very important, if line-height not setted or setted - in relative units scroll will be broken in firefox - */ - line-height: 16px; - overflow: hidden; -} - -.ac_loading { - background: white url('indicator.gif') right center no-repeat; -} - -.ac_odd { - background-color: #fff; /* #eee */ - margin-left: 0.3em; -} - -.ac_even { - margin-left: 0.3em; -} - -.ac_over { - background-color: #0A246A; - color: white; -} - -.ac_header { - font-style: normal; - color: gray; - border-bottom: 0.1em solid gray; -} - -/****************************************************************************/ -/* Custom code for supporting tags */ -/****************************************************************************/ -.tag-area { - width: 100%; - cursor: pointer; - border: solid 1px #eee; -} - -.active-tag-area { - background-color: white; -} - -.toggle-link -{ - font-weight: normal; - padding: 0.3em; - margin-bottom: 1em; - width: 100%; - padding: 0.2em 0em 0.2em 0em; -} - -.tag-button { - width: auto; - color: #444; - text-decoration: none; - display: inline-block; - cursor: pointer; - margin: 0.2em; - border: 0; - padding: 0.1em 0.5em 0.1em 0.5em; - -moz-border-radius: .5em; - -webkit-border-radius: .5em; - border-radius: .5em; - background:#bbb; -} - -.tag-button img -{ - padding-left: 0.4em; -} - -.tag-button .tag-name:hover -{ - color: white; -} - -.add-tag-button -{ - margin-bottom: 0.3em; - vertical-align: middle; - padding: 0.3em; -} - -.add-tag-button:hover -{ - cursor: pointer; -} - -.tag-input { - vertical-align: bottom; - border: none; - outline: none; -} - -.delete-tag-img -{ - - margin-left: 0.3em -} \ No newline at end of file +.ac_results{padding:0px;border:1px solid black;background-color:white;overflow:hidden;z-index:99999;} +.ac_results ul{width:100%;list-style-position:outside;list-style:none;padding:0;margin:0;} +.ac_results li{padding:2px 5px;cursor:default;display:block;font-size:12px;line-height:16px;overflow:hidden;} +.ac_loading{background:white url('indicator.gif') right center no-repeat;} +.ac_odd{background-color:#fff;margin-left:0.3em;} +.ac_even{margin-left:0.3em;} +.ac_over{background-color:#0A246A;color:white;} +.ac_header{font-style:normal;color:gray;border-bottom:0.1em solid gray;} +.tag-area{width:100%;cursor:pointer;border:solid 1px #eee;} +.active-tag-area{background-color:white;} +.toggle-link{font-weight:normal;padding:0.3em;margin-bottom:1em;width:100%;padding:0.2em 0em 0.2em 0em;} +.tag-button{width:auto;color:#444;text-decoration:none;display:inline-block;cursor:pointer;margin:0.2em;border:0;padding:0.1em 0.5em 0.1em 0.5em;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em;background:#bbb;} +.tag-button img{padding-left:0.4em;} +.tag-button .tag-name:hover{color:white;} +.add-tag-button{margin-bottom:0.3em;vertical-align:middle;padding:0.3em;} +.add-tag-button:hover{cursor:pointer;} +.tag-input{vertical-align:bottom;border:none;outline:none;} +.delete-tag-img{margin-left:0.3em;} diff -r 2950f021fc0c -r 2f3c4dd6ff1a templates/history/view.mako --- a/templates/history/view.mako Wed Oct 21 14:16:38 2009 -0400 +++ b/templates/history/view.mako Wed Oct 21 14:19:45 2009 -0400 @@ -8,6 +8,13 @@ <%def name="stylesheets()"> ${parent.stylesheets()} ${h.css( "history", "autocomplete_tagging" )} + <style type="text/css"> + .visible-right-border { + padding-right: 3px; + border-right-style: solid; + border-right-color: #66AA66; + }; + </style> </%def> <%namespace file="/root/history_common.mako" import="render_dataset" /> @@ -291,7 +298,7 @@ <div id="top-links" class="historyLinks" style="padding: 0px 0px 5px 0px"> %if not user_owns_history: - <a href="${h.url_for( controller='history', action='imp', id=trans.security.encode_id(history.id) )}">${_('import')}</a> | + <a href="${h.url_for( controller='history', action='imp', id=trans.security.encode_id(history.id) )}">import and start using history</a> | %endif <a href="${h.url_for( controller='history', action='view', id=trans.security.encode_id(history.id) )}">${_('refresh')}</a> %if show_deleted: @@ -320,7 +327,7 @@ %if trans.get_user() is not None: <div id='history-tag-area' class="tag-element"></div> - ${render_tagging_element(history, "history-tag-area", get_toggle_link_text_fn='get_toggle_link_text', editable=user_owns_history)} + ${render_tagging_element(history, "history-tag-area", use_toggle_link='false', get_toggle_link_text_fn='get_toggle_link_text', editable=user_owns_history)} %endif %if not datasets: @@ -332,7 +339,7 @@ ## Render requested datasets, ordered from newest to oldest %for data in reversed( datasets ): %if data.visible: - <div class="historyItemContainer" id="historyItemContainer-${data.id}"> + <div class="historyItemContainer visible-right-border" id="historyItemContainer-${data.id}"> ${render_dataset( data, data.hid, show_deleted_on_refresh = show_deleted, user_owns_dataset=user_owns_history )} </div> %endif