diff --git a/changelog/2.075.0_pre.dd b/changelog/2.075.0_pre.dd index a1b5058c74..f9395da4f7 100644 --- a/changelog/2.075.0_pre.dd +++ b/changelog/2.075.0_pre.dd @@ -2,7 +2,7 @@ Ddoc $(CHANGELOG_NAV_LAST 2.074.1) -$(VERSION Jul 16, 2017, =================================================, +$(BETA_VERSION Jul 16, 2017, =================================================, $(BUGSTITLE Compiler changes, diff --git a/changelog/changelog.ddoc b/changelog/changelog.ddoc index 83351b2fa5..9dafb73efc 100644 --- a/changelog/changelog.ddoc +++ b/changelog/changelog.ddoc @@ -15,7 +15,7 @@ SUBNAV=$(SUBNAV_TEMPLATE SEARCH_OPTIONS_EXTRA= -VERSION= +STABLE_VERSION= $(DIVC version, $(P $(B $(LARGE $(LINK2 http://downloads.dlang.org/releases/2.x/$(VER), Download D $(VER))))$(BR) @@ -23,14 +23,28 @@ $(SMALL released $1, $2) ) $4 ) +VERSION=$(STABLE_VERSION $0) + +BETA_VERSION= +$(DIVC version, +$(P +$(B $(LARGE $(LINK2 http://downloads.dlang.org/releases/2.x/$(VER), Download D$(VER) (beta))))$(BR) +$(SMALL to be released $1, $2) +$(P Please report bugs at $(LINK2 $(ROOT_DIR)bugstats.html, Bugzilla).) +$(MESSAGE_BOX orange, Experimental - beta releases may contain regressions. Test with care.) +) +$4 +) NIGHTLY_VERSION= $(DIVC version, $(P -$(B $(LARGE $(LINK2 http://nightlies.dlang.org, Download D nightlies)))$(BR) +$(B $(LARGE $(LINK2 http://nightlies.dlang.org, Download D (Nightly))))$(BR) $(SMALL $1) +$(P Please report bugs at $(LINK2 $(ROOT_DIR)bugstats.html, Bugzilla).) +$(MESSAGE_BOX red, Unstable - nightly releases are not suited for production. Use stable.) ) -$4 +$3 ) BUGZILLA = Bugzilla $0 diff --git a/css/style.css b/css/style.css index 005322abb1..f7fed38aa8 100644 --- a/css/style.css +++ b/css/style.css @@ -2243,3 +2243,26 @@ dt.d_decl:hover .decl_anchor { text-align: right; } } + +/** + * Message boxes - different color for each category + */ +.message-box { + padding: 1em 1em 1em 1em; + border-radius: 5px; +} +.message-box, .message-box a { + color: white; +} +.message-box-red { + background-color: #D60027; +} +.message-box-gray { + background-color: #797979; +} +.message-box-orange { + background-color: #EC5315; +} +.message-box-green { + background-color: #4EBA0F; +} diff --git a/dlang.org.ddoc b/dlang.org.ddoc index 9af13cff38..91b4879654 100644 --- a/dlang.org.ddoc +++ b/dlang.org.ddoc @@ -205,6 +205,7 @@ MENU =
  • $+
  • MENU_W_SUBMENU =
  • $0 MENU_W_SUBMENU_LINK =
  • $+ MENU_W_SUBMENU_END =
  • +MESSAGE_BOX = $(DIVC message-box message-box-$1, $+) META_KEYWORDS=D programming language META_DESCRIPTION=D Programming Language MODDEFFILE=$(TC pre, moddeffile notranslate, $0) diff --git a/posix.mak b/posix.mak index e7eb91716f..4fa4a089d2 100644 --- a/posix.mak +++ b/posix.mak @@ -656,7 +656,7 @@ test: $(ASSERT_WRITELN_BIN)_test all changelog/${NEXT_VERSION}_pending.dd: | ${STABLE_DMD} ../tools ../installer $(STABLE_RDMD) $(TOOLS_DIR)/changed.d $(CHANGELOG_VERSION_MASTER) -o $@ \ - --version "${NEXT_VERSION} (pending)" --date "Pending" --nightly + --version "${NEXT_VERSION} (Nightly)" --date "To be released" --release-type "nightly" changelog/${NEXT_VERSION}_pre.dd: | ${STABLE_DMD} ../tools ../installer $(STABLE_RDMD) $(TOOLS_DIR)/changed.d $(CHANGELOG_VERSION_STABLE) -o $@ \