Skip to content

Commit a638dec

Browse files
authored
Merge pull request galaxyproject#21387 from guerler/remove_unused_js_from_toolshed_makos
Remove unused javascript from toolshed test makos
2 parents c65c259 + 949c977 commit a638dec

19 files changed

Lines changed: 31 additions & 1310 deletions

File tree

lib/tool_shed/grids/framework.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,8 @@ class Grid:
620620
title = ""
621621
model_class: Optional[type] = None
622622
show_item_checkboxes = False
623-
template = "legacy/grid_base.mako"
624-
async_template = "legacy/grid_base_async.mako"
623+
template = "grid_base.mako"
624+
async_template = "grid_base_async.mako"
625625
use_async = False
626626
use_hide_message = True
627627
global_actions: list[GridAction] = []
Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,6 @@
1-
<%namespace name="galaxy_client" file="/galaxy_client_app.mako" />
2-
<% self.js_app = None %>
3-
4-
<% _=n_ %>
51
<!DOCTYPE HTML>
62
<html>
7-
<!--base.mako-->
8-
${self.init()}
9-
<head>
10-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
11-
12-
<title>
13-
Galaxy
14-
%if app.config.brand:
15-
| ${app.config.brand}
16-
%endif
17-
| ${self.title()}
18-
</title>
19-
20-
## relative href for site root
21-
## TODO: try <base> tag?
22-
<link rel="index" href="${ h.url_for( '/' ) }"/>
23-
24-
${self.metas()}
25-
${self.stylesheets()}
26-
${self.javascripts()}
27-
${self.javascript_app()}
28-
</head>
29-
<body class="inbound">
3+
<body>
304
${next.body()}
315
</body>
326
</html>
33-
34-
## Default title
35-
<%def name="title()"></%def>
36-
37-
## Default init
38-
<%def name="init()"></%def>
39-
40-
## Default stylesheets
41-
<%def name="stylesheets()">
42-
${h.dist_css('base')}
43-
</%def>
44-
45-
## Default javascripts
46-
<%def name="javascripts()">
47-
## TODO: remove when all libs are required directly in modules
48-
${h.dist_js(
49-
'libs.bundled',
50-
)}
51-
${self.javascript_entry()}
52-
</%def>
53-
54-
<%def name="javascript_entry()">
55-
${h.dist_js('toolshed.bundled')}
56-
</%def>
57-
58-
<%def name="javascript_app()">
59-
60-
${ galaxy_client.load( app=self.js_app ) }
61-
${ galaxy_client.config_sentry( app=self.js_app ) }
62-
%if self.js_app and self.js_app.config and self.js_app.config.ga_code:
63-
${ galaxy_client.config_google_analytics(self.js_app.config.ga_code) }
64-
%endif
65-
%if self.js_app and self.js_app.config and self.js_app.config.plausible_server and self.js_app.config.plausible_domain:
66-
${ galaxy_client.config_plausible_analytics(self.js_app.config.plausible_server, self.js_app.config.plausible_domain) }
67-
%endif
68-
%if self.js_app and self.js_app.config and self.js_app.config.matomo_server and self.js_app.config.matomo_site_id:
69-
${ galaxy_client.config_matomo_analytics(self.js_app.config.matomo_server, self.js_app.config.matomo_site_id) }
70-
%endif
71-
72-
%if not form_input_auto_focus is UNDEFINED and form_input_auto_focus:
73-
<script type="text/javascript">
74-
// Auto Focus on first item on form
75-
config.addInitialization(function() {
76-
console.log("base.mako", "auto focus on first item on form");
77-
if ( $("*:focus").html() == null ) {
78-
$(":input:not([type=hidden]):visible:enabled:first").focus();
79-
}
80-
});
81-
</script>
82-
%endif
83-
84-
</%def>
85-
86-
## Additional metas can be defined by templates inheriting from this one.
87-
<%def name="metas()"></%def>

lib/tool_shed/webapp/templates/base/base_panels.mako

Lines changed: 0 additions & 191 deletions
This file was deleted.

0 commit comments

Comments
 (0)