Skip to content

Commit 6153961

Browse files
authored
refactor(texascale): cms v3.12.0 beta (#190)
1 parent 964e346 commit 6153961

File tree

65 files changed

+31
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+31
-16
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends "texascale_cms/templates/article.freeform.html" %}

texascale-org/templates/article.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends "texascale_cms/templates/article.html" %}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends "texascale_cms/templates/article.image-map.html" %}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends "texascale_cms/templates/article.sidebar-right.html" %}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends "texascale_cms/templates/article.visual.html" %}

texascale-org/templates/category.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends "texascale_cms/templates/category.html" %}
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends "texascale_cms/templates/fullwidth.html" %}
File renamed without changes.
File renamed without changes.

texascale_org/settings_custom.py texascale_cms/settings_custom.py

+17-9
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,21 @@
77
########################
88

99
CMS_TEMPLATES = (
10-
('texascale_org/templates/fullwidth.html', 'Fullwidth'),
11-
('texascale_org/templates/category.html', 'Category'),
12-
('texascale_org/templates/article.html', 'Article'),
13-
('texascale_org/templates/article.freeform.html', 'Article (Free-Form)'),
14-
('texascale_org/templates/article.sidebar-right.html', 'Article (Right Sidebar)'),
15-
('texascale_org/templates/article.visual.html', 'Article (Full-Size Visual)'),
16-
('texascale_org/templates/article.image-map.html', 'Article (Image Map)'),
10+
('texascale_cms/templates/fullwidth.html', 'Fullwidth'),
11+
('texascale_cms/templates/category.html', 'Category'),
12+
('texascale_cms/templates/article.html', 'Article'),
13+
('texascale_cms/templates/article.freeform.html', 'Article (Free-Form)'),
14+
('texascale_cms/templates/article.sidebar-right.html', 'Article (Right Sidebar)'),
15+
('texascale_cms/templates/article.visual.html', 'Article (Full-Size Visual)'),
16+
('texascale_cms/templates/article.image-map.html', 'Article (Image Map)'),
17+
# DEPRECATED
18+
('texascale-org/templates/fullwidth.html', 'DEPRECATED Fullwidth'),
19+
('texascale-org/templates/category.html', 'DEPRECATED Category'),
20+
('texascale-org/templates/article.html', 'DEPRECATED Article'),
21+
('texascale-org/templates/article.freeform.html', 'DEPRECATED Article (Free-Form)'),
22+
('texascale-org/templates/article.sidebar-right.html', 'DEPRECATED Article (Right Sidebar)'),
23+
('texascale-org/templates/article.visual.html', 'DEPRECATED Article (Full-Size Visual)'),
24+
('texascale-org/templates/article.image-map.html', 'DEPRECATED Article (Image Map)'),
1725
)
1826

1927
########################
@@ -22,7 +30,7 @@
2230

2331
LOGO = [
2432
"texascale",
25-
"texascale_org/img/org_logos/texascale-wordmark.png",
33+
"texascale_cms/img/org_logos/texascale-wordmark.png",
2634
"",
2735
"/",
2836
"_self",
@@ -89,4 +97,4 @@
8997
########################
9098

9199
# TACC/Core-CMS-Resources#75: Load custom urls.py so we can add urlpatterns for taggit_autosuggest
92-
ROOT_URLCONF = 'taccsite_custom.texascale_org.urls'
100+
ROOT_URLCONF = 'taccsite_custom.texascale_cms.urls'

texascale_org/templates/article.html texascale_cms/templates/article.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% block assets_custom %}
55
{{ block.super }}
66

7-
<link rel="stylesheet" href="{% static 'texascale_org/css/build/template.article.css' %}">
7+
<link rel="stylesheet" href="{% static 'texascale_cms/css/build/template.article.css' %}">
88
{% endblock assets_custom %}
99

1010
{% block content %}

texascale_org/templates/article.image-map.html texascale_cms/templates/article.image-map.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% block assets_custom %}
55
{{ block.super }}
66

7-
<link rel="stylesheet" href="{% static 'texascale_org/css/build/template.article.image-map.css' %}">
7+
<link rel="stylesheet" href="{% static 'texascale_cms/css/build/template.article.image-map.css' %}">
88
{% endblock assets_custom %}
99

1010
{% block content %}
@@ -36,5 +36,5 @@
3636
{% block assets_custom_delayed %}
3737
{{ block.super }}
3838

39-
<script src="{% static 'texascale_org/js/activateFocusTarget.js' %}" crossorigin="anonymous"></script>
39+
<script src="{% static 'texascale_cms/js/activateFocusTarget.js' %}" crossorigin="anonymous"></script>
4040
{% endblock assets_custom_delayed %}

texascale_org/templates/category.html texascale_cms/templates/category.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% block assets_custom %}
55
{{ block.super }}
66

7-
<link rel="stylesheet" href="{% static 'texascale_org/css/build/template.category.css' %}">
7+
<link rel="stylesheet" href="{% static 'texascale_cms/css/build/template.category.css' %}">
88
{% endblock assets_custom %}
99

1010
{# Add class to the <html> #}

texascale_org/templates/fullwidth.html texascale_cms/templates/fullwidth.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{% block assets_custom %}
1111
{{ block.super }}
1212

13-
<link rel="stylesheet" href="{% static 'texascale_org/css/build/site.css' %}">
13+
<link rel="stylesheet" href="{% static 'texascale_cms/css/build/site.css' %}">
1414
{% endblock assets_custom %}
1515

1616
{% block content %}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<link rel="stylesheet" href="/static/texascale_cms/css/build/page.frontera-secret-sauce.css">
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<link rel="stylesheet" href="/static/texascale_cms/css/build/page.whats-in-a-node.css">
File renamed without changes.

texascale_org/templates/snippets/image-map-frontera-secret-sauce-styles.html

-1
This file was deleted.

texascale_org/templates/snippets/image-map-whats-in-a-node-styles.html

-1
This file was deleted.

0 commit comments

Comments
 (0)