From afd31b739d32082fd5aed7531f728d520105bb08 Mon Sep 17 00:00:00 2001 From: Aman Agrawal Date: Tue, 26 Jul 2022 04:12:33 +0000 Subject: [PATCH] templates: Move case-studies and /for pages to corporate folder. Since these pages don't belong in a self-hosted server. --- corporate/urls.py | 50 +++++++++++++------ .../case-studies}/asciidoctor-case-study.html | 2 +- .../case-studies}/asciidoctor-case-study.md | 0 .../case-studies}/idrift-case-study.html | 2 +- .../case-studies}/idrift-case-study.md | 0 .../case-studies}/lean-case-study.html | 2 +- .../case-studies}/lean-case-study.md | 0 .../recurse-center-case-study.html | 2 +- .../recurse-center-case-study.md | 0 .../case-studies}/rust-case-study.html | 2 +- .../case-studies}/rust-case-study.md | 0 .../case-studies}/tum-case-study.html | 2 +- .../case-studies}/tum-case-study.md | 0 .../case-studies}/ucsd-case-study.html | 2 +- .../case-studies}/ucsd-case-study.md | 0 .../for/business.html} | 0 .../for/communities.html} | 2 +- .../{zerver => corporate}/for/communities.md | 0 .../for/education.html} | 0 .../for/events.html} | 0 .../for/open-source.html} | 0 .../for/research.html} | 0 .../{zerver => corporate/for}/use-cases.html | 2 +- .../{zerver => corporate}/for/use-cases.md | 0 tools/linter_lib/custom_check.py | 2 +- 25 files changed, 45 insertions(+), 25 deletions(-) rename templates/{zerver => corporate/case-studies}/asciidoctor-case-study.html (91%) rename templates/{zerver/for => corporate/case-studies}/asciidoctor-case-study.md (100%) rename templates/{zerver => corporate/case-studies}/idrift-case-study.html (91%) rename templates/{zerver/for => corporate/case-studies}/idrift-case-study.md (100%) rename templates/{zerver => corporate/case-studies}/lean-case-study.html (92%) rename templates/{zerver/for => corporate/case-studies}/lean-case-study.md (100%) rename templates/{zerver => corporate/case-studies}/recurse-center-case-study.html (90%) rename templates/{zerver/for => corporate/case-studies}/recurse-center-case-study.md (100%) rename templates/{zerver => corporate/case-studies}/rust-case-study.html (92%) rename templates/{zerver/for => corporate/case-studies}/rust-case-study.md (100%) rename templates/{zerver => corporate/case-studies}/tum-case-study.html (91%) rename templates/{zerver/for => corporate/case-studies}/tum-case-study.md (100%) rename templates/{zerver => corporate/case-studies}/ucsd-case-study.html (91%) rename templates/{zerver/for => corporate/case-studies}/ucsd-case-study.md (100%) rename templates/{zerver/for-business.html => corporate/for/business.html} (100%) rename templates/{zerver/for-communities.html => corporate/for/communities.html} (97%) rename templates/{zerver => corporate}/for/communities.md (100%) rename templates/{zerver/for-education.html => corporate/for/education.html} (100%) rename templates/{zerver/for-events.html => corporate/for/events.html} (100%) rename templates/{zerver/for-open-source.html => corporate/for/open-source.html} (100%) rename templates/{zerver/for-research.html => corporate/for/research.html} (100%) rename templates/{zerver => corporate/for}/use-cases.html (94%) rename templates/{zerver => corporate}/for/use-cases.md (100%) diff --git a/corporate/urls.py b/corporate/urls.py index d6fefbde2e..df16ad8aec 100644 --- a/corporate/urls.py +++ b/corporate/urls.py @@ -72,38 +72,58 @@ landing_page_urls = [ path("self-hosting/", landing_view, {"template_name": "zerver/self-hosting.html"}), path("security/", landing_view, {"template_name": "zerver/security.html"}), # /for pages - path("use-cases/", landing_view, {"template_name": "zerver/use-cases.html"}), - path("for/education/", landing_view, {"template_name": "zerver/for-education.html"}), - path("for/events/", landing_view, {"template_name": "zerver/for-events.html"}), - path("for/open-source/", landing_view, {"template_name": "zerver/for-open-source.html"}), - path("for/research/", landing_view, {"template_name": "zerver/for-research.html"}), - path("for/business/", landing_view, {"template_name": "zerver/for-business.html"}), - path("for/companies/", RedirectView.as_view(url="/for/business/", permanent=True)), + path("use-cases/", landing_view, {"template_name": "corporate/for/use-cases.html"}), path( "for/communities/", landing_view, - {"template_name": "zerver/for-communities.html"}, + {"template_name": "corporate/for/communities.html"}, ), # We merged this into /for/communities. path( "for/working-groups-and-communities/", RedirectView.as_view(url="/for/communities/", permanent=True), ), + path("for/education/", landing_view, {"template_name": "corporate/for/education.html"}), + path("for/events/", landing_view, {"template_name": "corporate/for/events.html"}), + path("for/open-source/", landing_view, {"template_name": "corporate/for/open-source.html"}), + path("for/research/", landing_view, {"template_name": "corporate/for/research.html"}), + path("for/business/", landing_view, {"template_name": "corporate/for/business.html"}), + path("for/companies/", RedirectView.as_view(url="/for/business/", permanent=True)), # case-studies - path("case-studies/idrift/", landing_view, {"template_name": "zerver/idrift-case-study.html"}), - path("case-studies/tum/", landing_view, {"template_name": "zerver/tum-case-study.html"}), - path("case-studies/ucsd/", landing_view, {"template_name": "zerver/ucsd-case-study.html"}), - path("case-studies/rust/", landing_view, {"template_name": "zerver/rust-case-study.html"}), - path("case-studies/lean/", landing_view, {"template_name": "zerver/lean-case-study.html"}), + path( + "case-studies/idrift/", + landing_view, + {"template_name": "corporate/case-studies/idrift-case-study.html"}, + ), + path( + "case-studies/tum/", + landing_view, + {"template_name": "corporate/case-studies/tum-case-study.html"}, + ), + path( + "case-studies/ucsd/", + landing_view, + {"template_name": "corporate/case-studies/ucsd-case-study.html"}, + ), + path( + "case-studies/rust/", + landing_view, + {"template_name": "corporate/case-studies/rust-case-study.html"}, + ), + path( + "case-studies/lean/", + landing_view, + {"template_name": "corporate/case-studies/lean-case-study.html"}, + ), path( "case-studies/asciidoctor/", landing_view, - {"template_name": "zerver/asciidoctor-case-study.html"}, + {"template_name": "corporate/case-studies/asciidoctor-case-study.html"}, ), path( "case-studies/recurse-center/", landing_view, - {"template_name": "zerver/recurse-center-case-study.html"}, + {"template_name": "corporate/case-studies/recurse-center-case-study.html"}, ), ] i18n_urlpatterns += landing_page_urls diff --git a/templates/zerver/asciidoctor-case-study.html b/templates/corporate/case-studies/asciidoctor-case-study.html similarity index 91% rename from templates/zerver/asciidoctor-case-study.html rename to templates/corporate/case-studies/asciidoctor-case-study.html index 691bed5a62..b3be41fa64 100644 --- a/templates/zerver/asciidoctor-case-study.html +++ b/templates/corporate/case-studies/asciidoctor-case-study.html @@ -27,7 +27,7 @@
- {{ render_markdown_path('zerver/for/asciidoctor-case-study.md') }} + {{ render_markdown_path('corporate/case-studies/asciidoctor-case-study.md') }}
diff --git a/templates/zerver/for/asciidoctor-case-study.md b/templates/corporate/case-studies/asciidoctor-case-study.md similarity index 100% rename from templates/zerver/for/asciidoctor-case-study.md rename to templates/corporate/case-studies/asciidoctor-case-study.md diff --git a/templates/zerver/idrift-case-study.html b/templates/corporate/case-studies/idrift-case-study.html similarity index 91% rename from templates/zerver/idrift-case-study.html rename to templates/corporate/case-studies/idrift-case-study.html index 26714bb803..fa134a8fc7 100644 --- a/templates/zerver/idrift-case-study.html +++ b/templates/corporate/case-studies/idrift-case-study.html @@ -27,7 +27,7 @@
- {{ render_markdown_path('zerver/for/idrift-case-study.md') }} + {{ render_markdown_path('corporate/case-studies/idrift-case-study.md') }}
diff --git a/templates/zerver/for/idrift-case-study.md b/templates/corporate/case-studies/idrift-case-study.md similarity index 100% rename from templates/zerver/for/idrift-case-study.md rename to templates/corporate/case-studies/idrift-case-study.md diff --git a/templates/zerver/lean-case-study.html b/templates/corporate/case-studies/lean-case-study.html similarity index 92% rename from templates/zerver/lean-case-study.html rename to templates/corporate/case-studies/lean-case-study.html index 248bf7fb03..860d4179c0 100644 --- a/templates/zerver/lean-case-study.html +++ b/templates/corporate/case-studies/lean-case-study.html @@ -27,7 +27,7 @@
- {{ render_markdown_path('zerver/for/lean-case-study.md') }} + {{ render_markdown_path('corporate/case-studies/lean-case-study.md') }}
diff --git a/templates/zerver/for/lean-case-study.md b/templates/corporate/case-studies/lean-case-study.md similarity index 100% rename from templates/zerver/for/lean-case-study.md rename to templates/corporate/case-studies/lean-case-study.md diff --git a/templates/zerver/recurse-center-case-study.html b/templates/corporate/case-studies/recurse-center-case-study.html similarity index 90% rename from templates/zerver/recurse-center-case-study.html rename to templates/corporate/case-studies/recurse-center-case-study.html index 8e080257fd..345eea21d6 100644 --- a/templates/zerver/recurse-center-case-study.html +++ b/templates/corporate/case-studies/recurse-center-case-study.html @@ -27,7 +27,7 @@
- {{ render_markdown_path('zerver/for/recurse-center-case-study.md') }} + {{ render_markdown_path('corporate/case-studies/recurse-center-case-study.md') }}
diff --git a/templates/zerver/for/recurse-center-case-study.md b/templates/corporate/case-studies/recurse-center-case-study.md similarity index 100% rename from templates/zerver/for/recurse-center-case-study.md rename to templates/corporate/case-studies/recurse-center-case-study.md diff --git a/templates/zerver/rust-case-study.html b/templates/corporate/case-studies/rust-case-study.html similarity index 92% rename from templates/zerver/rust-case-study.html rename to templates/corporate/case-studies/rust-case-study.html index 0836511d7b..598bc4ccf7 100644 --- a/templates/zerver/rust-case-study.html +++ b/templates/corporate/case-studies/rust-case-study.html @@ -27,7 +27,7 @@
- {{ render_markdown_path('zerver/for/rust-case-study.md') }} + {{ render_markdown_path('corporate/case-studies/rust-case-study.md') }}
diff --git a/templates/zerver/for/rust-case-study.md b/templates/corporate/case-studies/rust-case-study.md similarity index 100% rename from templates/zerver/for/rust-case-study.md rename to templates/corporate/case-studies/rust-case-study.md diff --git a/templates/zerver/tum-case-study.html b/templates/corporate/case-studies/tum-case-study.html similarity index 91% rename from templates/zerver/tum-case-study.html rename to templates/corporate/case-studies/tum-case-study.html index 796da12c66..3744af2aef 100644 --- a/templates/zerver/tum-case-study.html +++ b/templates/corporate/case-studies/tum-case-study.html @@ -26,7 +26,7 @@
- {{ render_markdown_path('zerver/for/tum-case-study.md') }} + {{ render_markdown_path('corporate/case-studies/tum-case-study.md') }}
diff --git a/templates/zerver/for/tum-case-study.md b/templates/corporate/case-studies/tum-case-study.md similarity index 100% rename from templates/zerver/for/tum-case-study.md rename to templates/corporate/case-studies/tum-case-study.md diff --git a/templates/zerver/ucsd-case-study.html b/templates/corporate/case-studies/ucsd-case-study.html similarity index 91% rename from templates/zerver/ucsd-case-study.html rename to templates/corporate/case-studies/ucsd-case-study.html index e1009a1445..ebd925a74d 100644 --- a/templates/zerver/ucsd-case-study.html +++ b/templates/corporate/case-studies/ucsd-case-study.html @@ -26,7 +26,7 @@
- {{ render_markdown_path('zerver/for/ucsd-case-study.md') }} + {{ render_markdown_path('corporate/case-studies/ucsd-case-study.md') }}
diff --git a/templates/zerver/for/ucsd-case-study.md b/templates/corporate/case-studies/ucsd-case-study.md similarity index 100% rename from templates/zerver/for/ucsd-case-study.md rename to templates/corporate/case-studies/ucsd-case-study.md diff --git a/templates/zerver/for-business.html b/templates/corporate/for/business.html similarity index 100% rename from templates/zerver/for-business.html rename to templates/corporate/for/business.html diff --git a/templates/zerver/for-communities.html b/templates/corporate/for/communities.html similarity index 97% rename from templates/zerver/for-communities.html rename to templates/corporate/for/communities.html index 379e99bf0e..cbbd7d638b 100644 --- a/templates/zerver/for-communities.html +++ b/templates/corporate/for/communities.html @@ -42,7 +42,7 @@
- {{ render_markdown_path('zerver/for/communities.md') }} + {{ render_markdown_path('corporate/for/communities.md') }}
diff --git a/templates/zerver/for/communities.md b/templates/corporate/for/communities.md similarity index 100% rename from templates/zerver/for/communities.md rename to templates/corporate/for/communities.md diff --git a/templates/zerver/for-education.html b/templates/corporate/for/education.html similarity index 100% rename from templates/zerver/for-education.html rename to templates/corporate/for/education.html diff --git a/templates/zerver/for-events.html b/templates/corporate/for/events.html similarity index 100% rename from templates/zerver/for-events.html rename to templates/corporate/for/events.html diff --git a/templates/zerver/for-open-source.html b/templates/corporate/for/open-source.html similarity index 100% rename from templates/zerver/for-open-source.html rename to templates/corporate/for/open-source.html diff --git a/templates/zerver/for-research.html b/templates/corporate/for/research.html similarity index 100% rename from templates/zerver/for-research.html rename to templates/corporate/for/research.html diff --git a/templates/zerver/use-cases.html b/templates/corporate/for/use-cases.html similarity index 94% rename from templates/zerver/use-cases.html rename to templates/corporate/for/use-cases.html index 10164ff0f5..e664f950be 100644 --- a/templates/zerver/use-cases.html +++ b/templates/corporate/for/use-cases.html @@ -34,7 +34,7 @@
- {{ render_markdown_path('zerver/for/use-cases.md') }} + {{ render_markdown_path('corporate/for/use-cases.md') }}
diff --git a/templates/zerver/for/use-cases.md b/templates/corporate/for/use-cases.md similarity index 100% rename from templates/zerver/for/use-cases.md rename to templates/corporate/for/use-cases.md diff --git a/tools/linter_lib/custom_check.py b/tools/linter_lib/custom_check.py index a66f95ddaa..7895d61d03 100644 --- a/tools/linter_lib/custom_check.py +++ b/tools/linter_lib/custom_check.py @@ -551,7 +551,7 @@ html_rules: List["Rule"] = [ "exclude": { "templates/zerver/email.html", "zerver/tests/fixtures/email", - "templates/zerver/for-business.html", + "templates/corporate/for/business.html", "templates/corporate/support_request.html", "templates/corporate/support_request_thanks.html", "templates/zerver/emails/support_request.html",