From f56da5c7f2862e55de18b024baee1e29b4e54c82 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:20:37 -0500
Subject: [PATCH] Revert "enhance: WP-308 form footer "Powered by: [tapis]""

---
 service/templates/authorize.html      |  1 -
 service/templates/base-auth.html      |  2 +-
 service/templates/content_footer.html | 23 -----------------------
 service/templates/device-code.html    |  1 -
 service/templates/login.html          |  9 ++++++++-
 service/templates/mfa.html            |  1 -
 service/templates/select_idp.html     |  9 ++++++++-
 7 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 service/templates/content_footer.html

diff --git a/service/templates/authorize.html b/service/templates/authorize.html
index a8ccb8f..0e4ac68 100644
--- a/service/templates/authorize.html
+++ b/service/templates/authorize.html
@@ -44,7 +44,6 @@ <h1>
       <button type="submit" name="approve" value="true" required>Connect</button>
     </footer>
   </form>
-  {% include "./content_footer.html" %}
 </main>
 {% endblock %}
 
diff --git a/service/templates/base-auth.html b/service/templates/base-auth.html
index 34c155f..6918e74 100644
--- a/service/templates/base-auth.html
+++ b/service/templates/base-auth.html
@@ -3,7 +3,7 @@
 {% block assets %}
 {{ super() }}
 
-{% with core_styles_cdn_url="https://unpkg.com/@tacc/core-styles@2.18.0" %}
+{% with core_styles_cdn_url="https://unpkg.com/@tacc/core-styles@2.17.5" %}
 <style>
   /* base styles */
   @import url('{{ core_styles_cdn_url }}/dist/core-styles.settings.css') layer(base);
diff --git a/service/templates/content_footer.html b/service/templates/content_footer.html
deleted file mode 100644
index 3f638f9..0000000
--- a/service/templates/content_footer.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<footer>
-  <a href="https://tacc.utexas.edu/about/security-and-compliance/">
-    Security
-  </a>
-  <a href="https://tacc.utexas.edu/use-tacc/user-policies/">
-    Policies
-  </a>
-  <a href="https://tapis-project.org" target="_blank" class="powered_by">
-    Powered by:
-    <img src="https://dev.develop.tapis.io/v3/oauth2/authorize/tapis.png"
-      alt="Tapis logo" title="Tapis (TACC APIs)" height="50px">
-  </a>
-</footer>
-
-{% block head_extra %}
-{{ super() }}
-<style>
-  /* To move non-image links to the left */
-  .powered_by {
-    margin-left: auto;
-  }
-</style>
-{% endblock %}
diff --git a/service/templates/device-code.html b/service/templates/device-code.html
index c03ba6b..79c74d5 100644
--- a/service/templates/device-code.html
+++ b/service/templates/device-code.html
@@ -35,6 +35,5 @@ <h1>
       <button type="submit">Submit</button>
     </footer>
   </form>
-  {% include "./content_footer.html" %}
 </main>
 {% endblock %}
diff --git a/service/templates/login.html b/service/templates/login.html
index de1156b..c990455 100644
--- a/service/templates/login.html
+++ b/service/templates/login.html
@@ -55,7 +55,14 @@ <h1>
       </a>
     </nav>
   </form>
-  {% include "./content_footer.html" %}
+  <footer>
+    <a href="https://tacc.utexas.edu/about/security-and-compliance/">
+      Security
+    </a>
+    <a href="https://tacc.utexas.edu/use-tacc/user-policies/">
+      Policies
+    </a>
+  </footer>
 </main>
 {% endblock %}
 
diff --git a/service/templates/mfa.html b/service/templates/mfa.html
index d4b0f48..831f4c9 100644
--- a/service/templates/mfa.html
+++ b/service/templates/mfa.html
@@ -40,6 +40,5 @@ <h1>
          <button type="submit">Submit</button>
       </footer>
    </form>
-  {% include "./content_footer.html" %}
 </main>
 {% endblock %}
diff --git a/service/templates/select_idp.html b/service/templates/select_idp.html
index 8f79d8d..c00432c 100644
--- a/service/templates/select_idp.html
+++ b/service/templates/select_idp.html
@@ -42,7 +42,14 @@ <h1>
     </nav>
 
  </form>
-  {% include "./content_footer.html" %}
+ <footer>
+   <a href="https://tacc.utexas.edu/about/security-and-compliance/">
+     Security
+   </a>
+   <a href="https://tacc.utexas.edu/use-tacc/user-policies/">
+     Policies
+   </a>
+ </footer>
 
 </main>
 {% endblock %}