TACC · wesleyboar · May 3, 2022 · Mar 8, 2022 · Mar 8, 2022 · Mar 8, 2022
diff --git a/package-lock.json b/package-lock.json
diff --git a/taccsite_cms/locale/en/LC_MESSAGES/django.mo b/taccsite_cms/locale/en/LC_MESSAGES/django.mo
diff --git a/taccsite_cms/locale/en/LC_MESSAGES/django.po b/taccsite_cms/locale/en/LC_MESSAGES/django.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# The "Plural-Forms" fixes a bug (https://stackoverflow.com/a/64525866/11817077)
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Last-Translator: Wesley B\n"
+"Language-Team: TACC-ACI-WMA <wma_prtl@tacc.utexas.edu>\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+
+
+#: djangocms-blog
+#: templates/djangocms_blog/includes/blog_meta.html:6
+msgid "by"
+msgstr "by:"
+
+#: djangocms-blog
+#: cms_appconfig.py:39
+msgid ""
+"If left empty the image size will have to be set for every newly created "
+"post."
+msgstr ""
+"If left empty the image size must be set for every newly created "
+"post. "
+"And any post that unsets its image size will use this setting value."
+
+#: djangocms-blog
+#: cms_appconfig.py:45
+msgid ""
+"If left empty the thumbnail image size will have to be set for every newly "
+"created post."
+msgstr ""
+"If left empty the thumbnail image size must be set for every newly "
+"created post. "
+"And any post that unsets its thumbnail image size will use this setting value."
+
+#: djangocms-blog
+#: templates/djangocms_blog/includes/blog_item.html:24
+# this link text only appears for a CMS editor
+msgid "read more"
+msgstr "open article"
+
+#: djangocms-blog
+#: templates/djangocms_blog/post_list.html:29
+msgid "previous"
+msgstr "Previous"
+
+#: djangocms-blog
+#: templates/djangocms_blog/post_list.html:35
+msgid "next"
+msgstr "Next"
+
+
+
+#: djangocms-picture
+#: models.py:117
+msgid "Aligns the image according to the selected option."
+msgstr "Aligns the image according to the selected option. WARNING: Alignment behavior changes if \"Caption text\" is added."
+
+#: djangocms-picture
+#: models.py:123
+msgid "Provide a description, attribution, copyright or other information."
+msgstr "Provide a description, attribution, copyright or other information. WARNING: Adding caption text will change the behavior of \"Alignment\"."
+
+
+
+#: site-cms(djangocms-blog)
+#: templates/djangocms_blog/includes/blog_meta.html:6
+msgid "Published"
+msgstr "Published:"
+
+#: site-cms(djangocms-blog)
+#: templates/djangocms_blog/post_list.html:6
+msgid "News"
+msgstr ""
diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py
@@ -14,6 +14,8 @@
 import ldap
 from django_auth_ldap.config import LDAPSearch, GroupOfNamesType
 
+from django.utils.translation import gettext_lazy as _
+
 SECRET_KEY = 'CHANGE_ME'
 def gettext(s): return s
 
@@ -193,6 +195,13 @@ def gettext(s): return s
 # for example, CEP_AUTH_VERIFICATION_ENDPOINT=https://dev.cep.tacc.utexas.edu
 CEP_AUTH_VERIFICATION_ENDPOINT = 'http://django:6000'
 
+########################
+# TACC: NEWS/BLOG
+########################
+
+TACC_BLOG_SHOW_CATEGORIES = True
+TACC_BLOG_SHOW_TAGS = True
+
 ########################
 # CLIENT BUILD SETTINGS
 ########################
@@ -255,6 +264,10 @@ def gettext(s): return s
     },
 ]
 
