<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12754] CalendarServer/trunk/calendarserver/webadmin/work.xhtml</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12754">12754</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-25 18:23:34 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>SVG</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkxhtml">CalendarServer/trunk/calendarserver/webadmin/work.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminworkxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml (12753 => 12754)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-26 02:23:01 UTC (rev 12753)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2014-02-26 02:23:34 UTC (rev 12754)
</span><span class="lines">@@ -1,60 +1,67 @@
</span><span class="cx"> <!DOCTYPE html>
</span><del>-<html xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1" t:render="main">
</del><ins>+<html
+ xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1"
+ t:render="main"
+>
</ins><span class="cx">
</span><span class="cx"> <head>
</span><ins>+
</ins><span class="cx"> <title><t:slot name="title" /></title>
</span><del>- <!-- <link t:render="stylesheet" /> -->
</del><ins>+ <link t:render="stylesheet" />
</ins><span class="cx">
</span><span class="cx"> <style>
</span><del>- #work_queues_chart div {
- font-size: 0.5em;
- font-family: sans-serif;
</del><span class="cx">
</span><del>- color: white;
- background-color: steelblue;
</del><ins>+ #work_queues_chart rect {
+ fill: steelblue;
+ }
</ins><span class="cx">
</span><del>- text-align: right;
- padding: 0.5em;
- margin: 0.2em;
- }
</del><ins>+ #work_queues_chart text {
+ fill: white;
+ font: 10px sans-serif;
+ text-anchor: end;
+ }
+
</ins><span class="cx"> </style>
</span><span class="cx">
</span><del>- <script src="http://d3js.org/d3.v3.min.js" charset="utf-8" />
- <script type="text/javascript">
</del><ins>+ <script src="http://d3js.org/d3.v3.min.js"></script>
+ <script>
</ins><span class="cx">
</span><span class="cx"> function init() {
</span><span class="cx">
</span><del>- var data = [0, 0, 0, 0, 0, 0];
</del><ins>+ var data = [4, 8, 15, 16, 23, 42];
</ins><span class="cx">
</span><del>- /* scale is a function that normalizes a value in data into the range 0-98 */
- var scale = d3.scale.linear()
- .domain([0, 200])
- .range([0, 98]);
</del><ins>+ var width = 600;
+ var barHeight = 20;
</ins><span class="cx">
</span><del>- var chart = d3.select("#work_queues_chart")
- .selectAll("div")
- .data(data);
</del><ins>+ var scaledWidth =
+ d3.scale.linear()
+ .domain([0, d3.max(data)])
+ .range([0, width]);
</ins><span class="cx">
</span><del>- var bars = chart.enter().append("div");
</del><ins>+ var chart =
+ d3.select("#work_queues_chart")
+ .attr("width", width)
+ .attr("height", barHeight * data.length);
</ins><span class="cx">
</span><del>- bars.style("width", function(d) { return scale(d) + "%"; })
- bars.text(function(d) { return d; });
</del><ins>+ var bar =
+ chart.selectAll("g")
+ .data(data)
+ .enter().append("g")
+ .attr(
+ "transform",
+ function(d, i) { return "translate(0," + i * barHeight + ")"; }
+ );
</ins><span class="cx">
</span><del>- }
</del><ins>+ bar.append("rect")
+ .attr("width", scaledWidth)
+ .attr("height", barHeight - 1);
</ins><span class="cx">
</span><del>- function update() {
</del><ins>+ bar.append("text")
+ .attr("x", function(d) { return scaledWidth(d) - 3; })
+ .attr("y", barHeight / 2)
+ .attr("dy", "0.35em")
+ .text(function(d) { return d; });
</ins><span class="cx">
</span><del>- var data = [4, 8, 15, 16, 23, 42];
-
- var chart = d3.select("#work_queues_chart")
- .selectAll("div")
- .data(data);
-
- chart.enter();
- chart.exit().remove();
-
- /* http://stackoverflow.com/questions/14958825/dynamically-update-chart-data-in-d3 */
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.onload = init;
</span><span class="lines">@@ -67,10 +74,9 @@
</span><span class="cx">
</span><span class="cx"> <h1><t:slot name="title" /></h1>
</span><span class="cx">
</span><del>- <div id="work_queues_chart" />
</del><ins>+ <svg id="work_queues_chart" />
</ins><span class="cx">
</span><del>- <button onclick="update()">Update</button>
-
</del><span class="cx"> </body>
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> </html>
</span></span></pre>
</div>
</div>
</body>
</html>