opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure the options are all documented, remove some logging.

Browse Source
This commit is contained in:
setlen
2021-02-12 21:23:52 +01:00
parent c9c2311f10
commit 4677cf9e0d
6 changed files with 87 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/galaxy.library.js
+5 -3
View File
@@ -69,8 +69,8 @@ var LibraryRouter = Backbone.Router.extend({
if (typeof ga !== "undefined") {
ga("send", "pageview", `${getAppRoot()}library/list${url}`);
}
if (typeof plausible !== "undefined") {
plausible(`pageview ${getAppRoot()}library/list${url}`);
if (typeof window.plausible !== "undefined") {
window.plausible(`pageview ${getAppRoot()}library/list${url}`);
}
if (typeof window._paq !== "undefined") {
window._paq.push(['setCustomUrl', `${getAppRoot()}library/list${url}`]);
@@ -138,7 +138,9 @@ var GalaxyLibrary = Backbone.View.extend({
var u=Galaxy.config.matomo_server+"/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', Galaxy.config.matomo_site_id]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
var d=document;
var g=d.createElement('script');
var s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
}
doc/source/admin/galaxy_options.rst
+45
View File
@@ -1468,6 +1468,51 @@
:Type: str
~~~~~~~~~~~~~~~~~~~~
``plausible_server``
~~~~~~~~~~~~~~~~~~~~
:Description:
Please enter the URL for the Plausible server (including https) so
this can be used for tracking with Plausible
(https://plausible.io/).
:Default: ``None``
:Type: str
~~~~~~~~~~~~~~~~~~~~
``plausible_domain``
~~~~~~~~~~~~~~~~~~~~
:Description:
Please enter the URL for the Galaxy server so this can be used for
tracking with Plausible (https://plausible.io/).
:Default: ``None``
:Type: str
~~~~~~~~~~~~~~~~~
``matomo_server``
~~~~~~~~~~~~~~~~~
:Description:
Please enter the URL for the Matomo server (including https) so
this can be used for tracking with Matomo (https://matomo.org/).
:Default: ``None``
:Type: str
~~~~~~~~~~~~~~~~~~
``matomo_site_id``
~~~~~~~~~~~~~~~~~~
:Description:
Please enter the site ID for the Matomo server so this can be used
for tracking with Matomo (https://matomo.org/).
:Default: ``None``
:Type: str
~~~~~~~~~~~~~~~~~~~
``display_servers``
~~~~~~~~~~~~~~~~~~~
lib/galaxy/config/sample/galaxy.yml.sample
+14 -5
View File
@@ -817,14 +817,23 @@ galaxy:
# your Google Analytics account. Example: UA-XXXXXXXX-Y
#ga_code: null
# Please enter the URL for the Plausible server (including https) so this can be used for tracking
# with Plausible (https://plausible.io/).
# plausible_server: null
# Please enter the URL for the Plausible server (including https) so
# this can be used for tracking with Plausible
# (https://plausible.io/).
#plausible_server: null
# Please enter the URL for the Galaxy server so this can be used for tracking
# with Plausible (https://plausible.io/).
# Please enter the URL for the Galaxy server so this can be used for
# tracking with Plausible (https://plausible.io/).
#plausible_domain: null
# Please enter the URL for the Matomo server (including https) so this
# can be used for tracking with Matomo (https://matomo.org/).
#matomo_server: null
# Please enter the site ID for the Matomo server so this can be used
# for tracking with Matomo (https://matomo.org/).
#matomo_site_id: null
# Galaxy can display data at various external browsers. These options
# specify which browsers should be available. URLs and builds
# available at these browsers are defined in the specified files.
lib/galaxy/config/sample/tool_shed.yml.sample
+14 -5
View File
@@ -179,14 +179,23 @@ tool_shed:
# your Google Analytics account. Example: UA-XXXXXXXX-Y
#ga_code: null
# Please enter the URL for the Plausible server (including https) so this can be used for tracking
# with Plausible (https://plausible.io/).
# plausible_server: null
# Please enter the URL for the Plausible server (including https) so
# this can be used for tracking with Plausible
# (https://plausible.io/).
#plausible_server: null
# Please enter the URL for the Galaxy server so this can be used for tracking
# with Plausible (https://plausible.io/).
# Please enter the URL for the Galaxy server so this can be used for
# tracking with Plausible (https://plausible.io/).
#plausible_domain: null
# Please enter the URL for the Matomo server (including https) so this
# can be used for tracking with Matomo (https://matomo.org/).
#matomo_server: null
# Please enter the site ID for the Matomo server so this can be used
# for tracking with Matomo (https://matomo.org/).
#matomo_site_id: null
# The Tool Shed encodes various internal values when these values will
# be output in some format (for example, in a URL or cookie). You
# should set a key to be used by the algorithm that encodes and
lib/tool_shed/webapp/templates/galaxy_client_app.mako
+3 -5
View File
@@ -71,10 +71,6 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
</%def>
<%def name="config_plausible_analytics(plausible_server, plausible_domain)">
<script>
console.log("config_plausible_analytics plausible_server:", '${plausible_server}');
console.log("config_plausible_analytics plausible_domain:", '${plausible_domain}');
</script>
%if plausible_server and plausible_domain:
<script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/plausible.js"></script>
%else:
@@ -95,7 +91,9 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
var u = "${matomo_server}/";
_paq.push(['setTrackerUrl', u + 'matomo.php']);
_paq.push(['setSiteId', '${matomo_site_id}']);
var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
var d = document;
var g = d.createElement('script');
var s = d.getElementsByTagName('script')[0];
g.type = 'text/javascript';
g.async = true;
g.src = u + 'matomo.js';
templates/galaxy_client_app.mako
+6 -6
View File
@@ -72,15 +72,13 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
</%def>
<%def name="config_plausible_analytics(plausible_server, plausible_domain)">
<script>
console.log("config_plausible_analytics plausible_server:", '${plausible_server}');
console.log("config_plausible_analytics plausible_domain:", '${plausible_domain}');
</script>
%if plausible_server and plausible_domain:
<script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/plausible.js"></script>
<script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
%else:
<script>console.warn("Missing plausible server or plausible domain");</script>
<script>
console.warn("Missing plausible server or plausible domain");
</script>
%endif
</%def>
@@ -97,7 +95,9 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
var u = "${matomo_server}/";
_paq.push(['setTrackerUrl', u + 'matomo.php']);
_paq.push(['setSiteId', '${matomo_site_id}']);
var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
var d = document;
var g = d.createElement('script');
var s = d.getElementsByTagName('script')[0];
g.type = 'text/javascript';
g.async = true;
g.src = u + 'matomo.js';