details: http://www.bx.psu.edu/hg/galaxy/rev/857d3a8ebd3d changeset: 2504:857d3a8ebd3d user: James Taylor <james@jamestaylor.org> date: Sun Jul 26 12:08:44 2009 -0400 description: Fix problem with history icons repeating 3 file(s) affected in this change: static/june_2007_style/blue/history.css static/june_2007_style/history.css.tmpl templates/root/history_common.mako diffs (132 lines): diff -r cbdd394a265c -r 857d3a8ebd3d static/june_2007_style/blue/history.css --- a/static/june_2007_style/blue/history.css Fri Jul 24 17:06:12 2009 -0400 +++ b/static/june_2007_style/blue/history.css Sun Jul 26 12:08:44 2009 -0400 @@ -2,22 +2,23 @@ a{color:#303030;} div.historyLinks{padding:5px;margin:5px 0 5px 0;} div.historyItem{margin:5px -5px 5px 0px;padding:5px 11px 5px 5px;border:solid #888888 1px;border-left:solid #888888 5px;border-right:none;background:#EEEEEE;} -div.historyItem div.historyItemTitleBar{padding-left:20px;background-position:0 1px;background-repeat:no-repeat;} +div.historyItem .state-icon{display:inline-block;vertical-align:middle;width:16px;height:16px;background-position:0 1px;background-repeat:no-repeat;} +div.historyItem .historyItemTitle{line-height:16px;} div.historyItem div.historyItem{margin-right:-11px;} div.historyItem-ok{border-color:#66AA66;background:#CCFFCC;} -div.historyItem-ok div.historyItemTitleBar{padding-left:0;} +div.historyItem-ok .state-icon{display:none;} div.historyItem-error{border-color:#AA6666;background:#FFCCCC;} -div.historyItem-error div.historyItemTitleBar{background:url(history-states.png) no-repeat 0px -0px;} +div.historyItem-error .state-icon{background:url(history-states.png) no-repeat 0px -0px;} div.historyItem-empty{border-color:#AA6666;background:#FFCCCC;} -div.historyItem-empty div.historyItemTitleBar{background:url(history-states.png) no-repeat 0px -25px;} +div.historyItem-empty .state-icon{background:url(history-states.png) no-repeat 0px -25px;} div.historyItem-running{border-color:#AAAA66;background:#FFFFCC;} -div.historyItem-running div.historyItemTitleBar{background-image:url(data_running.gif);} +div.historyItem-running .state-icon{background-image:url(data_running.gif);} div.historyItem-upload{border-color:#6666AA;background:#CCCCFF;} -div.historyItem-upload div.historyItemTitleBar{background-image:url(data_upload.gif);} +div.historyItem-upload .state-icon{background-image:url(data_upload.gif);} div.historyItem-queued{background:#EEEEEE;} -div.historyItem-queued div.historyItemTitleBar{background:url(history-states.png) no-repeat 0px -50px;} +div.historyItem-queued .state-icon{background:url(history-states.png) no-repeat 0px -50px;} div.historyItem-noPermission{filter:alpha(opacity=60);-moz-opacity:.60;opacity:.60;} -div.historyItemTitleBar.spinner{background:url(data_running.gif) 0 1px no-repeat !important;padding-left:20px !important;} +div.historyItemTitleBar.spinner .state-icon{background:url(data_running.gif) 0 1px no-repeat !important;} div.historyItemButtons{float:right;} .icon-button{width:16px;height:16px;display:block;float:left;margin-left:2px;text-indent:20px;} .icon-button.display{background:url(history-buttons.png) no-repeat 0px -0px;} diff -r cbdd394a265c -r 857d3a8ebd3d static/june_2007_style/history.css.tmpl --- a/static/june_2007_style/history.css.tmpl Fri Jul 24 17:06:12 2009 -0400 +++ b/static/june_2007_style/history.css.tmpl Sun Jul 26 12:08:44 2009 -0400 @@ -27,10 +27,16 @@ border-left: solid $history_queued_border 5px; border-right: none; background: $history_queued_bg; - div.historyItemTitleBar { - padding-left: 20px; + .state-icon { + display: inline-block; + vertical-align: middle; + width: 16px; + height: 16px; background-position: 0 1px; background-repeat: no-repeat; + } + .historyItemTitle { + line-height: 16px; } } @@ -43,14 +49,14 @@ div.historyItem-ok { border-color: $history_ok_border; background: $history_ok_bg; - div.historyItemTitleBar { - padding-left: 0; + .state-icon { + display: none; } } div.historyItem-error { border-color: $history_error_border; background: $history_error_bg; - div.historyItemTitleBar { + .state-icon { -sprite-group: history-states; -sprite-image: data_error.png; } @@ -59,7 +65,7 @@ div.historyItem-empty { border-color: $history_error_border; background: $history_error_bg; - div.historyItemTitleBar { + .state-icon { -sprite-group: history-states; -sprite-image: data_empty.png; } @@ -68,7 +74,7 @@ div.historyItem-running { border-color: $history_running_border; background: $history_running_bg; - div.historyItemTitleBar { + .state-icon { background-image: url(data_running.gif); } } @@ -76,14 +82,14 @@ div.historyItem-upload { border-color: $history_upload_border; background: $history_upload_bg; - div.historyItemTitleBar { + .state-icon { background-image: url(data_upload.gif); } } div.historyItem-queued { background: $history_queued_bg; - div.historyItemTitleBar { + .state-icon { -sprite-group: history-states; -sprite-image: data_queued.png; } @@ -96,9 +102,8 @@ } ## Special case for showing the spinner but not changing the background -div.historyItemTitleBar.spinner { +div.historyItemTitleBar.spinner .state-icon { background: url(data_running.gif) 0 1px no-repeat !important; - padding-left: 20px !important; } ## Buttons diff -r cbdd394a265c -r 857d3a8ebd3d templates/root/history_common.mako --- a/templates/root/history_common.mako Fri Jul 24 17:06:12 2009 -0400 +++ b/templates/root/history_common.mako Sun Jul 26 12:08:44 2009 -0400 @@ -34,6 +34,7 @@ %endif <a class="icon-button delete" title="delete" href="${h.url_for( action='delete', id=data.id, show_deleted_on_refresh=show_deleted_on_refresh )}" id="historyItemDeleter-${data.id}"></a> </div> + <span class="state-icon"></span> <span class="historyItemTitle"><b>${hid}: ${data.display_name()}</b></span> </div>