add index-text to the main page and use that to link other blogs

Author: nikomatsakis

posts/blog.yml

@@ -1,6 +1,8 @@
 title: Rust Blog
 index-title: The Rust Programming Language Blog
 description: Empowering everyone to build reliable and efficient software.
+index-html: This is the <b>main Rust blog</b>. We use this blog to
+            announce big developments in the world of Rust.
 maintained-by: the Rust Team
 requires-team: false
 

posts/inside-rust/blog.yml

@@ -1,5 +1,10 @@
 title: Inside Rust blog
 index-title: the Inside Rust blog
 description: Want to follow along with Rust development? Curious how you might get involved? Take a look!
+index-html: This is the <b>"Inside Rust"</b> blog. This blog is aimed at those who wish
+            to follow along with Rust development. The various
+            <a href="https://www.rust-lang.org/governance">Rust teams and working groups</a>
+            use this blog to post status updates, calls for help, and other
+            similar announcements.
 maintained-by: the Rust Teams
 requires-team: true

src/blogs.rs

@@ -13,6 +13,7 @@ pub(crate) struct Manifest {
     pub(crate) index_title: String,
     pub(crate) description: String,
     pub(crate) maintained_by: String,
+    pub(crate) index_html: String,
     pub(crate) requires_team: bool,
 }
 
@@ -22,6 +23,7 @@ pub(crate) struct Blog {
     index_title: String,
     description: String,
     maintained_by: String,
+    index_html: String,
     #[serde(serialize_with = "add_postfix_slash")]
     prefix: PathBuf,
     posts: Vec<Post>,
@@ -55,6 +57,7 @@ impl Blog {
             index_title: manifest.index_title,
             description: manifest.description,
             maintained_by: manifest.maintained_by,
+            index_html: manifest.index_html,
             prefix,
             posts,
         })

src/main.rs

@@ -134,7 +134,7 @@ impl Generator {
         let other_blogs: Vec<_> = self.blogs.iter().filter(|b| b.index_title() != blog.index_title())
             .map(|other_blog| json!({
                 "name": other_blog.index_title(),
-                "url": other_blog.prefix().join("index.html"),
+                "url": PathBuf::from("/").join(other_blog.prefix()).join("index.html"),
             }))
             .collect();
 

templates/index.hbs

@@ -1,16 +1,18 @@
 {{#*inline "page"}}
-<header class="mt3 mt0-ns mb6-ns">
+<header class="mt3 mt0-ns mb4-ns">
   <div class="container flex flex-column flex-row-l justify-between-l">
-    <div class="mw8-l">
-      <h1>Posts</h1>
+    <div class="mw6-l">
+      <p>{{{blog.index_html}}}</p>
     </div>
-  </div>
+  </div>    
   <div class="container flex flex-column flex-row-l justify-between-l">
     <div class="mw8-l">
+      <p>
       <b>See also:</b>
       {{#each other_blogs}}
               <a href="{{url}}">{{name}}</a>
       {{/each}}
+      </p>
     </div>
   </div>
 </header>
@@ -22,7 +24,7 @@
     {{#each blog.posts}}
       {{#if show_year}}<tr>
         <td class="bn"></td>
-        <td class="bn"><h3 class="f0-l f1-m f2-s mt4 mb0">{{year}}</h3></td>
+        <td class="bn"><h3 class="f0-l f1-m f2-s mt4 mb0">Posts in {{year}}</h3></td>
       </tr>{{/if}}
       <tr>
         <td class="tr o-60 pr4 pr5-l bn">{{month_name month}}&nbsp;{{day}}</td>