Skip to content
This repository was archived by the owner on Jul 17, 2025. It is now read-only.

FP-1238/GH-68: Frontera: Cleanup Templates & Add Standard Template#69

Merged
wesleyboar merged 11 commits intomainfrom
task/GH-68-new-fullwidth-standard-templates
Oct 14, 2021
Merged

FP-1238/GH-68: Frontera: Cleanup Templates & Add Standard Template#69
wesleyboar merged 11 commits intomainfrom
task/GH-68-new-fullwidth-standard-templates

Conversation

@wesleyboar
Copy link
Copy Markdown
Member

@wesleyboar wesleyboar commented Aug 30, 2021 •
edited
Loading

To Do (Done)

Required By

Overview

  • Add "Standard" template.
  • Simplify "Full Width" template.
  • Remove unused template from list.
  • Share custom assets via new file.

Issues

Changes

See https://github.com/TACC/Core-CMS-Resources/pull/69/commits.

Testing

Basic Testing
  • Ensure "Homepage" and "Full Width" templates result in the same render.
  • Ensure "Homepage" template loads same stylesheets, plus new system_monitor stylesheet.
  • Ensure "Full Width" template loads same stylesheets, but combines migration stylesheets.
  • Ensure "Standard" template is available and adds page margin and breadcrumbs.
Detailed Testing
  1. Load https://dev.fronteraweb.tacc.utexas.edu.
  2. Ensure Home page has "Homepage" template.
  3. Ensure homepage still looks like production.*
  4. Ensure Training page has "Full Width" template.
  5. Ensure Training page still looks like production.*
  6. Ensure System page has "Full Width" template.
  7. Ensure System page looks like GH-88 / PR #330 "Screenshots" under "Render".†

* Mention discrepancies to @tacc-wbomar who may know unrelated discrepancies.
† Most importantly, the System page should have breadcrumbs and page margin.

Screenshots

Recent Testing (After FP-1187)
Template Change Screenshot
Home no change GH-68 Homepage
Full Width only rename GH-68 Full Width
Standard new GH-68 Standard
Earlier Testing (Before FP-1187)
Template Change Screenshot Notes
Home no change GH-68 Frontera Home - CSS Load GH-68 Frontera Home - Template
Full Width only rename GH-68 Frontera Fullwidth - CSS Load GH-68 Frontera Fullwidth - Template rename pending FP-1187
Standard new … usage pending FP-1187

Notes

There was a similar PR for ProTX & A2CPS:

@wesleyboar
GH-68: Frontera: Rename "Fullwidth" → "Full Width"
9d80d6b
@wesleyboar
GH-68: Frontera: Remove "DEPRECATED Fullwidth"
a2ae12a
@wesleyboar
GH-68: Frontera: Add "Standard" template
8478c95 
- Add to `secrets.py`.
- Add custom assets mini-template.
- Extend Core standard template but with custom assets.
@wesleyboar
GH-68: Frontera: Cleanup "Full Width" template
1f313cc 
- Remove cruft.
- Include custom assets via mini-template (added in 640952b).
@wesleyboar
GH-68: Frontera: Cleanup "Home" template
8e4464f 
- Extend local `fullwidth.html` template.
- Overwrite custom assets block.
- Include custom assets via mini-template (added in 640952b).
This was referenced Aug 30, 2021
Merged
Merged
@wesleyboar wesleyboar changed the title GH-68: Frontera: Cleanup Templates & Add Standard Template FP-1238/GH-68: Frontera: Cleanup Templates & Add Standard Template Oct 4, 2021
@wesleyboar wesleyboar mentioned this pull request Oct 7, 2021
Merged
wesleyboar added a commit that referenced this pull request Oct 7, 2021
@wesleyboar
GH-93: Fix: Do NOT load migrate CSS on homepage
a0f968e 
Also fixed in #69.
wesleyboar added a commit that referenced this pull request Oct 8, 2021
@wesleyboar
Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-s…
1f19f64 
…tyles of the following:

commit ca3d537
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 16:59:29 2021 -0500

    GH-93: Fix bug from intro of `x-overlay--` mixin

    Bug Source:
    - TACC/Core-CMS#368
        - TACC/Core-CMS#361
            - 6d253e1...522c296#diff-5894bbc

