Merge cd7d73b into 8231b24

cmheisel · Dec 22, 2016 · a3a2272 · a3a2272
2 parents 8231b24 + cd7d73b
commit a3a2272
Show file tree

Hide file tree

Showing 7 changed files with 186 additions and 3 deletions.
diff --git a/dashboard/static/dashboard/node_modules/chartist-plugin-tooltips/CHANGELOG.md b/dashboard/static/dashboard/node_modules/chartist-plugin-tooltips/CHANGELOG.md
diff --git a/dashboard/static/dashboard/node_modules/chartist-plugin-tooltips/LICENSE b/dashboard/static/dashboard/node_modules/chartist-plugin-tooltips/LICENSE
diff --git a/dashboard/static/dashboard/node_modules/chartist-plugin-tooltips/package.json b/dashboard/static/dashboard/node_modules/chartist-plugin-tooltips/package.json
diff --git a/dashboard/static/dashboard/package.json b/dashboard/static/dashboard/package.json
@@ -4,7 +4,8 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "chartist-plugin-legend": "^0.6.0"
+    "chartist-plugin-legend": "^0.6.0",
+    "chartist-plugin-tooltips": "0.0.17"
   },
   "devDependencies": {},
   "scripts": {

diff --git a/dashboard/static/dashboard/version.txt b/dashboard/static/dashboard/version.txt
@@ -1 +1 @@
-v0.11.0
+v0.11.1
diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
@@ -21,8 +21,11 @@
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
 
     <link rel="stylesheet" href="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css">
+    <link rel="stylesheet" href="{% static "dashboard/node_modules/chartist-plugin-tooltips/dist/chartist-plugin-tooltip.css" %}">
+
     <script src="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.js"></script>
     <script src="{% static "dashboard/node_modules/chartist-plugin-legend/chartist-plugin-legend.js" %}"></script>
+    <script src="{% static "dashboard/node_modules/chartist-plugin-tooltips/dist/chartist-plugin-tooltip.min.js" %}"></script>
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

diff --git a/dashboard/templates/forecast.html b/dashboard/templates/forecast.html
@@ -6,7 +6,8 @@
 {% block page_title %}Project Forecast: {{ filter_id }}{% endblock page_title %}
 
 {% block content %}
-<p><small><a href="{% url 'dashboard' %}" title="Back"><< Back</a></small></p>
+<p><small><a href="{% url 'dashboard' %}" title="Back"><< Back</a> / <a href="{{ JIRA_URL }}/secure/IssueNavigator.jspa?mode=hide&amp;requestId={{ filter_id }}" title="View JIRA filter">JIRA <span class="glyphicon glyphicon-filter"></span></a>
+</small></p>
 
 
 <div class="col-md-6" style="padding-left: 0px">
@@ -167,6 +168,10 @@ <h2>Progress over past {{ recent_history|length }} days</h2>
     plugins: [
         Chartist.plugins.legend({
             className: 'crazyPink'
+        }),
+        Chartist.plugins.tooltip({
+          anchorToPoint: true,
+          appendToBody: true
         })
     ]
   }