1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/86411cd12e2f/ changeset: 86411cd12e2f user: carlfeberhard date: 2013-03-12 15:42:41 summary: history panel: have 'new' state HDAs display their body properly affected #: 3 files
diff -r 6ea891cafbbb7f9435887ca86b0823e1b8709882 -r 86411cd12e2f591f6f6f7502a8481d832bcf56c0 static/scripts/mvc/dataset/hda-base.js --- a/static/scripts/mvc/dataset/hda-base.js +++ b/static/scripts/mvc/dataset/hda-base.js @@ -358,6 +358,7 @@ //TODO: not a fan of this dispatch switch( this.model.get( 'state' ) ){ case HistoryDatasetAssociation.STATES.NEW : + this._render_body_new( body ); break; case HistoryDatasetAssociation.STATES.NOT_VIEWABLE : this._render_body_not_viewable( body ); @@ -400,12 +401,21 @@ this._setUpBehaviors( body ); },
+ /** Render a new dataset - this should be a transient state that's never shown + * in case it does tho, we'll make sure there's some information here + * @param {jQuery} parent DOM to which to append this body + */ + _render_body_new : function( parent ){ + var newMsg = 'This is a new dataset and not all of its data are available yet'; + parent.append( $( '<div>' + _l( newMsg ) + '</div>' ) ); + }, + /** Render inaccessible, not-owned by curr user. * @param {jQuery} parent DOM to which to append this body */ _render_body_not_viewable : function( parent ){ //TODO: revisit - still showing display, edit, delete (as common) - that CAN'T be right - parent.append( $( '<div>' + _l( 'You do not have permission to view dataset' ) + '.</div>' ) ); + parent.append( $( '<div>' + _l( 'You do not have permission to view dataset' ) + '</div>' ) ); },
/** Render an HDA still being uploaded. @@ -419,7 +429,7 @@ * @param {jQuery} parent DOM to which to append this body */ _render_body_queued : function( parent ){ - parent.append( $( '<div>' + _l( 'Job is waiting to run' ) + '.</div>' ) ); + parent.append( $( '<div>' + _l( 'Job is waiting to run' ) + '</div>' ) ); parent.append( this._render_primaryActionButtons( this.defaultPrimaryActionButtonRenderers )); },
@@ -427,7 +437,7 @@ * @param {jQuery} parent DOM to which to append this body */ _render_body_paused: function( parent ){ - parent.append( $( '<div>' + _l( 'Job is paused. Use the history menu to resume' ) + '.</div>' ) ); + parent.append( $( '<div>' + _l( 'Job is paused. Use the history menu to resume' ) + '</div>' ) ); parent.append( this._render_primaryActionButtons( this.defaultPrimaryActionButtonRenderers )); },
@@ -435,7 +445,7 @@ * @param {jQuery} parent DOM to which to append this body */ _render_body_running : function( parent ){ - parent.append( '<div>' + _l( 'Job is currently running' ) + '.</div>' ); + parent.append( '<div>' + _l( 'Job is currently running' ) + '</div>' ); parent.append( this._render_primaryActionButtons( this.defaultPrimaryActionButtonRenderers )); },
diff -r 6ea891cafbbb7f9435887ca86b0823e1b8709882 -r 86411cd12e2f591f6f6f7502a8481d832bcf56c0 static/style/base.less --- a/static/style/base.less +++ b/static/style/base.less @@ -1650,6 +1650,15 @@ } }
+div.historyItem-new { + .state-icon { + .fa-icon(); + &:before { + content: "\f071"; + } + } +} + // Special case for showing the spinner but not changing the background div.historyItemTitleBar.spinner .state-icon { background: url(data_running.gif) 0 1px no-repeat !important;
diff -r 6ea891cafbbb7f9435887ca86b0823e1b8709882 -r 86411cd12e2f591f6f6f7502a8481d832bcf56c0 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1133,6 +1133,7 @@ div.historyItem-queued{background:#eeeeee;} div.historyItem-noPermission{filter:alpha(opacity=60);-moz-opacity:.60;opacity:.60;} div.historyItem-paused{background:#d9edf7;}div.historyItem-paused .state-icon{font-family:FontAwesome;font-size:1.1666666666666667em;background-image:none !important;background-position:0% 0%;background-repeat:repeat;}div.historyItem-paused .state-icon:before{content:"\f04c";} +div.historyItem-new .state-icon{font-family:FontAwesome;font-size:1.1666666666666667em;background-image:none !important;background-position:0% 0%;background-repeat:repeat;}div.historyItem-new .state-icon:before{content:"\f071";} div.historyItemTitleBar.spinner .state-icon{background:url(data_running.gif) 0 1px no-repeat !important;} div.historyItemButtons{float:right;} div.historyItemBody div{padding-top:2px;}
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.