Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: TV3-181/cmd-79 change FAVICON & LOGO prefix #795

Merged
merged 1 commit into from
Feb 8, 2024
Merged

feat: TV3-181/cmd-79 change FAVICON & LOGO prefix #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions taccsite_cms/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,17 +266,17 @@ def gettext(s): return s
# TACC: LOGO & FAVICON
########################

TACC_LOGO = {
PORTAL_LOGO = {
"img_file_src": "site_cms/img/org_logos/portal.png",
"is_remote": False,
"img_class": "", # additional class names
"link_href": "/",
"link_target": "_self",
"img_alt_text": "Portal Logo",
"img_crossorigin": "anonymous",
} # To hide logo, set `TACC_LOGO = False`
} # To hide logo, set `PORTAL_LOGO = False`

TACC_FAVICON = {
PORTAL_FAVICON = {
"img_file_src": "site_cms/img/favicons/favicon.ico",
"is_remote": False
}
Expand Down Expand Up @@ -718,16 +718,16 @@ def get_subdirs_as_module_names(path):
if 'FAVICON' not in locals():
FAVICON = False
else:
TACC_FAVICON = FAVICON
PORTAL_FAVICON = FAVICON

# Export expected settings
SETTINGS_EXPORT = [
'DEBUG',
'BRANDING',
'LOGO', # deprecated
'FAVICON', # deprecated
'TACC_LOGO',
'TACC_FAVICON',
'PORTAL_LOGO',
'PORTAL_FAVICON',
'INCLUDES_CORE_PORTAL',
'INCLUDES_PORTAL_NAV',
'INCLUDES_SEARCH_BAR',
Expand Down
2 changes: 1 addition & 1 deletion taccsite_cms/templates/assets_custom.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


<!-- Custom Site Assets: Favicon. -->
{% with settings.TACC_FAVICON as favicon %}
{% with settings.PORTAL_FAVICON as favicon %}
<link rel="icon" href="{% if favicon.is_remote %}{{ favicon.img_file_src }}{% else %}{% static favicon.img_file_src %}{% endif %}" type="image/x-icon" />
{% endwith %}

Expand Down
2 changes: 1 addition & 1 deletion taccsite_cms/templates/header_logo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

{% else %}

{% with settings.TACC_LOGO as logo %}
{% with settings.PORTAL_LOGO as logo %}
<a
id="header-logo"
class="navbar-brand {{className}}"
Expand Down