# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Kanwei Li <kanwei@gmail.com> # Date 1286480034 14400 # Node ID 4ecbb9b5a360c1d1997890917799f31f5896a01e # Parent 5a5e35e09eab477df04549408b56dd7d0ab024b0 Make published items set the "Shared Data" tab as the active tab --- a/templates/sharing_base.mako +++ b/templates/sharing_base.mako @@ -15,7 +15,7 @@ %><%inherit file="${inherit(context)}"/> -<%namespace file="./display_common.mako" import="*" /> +<%namespace file="/display_common.mako" import="*" /><%namespace file="/message.mako" import="render_msg" /> ## @@ -157,7 +157,7 @@ if item.published: item_status = item_status + " and published" %> - This ${item_class_name_lc} <strong>${item_status}</strong>. + This ${item_class_name_lc} is currently <strong>${item_status}</strong>. <div><p>Anyone can view and import this ${item_class_name_lc} by visiting the following URL: @@ -195,10 +195,10 @@ %else: ## item.published == True ## Item is importable and published. User can unpublish or disable import and unpublish. <input class="action-button" type="submit" name="unpublish" value="Unpublish ${item_class_name}"> - <div class="toolParamHelp">Removes ${item_class_name_lc} from Galaxy's <a href='${h.url_for( action='list_published' )}' target="_top">Published ${item_class_plural_name}</a> section so that it is not publicly listed or searchable.</div> + <div class="toolParamHelp">Removes this ${item_class_name_lc} from Galaxy's <a href='${h.url_for( action='list_published' )}' target="_top">Published ${item_class_plural_name}</a> section so that it is not publicly listed or searchable.</div><br><input class="action-button" type="submit" name="disable_link_access_and_unpublish" value="Disable Access to ${item_class_name} via Link and Unpublish"> - <div class="toolParamHelp">Disables ${item_class_name_lc}'s link so that it is not accessible and removes ${item_class_name_lc} from Galaxy's <a href='${h.url_for( action='list_published' )}' target='_top'>Published ${item_class_plural_name}</a> section so that it is not publicly listed or searchable.</div> + <div class="toolParamHelp">Disables this ${item_class_name_lc}'s link so that it is not accessible and removes ${item_class_name_lc} from Galaxy's <a href='${h.url_for( action='list_published' )}' target='_top'>Published ${item_class_plural_name}</a> section so that it is not publicly listed or searchable.</div> %endif </form> --- a/templates/history/list_published.mako +++ b/templates/history/list_published.mako @@ -4,7 +4,7 @@ <% self.has_left_panel=False self.has_right_panel=False - self.active_view="page" + self.active_view="shared" self.message_box_visible=False %></%def> --- a/templates/visualization/list_published.mako +++ b/templates/visualization/list_published.mako @@ -4,7 +4,7 @@ <% self.has_left_panel=False self.has_right_panel=False - self.active_view="page" + self.active_view="shared" self.message_box_visible=False %></%def> --- a/templates/workflow/list_published.mako +++ b/templates/workflow/list_published.mako @@ -4,7 +4,7 @@ <% self.has_left_panel=False self.has_right_panel=False - self.active_view="" + self.active_view="shared" self.message_box_visible=False %></%def> --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -74,7 +74,7 @@ [ 'Published Visualizations', h.url_for( controller='/visualization', action='list_published' ) ], [ 'Published Pages', h.url_for( controller='/page', action='list_published' ) ] ] - tab( "libraries", "Shared Data", h.url_for( controller='/library', action='index'), menu_options=menu_options ) + tab( "shared", "Shared Data", h.url_for( controller='/library', action='index'), menu_options=menu_options ) %> ## Lab menu. --- a/templates/page/index.mako +++ b/templates/page/index.mako @@ -4,7 +4,7 @@ <% self.has_left_panel=False self.has_right_panel=False - self.active_view="page" + self.active_view="shared" self.message_box_visible=False %></%def> --- a/templates/display_base.mako +++ b/templates/display_base.mako @@ -25,7 +25,7 @@ self.has_left_panel=False self.has_right_panel=True self.message_box_visible=False - self.active_view="" + self.active_view="shared" self.overlay_visible=False %></%def> --- a/templates/page/list_published.mako +++ b/templates/page/list_published.mako @@ -4,7 +4,7 @@ <% self.has_left_panel=False self.has_right_panel=False - self.active_view="page" + self.active_view="shared" self.message_box_visible=False %></%def> --- a/templates/library/index.mako +++ b/templates/library/index.mako @@ -4,7 +4,7 @@ <% self.has_left_panel=False self.has_right_panel=False - self.active_view="libraries" + self.active_view="shared" %></%def> --- a/templates/grid_base.mako +++ b/templates/grid_base.mako @@ -812,7 +812,7 @@ <% num_rows_rendered = 0 %> %if query.count() == 0: ## No results. - <tr><td></td><td><em>No Items</em></td></tr> + <tr><td colspan="100"><em>No Items</em></td></tr><% num_rows_rendered = 1 %> %endif %for i, item in enumerate( query ):