From e60b24066abb2928e09d327a1d6eee79dc228e59 Mon Sep 17 00:00:00 2001 From: jvican Date: Mon, 26 Sep 2016 14:20:03 +0200 Subject: [PATCH 1/6] Modify titles of SIP-27, SIP-28 and SIP-29 Also, update the status of SIP-28 and SIP-29 with an explanatory note. --- sips/pending/_posts/2016-06-25-trailing-commas.md | 2 -- sips/pending/_posts/2016-09-09-inline-meta.md | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sips/pending/_posts/2016-06-25-trailing-commas.md b/sips/pending/_posts/2016-06-25-trailing-commas.md index 15d5a87a00..c593e2ee5a 100644 --- a/sips/pending/_posts/2016-06-25-trailing-commas.md +++ b/sips/pending/_posts/2016-06-25-trailing-commas.md @@ -4,8 +4,6 @@ disqus: true title: SIP-27 - Trailing Commas --- -# SIP-27: Trailing Commas - **By: Dale Wijnand** ## History diff --git a/sips/pending/_posts/2016-09-09-inline-meta.md b/sips/pending/_posts/2016-09-09-inline-meta.md index e4fbc1aeed..743fb9c71e 100644 --- a/sips/pending/_posts/2016-09-09-inline-meta.md +++ b/sips/pending/_posts/2016-09-09-inline-meta.md @@ -2,9 +2,10 @@ layout: sip disqus: true title: SIP-NN - Inline/meta ---- -# SIP-NN: Inline/meta +vote-status: numbered +vote-text: The following proposal has been split and numbered as SIP-28: Inline and SIP-29: Meta. For more information on this decision, check the [minutes](http://docs.scala-lang.org/sips/minutes/sip-20th-september-minutes.html). +--- **By: Eugene Burmako, Sébastien Doeraene, Vojin Jovanovic, Martin Odersky, Dmitry Petrashko, Denys Shabalin** @@ -1020,4 +1021,4 @@ mandated by the SIP process. [FeedbackWebsite]: http://gitter.im/scalameta/sips [AppendixInteraction]: https://gist.github.com/xeno-by/e26a904051a171e4bc8b9096630220a7 [AppendixExpansion]: https://gist.github.com/xeno-by/5dde62aedcc23afc85ecf4d795ac67c2 -[AppendixMeta]: https://gist.github.com/xeno-by/9741ce7532cb30368b3753521bbfce4e \ No newline at end of file +[AppendixMeta]: https://gist.github.com/xeno-by/9741ce7532cb30368b3753521bbfce4e From d5032ce40ec00ca878d48977c7c1f7470efc1d7c Mon Sep 17 00:00:00 2001 From: jvican Date: Mon, 26 Sep 2016 14:29:56 +0200 Subject: [PATCH 2/6] Move the Trailing Commas SIP to completed --- .../_posts/2016-06-25-trailing-commas.md | 3 +++ 1 file changed, 3 insertions(+) rename sips/{pending => completed}/_posts/2016-06-25-trailing-commas.md (94%) diff --git a/sips/pending/_posts/2016-06-25-trailing-commas.md b/sips/completed/_posts/2016-06-25-trailing-commas.md similarity index 94% rename from sips/pending/_posts/2016-06-25-trailing-commas.md rename to sips/completed/_posts/2016-06-25-trailing-commas.md index c593e2ee5a..562a968141 100644 --- a/sips/pending/_posts/2016-06-25-trailing-commas.md +++ b/sips/completed/_posts/2016-06-25-trailing-commas.md @@ -2,6 +2,9 @@ layout: sip disqus: true title: SIP-27 - Trailing Commas + +vote-status: accepted +vote-text: The following proposal needs to be updated, since only the specialized case version (with new lines) has been accepted. For more information, check the minutes. --- **By: Dale Wijnand** From 1c0ad1dbff4ddc6d035c6b90ae436bf89b1a0680 Mon Sep 17 00:00:00 2001 From: jvican Date: Mon, 26 Sep 2016 14:32:37 +0200 Subject: [PATCH 3/6] Put correct date for September minutes --- ...tember-minutes.md => 2016-09-20-sip-20th-september-minutes.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sips/minutes/_posts/{2016-08-20-sip-20th-september-minutes.md => 2016-09-20-sip-20th-september-minutes.md} (100%) diff --git a/sips/minutes/_posts/2016-08-20-sip-20th-september-minutes.md b/sips/minutes/_posts/2016-09-20-sip-20th-september-minutes.md similarity index 100% rename from sips/minutes/_posts/2016-08-20-sip-20th-september-minutes.md rename to sips/minutes/_posts/2016-09-20-sip-20th-september-minutes.md From c0eeb230b6a81f457d042ea7efcd1c53c80cce2a Mon Sep 17 00:00:00 2001 From: jvican Date: Mon, 26 Sep 2016 14:37:36 +0200 Subject: [PATCH 4/6] Modify formatting errors in Inline Meta SIP --- sips/pending/_posts/2016-09-09-inline-meta.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sips/pending/_posts/2016-09-09-inline-meta.md b/sips/pending/_posts/2016-09-09-inline-meta.md index 743fb9c71e..ca19579e44 100644 --- a/sips/pending/_posts/2016-09-09-inline-meta.md +++ b/sips/pending/_posts/2016-09-09-inline-meta.md @@ -1,10 +1,10 @@ --- layout: sip disqus: true -title: SIP-NN - Inline/meta +title: SIP-28 and SIP-29 - Inline meta vote-status: numbered -vote-text: The following proposal has been split and numbered as SIP-28: Inline and SIP-29: Meta. For more information on this decision, check the [minutes](http://docs.scala-lang.org/sips/minutes/sip-20th-september-minutes.html). +vote-text: The following proposal has been split and numbered as SIP-28 (Inline) and SIP-29 (Meta). For more information on this decision, check the minutes. --- **By: Eugene Burmako, Sébastien Doeraene, Vojin Jovanovic, Martin Odersky, Dmitry Petrashko, Denys Shabalin** From 3c5e664c77d1f151b2cae0e5c84636adeb759710 Mon Sep 17 00:00:00 2001 From: jvican Date: Mon, 26 Sep 2016 14:55:36 +0200 Subject: [PATCH 5/6] Add status to pending posts and modify css Add css and vote status in `_includes`. Change colors of vote-status. --- _includes/allsids.txt | 10 ++++++++-- _includes/toc.txt | 12 ++++++++++++ resources/stylesheets/bootstrap.css | 3 ++- .../2013-05-31-improved-lazy-val-initialization.md | 2 ++ sips/pending/_posts/2013-06-10-spores.md | 3 +++ sips/pending/_posts/2013-06-30-async.md | 3 +++ 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/_includes/allsids.txt b/_includes/allsids.txt index 9c5e9b6975..8d30ebaad0 100644 --- a/_includes/allsids.txt +++ b/_includes/allsids.txt @@ -8,9 +8,15 @@ {% elsif post.vote-status == 'deferred' %} Deferred {% elsif post.vote-status == 'postponed' %} - Postponed + Postponed + {% elsif post.vote-status == 'under review' %} + Under review + {% elsif post.vote-status == 'numbered' %} + Numbered {% elsif post.vote-status == 'not accepted' %} - Not Accepted + Rejected + {% elsif post.vote-status == 'rejected' %} + Rejected {% endif %} {% endif %} diff --git a/_includes/toc.txt b/_includes/toc.txt index bc2446ae6d..93a8542690 100644 --- a/_includes/toc.txt +++ b/_includes/toc.txt @@ -19,6 +19,18 @@ Postponed To A Future Release

