Merge pull request #69 from TACC/task/GH-68-new-fullwidth-standard-te…

…mplates
TACC · Oct 14, 2021 · 40e4816 · 40e4816
2 parents 3bfefb6 + 9cec504
commit 40e4816
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 21 deletions.
diff --git a/frontera-cms/settings_custom.py b/frontera-cms/settings_custom.py
@@ -10,9 +10,10 @@
 ########################
 
 CMS_TEMPLATES = (
-    ('frontera-cms/templates/fullwidth.html', 'Fullwidth'),
-    ('fullwidth.html', 'DEPRECATED Fullwidth'),
+    ('frontera-cms/templates/standard.html', 'Standard'),
+    ('frontera-cms/templates/fullwidth.html', 'Full Width'),
     ('frontera-cms/templates/home.html', 'Homepage'),
+
     ('guide.html', 'Guide'),
     ('guides/getting_started.html', 'Guide: Getting Started'),
     ('guides/data_transfer.html', 'Guide: Data Transfer'),

diff --git a/frontera-cms/templates/assets_custom.html b/frontera-cms/templates/assets_custom.html
@@ -0,0 +1,4 @@
+{% load static %}
+
+<link rel="stylesheet" href="{% static 'frontera-cms/css/build/site.css' %}">
+<link rel="stylesheet" href="{% static 'frontera-cms/css/build/site.header.css' %}">
diff --git a/frontera-cms/templates/fullwidth.html b/frontera-cms/templates/fullwidth.html
@@ -1,22 +1,10 @@
-{% extends "base.html" %}
-{% load cms_tags staticfiles %}
-
-{% block title %}{% page_attribute "page_title" %}{% endblock title %}
-
-{% block assets_font %}
-  {{ block.super }}
-{% endblock assets_font %}
-
-{% block content %}
-{% placeholder "content" %}
-{% endblock content %}
+{% extends "fullwidth.html" %}
+{% load cms_tags static %}
 
 {% block assets_custom %}
   {{ block.super }}
 
-  <!-- To customize styles for this project -->
-  <link rel="stylesheet" href="{% static 'frontera-cms/css/build/site.css' %}">
-  <link rel="stylesheet" href="{% static 'frontera-cms/css/build/site.header.css' %}">
+  {% include "./assets_custom.html" %}
 
   <!-- To style old CMS content on new CMS -->
   <!-- NOTE: This should probably be loaded BEFORE "To customize styles …", but:

diff --git a/frontera-cms/templates/home.html b/frontera-cms/templates/home.html
@@ -1,11 +1,10 @@
-{% extends "./fullwidth.html" %}
-{% load cms_tags staticfiles %}
+{% extends "fullwidth.html" %}
+{% load cms_tags static %}
 
 {% block assets_custom %}
   {{ block.super }}
 
-  <link rel="stylesheet" href="{% static 'frontera-cms/css/build/site.css' %}">
-  <link rel="stylesheet" href="{% static 'frontera-cms/css/build/site.header.css' %}">
+  {% include "./assets_custom.html" %}
 
   <style>
   /* To simplify calculation of `rem` values */

diff --git a/frontera-cms/templates/standard.html b/frontera-cms/templates/standard.html
@@ -0,0 +1,6 @@
+{% extends "standard.html" %}
+{% load cms_tags %}
+
+{% block assets_custom %}
+  {% include "./assets_custom.html" %}
+{% endblock assets_custom %}