opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-01 15:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_23.0' into release_23.1

Browse Source
This commit is contained in:
mvdbeek
2023-07-04 18:04:08 +02:00
parent 7f8d8062dd 6774c5a36e
commit 4ed3199b8d
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/config/templates/mail/activation-email.html
+4 -7
View File
@@ -1,5 +1,6 @@
Edit this template to customise the "account activation" HTML email your
users will receive.
Use this template to customise the "account activation" HTML email your
users will receive. Copy the file to
{{ templates_dir }}/mail/activation-email.html and modify as required.
If you are adding URLs into this, remember that only absolute URLS (with
a domain name) make sense in email! They can be served from any stable
@@ -26,10 +27,6 @@ Template begins here >>>>>>
<head>
<meta charset="utf-8">
<title>Galaxy account activation</title>
<!-- Load custom font from Google Fonts -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
</head>
<body style="font-family: 'Roboto', sans-serif;">
@@ -73,7 +70,7 @@ Template begins here >>>>>>
{% endif %}
<li>
Find out more about the Galaxy Project at
<a href="galaxyproject.org">galaxyproject.org</a>.
<a href="https://galaxyproject.org">galaxyproject.org</a>.
</li>
</ul>
</p>
lib/galaxy/config/templates/mail/activation-email.txt
+4 -3
View File
@@ -1,11 +1,12 @@
Edit this template to customise the "account activation" text email your
users will receive.
Use this template to customise the "account activation" text email your
users will receive. Copy the file to
{{ templates_dir }}/mail/activation-email.txt and modify as required.
If you are adding URLs into this, remember that only absolute URLS (with
a domain name) make sense in email! They can be served from any stable
location, including your Galaxy server or GitHub.
The following variables are available for inserting into the html like
The following variables are available for inserting into the text like
{{ variable_name }}. They will be rendered into the text before the email is
sent:
templates/tagging_common.mako
+1 -7
View File
@@ -33,13 +33,7 @@ from markupsafe import escape
tagged_item_id = str( trans.security.encode_id ( tagged_item.id ) )
controller_name = get_controller_name(tagged_item)
click_url = h.url_for( controller='/' + modern_route_for_controller(controller_name) , action='list_published')
community_tags = trans.app.tag_handler.get_community_tags( item=tagged_item, limit=5 )
## Having trouble converting list of tags into a plain array, this just
## just plucks out the name
community_tag_names = []
for tag in community_tags:
community_tag_names.append(escape(tag.name))
community_tag_names = community_tags = tagged_item.make_tag_string_list()
%>
<div id="tags-community-${controller_name}-${tagged_item_id}"></div>