From 24c0cf908dcbeb17c26b3d1499e438a3f8121818 Mon Sep 17 00:00:00 2001
From: bcanini <canini.16@osu.edu>
Date: Wed, 26 Sep 2018 10:11:07 -0400
Subject: [PATCH] asc_bootstrap - sass updates, adding logout link to footer
when user is logged in
---
.../asc_bootstrap/assets/sass/layout/_aside.scss | 2 +-
web/themes/asc_bootstrap/css/style.css | 2 +-
.../templates/system/includes/_footer.twig | 14 ++++++++++----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/web/themes/asc_bootstrap/assets/sass/layout/_aside.scss b/web/themes/asc_bootstrap/assets/sass/layout/_aside.scss
index e358f6db83..a0c84e784f 100644
--- a/web/themes/asc_bootstrap/assets/sass/layout/_aside.scss
+++ b/web/themes/asc_bootstrap/assets/sass/layout/_aside.scss
@@ -12,7 +12,7 @@ aside {
}
.region-sidebar-second {
- padding: 5px 15px;
+ padding: 5px 15px 20px;
background: #efefef;
min-height: $full;
}
diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css
index 2eb0111621..6caab50c77 100644
--- a/web/themes/asc_bootstrap/css/style.css
+++ b/web/themes/asc_bootstrap/css/style.css
@@ -1958,7 +1958,7 @@ aside img {
}
/* line 14, ../assets/sass/layout/_aside.scss */
aside .region-sidebar-second {
- padding: 5px 15px;
+ padding: 5px 15px 20px;
background: #efefef;
min-height: 100%;
}
diff --git a/web/themes/asc_bootstrap/templates/system/includes/_footer.twig b/web/themes/asc_bootstrap/templates/system/includes/_footer.twig
index 28218959cf..2212a60c3b 100644
--- a/web/themes/asc_bootstrap/templates/system/includes/_footer.twig
+++ b/web/themes/asc_bootstrap/templates/system/includes/_footer.twig
@@ -51,9 +51,15 @@
</a>
</li>
<li>
- <a href="/saml_login">
- LOGIN
- </a>
+ {% if logged_in %}
+ <a href="/logout">
+ LOGOUT: {{ user.displayname }}
+ </a>
+ {% else %}
+ <a href="/saml_login">
+ LOGIN
+ </a>
+ {% endif %}
</li>
</ul>
</div>
@@ -64,7 +70,7 @@
</div>
<div class="col-xs-12 col-md-6 sf-col2">
- <p><small><i>Designed and built by <a href=https://asctech.osu.edu/services/web-services">ASCTech Web Services</a></i></small></p>
+ <p><small><i>Designed and built by <a href="https://asctech.osu.edu/services/web-services">ASCTech Web Services</a></i></small></p>
</div>
</div>
</div>
--
GitLab