+LOCALE_PATHS = [
+    os.path.join(BASE_DIR, 'taccsite_cms', 'locale'),
+]
+
 MIDDLEWARE = [
     'cms.middleware.utils.ApphookReloadMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -289,7 +302,9 @@ def gettext(s): return s
     'treebeard',  # Replaces mptt.
     'djangocms_text_ckeditor',
     'filer',
+    'meta',
     'easy_thumbnails',
+    'djangocms_page_meta',
     'djangocms_column',
     'djangocms_file',
     'djangocms_link',
@@ -404,6 +419,11 @@ def get_subdirs_as_module_names(path):
     576, 768, 992, 1200, 1400, 1680, 1920
 ]
 DJANGOCMS_PICTURE_RATIO = 1.618
+DJANGOCMS_PICTURE_ALIGN = [
+    ('left', _('Align left')),
+    ('right', _('Align right')),
+    ('center', _('Align center')),
+]
 
 # FILE UPLOAD VALUES MUST BE SET!
 # Set in correlation with the `client_max_body_size    20m;` value in /etc/nginx/proxy.conf.
@@ -443,8 +463,6 @@ def get_subdirs_as_module_names(path):
 
 SETTINGS_EXPORT_VARIABLE_NAME = 'settings'
 
-FEATURES = ''
-
 ########################
 # PLUGIN SETTINGS
 ########################
@@ -476,6 +494,13 @@ def get_subdirs_as_module_names(path):
     'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
 ]
 
+# https://github.com/nephila/django-meta
+META_SITE_PROTOCOL = 'http'
+META_USE_SITES = True
+META_USE_OG_PROPERTIES = True
+META_USE_TWITTER_PROPERTIES = True
+META_USE_SCHEMAORG_PROPERTIES = True
+
 ########################
 # IMPORT & EXPORT
 ########################
@@ -500,12 +525,13 @@ def get_subdirs_as_module_names(path):
 
 SETTINGS_EXPORT = [
     'DEBUG',
-    'FEATURES',
     'THEME',
     'BRANDING',
     'LOGO',
     'FAVICON',
     'INCLUDES_CORE_PORTAL',
     'GOOGLE_ANALYTICS_PROPERTY_ID',
-    'GOOGLE_ANALYTICS_PRELOAD'
+    'GOOGLE_ANALYTICS_PRELOAD',
+    'TACC_BLOG_SHOW_CATEGORIES',
+    'TACC_BLOG_SHOW_TAGS'
 ]
diff --git a/taccsite_cms/settings_custom.example.py b/taccsite_cms/settings_custom.example.py
@@ -79,49 +79,48 @@
 }
 
 ########################
-# BLOG & SOCIAL METADATA
+# NEWS / BLOG
 ########################
 