{{ page.vote-text }}

+ {% elsif page.vote-status == 'numbered' %} +

SIP Committee Decision

+
+ Numbered +

{{ page.vote-text }}

+
+ {% elsif page.vote-status == 'under review' %} +

SIP Committee Decision

+
+ Under review +

{{ page.vote-text }}

+
{% elsif page.vote-status == 'rejected' %}

SIP Committee Decision

diff --git a/resources/stylesheets/bootstrap.css b/resources/stylesheets/bootstrap.css index ccff7175a0..f884d748fc 100644 --- a/resources/stylesheets/bootstrap.css +++ b/resources/stylesheets/bootstrap.css @@ -321,10 +321,11 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} .label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} .label.warning{background-color:#f89406;} +.label.light-warning{background-color:#9fa847;} .label.success{background-color:#46a546;} .label.notice{background-color:#62cffc;} .media-grid{margin-left:-20px;margin-bottom:0;zoom:1;}.media-grid:before,.media-grid:after{display:table;content:"";zoom:1;*display:inline;} .media-grid:after{clear:both;} .media-grid li{display:inline;} .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;} -.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} \ No newline at end of file +.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} diff --git a/sips/pending/_posts/2013-05-31-improved-lazy-val-initialization.md b/sips/pending/_posts/2013-05-31-improved-lazy-val-initialization.md index 3d9b81334c..fe79de122b 100644 --- a/sips/pending/_posts/2013-05-31-improved-lazy-val-initialization.md +++ b/sips/pending/_posts/2013-05-31-improved-lazy-val-initialization.md @@ -3,6 +3,8 @@ layout: sip disqus: true title: SIP-20 - Improved Lazy Vals Initialization +vote-status: under review +vote-text: Next iteration takes place in October 2016. --- **By: Aleksandar Prokopec, Miguel Garcia, Jason Zaugg, Hubert Plociniczak, Viktor Klang, Martin Odersky** diff --git a/sips/pending/_posts/2013-06-10-spores.md b/sips/pending/_posts/2013-06-10-spores.md index 83c07f9781..98256674a4 100644 --- a/sips/pending/_posts/2013-06-10-spores.md +++ b/sips/pending/_posts/2013-06-10-spores.md @@ -2,6 +2,9 @@ layout: sip disqus: true title: SIP-21 - Spores + +vote-status: under review +vote-text: Next iteration takes place in November 2016. Check September's minutes. --- **By: Heather Miller, Martin Odersky, and Philipp Haller** diff --git a/sips/pending/_posts/2013-06-30-async.md b/sips/pending/_posts/2013-06-30-async.md index bca713b2b7..e006aff9fb 100644 --- a/sips/pending/_posts/2013-06-30-async.md +++ b/sips/pending/_posts/2013-06-30-async.md @@ -2,6 +2,9 @@ layout: sip disqus: true title: SIP-22 - Async + +vote-status: postponed +vote-text: Authors have asked to postpone until further notice. They will eventually open the proposal when some details in the implementation are ready. Check July's minutes. --- **By: Philipp Haller and Jason Zaugg** From 8c15419f2f166876aab874b69079a79d388676d6 Mon Sep 17 00:00:00 2001 From: jvican Date: Mon, 26 Sep 2016 17:04:56 +0200 Subject: [PATCH 6/6] Go back to `Not Accepted` and capitalize it --- _includes/allsids.txt | 6 +++--- _includes/toc.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_includes/allsids.txt b/_includes/allsids.txt index 8d30ebaad0..aa20a8596c 100644 --- a/_includes/allsids.txt +++ b/_includes/allsids.txt @@ -10,13 +10,13 @@ {% elsif post.vote-status == 'postponed' %} Postponed {% elsif post.vote-status == 'under review' %} - Under review + Under Review {% elsif post.vote-status == 'numbered' %} Numbered {% elsif post.vote-status == 'not accepted' %} - Rejected + Not Accepted {% elsif post.vote-status == 'rejected' %} - Rejected + Not Accepted {% endif %} {% endif %} diff --git a/_includes/toc.txt b/_includes/toc.txt index 93a8542690..e786cfff98 100644 --- a/_includes/toc.txt +++ b/_includes/toc.txt @@ -28,13 +28,13 @@ {% elsif page.vote-status == 'under review' %}

SIP Committee Decision

- Under review + Under Review

{{ page.vote-text }}

{% elsif page.vote-status == 'rejected' %}

SIP Committee Decision

- Rejected + Not Accepted

{{ page.vote-text }}

{% endif %}