1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2fed7f7b23fd/ Changeset: 2fed7f7b23fd User: guerler Date: 2013-10-03 18:09:35 Summary: Fix grid_base.mako url_base parameters (grids need to be refactored), continue integration of new modal Affected #: 4 files diff -r b714089d888cad2942ba3edcd968532f07b56143 -r 2fed7f7b23fd5dbc3f25a8f783b55a4f81e014cd static/scripts/galaxy.grids.js --- a/static/scripts/galaxy.grids.js +++ b/static/scripts/galaxy.grids.js @@ -255,7 +255,8 @@ }); // Initialize ratings. - $('.community_rating_star').rating({}); + if ($('.community_rating_star').length !== 0) + $('.community_rating_star').rating({}); // Initialize item menu operations. make_popup_menus(); diff -r b714089d888cad2942ba3edcd968532f07b56143 -r 2fed7f7b23fd5dbc3f25a8f783b55a4f81e014cd static/scripts/viz/visualization.js --- a/static/scripts/viz/visualization.js +++ b/static/scripts/viz/visualization.js @@ -20,47 +20,7 @@ data: filters, error: function() { alert( "Grid failed" ); }, success: function(table_html) { - show_modal( - "Select datasets for new tracks", - table_html, - { - "Cancel": function() { - hide_modal(); - }, - "Add": function() { - var requests = []; - $('input[name=id]:checked,input[name=ldda_ids]:checked').each(function() { - var data = { - data_type: 'track_config', - 'hda_ldda': 'hda' - }, - id = $(this).val(); - if ($(this).attr("name") !== "id") { - data.hda_ldda = 'ldda'; - } - requests[requests.length] = $.ajax({ - url: add_track_async_url + "/" + id, - data: data, - dataType: "json" - }); - }); - // To preserve order, wait until there are definitions for all tracks and then add - // them sequentially. - $.when.apply($, requests).then(function() { - // jQuery always returns an Array for arguments, so need to look at first element - // to determine whether multiple requests were made and consequently how to - // map arguments to track definitions. - var track_defs = (arguments[0] instanceof Array ? - $.map(arguments, function(arg) { return arg[0]; }) : - [ arguments[0] ] - ); - success_fn(track_defs); - }); - hide_modal(); - } - } - ); - /*Galaxy.modal.show({ + Galaxy.modal.show({ title : "Select datasets for new tracks", body : table_html, buttons : @@ -100,7 +60,7 @@ Galaxy.modal.hide(); } } - });*/ + }); } }); }; diff -r b714089d888cad2942ba3edcd968532f07b56143 -r 2fed7f7b23fd5dbc3f25a8f783b55a4f81e014cd templates/grid_base.mako --- a/templates/grid_base.mako +++ b/templates/grid_base.mako @@ -86,7 +86,7 @@ // Create grid. var grid = new Grid({ - url_base: location.pathname, + url_base: '${trans.request.path_url}', async: is_true('${grid.use_async}'), async_ops: async_ops, categorical_filters: categorical_filters, @@ -102,6 +102,12 @@ // Initialize grid objects on load. // FIXME: use a grid view object eventually. $(document).ready(function() { + + // strip protocol and domain + var url = grid.get('url_base'); + url = url.replace(/^.*\/\/[^\/]+/, ''); + grid.set('url_base', url); + init_grid_elements(); init_grid_controls(); // Initialize text filters to select text on click and use normal font when user is typing. diff -r b714089d888cad2942ba3edcd968532f07b56143 -r 2fed7f7b23fd5dbc3f25a8f783b55a4f81e014cd templates/webapps/galaxy/galaxy.panels.mako --- a/templates/webapps/galaxy/galaxy.panels.mako +++ b/templates/webapps/galaxy/galaxy.panels.mako @@ -152,38 +152,6 @@ </script></%def> -<%def name="overlay( title='', content='', visible=False )"> - <%def name="title()"></%def> - <%def name="content()"></%def> - - <% - if visible: - display = "style='display: block;'" - overlay_class = "in" - else: - display = "style='display: none;'" - overlay_class = "" - %> - - <div id="top-modal" class="modal fade ${overlay_class}" ${display}> - <div id="top-modal-backdrop" class="modal-backdrop fade ${overlay_class}" style="z-index: -1"></div> - <div id="top-modal-dialog" class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type='button' class='close' style="display: none;">×</button> - <h4 class='title'>${title}</h4> - </div> - <div class="modal-body">${content}</div> - <div class="modal-footer"> - <div class="buttons" style="float: right;"></div> - <div class="extra_buttons" style=""></div> - <div style="clear: both;"></div> - </div> - </div> - </div> - </div> -</%def> - ## document <html><head> @@ -214,7 +182,6 @@ %if self.galaxy_config['message_box']: <div id="messagebox" class="panel-message"></div> %endif - ${self.overlay()} ## left panel %if self.galaxy_config['left_panel']: <div id="left"> 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.