Skip to content

Commit 3574c85

Browse files
andralexandralex
authored
Merge pull request #2173 from wilzbach/foundation-move
Move foundation pages to /foundation
2 parents a31a16c + 659c7e1 commit 3574c85

File tree

10 files changed

+36
-24
lines changed

10 files changed

+36
-24
lines changed

‎.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,12 @@ cpp_interface|objc_interface|portability|entity|memory-safe-d|abi|simd)\
5959
(\.html)?$ \
6060
spec/$1.html [R=301,L]
6161

62+
# Foundation pages
63+
Redirect 301 /foundation_overview.html https://dlang.org/foundation/index.html
64+
Redirect 301 /foundation.html https://dlang.org/foundation/about.html
65+
Redirect 301 /contributors.html https://dlang.org/foundation/contributors.html
66+
Redirect 301 /sponsors.html https://dlang.org/foundation/sponsors.html
67+
Redirect 301 /dlangupb-scholarship.html https://dlang.org/foundation/updscholarship.html
68+
6269
# Error pages
6370
ErrorDocument 404 /404.html

‎dlang.org.ddoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,10 @@ $(SUBMENU_MANUAL
266266
$(SUBMENU_LINK_DIVIDER https://github.com/dlang, GitHub)
267267
$(SUBMENU_LINK $(ROOT_DIR)bugstats.html, Issues)
268268
$(SUBMENU_LINK https://wiki.dlang.org/Get_involved, Get involved)
269-
$(SUBMENU_LINK_DIVIDER $(ROOT_DIR)contributors.html, Contributors)
270-
$(SUBMENU_LINK $(ROOT_DIR)foundation_overview.html, Foundation)
271-
$(SUBMENU_LINK $(ROOT_DIR)donate.html, Donate)
272-
$(SUBMENU_LINK $(ROOT_DIR)sponsors.html, Sponsors)
269+
$(SUBMENU_LINK_DIVIDER $(ROOT_DIR)foundation/contributors.html, Contributors)
270+
$(SUBMENU_LINK $(ROOT_DIR)foundation/index.html, Foundation)
271+
$(SUBMENU_LINK $(ROOT_DIR)foundation/donate.html, Donate)
272+
$(SUBMENU_LINK $(ROOT_DIR)foundation/sponsors.html, Sponsors)
273273
)
274274
NAVIGATION_DOCUMENTATION=
275275
$(SUBMENU_MANUAL
@@ -479,14 +479,14 @@ $(SUBNAV_TEMPLATE
479479
)
480480
SUBNAV_FOUNDATION=
481481
$(SUBNAV_TEMPLATE
482-
$(SUBNAV_HEAD Foundation, $(ROOT_DIR)foundation_overview.html, overview)
482+
$(SUBNAV_HEAD Foundation, $(ROOT_DIR)foundation/index.html, overview)
483483
$(UL $(SUBMENU2
484-
$(ROOT_DIR)foundation.html, About the Foundation,
485-
$(ROOT_DIR)donate.html, Donate,
486-
$(ROOT_DIR)dlangupb-scholarship.html, Scholarships,
484+
$(ROOT_DIR)foundation/about.html, About the Foundation,
485+
$(ROOT_DIR)foundation/donate.html, Donate,
486+
$(ROOT_DIR)foundation/upb-scholarship.html, Scholarships,
487487
https://wiki.dlang.org/GSOC_2018_Ideas, GSoC 2018 Ideas,
488-
$(ROOT_DIR)sponsors.html, Sponsors,
489-
$(ROOT_DIR)contributors.html, Contributors,
488+
$(ROOT_DIR)foundation/sponsors.html, Sponsors,
489+
$(ROOT_DIR)foundation/contributors.html, Contributors,
490490
))
491491
)
492492

‎foundation.dd renamed to ‎foundation/about.dd

File renamed without changes.

‎contributors.dd renamed to ‎foundation/contributors.dd

File renamed without changes.

‎foundation/foundation.ddoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ROOT_DIR = ../

‎foundation_overview.dd renamed to ‎foundation/index.dd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ $(D_S D Language Foundation,
1111
$(DIVC boxes,
1212
$(DIVC row,
1313
$(DIVC item,
14-
$(H4 $(LINK2 $(ROOT_DIR)foundation.html, About))
14+
$(H4 $(LINK2 $(ROOT_DIR)foundation/about.html, About))
1515
$(P Learn more about the history and activities of the D Language Foundation.)
1616
)
1717
$(DIVC item,
18-
$(H4 $(LINK2 $(ROOT_DIR)donate.html, Donate))
18+
$(H4 $(LINK2 $(ROOT_DIR)foundation/donate.html, Donate))
1919
$(P Support the D Language Foundation and help to further
2020
the development of the D language.
2121
)
2222
)
2323
)
2424
$(DIVC row,
2525
$(DIVC item,
26-
$(H4 $(LINK2 $(ROOT_DIR)dlangupb-scholarship.html, Scholarships))
26+
$(H4 $(LINK2 $(ROOT_DIR)foundation/upb-scholarship.html, Scholarships))
2727
$(P The D Language Foundation offers Languages and Systems Research Scholarships
2828
to EE and CS students at University "Politehnica" Bucharest (UPB).
2929
)
@@ -35,12 +35,12 @@ $(D_S D Language Foundation,
3535
)
3636
$(DIVC row,
3737
$(DIVC item,
38-
$(H4 $(LINK2 $(ROOT_DIR)sponsors.html, Sponsors))
38+
$(H4 $(LINK2 $(ROOT_DIR)foundation/sponsors.html, Sponsors))
3939
$(P Browse the list of all sponsors donating monetary resources
4040
to the D Language Foundation.)
4141
)
4242
$(DIVC item,
43-
$(H4 $(LINK2 $(ROOT_DIR)contributors.html, Contributors))
43+
$(H4 $(LINK2 $(ROOT_DIR)foundation/contributors.html, Contributors))
4444
$(P Browse the list of all the awesome people who contributed
4545
to D's source code and helped to make D possible.)
4646
)

‎sponsors.dd renamed to ‎foundation/sponsors.dd

File renamed without changes.

‎dlangupb-scholarship.dd renamed to ‎foundation/upb-scholarship.dd

File renamed without changes.

‎index.dd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -674,12 +674,12 @@ $(DIVC call_to_donate,
674674
community by supporting the Foundation.
675675
</p>
676676
<p class="center">
677-
<a href="$(ROOT_DIR)donate.html" class="btn call_to_donate_btn">Donate</a>
678-
<a href="$(ROOT_DIR)foundation_overview.html" class="btn subdued">Learn More About The Foundation</a>
677+
<a href="$(ROOT_DIR)foundation/donate.html" class="btn call_to_donate_btn">Donate</a>
678+
<a href="$(ROOT_DIR)foundation/index.html" class="btn subdued">Learn More About The Foundation</a>
679679
$(BR)
680680
$(BR)
681-
Lots of $(WHY_D_ICON heart) to our $(LINK2 $(ROOT_DIR)sponsors.html, sponsors) and
682-
$(LINK2 $(ROOT_DIR)contributors.html, contributors).
681+
Lots of $(WHY_D_ICON heart) to our $(LINK2 $(ROOT_DIR)foundation/sponsors.html, sponsors) and
682+
$(LINK2 $(ROOT_DIR)foundation/contributors, contributors).
683683
</p>
684684
)
685685

‎posix.mak

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,19 +355,20 @@ PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage \
355355
articles ascii-table bugstats builtin \
356356
$(CHANGELOG_FILES) code_coverage community comparison concepts \
357357
const-faq cppcontracts cpptod ctarguments ctod donate \
358-
D1toD2 d-array-article d-floating-point deprecate dlangupb-scholarship dll-linux dmd \
358+
D1toD2 d-array-article d-floating-point deprecate dll-linux dmd \
359359
dmd-freebsd dmd-linux dmd-osx dmd-windows documentation download dstyle \
360-
exception-safe faq forum-template foundation foundation_overview gpg_keys glossary \
360+
exception-safe faq forum-template gpg_keys glossary \
361361
gsoc2011 gsoc2012 gsoc2012-template hijack howto-promote htod index install \
362362
intro-to-datetime lazy-evaluation menu migrate-to-shared mixin \
363363
orgs-using-d overview pretod rationale rdmd regular-expression resources safed \
364-
search sponsors template-comparison templates-revisited tuple \
365-
variadic-function-templates warnings wc windbg
364+
search template-comparison templates-revisited tuple \
365+
variadic-function-templates warnings wc windbg \
366+
$(addprefix foundation/, index about sponsors upb-scholarship)
366367

367368
# The contributors listing is dynamically generated
368369
ifneq (1,$(DIFFABLE))
369370
ifneq (1,$(RELEASE))
370-
PAGES_ROOT+=contributors
371+
PAGES_ROOT+=foundation/contributors
371372
endif
372373
endif
373374

@@ -476,6 +477,9 @@ $W/404.html : 404.dd $(DDOC) $(DMD)
476477
$(DOC_OUTPUT_DIR)/contributors.html: contributors.dd $G/contributors_list.ddoc $(DDOC) $(DMD)
477478
$(DMD) -conf= -c -o- -Df$@ $(DDOC) $(word 2, $^) $<
478479

480+
$W/foundation/%.html : foundation/%.dd $(DDOC) $(DMD) $(DDOC_BIN) foundation/foundation.ddoc
481+
$(DDOC_BIN) --compiler=$(DMD) -conf= -c -o- -Df$@ $(DDOC) $< foundation/foundation.ddoc
482+
479483
$W/%.html : %.dd $(DDOC) $(DMD) $(DDOC_BIN)
480484
$(DDOC_BIN) --compiler=$(DMD) -conf= -c -o- -Df$@ $(DDOC) $<
481485

0 commit comments

Comments
 (0)