Merge pull request #2153 from wilzbach/foundation

andralex · web-flow · commit ed09b3004cf6 · 2018-02-03T00:21:36.000-05:00
Group D Language Foundation pages
diff --git a/contributors.dd b/contributors.dd
@@ -28,6 +28,7 @@ Macros:
     TITLE=Contributors ($(NR_D_CONTRIBUTORS))
     GH_REPO=$(LINK2 https://github.com/dlang/$1, $(D $1))
     D_CONTRIBUTOR=$(LI $1)
+    SUBNAV=$(SUBNAV_FOUNDATION)
     EXTRA_HEADERS=$(T style,
     #all-d-contributors {
         -moz-column-gap: 20px;
diff --git a/dlang.org.ddoc b/dlang.org.ddoc
@@ -50,7 +50,7 @@ COMPATIBILITY_BOX_EXPERIMENTAL = $(MESSAGE_BOX orange, $(B Experimental) - $0)
 _=
 
 CONSOLE=$(TC pre, console notranslate, $0)
-COPYRIGHT_FOUNDATION=Copyright &copy; 1999-$(YEAR) by the $(LINK2 $(ROOT_DIR)foundation.html, D Language Foundation)
+COPYRIGHT_FOUNDATION=Copyright &copy; 1999-$(YEAR) by the $(LINK2 $(ROOT_DIR)foundation_overview.html, D Language Foundation)
 CPPCODE=$(TC pre, cppcode notranslate, $0)
 CPPLISTING=$(CPPCODE $0)
 CROSS=&#x2718;
@@ -66,7 +66,7 @@ DDOC=
 <!--
     Copyright (c) 1999-$(YEAR) by the D Language Foundation
     All Rights Reserved.
-    https://dlang.org/foundation.html
+    https://dlang.org/foundation_overview.html
   -->
 <head>
 <meta charset="utf-8">
@@ -267,7 +267,7 @@ $(SUBMENU_MANUAL
     $(SUBMENU_LINK $(ROOT_DIR)bugstats.html, Issues)
     $(SUBMENU_LINK https://wiki.dlang.org/Get_involved, Get involved)
     $(SUBMENU_LINK_DIVIDER $(ROOT_DIR)contributors.html, Contributors)
-    $(SUBMENU_LINK $(ROOT_DIR)foundation.html, Foundation)
+    $(SUBMENU_LINK $(ROOT_DIR)foundation_overview.html, Foundation)
     $(SUBMENU_LINK $(ROOT_DIR)donate.html, Donate)
     $(SUBMENU_LINK $(ROOT_DIR)sponsors.html, Sponsors)
 )
@@ -477,6 +477,18 @@ $(SUBNAV_TEMPLATE
         $(ROOT_DIR)d-array-article.html, D Slices
     ))
 )
+SUBNAV_FOUNDATION=
+$(SUBNAV_TEMPLATE
+    $(SUBNAV_HEAD Foundation, $(ROOT_DIR)foundation_overview.html, overview)
+    $(UL $(SUBMENU2
+        $(ROOT_DIR)foundation.html, About the Foundation,
+        $(ROOT_DIR)donate.html, Donate,
+        $(ROOT_DIR)dlangupb-scholarship.html, Scholarships,
+        https://wiki.dlang.org/GSOC_2018_Ideas, GSoC 2018 Ideas,
+        $(ROOT_DIR)sponsors.html, Sponsors,
+        $(ROOT_DIR)contributors.html, Contributors,
+    ))
+)
 
 SUBNAV_HEAD=
     $(DIVC head,
diff --git a/dlangupb-scholarship.dd b/dlangupb-scholarship.dd
@@ -75,3 +75,4 @@ you. Feel free to direct any related questions to foundation@dlang.org.)
 
 Macros:
         TITLE=The DLang UPB Languages and Systems Research Scholarship
+        SUBNAV=$(SUBNAV_FOUNDATION)
diff --git a/donate.dd b/donate.dd
@@ -81,6 +81,7 @@ Macros:
     FA_ICON=<i class="fa fa-$1" aria-hidden="true"></i>
         REMOVE_FIRST=$+
         DONATE_ITEM=<div class="donate-item"><h4>$(FA_ICON $2) $1</h4><div>$(REMOVE_FIRST $+)</div></div>
+        SUBNAV=$(SUBNAV_FOUNDATION)
     EXTRA_HEADERS=$(T style,
         .donate-item {
             padding-left: 30px;
diff --git a/dpl-docs/views/layout.dt b/dpl-docs/views/layout.dt
@@ -5,7 +5,7 @@ html(lang='en-US')
   //
     | Copyright (c) 1999-$#{year} by the D Language Foundation
     | All Rights Reserved.
-    | https://dlang.org/foundation.html
+    | https://dlang.org/foundation_overview.html
   - import std.process : environment;
   - import std.array : replace;
   - string version_id = environment["GIT_TARGET"];
@@ -212,7 +212,7 @@ html(lang='en-US')
         #quickindex.quickindex
 
         #copyright.smallprint
-          | Copyright &copy; 1999-#{year} by the <a href="#{root_dir}foundation.html">D Language Foundation</a> | Page generated by <a href="https://github.com/rejectedsoftware/ddox">ddox</a>.
+          | Copyright &copy; 1999-#{year} by the <a href="#{root_dir}foundation_overview.html">D Language Foundation</a> | Page generated by <a href="https://github.com/rejectedsoftware/ddox">ddox</a>.
 
     script(type='text/javascript', src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js')
     |     
diff --git a/ebook.ddoc b/ebook.ddoc
@@ -5,7 +5,7 @@ DDOC=
 <!--
     Copyright (c) 1999-$(YEAR) by the D Language Foundation
     All Rights Reserved.
-    https://dlang.org/foundation.html
+    https://dlang.org/foundation_overview.html
   -->
 
 <head>
diff --git a/foundation.dd b/foundation.dd
@@ -75,6 +75,7 @@ $(LINK2 mailto:foundation@dlang.org, foundation@dlang.org) and other corresponde
 
 Macros:
         TITLE=The D Language Foundation
+        SUBNAV=$(SUBNAV_FOUNDATION)
     EXTRA_HEADERS=$(T style,
         .dlang-address {
             padding-left: 30px;
diff --git a/foundation_overview.dd b/foundation_overview.dd
@@ -0,0 +1,53 @@
+Ddoc
+
+$(D_S D Language Foundation,
+
+    $(H4 The D Language Foundation is a
+        $(HTTPS en.wikipedia.org/wiki/501(c)_organization, 501(c)(3) non-profit public charity)
+         devoted to advancing open source technology related to the D programming language.
+    )
+
+
+    $(DIVC boxes,
+        $(DIVC row,
+            $(DIVC item,
+                $(H4 $(LINK2 $(ROOT_DIR)foundation.html, About))
+                $(P Learn more about the history and activities of the D Language Foundation.)
+            )
+            $(DIVC item,
+                $(H4 $(LINK2 $(ROOT_DIR)donate.html, Donate))
+                $(P Support the D Language Foundation and help to further
+                    the development of the D language.
+                )
+            )
+        )
+        $(DIVC row,
+            $(DIVC item,
+                $(H4 $(LINK2 $(ROOT_DIR)dlangupb-scholarship.html, Scholarships))
+                $(P The D Language Foundation offers Languages and Systems Research Scholarships
+                    to EE and CS students at University "Politehnica" Bucharest (UPB).
+                )
+            )
+            $(DIVC item,
+                $(H4 $(LINK2 https://wiki.dlang.org/GSOC_2018_Ideas, GSoC 2018 Ideas))
+                $(P The D Language Foundation is applying for the Google Summer of Code 2018.)
+            )
+        )
+        $(DIVC row,
+            $(DIVC item,
+                $(H4 $(LINK2 $(ROOT_DIR)sponsors.html, Sponsors))
+                $(P Browse the list of all sponsors donating monetary resources
+                    to the D Language Foundation.)
+            )
+            $(DIVC item,
+                $(H4 $(LINK2 $(ROOT_DIR)contributors.html, Contributors))
+                $(P Browse the list of all the awesome people who contributed
+                    to D's source code and helped to make D possible.)
+            )
+        )
+    )
+)
+
+Macros:
+    TITLE=Articles
+    SUBNAV=$(SUBNAV_FOUNDATION)
diff --git a/index.dd b/index.dd
@@ -403,7 +403,7 @@ $(DIVC boxes,
                 Browse the $(LINK2 https://wiki.dlang.org/, wiki) where among
                 other things you can find the
                 $(LINK2 https://wiki.dlang.org/Vision/2017H2, high-level vision)
-                of the $(LINK2 $(ROOT_DIR)foundation.html, D Language Foundation).
+                of the $(LINK2 $(ROOT_DIR)foundation_overview.html, D Language Foundation).
             )
         )
         $(TOUR book, Documentation,
@@ -675,7 +675,7 @@ $(DIVC call_to_donate,
     </p>
     <p class="center">
         <a href="$(ROOT_DIR)donate.html" class="btn call_to_donate_btn">Donate</a>
-        <a href="$(ROOT_DIR)foundation.html" class="btn subdued">Learn More About The Foundation</a>
+        <a href="$(ROOT_DIR)foundation_overview.html" class="btn subdued">Learn More About The Foundation</a>
         $(BR)
         $(BR)
         Lots of $(WHY_D_ICON heart) to our $(LINK2 $(ROOT_DIR)sponsors.html, sponsors) and
diff --git a/posix.mak b/posix.mak
@@ -357,7 +357,7 @@ PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage \
 	const-faq cppcontracts cpptod ctarguments ctod donate \
 	D1toD2 d-array-article d-floating-point deprecate dlangupb-scholarship dll-linux dmd \
 	dmd-freebsd dmd-linux dmd-osx dmd-windows documentation download dstyle \
-	exception-safe faq forum-template foundation gpg_keys glossary \
+	exception-safe faq forum-template foundation foundation_overview gpg_keys glossary \
 	gsoc2011 gsoc2012 gsoc2012-template hijack howto-promote htod index install \
 	intro-to-datetime lazy-evaluation menu migrate-to-shared mixin \
 	orgs-using-d overview pretod rationale rdmd regular-expression resources safed \
diff --git a/sponsors.dd b/sponsors.dd
@@ -44,4 +44,5 @@ $(UL
 )
 
 Macros:
-    TITLE=D Language Foundation Sponsors
+    TITLE=D Language Foundation Sponsors
+    SUBNAV=$(SUBNAV_FOUNDATION)

Original file line number	Diff line number	Diff line change
`@@ -75,3 +75,4 @@ you. Feel free to direct any related questions to [email protected].)`
`75`	`75`
`76`	`76`	`Macros:`
`77`	`77`	`TITLE=The DLang UPB Languages and Systems Research Scholarship`
	`78`	`+ SUBNAV=$(SUBNAV_FOUNDATION)`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,5 @@ $(UL`
`44`	`44`	`)`
`45`	`45`
`46`	`46`	`Macros:`
`47`		`- TITLE=D Language Foundation Sponsors`
	`47`	`+ TITLE=D Language Foundation Sponsors`
	`48`	`+ SUBNAV=$(SUBNAV_FOUNDATION)`