Skip to content

Commit 6221dbe

Browse files
committed
Strip legacy makos relying on galaxy app
1 parent 760a645 commit 6221dbe

File tree

3 files changed

+3
-30
lines changed

3 files changed

+3
-30
lines changed

templates/base.mako

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<%namespace name="galaxy_client" file="/galaxy_client_app.mako" />
21
<% self.js_app = None %>
32

43
<% _=n_ %>
@@ -63,19 +62,6 @@
6362
</%def>
6463

6564
<%def name="javascript_app()">
66-
67-
${ galaxy_client.load( app=self.js_app ) }
68-
${ galaxy_client.config_sentry( app=self.js_app ) }
69-
%if self.js_app and self.js_app.config and self.js_app.config.ga_code:
70-
${ galaxy_client.config_google_analytics(self.js_app.config.ga_code) }
71-
%endif
72-
%if self.js_app and self.js_app.config and self.js_app.config.plausible_server and self.js_app.config.plausible_domain:
73-
${ galaxy_client.config_plausible_analytics(self.js_app.config.plausible_server, self.js_app.config.plausible_domain) }
74-
%endif
75-
%if self.js_app and self.js_app.config and self.js_app.config.matomo_server and self.js_app.config.matomo_site_id:
76-
${ galaxy_client.config_matomo_analytics(self.js_app.config.matomo_server, self.js_app.config.matomo_site_id) }
77-
%endif
78-
7965
%if not form_input_auto_focus is UNDEFINED and form_input_auto_focus:
8066
<script type="text/javascript">
8167
// Auto Focus on first item on form
@@ -87,7 +73,6 @@
8773
});
8874
</script>
8975
%endif
90-
9176
</%def>
9277

9378
## Additional metas can be defined by templates inheriting from this one.

templates/base/base_panels.mako

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<!DOCTYPE HTML>
2-
<%namespace name="galaxy_client" file="/galaxy_client_app.mako" />
32

43
<%
54
self.has_left_panel = hasattr( self, 'left_panel' )
@@ -33,21 +32,10 @@
3332
</%def>
3433

3534
<%def name="javascript_app()">
36-
${ galaxy_client.load() }
3735
</%def>
3836

3937
## Default late-load javascripts
4038
<%def name="late_javascripts()">
41-
%if t.webapp.name == 'galaxy' and app.config.ga_code:
42-
${galaxy_client.config_google_analytics(app.config.ga_code)}
43-
%endif
44-
%if t.webapp.name == 'galaxy' and app.config.plausible_server and app.config.plausible_domain:
45-
${ galaxy_client.config_plausible_analytics(app.config.plausible_server, app.config.plausible_domain) }
46-
%endif
47-
%if t.webapp.name == 'galaxy' and app.config.matomo_server and app.config.matomo_site_id:
48-
${ galaxy_client.config_matomo_analytics(app.config.matomo_server, app.config.matomo_site_id) }
49-
%endif
50-
5139
</%def>
5240

5341
## Masthead

templates/js-app.mako

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@
5151
${ h.dist_js('libs.bundled', '%s.bundled' % js_app_name )}
5252

5353
%if app.config.ga_code:
54-
${ galaxy_client.config_google_analytics(app.config.ga_code) }
54+
${ config_google_analytics(app.config.ga_code) }
5555
%endif
5656
%if app.config.plausible_server and app.config.plausible_domain:
57-
${ galaxy_client.config_plausible_analytics(app.config.plausible_server, app.config.plausible_domain) }
57+
${ config_plausible_analytics(app.config.plausible_server, app.config.plausible_domain) }
5858
%endif
5959
%if app.config.matomo_server and app.config.matomo_site_id:
60-
${ galaxy_client.config_matomo_analytics(app.config.matomo_server, app.config.matomo_site_id) }
60+
${ config_matomo_analytics(app.config.matomo_server, app.config.matomo_site_id) }
6161
%endif
6262
</body>
6363
</html>

0 commit comments

Comments
 (0)