Merge branch 'develop' of github.com:nature/pa11y-dashboard into edit-page

This commit is contained in:
perryharlock
2013-11-27 14:11:45 +00:00
5 changed files with 15 additions and 7 deletions

File diff suppressed because one or more lines are too long

View File

@@ -205,7 +205,7 @@ $(document).ready(function(){
} }
function showTooltip(x, y, contents) { function showTooltip(x, y, contents) {
$('<div data-role="tooltip" class="tooltip in"><div class="tooltip-inner">' + $('<div data-role="tooltip" class="tooltip tooltip-graph in"><div class="tooltip-inner">' +
contents + contents +
'</div></div>').css({top: y + 5,left: x + 5}).appendTo('body').fadeIn(200); '</div></div>').css({top: y + 5,left: x + 5}).appendTo('body').fadeIn(200);
} }
@@ -216,8 +216,13 @@ $(document).ready(function(){
if (previousPoint != item.dataIndex) { if (previousPoint != item.dataIndex) {
previousPoint = item.dataIndex; previousPoint = item.dataIndex;
$('[data-role="tooltip"]').remove(); $('[data-role="tooltip"]').remove();
var y = item.datapoint[1].toFixed(0); var count = item.datapoint[1].toFixed(0);
var contents = '<h6 class="crunch">' + y + ' ' + item.series.label + '</h6>'; var date = $.plot.formatDate(new Date(item.datapoint[0]), '%d %b' +
'<small> (%H:%M)</small>');
var contents = '<p class="crunch">' +
date + '<br/>' +
count + ' ' + item.series.label +
'</[h6]>';
showTooltip(item.pageX, item.pageY, contents); showTooltip(item.pageX, item.pageY, contents);
} }
} else { } else {

File diff suppressed because one or more lines are too long

View File

@@ -388,6 +388,9 @@ ul.date-links {
max-width:45px !important; max-width:45px !important;
} }
} }
.tooltip-graph {
font-size:12px;
}
/* New task page */ /* New task page */
.standards-lists { .standards-lists {

View File

@@ -17,7 +17,7 @@
<meta name="viewport" content="width=device-width"/> <meta name="viewport" content="width=device-width"/>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:400,700,900,400italic"/> <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:400,700,900,400italic"/>
<link rel="stylesheet" href="/css/site.min.css"/> <link rel="stylesheet" href="/css/site.min.css?v={{version}}"/>
</head> </head>
<!--[if IE 7]><body class="ie7"><![endif]--> <!--[if IE 7]><body class="ie7"><![endif]-->
@@ -47,7 +47,7 @@
{{> page-footer}} {{> page-footer}}
<script type="text/javascript" src="/js/site.min.js"></script> <script type="text/javascript" src="/js/site.min.js?v={{version}}"></script>
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="/js/vendor/flot/excanvas.min.js"></script><![endif]--> <!--[if lte IE 8]><script language="javascript" type="text/javascript" src="/js/vendor/flot/excanvas.min.js"></script><![endif]-->
</body> </body>