Skip to content

Commit 2f0fa8a

Browse files
authored
Merge branch 'main' into feat/tup-706-news-on-other-sites
2 parents 4c0749d + 72350e4 commit 2f0fa8a

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
<!--
88
- [CMD-XYZ](https://tacc-main.atlassian.net/browse/CMD-XYZ)
9-
- requires https://github.com/TACC/Core-Styles/pull/5
10-
- required by https://github.com/TACC/Core-CMS-Resources/pull/117
9+
- requires https://github.com/TACC/Core-Styles/pull/123
10+
- required by https://github.com/TACC/Core-CMS-Custom/pull/123
1111
-->
1212

1313
## Changes

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ The base CMS code for TACC WMA Workspace Portals & Websites
2424
- [Camino], a Docker container-based deployment scheme
2525
- [Core Portal], the base Portal code for TACC WMA CMS Websites
2626
- [Core Styles], the shared UI pattern code for TACC WMA CMS Websites
27+
- [Core CMS Template], a template for creating new TACC WMA CMS projects
2728
- [Core CMS Resources], the old solution for extensions of the [Core CMS] project
2829
- [Core CMS Custom], the new solution for extensions of the [Core CMS] project
2930
- [Core Portal Deployments], private repository that facilitates deployments of [Core Portal] images via [Camino] and Jenkins
@@ -187,6 +188,7 @@ To contribute, first read [How to Contirbute][Contributing].
187188
[Core CMS]: https://github.com/TACC/Core-CMS
188189
[Core Styles]: https://github.com/TACC/Core-Styles
189190
[Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources
191+
[Core CMS Template]: https://github.com/TACC/Core-CMS-Template
190192
[Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom
191193
[Core Portal]: https://github.com/TACC/Core-Portal
192194
[Core Portal Deployments]: https://github.com/TACC/Core-Portal-Deployments

docs/develop-custom-project.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,18 @@
22

33
| You can do these actions | via this resource | (status) |
44
| - | - | - |
5-
| **customize** templates, static assets, settings, custom apps, URLs, middleware | [Core-CMS-Custom](#via-core-cms-custom) | active |
6-
| **customize** templates, static assets, settings | [Core-CMS-Resources](#via-core-cms-resources) | deprecated |
5+
| **customize** static assets | [Core CMS Custom] | active |
6+
| **customize** templates, static assets, settings | [Core CMS Resources](#via-core-cms-resources) | deprecated |
7+
| **customize** templates, static assets, custom apps, URLs, middleware | [Core CMS Template] | active |
78
| **create** or **customize** an app | [Develop a Custom App/Plugin](./develop-custom-app.md) | active |
89

9-
## via [Core CMS Custom]
10-
11-
Work on the project **only** via [Core CMS Custom].
12-
13-
> **Note**
14-
> You should **not** need to clone **nor** edit this [Core CMS] repository.
15-
1610
## via [Core CMS Resources]
1711

1812
> [!DANGER]
19-
> Deprecated solution. Use [Core CMS Custom] instead.
13+
> Deprecated solution.
14+
15+
> [!TIP]
16+
> Use [Core CMS Custom] or [Core CMS Template] instead.
2017
2118
### Update Project
2219

@@ -72,8 +69,8 @@ To commit changes to a custom project:
7269

7370
[Core CMS]: https://github.com/TACC/Core-CMS
7471
[Core Styles]: https://github.com/TACC/Core-Styles
75-
[Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources
7672
[Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom
73+
[Core CMS Template]: https://github.com/TACC/Core-CMS-Template
7774

7875
[restart server]: https://github.com/TACC/Core-CMS/wiki/How-to-Restart-the-CMS-Server
7976
[collect static files]: ./develop-project.md#collect-static-files

taccsite_cms/static/site_cms/css/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ See [repo `README.md` at "Static Files"](/README.md#static-files).
1010

1111
- (Standard) Style TACC UI patterns in [Core Styles].
1212
- (Exception) Style CMS-specific UI in [Core CMS].
13-
- (Exception) Style project-specific UI in [Core CMS Resources].
13+
- (Exception) Style project-specific UI in [Core CMS Custom] or its own repo.
1414

1515

1616
<!-- Link Aliases -->
1717

1818
[Core CMS]: https://github.com/TACC/Core-CMS
19-
[Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources
19+
[Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom
2020
[Core Styles]: https://github.com/TACC/Core-Styles

taccsite_custom

Submodule taccsite_custom updated 25 files

0 commit comments

Comments
 (0)