details: http://www.bx.psu.edu/hg/galaxy/rev/3669500f699c changeset: 3295:3669500f699c user: jeremy goecks jeremy.goecks@emory.edu date: Thu Jan 28 10:51:38 2010 -0500 description: Cleanup display code and remove debugging code from page editor.
diffstat:
templates/display_base.mako | 17 ++++++++--------- templates/page/display.mako | 9 --------- templates/page/editor.mako | 5 ----- 3 files changed, 8 insertions(+), 23 deletions(-)
diffs (72 lines):
diff -r c265090bef9d -r 3669500f699c templates/display_base.mako --- a/templates/display_base.mako Thu Jan 28 10:33:12 2010 -0500 +++ b/templates/display_base.mako Thu Jan 28 10:51:38 2010 -0500 @@ -4,26 +4,25 @@ return '/base.mako' else: return '/base_panels.mako' - from galaxy import model + + from galaxy.model import History, StoredWorkflow, Page + from galaxy.web.framework.helpers import iff %> <%inherit file="${inherit( context )}"/> <%namespace file="/tagging_common.mako" import="render_individual_tagging_element, render_community_tagging_element" /> <%namespace file="/display_common.mako" import="*" />
-<%! - from galaxy.model import History, StoredWorkflow, Page - from galaxy.web.framework.helpers import iff -%> - <%def name="title()"> Galaxy | ${iff( item.published, "Published ", iff( item.importable , "Accessible ", iff( item.users_shared_with, "Shared ", "Private " ) ) ) + get_class_display_name( item.__class__ )} | ${get_item_name( item )} </%def>
<%def name="init()"> <% - self.has_left_panel=False - self.has_right_panel=item.published - self.message_box_visible=False + self.has_left_panel=False + self.has_right_panel=item.published + self.message_box_visible=False + self.active_view="user" + self.overlay_visible=False %> </%def>
diff -r c265090bef9d -r 3669500f699c templates/page/display.mako --- a/templates/page/display.mako Thu Jan 28 10:33:12 2010 -0500 +++ b/templates/page/display.mako Thu Jan 28 10:51:38 2010 -0500 @@ -150,15 +150,6 @@ ${h.css( "base", "history", "autocomplete_tagging" )} </%def>
-<%def name="init()"> -<% - self.has_left_panel=False - self.has_right_panel=item.published - self.active_view="user" - self.overlay_visible=False -%> -</%def> - <%def name="get_item_name( page )"> <% return page.title %> </%def> diff -r c265090bef9d -r 3669500f699c templates/page/editor.mako --- a/templates/page/editor.mako Thu Jan 28 10:33:12 2010 -0500 +++ b/templates/page/editor.mako Thu Jan 28 10:51:38 2010 -0500 @@ -387,11 +387,6 @@ annotations[ annotations.length ] = annotation; }); - // Remove inserted elements temporarily. - var annotated_history = $('.annotated_item'); - alert(annotated_history); - annotated_history.remove(); - // Do save. $.ajax( { url: "${h.url_for( action='save' )}",