From 15e2be16c8e533e6aaf7f7e64d343a63f362f79d Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Thu, 2 Mar 2017 04:34:30 +0100 Subject: [PATCH 1/2] Footer: show always the current year and the D Language Foundation --- dlang.org.ddoc | 10 +++++----- dpl-docs/views/layout.dt | 13 +++++++------ ebook.ddoc | 6 +++--- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlang.org.ddoc b/dlang.org.ddoc index ee19198ab6..c7a200d8cc 100644 --- a/dlang.org.ddoc +++ b/dlang.org.ddoc @@ -40,7 +40,7 @@ COMMON_SCRIPTS_DLANG = _= CONSOLE=$(TC pre, console notranslate, $0) -COPYRIGHT=Copyright © 1999-$(YEAR) by the $(LINK2 $(ROOT)/foundation.html, D Language Foundation) +COPYRIGHT_FOUNDATION=Copyright © 1999-$(YEAR) by the $(LINK2 $(ROOT)/foundation.html, D Language Foundation) CPPCODE=$(TC pre, cppcode notranslate, $0) CPPLISTING=$(CPPCODE $0) CROSS=✘ @@ -54,9 +54,9 @@ DDOC= @@ -152,7 +152,7 @@ EXTRA_FOOTERS= _= FAVICON=$(STATIC favicon.ico) -FOOTER = $(DIVCID smallprint, copyright, $(COPYRIGHT) | Page generated by +FOOTER = $(DIVCID smallprint, copyright, $(COPYRIGHT_FOUNDATION) | Page generated by $(LINK2 $(ROOT_DIR)spec/ddoc.html, Ddoc) on $(GEN_DATETIME)) FOOTNOTE=$(SPANC footnote, $0) FULL_TITLE=$(TITLE) - D Programming Language diff --git a/dpl-docs/views/layout.dt b/dpl-docs/views/layout.dt index 41c82eea72..97f470c18a 100644 --- a/dpl-docs/views/layout.dt +++ b/dpl-docs/views/layout.dt @@ -1,9 +1,11 @@ !!! 5 html(lang='en-US') + - import std.datetime : Clock; + - auto year = Clock.currTime.year; // - | Copyright (c) 1999-2016 by Digital Mars - | All Rights Reserved Written by Walter Bright - | http://digitalmars.com + | Copyright (c) 1999-$#{year} by the D Language Foundation + | All Rights Reserved. + | https://dlang.org/foundation.html - import std.process : environment; - string version_id = environment["GIT_TARGET"]; - bool noExactSourceCodeLinks = environment["NO_EXACT_SOURCE_CODE_LINKS"] == "1"; @@ -212,9 +214,8 @@ html(lang='en-US') | #quickindex.quickindex - #copyright - block copyright - | | Page generated by ddox. + #copyright.smallprint + | Copyright © 1999-#{year} by the D Language Foundation | Page generated by ddox. 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 index 5d13dfd68d..5505dae711 100644 --- a/ebook.ddoc +++ b/ebook.ddoc @@ -3,9 +3,9 @@ DDOC= From 397b65142cd1eb91d1ec72f3679ad9407d53c961 Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Thu, 2 Mar 2017 18:38:58 +0100 Subject: [PATCH 2/2] [SQUASH] use root_dir without a leading slash --- dlang.org.ddoc | 2 +- dpl-docs/views/layout.dt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlang.org.ddoc b/dlang.org.ddoc index c7a200d8cc..5667b38727 100644 --- a/dlang.org.ddoc +++ b/dlang.org.ddoc @@ -40,7 +40,7 @@ COMMON_SCRIPTS_DLANG = _= CONSOLE=$(TC pre, console notranslate, $0) -COPYRIGHT_FOUNDATION=Copyright © 1999-$(YEAR) by the $(LINK2 $(ROOT)/foundation.html, D Language Foundation) +COPYRIGHT_FOUNDATION=Copyright © 1999-$(YEAR) by the $(LINK2 $(ROOT_DIR)foundation.html, D Language Foundation) CPPCODE=$(TC pre, cppcode notranslate, $0) CPPLISTING=$(CPPCODE $0) CROSS=✘ diff --git a/dpl-docs/views/layout.dt b/dpl-docs/views/layout.dt index 97f470c18a..3be1eaf5d5 100644 --- a/dpl-docs/views/layout.dt +++ b/dpl-docs/views/layout.dt @@ -215,7 +215,7 @@ html(lang='en-US') #quickindex.quickindex #copyright.smallprint - | Copyright © 1999-#{year} by the D Language Foundation | Page generated by ddox. + | Copyright © 1999-#{year} by the D Language Foundation | Page generated by ddox. script(type='text/javascript', src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js') |