details: http://www.bx.psu.edu/hg/galaxy/rev/e97c45040b3e changeset: 2547:e97c45040b3e user: James Taylor <james@jamestaylor.org> date: Thu Aug 06 16:04:52 2009 -0400 description: Merge. 1 file(s) affected in this change: static/june_2007_style/blue/tiny_arror_right.png diffs (103 lines): diff -r 93dda9c3ded3 -r e97c45040b3e lib/galaxy/web/controllers/history.py --- a/lib/galaxy/web/controllers/history.py Thu Aug 06 10:48:14 2009 -0400 +++ b/lib/galaxy/web/controllers/history.py Thu Aug 06 16:04:52 2009 -0400 @@ -47,8 +47,8 @@ attach_popup=True ), DatasetsByStateColumn( "Datasets (by state)", ncells=4 ), StatusColumn( "Status", attach_popup=False ), - grids.GridColumn( "Age", key="create_time", format=time_ago ), - grids.GridColumn( "Last update", key="update_time", format=time_ago ), + grids.GridColumn( "Created", key="create_time", format=time_ago ), + grids.GridColumn( "Last Updated", key="update_time", format=time_ago ), # Valid for filtering but invisible grids.GridColumn( "Deleted", key="deleted", visible=False ) ] diff -r 93dda9c3ded3 -r e97c45040b3e lib/galaxy/web/framework/helpers/__init__.py --- a/lib/galaxy/web/framework/helpers/__init__.py Thu Aug 06 10:48:14 2009 -0400 +++ b/lib/galaxy/web/framework/helpers/__init__.py Thu Aug 06 16:04:52 2009 -0400 @@ -3,10 +3,16 @@ pkg_resources.require( "WebHelpers" ) from webhelpers import * -from datetime import datetime +from datetime import datetime, timedelta +# If the date is more than one week ago, then display the actual date instead of in words def time_ago( x ): - return date.distance_of_time_in_words( x, datetime.utcnow() ) + delta = timedelta(weeks=1) + + if (datetime.utcnow() - x) > delta: # Greater than a week difference + return x.strftime("%b %d, %Y") + else: + return date.distance_of_time_in_words( x, datetime.utcnow() ) + " ago" def iff( a, b, c ): if a: diff -r 93dda9c3ded3 -r e97c45040b3e static/images/overview_arrows.png Binary file static/images/overview_arrows.png has changed diff -r 93dda9c3ded3 -r e97c45040b3e static/images/resizable.png Binary file static/images/resizable.png has changed diff -r 93dda9c3ded3 -r e97c45040b3e static/june_2007_style/blue/tiny_arror_right.png Binary file static/june_2007_style/blue/tiny_arror_right.png has changed diff -r 93dda9c3ded3 -r e97c45040b3e templates/base_panels.mako --- a/templates/base_panels.mako Thu Aug 06 10:48:14 2009 -0400 +++ b/templates/base_panels.mako Thu Aug 06 16:04:52 2009 -0400 @@ -115,6 +115,8 @@ ## Masthead <%def name="masthead()"> + <div style="position: absolute; left: 0px; width: 100%; text-align: center"> + <div class="title" style="float: left;"> <a href="/"> <img border="0" src="${h.url_for('/static/images/galaxyIcon_noText.png')}" style="width: 26px; vertical-align: top;"> @@ -124,8 +126,6 @@ %endif </a> </div> - - <div style="z-index: -1; position: absolute; left: 0px; width: 100%; text-align: center"> <table class="tab-group" border="0" cellspacing="0" style="margin: auto;"> <tr> diff -r 93dda9c3ded3 -r e97c45040b3e templates/workflow/editor.mako --- a/templates/workflow/editor.mako Thu Aug 06 10:48:14 2009 -0400 +++ b/templates/workflow/editor.mako Thu Aug 06 16:04:52 2009 -0400 @@ -119,6 +119,19 @@ workflow.fit_canvas_to_nodes(); scroll_to_nodes(); canvas_manager.draw_overview(); + }); + + /* Lets the viewport be toggled visible and invisible, adjusting the arrows accordingly */ + $("#close-viewport").click( function() { + if ( $("#overview-border").css("right") == "0px" ) { + $("#overview-border").css("right", "20000px"); + $("#close-viewport").css("background-position", "12px 0px"); + + } else { + $("#overview-border").css("right", "0px"); + $("#close-viewport").css("background-position", "0px 0px"); + } + }); // Unload handler @@ -629,7 +642,7 @@ <div id="canvas-viewport" style="width: 100%; height: 100%; position: absolute; overflow: hidden; background: #EEEEEE; background: white url(${h.url_for('/static/images/light_gray_grid.gif')}) repeat;"> <div id="canvas-container" style="position: absolute; width: 100%; height: 100%;"></div> </div> - <div id="overview-border" style="position: absolute; width: 150px; height: 150px; right: 0; bottom: 0; border-top: solid gray 1px; border-left: solid grey 1px; padding: 7px 0 0 7px; background: #EEEEEE; z-index: 50000; overflow: hidden;"> + <div id="overview-border" style="position: absolute; width: 150px; height: 150px; right: 0px; bottom: 0px; border-top: solid gray 1px; border-left: solid grey 1px; padding: 7px 0 0 7px; background: #EEEEEE no-repeat url(${h.url_for('/static/images/resizable.png')}); z-index: 20000; overflow: hidden; max-width: 300px; max-height: 300px; min-width: 50px; min-height: 50px"> <div style="position: relative; overflow: hidden; width: 100%; height: 100%; border-top: solid gray 1px; border-left: solid grey 1px;"> <div id="overview" style="position: absolute;"> <canvas width="0" height="0" style="background: white; width: 100%; height: 100%;" id="overview-canvas"></canvas> @@ -637,6 +650,7 @@ </div> </div> </div> + <div id="close-viewport" style="border-left: 1px solid #999; border-top: 1px solid #999; background: #ddd url(${h.url_for('/static/images/overview_arrows.png')}); position: absolute; right: 0px; bottom: 0px; width: 12px; height: 12px; z-index: 25000;"></div> </div> </%def>