Skip to content

Commit

Permalink
Squashed merge of feat/CMD-165-custom-branding-via-setting:
Browse files Browse the repository at this point in the history
commit 85e6fa3
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 5 18:13:13 2024 -0500

    fix: CMD-165 allow settings_local BRANDING

commit 9a73ba5
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 5 16:42:28 2024 -0500

    fix: CMD-165 BRANDING loop values accessed wrong

commit 265bab3
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 5 16:06:18 2024 -0500

    chore: CMD-165 remove BRANDING from primary export

commit af10ad4
Merge: ff6405d deee0e4
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 5 16:02:33 2024 -0500

    Merge branch 'main' into feat/CMD-165-custom-branding-via-setting

commit ff6405d
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 5 15:47:33 2024 -0500

    fix: CMD-165 support deprecated BRANDING setting

commit f56a0dd
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 5 15:40:32 2024 -0500

    feat: CMD-165 render new or old custom branding

commit 4c6ee29
Author: Wesley Bomar <[email protected]>
Date:   Fri Jul 5 15:00:50 2024 -0500

    feat: CMD-165 custom branding via setting
  • Loading branch information
wesleyboar committed Jul 5, 2024
1 parent c34121d commit 552b753
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 27 deletions.
29 changes: 29 additions & 0 deletions taccsite_cms/_settings/branding.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
"""Configure standard branding"""

PORTAL_BRANDING_TACC = {
"is_remote": False,
"img_file_src": "site_cms/img/org_logos/tacc-white.png",
"img_class": "branding-tacc",
"link_href": "https://www.tacc.utexas.edu/",
"link_target": "_blank",
"img_alt_text": "TACC Logo",
"img_crossorigin": "anonymous",
}
PORTAL_BRANDING_UTEXAS = {
"is_remote": False,
"img_file_src": "site_cms/img/org_logos/utaustin-white.png",
"img_class": "branding-utaustin",
"link_href": "https://www.utexas.edu/",
"link_target": "_blank",
"img_alt_text": "University of Texas at Austin Logo",
"img_crossorigin": "anonymous",
}
PORTAL_BRANDING_NSF = {
"is_remote": False,
"img_file_src": "site_cms/img/org_logos/nsf-white.png",
"img_class": "branding-nsf",
"link_href": "https://www.nsf.gov/",
"link_target": "_blank",
"img_alt_text": "NSF Logo",
"img_crossorigin": "anonymous",
}
28 changes: 1 addition & 27 deletions taccsite_cms/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,33 +220,7 @@ def gettext(s): return s
# TACC: BRANDING
########################

PORTAL_BRANDING_TACC = {
"is_remote": False,
"img_file_src": "site_cms/img/org_logos/tacc-white.png",
"img_class": "branding-tacc",
"link_href": "https://www.tacc.utexas.edu/",
"link_target": "_blank",
"img_alt_text": "TACC Logo",
"img_crossorigin": "anonymous",
}
PORTAL_BRANDING_UTEXAS = {
"is_remote": False,
"img_file_src": "site_cms/img/org_logos/utaustin-white.png",
"img_class": "branding-utaustin",
"link_href": "https://www.utexas.edu/",
"link_target": "_blank",
"img_alt_text": "University of Texas at Austin Logo",
"img_crossorigin": "anonymous",
}
PORTAL_BRANDING_NSF = {
"is_remote": False,
"img_file_src": "site_cms/img/org_logos/nsf-white.png",
"img_class": "branding-nsf",
"link_href": "https://www.nsf.gov/",
"link_target": "_blank",
"img_alt_text": "NSF Logo",
"img_crossorigin": "anonymous",
}
from taccsite_cms._settings.branding import *

# To hide branding, set `PORTAL_BRANDING = False`
PORTAL_BRANDING = [ PORTAL_BRANDING_TACC, PORTAL_BRANDING_UTEXAS ]
Expand Down

0 comments on commit 552b753

Please sign in to comment.