commit 57a0e5a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 13:30:20 2021 -0500

    Major: Use `%x-overlay--` not `.x-overlay--`

    That class usage is undesirable and to be removed in Core-CMS.

commit a0f968e
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 13:18:33 2021 -0500

    GH-93: Fix: Do NOT load migrate CSS on homepage

    Also fixed in #69.

commit 6b16f93
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 12:53:07 2021 -0500

    GH-93: Isolate banner image tweaks, fix 300px bug

commit 4eb1b94
Merge: a7328b5 147ee85
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 12:24:49 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit a7328b5
Merge: fd1eb8f 7356817
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Sep 28 16:59:33 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit fd1eb8f
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Wed Sep 1 16:09:35 2021 -0500

    Revert "Squashed merge of task/GH-73-tacc-blockquote-plugin at commit 237c26c"

    This reverts commit 57e159b.

commit 436068f
Merge: fa1a998 50882bb
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 31 13:58:18 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit fa1a998
Merge: db9a390 4e69e60
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Aug 26 17:00:00 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit db9a390
Merge: 291dbda 23ab68f
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 16 17:04:02 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 291dbda
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Aug 13 05:51:54 2021 -0500

    GH-93: Avoid title color bug with upcoming PR #312

    Ensure heading turns white.

commit 1d81729
Merge: a1be40e e3f7c1a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Aug 13 05:50:02 2021 -0500

    Merge branch 'site/frontera/main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit e3f7c1a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Aug 12 22:53:26 2021 -0500

    Squashed merge of main at commit 23ab68f

commit 9c83643
Merge: 472a98d 4330d0c
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 9 11:34:51 2021 -0500

    Merge branch 'main' into site/frontera/main

commit 472a98d
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Wed Aug 4 12:57:44 2021 -0500

    Squashed merge of quick/support-and-move-snippets at commit c06c7cd

commit 57e159b
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jul 30 13:05:43 2021 -0500

    Squashed merge of task/GH-73-tacc-blockquote-plugin at commit 237c26c

commit a89d59e
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jul 30 13:02:40 2021 -0500

    Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles at commit a1be40e

commit a1be40e
Merge: 7204143 4330d0c
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jul 30 12:45:31 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 7204143
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Jul 20 17:23:20 2021 -0500

    GH-93: Frontera: Plugin-less style … snippet — Fix

commit 0709f20
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Jul 20 17:02:23 2021 -0500

    GH-93: Match plugin-less styles to plugins tyles

commit 68357a3
Merge: 184a2ab 2b0c7ba
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Jul 20 16:57:21 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 184a2ab
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Jun 24 20:45:28 2021 -0500

    WIP: GH-93: Drop old styles for new global styles

    GH-93: Move horz outline-offset to Frontera s-home

    GH-93: Frontera: banner: Use old s-article-preview

    GH-93: Frontera: Cleanup s-home as GH-93 completes

    GH-93: Frontera: Demote Deprecated Core Styles

    Also, update markup to be accurate for for a class within these styles.

    GH-93: Frontera: Noop: Clean up deprecated styles
wesleyboar
wesleyboar commented Oct 8, 2021
View reviewed changes
@wesleyboar wesleyboar marked this pull request as ready for review October 8, 2021 16:03
@wesleyboar
Copy link
Copy Markdown
Member Author

wesleyboar commented Oct 14, 2021 •
edited
Loading

Self-merging, so that FP-1238 can be tested/performed on pre-prod during Frontera testing session that happens (next week) before I could schedule a CMS PR review ticket (next next week, and may not get done till later). I have tested this ticket well, and accept the consequences of any problem it creates.

@wesleyboar wesleyboar merged commit 40e4816 into main Oct 14, 2021
@wesleyboar wesleyboar deleted the task/GH-68-new-fullwidth-standard-templates branch October 14, 2021 21:06
wesleyboar added a commit to TACC/Core-CMS that referenced this pull request Oct 14, 2021
@wesleyboar
Merge branch 'main' into site/frontera/task/GH-68-new-fullwidth-stand…
0c6bbcd 
…ard-templates

