Revert "Release Activity"

This reverts commit d1bc23b.

Author: Joshua Nelson

src/web/releases.rs

@@ -22,7 +22,6 @@ use postgres::Connection;
 use router::Router;
 use serde::Serialize;
 use serde_json::Value;
-use std::borrow::Cow;
 
 /// Number of release in home page
 const RELEASES_IN_HOME: i64 = 15;
@@ -662,19 +661,9 @@ pub fn search_handler(req: &mut Request) -> IronResult<Response> {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize)]
-struct ReleaseActivity {
-    description: Cow<'static, str>,
-    activity_data: Value,
-}
-
-impl_webpage! {
-    ReleaseActivity = "releases/activity.html",
-}
-
 pub fn activity_handler(req: &mut Request) -> IronResult<Response> {
     let conn = extension!(req, Pool).get()?;
-    let activity_data: Value = ctry!(
+    let release_activity_data: Value = ctry!(
         req,
         conn.query(
             "SELECT value FROM config WHERE name = 'release_activity'",
@@ -685,11 +674,13 @@ pub fn activity_handler(req: &mut Request) -> IronResult<Response> {
     .next()
     .map_or(Value::Null, |row| row.get("value"));
 
-    ReleaseActivity {
-        description: Cow::Borrowed("Monthly release activity"),
-        activity_data,
-    }
-    .into_response(req)
+    Page::new(release_activity_data)
+        .title("Releases")
+        .set("description", "Monthly release activity")
+        .set_true("show_releases_navigation")
+        .set_true("releases_navigation_activity_tab")
+        .set_true("javascript_highchartjs")
+        .to_resp("releases_activity")
 }
 
 pub fn build_queue_handler(req: &mut Request) -> IronResult<Response> {

templates/releases_activity.hbs

@@ -0,0 +1,41 @@
+{{> header}}
+{{#with content}}
+
+<div class="container">
+  <div id="releases-activity-chart"></div>
+</div>
+
+<script type="text/javascript" charset="utf-8">
+new Highcharts.Chart({
+  chart: {
+    renderTo: 'releases-activity-chart',
+    type: 'line'
+  },
+  title: {
+    text: 'Monthly release activity',
+    x: -20 //center
+  },
+  xAxis: {
+    categories: [{{#each dates}}'{{this}}',{{/each}}]
+  },
+  yAxis: {
+    title: {
+      text: 'Crates'
+    },
+    plotLines: [{
+      value: 0,
+      width: 1,
+      color: '#808080'
+    }]
+  },
+  series: [{
+    name: 'Releases',
+    data: [{{#each counts}}{{this}},{{/each}}]
+  },{
+    name: 'Build Failures',
+    data: [{{#each failures}}{{this}},{{/each}}]
+  }]
+});
+</script>
+{{/with}}
+{{> footer}}