-# Install required apps
-INSTALLED_APPS += [
-    # Blog/News
-    # 'filer',              # already added
-    # 'easy_thumbnails',    # already added
+tacc_app_index = INSTALLED_APPS.index('taccsite_cms')
+INSTALLED_APPS[tacc_app_index:tacc_app_index] = [
+    # 'filer',              # already in Core
+    # 'easy_thumbnails',    # already in Core
     'parler',
     'taggit',
     'taggit_autosuggest',
-    'meta',                 # also supports `djangocms_page_meta`
+    # 'meta',               # already in Core
     'sortedm2m',
     'djangocms_blog',
-
-    # Metadata
-    'djangocms_page_meta',
 ]
-# CAVEAT: 'taggit_autosuggest' requires the following is added to `urls.py`
+# REQ: 'taggit_autosuggest' requires the following is added to `urls.py`
 """
 urlpatterns += [
     # Support `taggit_autosuggest` (from `djangocms-blog`)
     url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
 ]
 """
 
-# Metadata: Configure
-META_SITE_PROTOCOL = 'http'
-META_USE_SITES = True
-META_USE_OG_PROPERTIES = True
-META_USE_TWITTER_PROPERTIES = True
-META_USE_GOOGLEPLUS_PROPERTIES = True # django-meta 1.x+
-# META_USE_SCHEMAORG_PROPERTIES=True  # django-meta 2.x+
-
-# Blog/News: Set custom paths for templates
+# Paths for alternate templates that user can choose for blog-specific plugin
+# - Devs can customize core templates at `templates/djangocms_blog/`.
+# - Users can choose alt. templates from `templates/djangocms_blog/plugins/*`.
+# - Devs can customize alt. templates at `templates/djangocms_blog/plugins/*`.
 BLOG_PLUGIN_TEMPLATE_FOLDERS = (
-    ('plugins/default', 'Default template'),    # i.e. `templates/djangocms_blog/plugins/default/`
-    ('plugins/default-clone', 'Clone of default template'),  # i.e. `templates/djangocms_blog/plugins/default-clone/`
+    ('plugins', 'Default'),
+    # ('plugins/alternate', 'Alternate'),
 )
 
-# Blog/News: Change default values for the auto-setup of one `BlogConfig`
+# Change default values for the auto-setup of one `BlogConfig`
 # SEE: https://github.com/nephila/djangocms-blog/issues/629
-BLOG_AUTO_SETUP = True
+BLOG_AUTO_SETUP = True # Set to False after setup (minimize overhead)
 BLOG_AUTO_HOME_TITLE ='Home'
 BLOG_AUTO_BLOG_TITLE = 'News'
 BLOG_AUTO_APP_TITLE = 'News'
+BLOG_AUTO_NAMESPACE = 'News'
+
+# Miscellaneous settings
+BLOG_ENABLE_COMMENTS = False
+
+# TACC settings
+TACC_BLOG_SHOW_CATEGORIES = True
+TACC_BLOG_SHOW_TAGS = True
diff --git a/taccsite_cms/static/djangocms_blog/css/djangocms_blog.css b/taccsite_cms/static/djangocms_blog/css/djangocms_blog.css
@@ -0,0 +1,3 @@
+/* SEE: ../../site_cms/css/src/app.blog.css */
+/* FAQ: We uses future syntax that must be processed to work in the present;
+        and the process does not support outputting files to this directory */
diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css b/taccsite_cms/static/site_cms/css/src/_imports/components/django.cms.blog.app.css
@@ -0,0 +1,71 @@
+/*
+Django CMS Blog App Components
+
+These styles are only for the blog app pages (list pages, article pages).
+
+Reference:
+
+- [Django CMS Blog App Templates](https://github.com/nephila/djangocms-blog/tree/1.1.1/djangocms_blog/templates/djangocms_blog)
+
+Styleguide Components.DjangoCMS.Blog.App
+*/
+@import url("@tacc/core-styles/source/_imports/components/bootstrap.pagination.css");
+
+@import url("./django.cms.blog.app.page.css");
+@import url("./django.cms.blog.app.item.css");
+
+
+
+
+
+/* Variables */
+
+.app-blog {
+  --blog-item-buffer: 20px;
+}
+
+
+
+/* Selectors */
+
+/* To make these selectors easier to remember (rather than add classnames) */
+/* FAQ: Avoiding changing blog templates to limit app upgrade maintenance */
+@custom-selector :--article article;
+@custom-selector :--article-page article.post-detail;
+@custom-selector :--article-item .blog-list article;
+
+
+
+/* Header */
+
+.blog-list > header {
+  margin-bottom: var(--blog-item-buffer);
+}
+
+ul.post-detail {
+  list-style: none;
+
+  padding-left: 0; /* overwrite html-elements.css */
+  margin-bottom: 0; /* overwrite Bootstrap `reboot.css` */
+
+  font-size: var(--global-font-size--medium);
+}
+
+
+
+/* Metadata */
+
+/* To (optionally) hide tags & categories */
+.app-blog.no-tags :--article .tags,
+.app-blog.no-categories :--article .categories {
+  display: none;
+}
+
+
+
+
+/* Pagination */
+
+.pagination {
+  margin-block: calc( var(--blog-item-buffer) * 2 );
+}