Merge pull request #159 from edunham/timestamp

alexcrichton · alexcrichton · commit 97f7b0599728 · 2015-08-04T13:51:08.000-07:00
Add timestamp of last site build to error page
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ sudo: false
 # Cloudfront invalidation: If not PR, decrypt credentials, then run 
 # https://github.com/laurilehmijoki/cf-s3-invalidator if build succeeded
 before_install:
-- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_9a099440e1ee_key -iv $encrypted_9a099440e1ee_iv -in _cf_s3_invalidator.yml.enc -out _cf_s3_invalidator.yml -d'
+- 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then openssl aes-256-cbc -K $encrypted_9a099440e1ee_key -iv $encrypted_9a099440e1ee_iv -in _cf_s3_invalidator.yml.enc -out _cf_s3_invalidator.yml -d; fi'
 install: 
 - gem install cf-s3-invalidator
 - gem install jekyll
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,57 @@
+# Contributing to the Rust website
+
+Thank you for your interest in contributing to the Rust site!
+
+As a reminder, all contributors are expected to follow our [Code of Conduct][coc].
+
+[coc]: http://www.rust-lang.org/conduct.html
+
+## What this repo isn't
+
+The documentation, `doc.rust-lang.org`, is built from the [docs in
+tree][rustdocs]. 
+
+The [playpen][playpen] source lives in [its own repo][playsrc].
+
+The [crates.io][crates] source lives [on github][cratessrc].
+
+[crates]: https://crates.io/
+[cratessrc]: https://github.com/rust-lang/crates.io
+[playpen]: https://play.rust-lang.org/
+[playsrc]: https://github.com/rust-lang/rust-playpen/
+[rustdocs]: https://github.com/rust-lang/rust/tree/master/src/doc
+
+## Troubleshooting this site
+
+Every page has the timestamp at which it was last generated embedded in the
+source code. You can view a page's source by right clicking and selecting
+"view source". The timestamp will look like `<!-- Page last generated
+2015-08-04 12:00:42 -0700 -->`. 
+
+## Bug Reports
+
+Opening an issue is as easy as following [this
+link](https://github.com/rust-lang/rust-www/issues/new) and filling out the fields.
+
+## Pull Requests
+
+Pull requests are the primary mechanism we use to change Rust. GitHub itself
+has some [great documentation][pull-requests] on using the Pull Request
+feature. We use the 'fork and pull' model described there.
+
+[pull-requests]: https://help.github.com/articles/using-pull-requests/
+
+Please make pull requests against the `master` branch.
+
+All pull requests are reviewed by another person. We have a bot,
+@rust-highfive, that will automatically assign a random person to review your
+request.
+
+If you want to request that a specific person reviews your pull request,
+you can add an `r?` to the message. For example, Steve usually reviews
+documentation changes. So if you were to make a documentation change, add
+
+    r? @steveklabnik
+
+to the end of the message, and @rust-highfive will assign @steveklabnik instead
+of a random person. This is entirely optional.
diff --git a/_includes/set_platform.js b/_includes/set_platform.js
@@ -21,9 +21,9 @@ function detect_platform() {
   "use strict";
   var platform = detect_platform();
 
-  var rec_package_name = "1.0.0";
+  var rec_package_name = "1.1.0";
   var rec_version_type = "source";
-  var rec_download_file = "rustc-1.0.0-src.tar.gz";
+  var rec_download_file = "rustc-1.1.0-src.tar.gz";
 
   if (platform == "x86_64-unknown-linux-gnu") {
     rec_version_type = "Linux binary";
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<!-- Page last generated {{ site.time }} -->
 <html lang="en">
   <head>
     <meta charset="utf-8">
@@ -18,12 +19,12 @@
     <header>
 
     <ul class="row menu">
-      <li class="col-xs-12 col-md-4">
+      <li class="col-xs-12 col-md-2">
         <a href="index.html">
           <img class="img-responsive" src="logos/rust-logo-blk.svg" onerror="this.src='logos/rust-logo-256x256-blk.png'" height="128" width="128" alt="Rust logo" />
         </a>
       </li>
-      <li class="col-xs-4 col-md-2"><h2>Docs (1.0.0)</h2>
+      <li class="col-xs-4 col-md-2"><h2>Docs (1.1.0)</h2>
         <ul>
           <li><a href="https://doc.rust-lang.org/stable/book/">Book</a></li>
           <li><a href="https://doc.rust-lang.org/stable/reference.html">Reference</a></li>
@@ -75,6 +76,13 @@
           </li>
         </ul>
       </li>
+      <li class="col-xs-4 col-md-2"><h2>&nbsp;</h2>
+        <ul>
+          <li>
+            <a href="team.html">Team</a>
+          </li>
+        </ul>
+      </li>
     </ul>
   </header>
       {{ content }}
diff --git a/index.html b/index.html
@@ -18,12 +18,12 @@
         <span class="version-rec-box-inner">
           Recommended Version:<br>
           <span id="install-version">
-            1.0.0
+            1.1.0
             (<span>source</span>)
           </span>
         </span>
         <a class="btn btn-primary" id="inst-link"
-            href="https://static.rust-lang.org/dist/rustc-1.0.0-src.tar.gz">Install</a>
+            href="https://static.rust-lang.org/dist/rustc-1.1.0-src.tar.gz">Install</a>
         <a class="btn btn-default" href="install.html" role="button">Other Downloads</a>
       </div>
     </div>
diff --git a/install.html b/install.html
@@ -5,8 +5,8 @@
 
     <div class="row install">
       <div class="col-md-4 side-header">
-        <h2>1.0.0</h2>
-        <h3>May 15, 2015</h3>
+        <h2>1.1.0</h2>
+        <h3>June 25, 2015</h3>
         <p>
 	  The current stable release of Rust, updated every six weeks and backwards-compatible.
         </p>
@@ -15,27 +15,27 @@ <h3>May 15, 2015</h3>
         <table class="table-features table-installers"><tbody>
           <tr>
           <td class="inst-type">Linux binaries (.tar.gz)</td>
-          <td><a href="https://static.rust-lang.org/dist/rust-1.0.0-x86_64-unknown-linux-gnu.tar.gz"><div class="inst-button">64-bit</div></a></td>
-          <td><a href="https://static.rust-lang.org/dist/rust-1.0.0-i686-unknown-linux-gnu.tar.gz"><div class="inst-button">32-bit</div></a></td>
+          <td><a href="https://static.rust-lang.org/dist/rust-1.1.0-x86_64-unknown-linux-gnu.tar.gz"><div class="inst-button">64-bit</div></a></td>
+          <td><a href="https://static.rust-lang.org/dist/rust-1.1.0-i686-unknown-linux-gnu.tar.gz"><div class="inst-button">32-bit</div></a></td>
           </tr>
           <tr>
           <td class="inst-type">Mac installer (.pkg)</td>
-          <td><a href="https://static.rust-lang.org/dist/rust-1.0.0-x86_64-apple-darwin.pkg"><div class="inst-button">64-bit</div></a></td>
-          <td><a href="https://static.rust-lang.org/dist/rust-1.0.0-i686-apple-darwin.pkg"><div class="inst-button">32-bit</div></a></td>
+          <td><a href="https://static.rust-lang.org/dist/rust-1.1.0-x86_64-apple-darwin.pkg"><div class="inst-button">64-bit</div></a></td>
+          <td><a href="https://static.rust-lang.org/dist/rust-1.1.0-i686-apple-darwin.pkg"><div class="inst-button">32-bit</div></a></td>
           </tr>
           <tr>
           <td class="inst-type">Mac binaries (.tar.gz)</td>
-          <td><a href="https://static.rust-lang.org/dist/rust-1.0.0-x86_64-apple-darwin.tar.gz"><div class="inst-button">64-bit</div></a></td>
-          <td><a href="https://static.rust-lang.org/dist/rust-1.0.0-i686-apple-darwin.tar.gz"><div class="inst-button">32-bit</div></a></td>
+          <td><a href="https://static.rust-lang.org/dist/rust-1.1.0-x86_64-apple-darwin.tar.gz"><div class="inst-button">64-bit</div></a></td>
+          <td><a href="https://static.rust-lang.org/dist/rust-1.1.0-i686-apple-darwin.tar.gz"><div class="inst-button">32-bit</div></a></td>
           </tr>
           <tr>
           <td class="inst-type">Windows installer (.msi)</td>
-          <td><a href="https://static.rust-lang.org/dist/rust-1.0.0-x86_64-pc-windows-gnu.msi"><div class="inst-button">64-bit</div></a></td>
-          <td><a href="https://static.rust-lang.org/dist/rust-1.0.0-i686-pc-windows-gnu.msi"><div class="inst-button">32-bit</div></a></td>
+          <td><a href="https://static.rust-lang.org/dist/rust-1.1.0-x86_64-pc-windows-gnu.msi"><div class="inst-button">64-bit</div></a></td>
+          <td><a href="https://static.rust-lang.org/dist/rust-1.1.0-i686-pc-windows-gnu.msi"><div class="inst-button">32-bit</div></a></td>
           </tr>
           <td class="inst-type">Source</td>
           <td colspan="2"><a
-              href="https://static.rust-lang.org/dist/rustc-1.0.0-src.tar.gz"><div class="inst-button">rustc-1.0.0-src.tar.gz</div></a></td>
+              href="https://static.rust-lang.org/dist/rustc-1.1.0-src.tar.gz"><div class="inst-button">rustc-1.1.0-src.tar.gz</div></a></td>
           </tr>
         </tbody></table>
       </div>
diff --git a/team.md b/team.md
@@ -16,6 +16,8 @@ people:
     name: Brian Koropoff
   brson:
     name: Brian Anderson
+  bstrie:
+    name: Ben Striegel
   BurntSushi:
     name: Andrew Gallant
     irc: burntsushi
@@ -53,8 +55,13 @@ people:
     name: Patrick Walton
   pnkfelix:
     name: Felix Klock
+  rpcraig:
+    name: Rachel Craig
+    site: twitter
   sfackler:
     name: Steven Fackler
+  skade:
+    name: Florian Gilcher
   steveklabnik:
     name: Steve Klabnik
   vadimcn:
@@ -83,10 +90,23 @@ teams:
     responsibility: "tool support (e.g. Cargo, multirust), CI infrastructure, etc."
     members: [brson, nrc, alexcrichton, vadimcn, wycats, michaelwoerister]
     lead: alexcrichton
+  - name: Community
+    responsibility: "coordinating events, outreach, commercial users, teaching materials, and exposure"
+    lead: steveklabnik
+    members: [brson, rpcraig, skade, manishearth, steveklabnik, bstrie, erickt]
   - name: Moderation
-    responsibility: "helping uphold the [code of conduct](http://www.rust-lang.org/conduct.html)"
+    responsibility: "helping uphold the <a href='http://www.rust-lang.org/conduct.html'>code of conduct</a>"
     members: [mbrubeck, BurntSushi, manishearth, pnkfelix, erickt]
     email: rust-mods@googlegroups.com
+
+# Information on sites to get profile information from
+sites:
+  github:
+    url: https://github.com/%nick
+    avatar: http://avatars.githubusercontent.com/%nick
+  twitter:
+    url: https://twitter.com/%nick
+    avatar: https://avatars.io/twitter/%nick?size=large
 ---
 
 <style type="text/css">
@@ -134,23 +154,31 @@ rosters, in alphabetical order.
 
 {% for team in page.teams %}
 <section id="{{ team.name | replace:' ','-' }}">
-## {{ team.name }} team
+<h2> {{ team.name }} team</h2>
+
+<strong>Responsibility</strong>: <em>{{ team.responsibility }}</em>
 
-**Responsibility**: *{{ team.responsibility }}*
+<br />
 
 {% if team.email %}
-  **Contact**:
+  <strong>Contact</strong>:
   <a href="mailto:{{ team.email | uri_escape }}">{{ team.email }}</a>
 {% endif %}
 
 <ul class="headshots">
-{% for github in team.members %}
-  {% assign person = page.people[github] %}
-  <li class="person {% if team.lead and team.lead == github %}lead{% endif %}">
-  <a href="https://github.com/{{ github }}">
+{% for nick in team.members %}
+  {% assign person = page.people[nick] %}
+  {% if person.site %}
+    {% assign sitename = person.site %}
+  {% else %}
+    {% assign sitename = "github" %}
+  {% endif %}
+  {% assign site = page.sites[sitename] %}
+  <li class="person {% if team.lead and team.lead == nick %}lead{% endif %}">
+  <a href="{{ site.url | replace:'%nick',nick }}">
     <div class="name">{{ person.name }}</div>
-    <div class="irc">irc: {% if person.irc %}{{ person.irc }}{% else %}{{ github }}{% endif %}</div>
-    <img class="headshot" src="http://avatars.githubusercontent.com/{{ github }}">
+    <div class="irc">irc: {% if person.irc %}{{ person.irc }}{% else %}{{ nick }}{% endif %}</div>
+    <img class="headshot" src="{{ site.avatar | replace:'%nick',nick }}">
   </a>
 </li>
 {% endfor %}
