Skip to content

Show messages boxes for beta and nightly #1821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wilzbach wants to merge 3 commits into from
Closed

Show messages boxes for beta and nightly #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8d3916
Add colorful message boxes
wilzbach Jul 13, 2017
a0b8e77
Show warnings for beta and nightly
wilzbach Jul 13, 2017
a509861
Apply changes for updated changed.d with release-type
wilzbach Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changelog/2.075.0_pre.dd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Ddoc

$(CHANGELOG_NAV_LAST 2.074.1)

$(VERSION Jul 16, 2017, =================================================,
$(BETA_VERSION Jul 16, 2017, =================================================,
Copy link
Copy Markdown
Contributor Author

@wilzbach wilzbach Jul 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid doing this manually, there will be --release-type=beta (dlang/tools#251)


$(BUGSTITLE Compiler changes,

Expand Down
20 changes: 17 additions & 3 deletions changelog/changelog.ddoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,36 @@ SUBNAV=$(SUBNAV_TEMPLATE
SEARCH_OPTIONS_EXTRA=<option value="dlang.org/changelog" selected>Change
Log</option>

VERSION=
STABLE_VERSION=
$(DIVC version,
$(P
$(B $(LARGE $(LINK2 http://downloads.dlang.org/releases/2.x/$(VER), Download D $(VER))))$(BR)
$(SMALL released $1, $2)
)
$4
)
VERSION=$(STABLE_VERSION $0)
Copy link
Copy Markdown
Contributor Author

@wilzbach wilzbach Jul 13, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For compatibility, in a follow-up we could do a quick sed to remove this.


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
Copy link
Copy Markdown
Contributor Author

@wilzbach wilzbach Jul 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In dlang/tools#251 the format is unified, that's why the tools PR needs to be pulled first.

)

BUGZILLA = <a href="https://issues.dlang.org/show_bug.cgi?id=$0">Bugzilla $0</a>
Expand Down
23 changes: 23 additions & 0 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2243,3 +2243,26 @@ dt.d_decl:hover .decl_anchor {
text-align: right;
}
}

/**
* Message boxes - different color for each category
Copy link
Copy Markdown
Contributor Author

@wilzbach wilzbach Jul 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As it turns out even without #1778, the message boxes are universally useful.

*/
.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;
}
1 change: 1 addition & 0 deletions dlang.org.ddoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ MENU = <li><a href='$1'><span>$+</span></a></li>
MENU_W_SUBMENU = <li class='expand-container'><a class='expand-toggle' href='#'><span>$0</span></a>
MENU_W_SUBMENU_LINK = <li class='expand-container'><a class='expand-toggle' href='$1'><span>$+</span></a>
MENU_W_SUBMENU_END = </li>
MESSAGE_BOX = $(DIVC message-box message-box-$1, $+)
Copy link
Copy Markdown
Contributor Author

@wilzbach wilzbach Jul 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might define RED_MESSAGE_BOX or ERROR_MESSAGE_BOX etc. in the future, but for now I kept it as bloat-free as possible.

META_KEYWORDS=D programming language
META_DESCRIPTION=D Programming Language
MODDEFFILE=$(TC pre, moddeffile notranslate, $0)
Expand Down
2 changes: 1 addition & 1 deletion posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Copy Markdown
Contributor Author

@wilzbach wilzbach Jul 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nightly is more meaningful than "pending"


changelog/${NEXT_VERSION}_pre.dd: | ${STABLE_DMD} ../tools ../installer
$(STABLE_RDMD) $(TOOLS_DIR)/changed.d $(CHANGELOG_VERSION_STABLE) -o $@ \
Expand Down