Also, update taccsite_custom to have latest from its main branch.

This gets recently merged TACC/Core-CMS-Resources#69 without second PR.
wesleyboar added a commit that referenced this pull request Nov 12, 2021
@wesleyboar
Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-s…
c38835a 
…tyles of the following:

commit 64e25a1
Merge: 71992da 28193da
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Nov 12 17:34:46 2021 -0600

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 71992da
Merge: 3819af9 4e51b1a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Nov 4 12:01:02 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 3819af9
Merge: ca3d537 40e4816
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 14 16:31:02 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit ca3d537
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 16:59:29 2021 -0500

    GH-93: Fix bug from intro of `x-overlay--` mixin

    Bug Source:
    - TACC/Core-CMS#368
        - TACC/Core-CMS#361
            - 6d253e1...522c296#diff-5894bbc

commit 57a0e5a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 13:30:20 2021 -0500

    Major: Use `%x-overlay--` not `.x-overlay--`

    That class usage is undesirable and to be removed in Core-CMS.

commit a0f968e
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 13:18:33 2021 -0500

    GH-93: Fix: Do NOT load migrate CSS on homepage

    Also fixed in #69.

commit 6b16f93
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 12:53:07 2021 -0500

    GH-93: Isolate banner image tweaks, fix 300px bug

commit 4eb1b94
Merge: a7328b5 147ee85
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Oct 7 12:24:49 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit a7328b5
Merge: fd1eb8f 7356817
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Sep 28 16:59:33 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit fd1eb8f
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Wed Sep 1 16:09:35 2021 -0500

    Revert "Squashed merge of task/GH-73-tacc-blockquote-plugin at commit 237c26c"

    This reverts commit 57e159b.

commit 436068f
Merge: fa1a998 50882bb
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Aug 31 13:58:18 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit fa1a998
Merge: db9a390 4e69e60
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Aug 26 17:00:00 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit db9a390
Merge: 291dbda 23ab68f
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 16 17:04:02 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 291dbda
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Aug 13 05:51:54 2021 -0500

    GH-93: Avoid title color bug with upcoming PR #312

    Ensure heading turns white.

commit 1d81729
Merge: a1be40e e3f7c1a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Aug 13 05:50:02 2021 -0500

    Merge branch 'site/frontera/main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit e3f7c1a
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Aug 12 22:53:26 2021 -0500

    Squashed merge of main at commit 23ab68f

commit 9c83643
Merge: 472a98d 4330d0c
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Mon Aug 9 11:34:51 2021 -0500

    Merge branch 'main' into site/frontera/main

commit 472a98d
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Wed Aug 4 12:57:44 2021 -0500

    Squashed merge of quick/support-and-move-snippets at commit c06c7cd

commit 57e159b
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jul 30 13:05:43 2021 -0500

    Squashed merge of task/GH-73-tacc-blockquote-plugin at commit 237c26c

commit a89d59e
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jul 30 13:02:40 2021 -0500

    Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles at commit a1be40e

commit a1be40e
Merge: 7204143 4330d0c
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Fri Jul 30 12:45:31 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 7204143
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Jul 20 17:23:20 2021 -0500

    GH-93: Frontera: Plugin-less style … snippet — Fix

commit 0709f20
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Jul 20 17:02:23 2021 -0500

    GH-93: Match plugin-less styles to plugins tyles

commit 68357a3
Merge: 184a2ab 2b0c7ba
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Tue Jul 20 16:57:21 2021 -0500

    Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles

commit 184a2ab
Author: Wesley Bomar <wbomar@tacc.utexas.edu>
Date:   Thu Jun 24 20:45:28 2021 -0500

    WIP: GH-93: Drop old styles for new global styles

    GH-93: Move horz outline-offset to Frontera s-home

    GH-93: Frontera: banner: Use old s-article-preview

    GH-93: Frontera: Cleanup s-home as GH-93 completes

    GH-93: Frontera: Demote Deprecated Core Styles

    Also, update markup to be accurate for for a class within these styles.

    GH-93: Frontera: Noop: Clean up deprecated styles
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Frontera: New Fullwidth & Standard Templates

1 participant

@wesleyboar