Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: CMD-97 add content to news page #869

Draft
wants to merge 30 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
17640a4
refactor: CMD-97 breadcrumbs for news via 1 template
wesleyboar Jul 16, 2024
55dc431
idea: TUP-706 4.a.i change RSS feed render ⚠️
wesleyboar Jul 19, 2024
de81256
refactor: TUP-706 rename and document blog block
wesleyboar Jul 22, 2024
463871f
feat: TUP-706 render page with only (*_)content
wesleyboar Jul 22, 2024
8038de7
fix: TUP-706 disable failed djangocms_blog_c… url
wesleyboar Jul 22, 2024
89a160c
idea!: TUP-706 render blog base via custom app
wesleyboar Jul 22, 2024
db234df
feat!: TUP-706 render remote url content
wesleyboar Jul 22, 2024
d7f10ae
chore: TUP-706 move an import higher in file
wesleyboar Jul 22, 2024
ec10c85
feat: TUP-706 render remote url via setting
wesleyboar Jul 22, 2024
223b72a
fix: TUP-706 render blog customizations
wesleyboar Jul 22, 2024
aaa971e
Merge branch 'main' into feat/tup-706-news-on-other-sites
wesleyboar Jul 22, 2024
646b26d
fix: TUP-706 render feed ⚠️
wesleyboar Jul 22, 2024
aa709fd
docs: TUP-706 describe each URL's problem
wesleyboar Jul 22, 2024
26a9412
docs: TUP-706 describe each URL goal and status
wesleyboar Jul 22, 2024
4e78038
feat: TUP-706 A.1+3.c remote markup via template
wesleyboar Jul 22, 2024
17380fb
Merge branch 'main' into feat/tup-706-news-on-other-sites
wesleyboar Jul 23, 2024
a461693
feat: TUP-706 A.1.a. support BLOG_MULTISITE
wesleyboar Jul 23, 2024
6bece39
fix: TUP-706 A.1.a. cannot login to site 2
wesleyboar Jul 23, 2024
e6bdbbf
Revert "fix: TUP-706 A.1.a. cannot login to site 2"
wesleyboar Jul 23, 2024
4f9888b
Merge branch 'main' into feat/tup-706-news-on-other-sites
wesleyboar Sep 10, 2024
104fe71
docs: TUP-706 feed status (ineffectual)
wesleyboar Sep 10, 2024
dfc9fa4
docs: tup-706 urls for local and remote
wesleyboar Sep 10, 2024
cd59bf9
feat(poc): TUP-706 get news from remote url
wesleyboar Sep 11, 2024
6995c44
chore: remove test print statements from feeds
wesleyboar Sep 11, 2024
db79397
core: clean up views
wesleyboar Sep 11, 2024
a6d8551
core: clean up views more
wesleyboar Sep 11, 2024
82027fe
refactor: switch order of methods in view class
wesleyboar Sep 11, 2024
0c94401
feat: TUP-706 edit links via get_client_markup()
wesleyboar Sep 11, 2024
49edd04
fix: TUP-706 broken links
wesleyboar Sep 12, 2024
f1dc83c
chore: remove tup-706 work / isolate CMD-97 work
wesleyboar Sep 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions taccsite_cms/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@
</div>

{% endblock content %}
{# To isolate content with a layout that admin can not change e.g. Blog #}
{% block fixed_content %}
{% endblock fixed_content %}
</main>

<footer class="c-footer s-footer">
Expand Down
14 changes: 12 additions & 2 deletions taccsite_cms/templates/djangocms_blog/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@
{% endif %}
{% endblock meta %}

{% block content %}
{# TACC (do not let blog usurp Content placeholder): #}
{% block fixed_content %}
{# /TACC #}
{# TACC (wrap list in container to mimic other page layouts): #}
<div class="container">
{# /TACC #}

{% if settings.TACC_CORE_STYLES_VERSION == 0 %}
<link rel="stylesheet" href="{% static 'site_cms/css/build/site.app.blog.css' %}">
Expand All @@ -33,4 +38,9 @@
{% block content_blog %}{% endblock %}
</div>

{% endblock content %}
{# TACC (wrap list in container to mimic other page layouts): #}
</div>
{# /TACC #}
{# TACC (do not let blog usurp Content placeholder): #}
{% endblock fixed_content %}
{# /TACC #}
8 changes: 0 additions & 8 deletions taccsite_cms/templates/djangocms_blog/post_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@
{% load i18n easy_thumbnails_tags cms_tags blog_post_use_custom_media blog_post_is_show_abstract %}

{% block content_blog %}{% spaceless %}
{# TACC (wrap and add breadcrumbs): #}

<section class="container">
{% include "nav_cms_breadcrumbs.html" %}

{# /TACC #}
{# TACC (define whether this is a special post): #}
{% blog_post_use_custom_media post settings.PORTAL_BLOG_CUSTOM_MEDIA_POST_CATEGORY as use_custom_media %}
{% blog_post_is_show_abstract post settings.PORTAL_BLOG_SHOW_ABSTRACT_TAG as is_show_abstract_post %}
Expand Down Expand Up @@ -88,9 +83,6 @@ <h3>{% render_model post "subtitle" %}</h3>
{% endif %}
</article>
{# TACC (end wrap and end spaceless-ness later than source): #}

</section>
{% endspaceless %}

{# /TACC #}
{% endblock content_blog %}
7 changes: 0 additions & 7 deletions taccsite_cms/templates/djangocms_blog/post_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
{% block canonical_url %}<link rel="canonical" href="{{ view.get_view_url }}"/>{% endblock canonical_url %}

{% block content_blog %}
{# TACC (wrap list in container w/ breadcrumbs to mimic other page layouts): #}
<div class="container">
{% include "nav_cms_breadcrumbs.html" %}
{# /TACC #}

<section class="blog-list">
{% block blog_title %}
Expand Down Expand Up @@ -82,8 +78,5 @@ <h2>
{% endif %}
</section>

{# TACC (wrap list in container w/ breadcrumbs to mimic other page layouts): #}
</div>
{# /TACC #}
{% endblock %}
{% endspaceless %}