commit/galaxy-central: dan: Data Manager UI enhancements.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a5a7edbe4905/ Changeset: a5a7edbe4905 User: dan Date: 2014-05-13 20:07:07 Summary: Data Manager UI enhancements. Affected #: 5 files diff -r e5b545b85b836b6f1be76164543d7e4613f25d87 -r a5a7edbe49055c328960eaa5c622a62ecf83b27d lib/galaxy/webapps/galaxy/controllers/data_manager.py --- a/lib/galaxy/webapps/galaxy/controllers/data_manager.py +++ b/lib/galaxy/webapps/galaxy/controllers/data_manager.py @@ -19,7 +19,7 @@ raise paste.httpexceptions.HTTPUnauthorized( "This Galaxy instance is not configured to allow non-admins to view the data manager." ) message = kwd.get( 'message' ) status = kwd.get( 'status', 'info' ) - return trans.fill_template( "data_manager/index.mako", data_managers=trans.app.data_managers, view_only=not_is_admin, message=message, status=status ) + return trans.fill_template( "data_manager/index.mako", data_managers=trans.app.data_managers, tool_data_tables=trans.app.tool_data_tables, view_only=not_is_admin, message=message, status=status ) @web.expose def manage_data_manager( self, trans, **kwd ): @@ -32,7 +32,7 @@ data_manager = trans.app.data_managers.get_manager( data_manager_id ) if data_manager is None: return trans.response.send_redirect( web.url_for( controller="data_manager", action="index", message="Invalid Data Manager (%s) was requested" % data_manager_id, status="error" ) ) - jobs = reversed( [ assoc.job for assoc in trans.sa_session.query( trans.app.model.DataManagerJobAssociation ).filter_by( data_manager_id=data_manager_id ) ] ) + jobs = list( reversed( [ assoc.job for assoc in trans.sa_session.query( trans.app.model.DataManagerJobAssociation ).filter_by( data_manager_id=data_manager_id ) ] ) ) return trans.fill_template( "data_manager/manage_data_manager.mako", data_manager=data_manager, jobs=jobs, view_only=not_is_admin, message=message, status=status ) @web.expose diff -r e5b545b85b836b6f1be76164543d7e4613f25d87 -r a5a7edbe49055c328960eaa5c622a62ecf83b27d templates/webapps/galaxy/data_manager/index.mako --- a/templates/webapps/galaxy/data_manager/index.mako +++ b/templates/webapps/galaxy/data_manager/index.mako @@ -11,11 +11,13 @@ %if view_only: <p>Not implemented</p> +%elif not data_managers.data_managers: + ${render_msg( "You do not currently have any Data Managers installed.", "warning" ) } %else: <p>Choose your data managing option from below.</p><ul> - <li><strong>Access data managers</strong> - get data, build indexes, etc - <p/> + <li><strong>Run Data Manager Tools</strong> + <div style="margin-left:1em"><ul> %for data_manager_id, data_manager in data_managers.data_managers.iteritems(): <li> @@ -24,10 +26,11 @@ <p/> %endfor </ul> + </div></li><p/> - <li><strong>View managed data by manager</strong> - <p/> + <li><strong>View Data Manager Jobs</strong> + <div style="margin-left:1em"><ul> %for data_manager_id, data_manager in data_managers.data_managers.iteritems(): <li> @@ -36,11 +39,12 @@ <p/> %endfor </ul> + </div></li><p/><p/> - <li><strong>View managed data by Tool Data Table</strong> - <p/> + <li><strong>View Tool Data Table Entries</strong> + <div style="margin-left:1em"><ul> %for table_name, managers in data_managers.managed_data_tables.iteritems(): <li> @@ -48,10 +52,21 @@ </li><p/> %endfor + %for table_name in tool_data_tables.get_tables(): + %if table_name not in data_managers.managed_data_tables: + <li> + <a href="${h.url_for( controller='data_manager', action='manage_data_table', table_name=table_name)}" target="galaxy_main">${ table_name | h }</a> + </li> + <p/> + %endif + %endfor </ul> + </div></li><p/></ul><p/><br/> %endif + +${render_msg( 'To find out more information about Data Managers, please visit the <a href="https://wiki.galaxyproject.org/Admin/Tools/DataManagers" target="_blank">wiki.</a>', "info" ) } diff -r e5b545b85b836b6f1be76164543d7e4613f25d87 -r a5a7edbe49055c328960eaa5c622a62ecf83b27d templates/webapps/galaxy/data_manager/manage_data_manager.mako --- a/templates/webapps/galaxy/data_manager/manage_data_manager.mako +++ b/templates/webapps/galaxy/data_manager/manage_data_manager.mako @@ -18,6 +18,7 @@ <div><table class="manage-table colored" border="0" cellspacing="0" cellpadding="0" width="100%"><tr class="header"> + <td>Actions</td><td>Job ID</td><td>User</td><td>Last Update</td> @@ -27,7 +28,8 @@ <td>PID/Cluster ID</td></tr> %for job in jobs: - <td><a href="${ h.url_for( controller="data_manager", action="view_job", id=trans.security.encode_id( job.id ) ) }">${ job.id | h }</a></td> + <td><a class="icon-btn" href="${ h.url_for( controller="data_manager", action="view_job", id=trans.security.encode_id( job.id ) ) }" title="View info"><span class="fa fa-info"></span></a></td> + <td>${ job.id | h }</td> %if job.history and job.history.user: <td>${job.history.user.email | h}</td> %else: diff -r e5b545b85b836b6f1be76164543d7e4613f25d87 -r a5a7edbe49055c328960eaa5c622a62ecf83b27d templates/webapps/galaxy/data_manager/manage_data_table.mako --- a/templates/webapps/galaxy/data_manager/manage_data_table.mako +++ b/templates/webapps/galaxy/data_manager/manage_data_table.mako @@ -10,30 +10,36 @@ %if view_only: <p>Not implemented</p> %else: -<% column_name_list = data_table.get_column_name_list() %> -<table class="tabletip"> - <thead> - <tr><th colspan="${len (column_name_list) }" style="font-size: 120%;"> - Data Manager: ${ data_table.name | h } - <a class="icon-btn" href="${ h.url_for( controller="data_manager", action="reload_tool_data_tables", table_name=data_table.name ) }" title="Reload ${data_table.name} tool data table" data-placement="bottom"> - <span class="fa fa-refresh"></span> - </a> - </th></tr> - <tr> - - %for name in column_name_list: - <th>${name | h}</th> - %endfor - </tr> - </thead> - <tbody> - %for table_row in data_table.data: - <tr> - %for field in table_row: - <td>${field | h}</td> - %endfor - </tr> - %endfor -</table> + <p> + <% column_name_list = data_table.get_column_name_list() %> + <table class="tabletip"> + <thead> + <tr><th colspan="${len (column_name_list) }" style="font-size: 120%;"> + Data Manager: ${ data_table.name | h } + <a class="icon-btn" href="${ h.url_for( controller="data_manager", action="reload_tool_data_tables", table_name=data_table.name ) }" title="Reload ${data_table.name} tool data table" data-placement="bottom"> + <span class="fa fa-refresh"></span> + </a> + </th></tr> + <tr> + + %for name in column_name_list: + <th>${name | h}</th> + %endfor + </tr> + </thead> + <tbody> + %for table_row in data_table.data: + <tr> + %for field in table_row: + <td>${field | h}</td> + %endfor + </tr> + %endfor + </tbody> + </table> + </p> + %if not data_table.data: + ${render_msg( "There are currently no entries in this Tool Data Table.", "warning" ) } + %endif %endif diff -r e5b545b85b836b6f1be76164543d7e4613f25d87 -r a5a7edbe49055c328960eaa5c622a62ecf83b27d templates/webapps/galaxy/data_manager/view_job.mako --- a/templates/webapps/galaxy/data_manager/view_job.mako +++ b/templates/webapps/galaxy/data_manager/view_job.mako @@ -34,7 +34,7 @@ <table class="tabletip"><thead><tr><th colspan="2" style="font-size: 120%;"> - Data Table: ${ table_name | h } + Data Table: <a href="${h.url_for( controller='data_manager', action='manage_data_table', table_name=table_name)}">${ table_name | h }</a></th></tr></thead><% len_json_table = len( json_table ) %> 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.
participants (1)
-
commits-noreply＠bitbucket.org