From 86da2783814feb2634cc77bd43de4282360814cc Mon Sep 17 00:00:00 2001
From: Elke Kreim <elke.kreim@hs-hannover.de>
Date: Thu, 21 Feb 2019 17:54:46 +0100
Subject: [PATCH] Fix #18 and #16 favicon for hahsassets and email address in
footer
---
hshassets/static/hshassets/img/favicon.ico | Bin 0 -> 5694 bytes
.../hshassets/includes/default_footer.html | 4 ++--
hshassets/utils.py | 2 +-
setup.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
create mode 100644 hshassets/static/hshassets/img/favicon.ico
diff --git a/hshassets/static/hshassets/img/favicon.ico b/hshassets/static/hshassets/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..58fba12ae945f181d935c3875bcf2070c6b16258
GIT binary patch
literal 5694
zcmZQzU}RuqaBu+891I#_3=Con3=A3!3=9qo3=9nn5OD?^fbr6Q2G+~}8Q3rXXW+c@
zpMm?ze+I#;{~1KD{b!K8_Mbua`hN!b>;D;)Z~SLaz4@O({pNoL&71!jv~T@q(7*Mc
z!Swcj2IqVK8QkyxXYjoLpTYb7e+K^t{~5v`{%44O^q(RA@qdQI$Nw3UAOB}afAXIp
z^XY$v!e{>(il6;wD1H8)q58#thQ^ow89HD6XXt(XpJC#g{|uAg{AZZ@=0C&Y_x~Ao
ze*Vv}`}2Q>gJ1qL9RBj3;po@@49CCzXE^=sKf~E?{~50S_|I_j$A5;~KmRk_{rR8a
z{?Gpm4}bk<c>L=>!_!~?8J_?C&+zj1e}>n;|1-S(^Pl1K-~S9h|NUq9{qH}+-~ay^
z{{R1vBV<N}M?+vV1cqJ+uyXTo;{cq@M0iKZ%n}#S6DLByi33hxr$U5&Q=HlzY}F{#
zuS$e|Gu-yu5o5nPZvEC$MA*+JCMAg-NC+|!p?_2fg(1Mr$IHitZU!S4FE1}Ux+pfj
zf~AGIm6iai6qCHMg}H^E5UMCvo-sK6$T6Zwa_WLaZHdo63aCkiOAoA{nDh_Hf1~<Q
z!hbaUM$?ajgY6K?Kd9vg$>~>JR0IhKOB<0G|MnpD=$M4?L)QxCk0AZVI><m<&ju6#
zB=}#El?4ef@#~YQUxC8(Gg^O))*nbAKyvvra?=l_|AFRzZb<u$nEr<$D5pE1wI4Yk
k`jwHQ1Q%1*(A3migAYww#=z9nL{kt=bd)<90z*3l0N8ME7XSbN
literal 0
HcmV?d00001
diff --git a/hshassets/templates/hshassets/includes/default_footer.html b/hshassets/templates/hshassets/includes/default_footer.html
index b291f79b..db134f1c 100644
--- a/hshassets/templates/hshassets/includes/default_footer.html
+++ b/hshassets/templates/hshassets/includes/default_footer.html
@@ -34,11 +34,11 @@
</p>
<p>
<abbr title="{% trans "Email" %}"><span class="icon is-small"><i class="fa fa-envelope"></i></span></abbr>
- <a href="mailto:support-it@hs-hannover.de">support-it@hs-hannover.de</a>
+ <a href="mailto:it-Support@hs-hannover.de">IT-Support@hs-hannover.de</a>
</p>
<p>
<abbr title="{% trans "Web" %}"><span class="icon is-small"><i class="fa fa-globe"></i></span></abbr>
- <a href="https://www.hs-hannover.de/it">https://hs-hannover.de/it</a>
+ <a href="https://www.hs-hannover.de/it">https://www.hs-hannover.de/it</a>
</p>
{% endblock %}
</div>
diff --git a/hshassets/utils.py b/hshassets/utils.py
index a59da563..3fb357bb 100644
--- a/hshassets/utils.py
+++ b/hshassets/utils.py
@@ -459,7 +459,7 @@ def build_app_css_from_scss(app_name):
else:
color_scheme = None
- if not color_scheme and app_name == get_projectname():
+ if not color_scheme and (app_name == get_projectname() or app_name == "hshassets"):
# get default color scheme from HSHASSETS
color_scheme = get_color_scheme(get_default_scss_path()) or 'service'
diff --git a/setup.py b/setup.py
index 445e7abe..872129de 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
setup(
name='django-hshassets',
- version='2.2.1',
+ version='2.2.2',
packages=find_packages(),
include_package_data=True,
license='MIT License',
--
GitLab