" + print websafe(repr(h)) + img = h.largest_image_url() + if img: + print "
| "
- print "", websafe(url), ""
- print " " - print websafe(repr(h)) - img = h.largest_image_url() - if img: - print " | (no image) | " - mo = h.media_object() - print ""
- if mo:
- s = scrapers[mo['type']]
- print websafe(repr(mo))
- print " " - print s.media_embed(**mo).content - else: - print "None" - print " | "
- print "
' + l + '
');
+ }
+
+ if (labels.length > 0) {
+ var dummyDiv = $(''
+ + labels.join("") + '
').appendTo(placeholder);
+ axis.labelHeight = dummyDiv.height();
+ dummyDiv.remove();
+ }
+ }
+ }
+ else if (axis.labelWidth == null || axis.labelHeight == null) {
+ // calculate y label dimensions
+ for (i = 0; i < axis.ticks.length; ++i) {
+ l = axis.ticks[i].label;
+ if (l)
+ labels.push('' + l + '
');
+ }
+
+ if (labels.length > 0) {
+ var dummyDiv = $(''
+ + labels.join("") + '
').appendTo(placeholder);
+ if (axis.labelWidth == null)
+ axis.labelWidth = dummyDiv.width();
+ if (axis.labelHeight == null)
+ axis.labelHeight = dummyDiv.find("div").height();
+ dummyDiv.remove();
+ }
+
+ }
+
+ if (axis.labelWidth == null)
+ axis.labelWidth = 0;
+ if (axis.labelHeight == null)
+ axis.labelHeight = 0;
+ }
+
+ function setGridSpacing() {
+ // get the most space needed around the grid for things
+ // that may stick out
+ var maxOutset = options.grid.borderWidth;
+ for (i = 0; i < series.length; ++i)
+ maxOutset = Math.max(maxOutset, 2 * (series[i].points.radius + series[i].points.lineWidth/2));
+
+ plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = maxOutset;
+
+ var margin = options.grid.labelMargin + options.grid.borderWidth;
+
+ if (axes.xaxis.labelHeight > 0)
+ plotOffset.bottom = Math.max(maxOutset, axes.xaxis.labelHeight + margin);
+ if (axes.yaxis.labelWidth > 0)
+ plotOffset.left = Math.max(maxOutset, axes.yaxis.labelWidth + margin);
+ if (axes.x2axis.labelHeight > 0)
+ plotOffset.top = Math.max(maxOutset, axes.x2axis.labelHeight + margin);
+ if (axes.y2axis.labelWidth > 0)
+ plotOffset.right = Math.max(maxOutset, axes.y2axis.labelWidth + margin);
+
+ plotWidth = canvasWidth - plotOffset.left - plotOffset.right;
+ plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top;
+ }
+
+ var axis;
+ for (axis in axes)
+ setRange(axes[axis], options[axis]);
+
+ if (options.grid.show) {
+ for (axis in axes) {
+ prepareTickGeneration(axes[axis], options[axis]);
+ setTicks(axes[axis], options[axis]);
+ measureLabels(axes[axis], options[axis]);
+ }
+
+ setGridSpacing();
+ }
+ else {
+ plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = 0;
+ plotWidth = canvasWidth;
+ plotHeight = canvasHeight;
+ }
+
+ for (axis in axes)
+ setTransformationHelpers(axes[axis], options[axis]);
+
+ if (options.grid.show)
+ insertLabels();
+
+ insertLegend();
+ }
+
+ function setRange(axis, axisOptions) {
+ var min = +(axisOptions.min != null ? axisOptions.min : axis.datamin),
+ max = +(axisOptions.max != null ? axisOptions.max : axis.datamax),
+ delta = max - min;
+
+ if (delta == 0.0) {
+ // degenerate case
+ var widen = max == 0 ? 1 : 0.01;
+
+ if (axisOptions.min == null)
+ min -= widen;
+ // alway widen max if we couldn't widen min to ensure we
+ // don't fall into min == max which doesn't work
+ if (axisOptions.max == null || axisOptions.min != null)
+ max += widen;
+ }
+ else {
+ // consider autoscaling
+ var margin = axisOptions.autoscaleMargin;
+ if (margin != null) {
+ if (axisOptions.min == null) {
+ min -= delta * margin;
+ // make sure we don't go below zero if all values
+ // are positive
+ if (min < 0 && axis.datamin != null && axis.datamin >= 0)
+ min = 0;
+ }
+ if (axisOptions.max == null) {
+ max += delta * margin;
+ if (max > 0 && axis.datamax != null && axis.datamax <= 0)
+ max = 0;
+ }
+ }
+ }
+ axis.min = min;
+ axis.max = max;
+ }
+
+ function prepareTickGeneration(axis, axisOptions) {
+ // estimate number of ticks
+ var noTicks;
+ if (typeof axisOptions.ticks == "number" && axisOptions.ticks > 0)
+ noTicks = axisOptions.ticks;
+ else if (axis == axes.xaxis || axis == axes.x2axis)
+ // heuristic based on the model a*sqrt(x) fitted to
+ // some reasonable data points
+ noTicks = 0.3 * Math.sqrt(canvasWidth);
+ else
+ noTicks = 0.3 * Math.sqrt(canvasHeight);
+
+ var delta = (axis.max - axis.min) / noTicks,
+ size, generator, unit, formatter, i, magn, norm;
+
+ if (axisOptions.mode == "time") {
+ // pretty handling of time
+
+ // map of app. size of time units in milliseconds
+ var timeUnitSize = {
+ "second": 1000,
+ "minute": 60 * 1000,
+ "hour": 60 * 60 * 1000,
+ "day": 24 * 60 * 60 * 1000,
+ "month": 30 * 24 * 60 * 60 * 1000,
+ "year": 365.2425 * 24 * 60 * 60 * 1000
+ };
+
+
+ // the allowed tick sizes, after 1 year we use
+ // an integer algorithm
+ var spec = [
+ [1, "second"], [2, "second"], [5, "second"], [10, "second"],
+ [30, "second"],
+ [1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"],
+ [30, "minute"],
+ [1, "hour"], [2, "hour"], [4, "hour"],
+ [8, "hour"], [12, "hour"],
+ [1, "day"], [2, "day"], [3, "day"],
+ [0.25, "month"], [0.5, "month"], [1, "month"],
+ [2, "month"], [3, "month"], [6, "month"],
+ [1, "year"]
+ ];
+
+ var minSize = 0;
+ if (axisOptions.minTickSize != null) {
+ if (typeof axisOptions.tickSize == "number")
+ minSize = axisOptions.tickSize;
+ else
+ minSize = axisOptions.minTickSize[0] * timeUnitSize[axisOptions.minTickSize[1]];
+ }
+
+ for (i = 0; i < spec.length - 1; ++i)
+ if (delta < (spec[i][0] * timeUnitSize[spec[i][1]]
+ + spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2
+ && spec[i][0] * timeUnitSize[spec[i][1]] >= minSize)
+ break;
+ size = spec[i][0];
+ unit = spec[i][1];
+
+ // special-case the possibility of several years
+ if (unit == "year") {
+ magn = Math.pow(10, Math.floor(Math.log(delta / timeUnitSize.year) / Math.LN10));
+ norm = (delta / timeUnitSize.year) / magn;
+ if (norm < 1.5)
+ size = 1;
+ else if (norm < 3)
+ size = 2;
+ else if (norm < 7.5)
+ size = 5;
+ else
+ size = 10;
+
+ size *= magn;
+ }
+
+ if (axisOptions.tickSize) {
+ size = axisOptions.tickSize[0];
+ unit = axisOptions.tickSize[1];
+ }
+
+ generator = function(axis) {
+ var ticks = [],
+ tickSize = axis.tickSize[0], unit = axis.tickSize[1],
+ d = new Date(axis.min);
+
+ var step = tickSize * timeUnitSize[unit];
+
+ if (unit == "second")
+ d.setUTCSeconds(floorInBase(d.getUTCSeconds(), tickSize));
+ if (unit == "minute")
+ d.setUTCMinutes(floorInBase(d.getUTCMinutes(), tickSize));
+ if (unit == "hour")
+ d.setUTCHours(floorInBase(d.getUTCHours(), tickSize));
+ if (unit == "month")
+ d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize));
+ if (unit == "year")
+ d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize));
+
+ // reset smaller components
+ d.setUTCMilliseconds(0);
+ if (step >= timeUnitSize.minute)
+ d.setUTCSeconds(0);
+ if (step >= timeUnitSize.hour)
+ d.setUTCMinutes(0);
+ if (step >= timeUnitSize.day)
+ d.setUTCHours(0);
+ if (step >= timeUnitSize.day * 4)
+ d.setUTCDate(1);
+ if (step >= timeUnitSize.year)
+ d.setUTCMonth(0);
+
+
+ var carry = 0, v = Number.NaN, prev;
+ do {
+ prev = v;
+ v = d.getTime();
+ ticks.push({ v: v, label: axis.tickFormatter(v, axis) });
+ if (unit == "month") {
+ if (tickSize < 1) {
+ // a bit complicated - we'll divide the month
+ // up but we need to take care of fractions
+ // so we don't end up in the middle of a day
+ d.setUTCDate(1);
+ var start = d.getTime();
+ d.setUTCMonth(d.getUTCMonth() + 1);
+ var end = d.getTime();
+ d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize);
+ carry = d.getUTCHours();
+ d.setUTCHours(0);
+ }
+ else
+ d.setUTCMonth(d.getUTCMonth() + tickSize);
+ }
+ else if (unit == "year") {
+ d.setUTCFullYear(d.getUTCFullYear() + tickSize);
+ }
+ else
+ d.setTime(v + step);
+ } while (v < axis.max && v != prev);
+
+ return ticks;
+ };
+
+ formatter = function (v, axis) {
+ var d = new Date(v);
+
+ // first check global format
+ if (axisOptions.timeformat != null)
+ return $.plot.formatDate(d, axisOptions.timeformat, axisOptions.monthNames);
+
+ var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
+ var span = axis.max - axis.min;
+ var suffix = (axisOptions.twelveHourClock) ? " %p" : "";
+
+ if (t < timeUnitSize.minute)
+ fmt = "%h:%M:%S" + suffix;
+ else if (t < timeUnitSize.day) {
+ if (span < 2 * timeUnitSize.day)
+ fmt = "%h:%M" + suffix;
+ else
+ fmt = "%b %d %h:%M" + suffix;
+ }
+ else if (t < timeUnitSize.month)
+ fmt = "%b %d";
+ else if (t < timeUnitSize.year) {
+ if (span < timeUnitSize.year)
+ fmt = "%b";
+ else
+ fmt = "%b %y";
+ }
+ else
+ fmt = "%y";
+
+ return $.plot.formatDate(d, fmt, axisOptions.monthNames);
+ };
+ }
+ else {
+ // pretty rounding of base-10 numbers
+ var maxDec = axisOptions.tickDecimals;
+ var dec = -Math.floor(Math.log(delta) / Math.LN10);
+ if (maxDec != null && dec > maxDec)
+ dec = maxDec;
+
+ magn = Math.pow(10, -dec);
+ norm = delta / magn; // norm is between 1.0 and 10.0
+
+ if (norm < 1.5)
+ size = 1;
+ else if (norm < 3) {
+ size = 2;
+ // special case for 2.5, requires an extra decimal
+ if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) {
+ size = 2.5;
+ ++dec;
+ }
+ }
+ else if (norm < 7.5)
+ size = 5;
+ else
+ size = 10;
+
+ size *= magn;
+
+ if (axisOptions.minTickSize != null && size < axisOptions.minTickSize)
+ size = axisOptions.minTickSize;
+
+ if (axisOptions.tickSize != null)
+ size = axisOptions.tickSize;
+
+ axis.tickDecimals = Math.max(0, (maxDec != null) ? maxDec : dec);
+
+ generator = function (axis) {
+ var ticks = [];
+
+ // spew out all possible ticks
+ var start = floorInBase(axis.min, axis.tickSize),
+ i = 0, v = Number.NaN, prev;
+ do {
+ prev = v;
+ v = start + i * axis.tickSize;
+ ticks.push({ v: v, label: axis.tickFormatter(v, axis) });
+ ++i;
+ } while (v < axis.max && v != prev);
+ return ticks;
+ };
+
+ formatter = function (v, axis) {
+ return v.toFixed(axis.tickDecimals);
+ };
+ }
+
+ axis.tickSize = unit ? [size, unit] : size;
+ axis.tickGenerator = generator;
+ if ($.isFunction(axisOptions.tickFormatter))
+ axis.tickFormatter = function (v, axis) { return "" + axisOptions.tickFormatter(v, axis); };
+ else
+ axis.tickFormatter = formatter;
+ }
+
+ function setTicks(axis, axisOptions) {
+ axis.ticks = [];
+
+ if (!axis.used)
+ return;
+
+ if (axisOptions.ticks == null)
+ axis.ticks = axis.tickGenerator(axis);
+ else if (typeof axisOptions.ticks == "number") {
+ if (axisOptions.ticks > 0)
+ axis.ticks = axis.tickGenerator(axis);
+ }
+ else if (axisOptions.ticks) {
+ var ticks = axisOptions.ticks;
+
+ if ($.isFunction(ticks))
+ // generate the ticks
+ ticks = ticks({ min: axis.min, max: axis.max });
+
+ // clean up the user-supplied ticks, copy them over
+ var i, v;
+ for (i = 0; i < ticks.length; ++i) {
+ var label = null;
+ var t = ticks[i];
+ if (typeof t == "object") {
+ v = t[0];
+ if (t.length > 1)
+ label = t[1];
+ }
+ else
+ v = t;
+ if (label == null)
+ label = axis.tickFormatter(v, axis);
+ axis.ticks[i] = { v: v, label: label };
+ }
+ }
+
+ if (axisOptions.autoscaleMargin != null && axis.ticks.length > 0) {
+ // snap to ticks
+ if (axisOptions.min == null)
+ axis.min = Math.min(axis.min, axis.ticks[0].v);
+ if (axisOptions.max == null && axis.ticks.length > 1)
+ axis.max = Math.max(axis.max, axis.ticks[axis.ticks.length - 1].v);
+ }
+ }
+
+ function draw() {
+ ctx.clearRect(0, 0, canvasWidth, canvasHeight);
+
+ var grid = options.grid;
+
+ if (grid.show && !grid.aboveData)
+ drawGrid();
+
+ for (var i = 0; i < series.length; ++i)
+ drawSeries(series[i]);
+
+ executeHooks(hooks.draw, [ctx]);
+
+ if (grid.show && grid.aboveData)
+ drawGrid();
+ }
+
+ function extractRange(ranges, coord) {
+ var firstAxis = coord + "axis",
+ secondaryAxis = coord + "2axis",
+ axis, from, to, reverse;
+
+ if (ranges[firstAxis]) {
+ axis = axes[firstAxis];
+ from = ranges[firstAxis].from;
+ to = ranges[firstAxis].to;
+ }
+ else if (ranges[secondaryAxis]) {
+ axis = axes[secondaryAxis];
+ from = ranges[secondaryAxis].from;
+ to = ranges[secondaryAxis].to;
+ }
+ else {
+ // backwards-compat stuff - to be removed in future
+ axis = axes[firstAxis];
+ from = ranges[coord + "1"];
+ to = ranges[coord + "2"];
+ }
+
+ // auto-reverse as an added bonus
+ if (from != null && to != null && from > to)
+ return { from: to, to: from, axis: axis };
+
+ return { from: from, to: to, axis: axis };
+ }
+
+ function drawGrid() {
+ var i;
+
+ ctx.save();
+ ctx.translate(plotOffset.left, plotOffset.top);
+
+ // draw background, if any
+ if (options.grid.backgroundColor) {
+ ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)");
+ ctx.fillRect(0, 0, plotWidth, plotHeight);
+ }
+
+ // draw markings
+ var markings = options.grid.markings;
+ if (markings) {
+ if ($.isFunction(markings))
+ // xmin etc. are backwards-compatible, to be removed in future
+ markings = markings({ xmin: axes.xaxis.min, xmax: axes.xaxis.max, ymin: axes.yaxis.min, ymax: axes.yaxis.max, xaxis: axes.xaxis, yaxis: axes.yaxis, x2axis: axes.x2axis, y2axis: axes.y2axis });
+
+ for (i = 0; i < markings.length; ++i) {
+ var m = markings[i],
+ xrange = extractRange(m, "x"),
+ yrange = extractRange(m, "y");
+
+ // fill in missing
+ if (xrange.from == null)
+ xrange.from = xrange.axis.min;
+ if (xrange.to == null)
+ xrange.to = xrange.axis.max;
+ if (yrange.from == null)
+ yrange.from = yrange.axis.min;
+ if (yrange.to == null)
+ yrange.to = yrange.axis.max;
+
+ // clip
+ if (xrange.to < xrange.axis.min || xrange.from > xrange.axis.max ||
+ yrange.to < yrange.axis.min || yrange.from > yrange.axis.max)
+ continue;
+
+ xrange.from = Math.max(xrange.from, xrange.axis.min);
+ xrange.to = Math.min(xrange.to, xrange.axis.max);
+ yrange.from = Math.max(yrange.from, yrange.axis.min);
+ yrange.to = Math.min(yrange.to, yrange.axis.max);
+
+ if (xrange.from == xrange.to && yrange.from == yrange.to)
+ continue;
+
+ // then draw
+ xrange.from = xrange.axis.p2c(xrange.from);
+ xrange.to = xrange.axis.p2c(xrange.to);
+ yrange.from = yrange.axis.p2c(yrange.from);
+ yrange.to = yrange.axis.p2c(yrange.to);
+
+ if (xrange.from == xrange.to || yrange.from == yrange.to) {
+ // draw line
+ ctx.beginPath();
+ ctx.strokeStyle = m.color || options.grid.markingsColor;
+ ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth;
+ //ctx.moveTo(Math.floor(xrange.from), yrange.from);
+ //ctx.lineTo(Math.floor(xrange.to), yrange.to);
+ ctx.moveTo(xrange.from, yrange.from);
+ ctx.lineTo(xrange.to, yrange.to);
+ ctx.stroke();
+ }
+ else {
+ // fill area
+ ctx.fillStyle = m.color || options.grid.markingsColor;
+ ctx.fillRect(xrange.from, yrange.to,
+ xrange.to - xrange.from,
+ yrange.from - yrange.to);
+ }
+ }
+ }
+
+ // draw the inner grid
+ ctx.lineWidth = 1;
+ ctx.strokeStyle = options.grid.tickColor;
+ ctx.beginPath();
+ var v, axis = axes.xaxis;
+ for (i = 0; i < axis.ticks.length; ++i) {
+ v = axis.ticks[i].v;
+ if (v <= axis.min || v >= axes.xaxis.max)
+ continue; // skip those lying on the axes
+
+ ctx.moveTo(Math.floor(axis.p2c(v)) + ctx.lineWidth/2, 0);
+ ctx.lineTo(Math.floor(axis.p2c(v)) + ctx.lineWidth/2, plotHeight);
+ }
+
+ axis = axes.yaxis;
+ for (i = 0; i < axis.ticks.length; ++i) {
+ v = axis.ticks[i].v;
+ if (v <= axis.min || v >= axis.max)
+ continue;
+
+ ctx.moveTo(0, Math.floor(axis.p2c(v)) + ctx.lineWidth/2);
+ ctx.lineTo(plotWidth, Math.floor(axis.p2c(v)) + ctx.lineWidth/2);
+ }
+
+ axis = axes.x2axis;
+ for (i = 0; i < axis.ticks.length; ++i) {
+ v = axis.ticks[i].v;
+ if (v <= axis.min || v >= axis.max)
+ continue;
+
+ ctx.moveTo(Math.floor(axis.p2c(v)) + ctx.lineWidth/2, -5);
+ ctx.lineTo(Math.floor(axis.p2c(v)) + ctx.lineWidth/2, 5);
+ }
+
+ axis = axes.y2axis;
+ for (i = 0; i < axis.ticks.length; ++i) {
+ v = axis.ticks[i].v;
+ if (v <= axis.min || v >= axis.max)
+ continue;
+
+ ctx.moveTo(plotWidth-5, Math.floor(axis.p2c(v)) + ctx.lineWidth/2);
+ ctx.lineTo(plotWidth+5, Math.floor(axis.p2c(v)) + ctx.lineWidth/2);
+ }
+
+ ctx.stroke();
+
+ if (options.grid.borderWidth) {
+ // draw border
+ var bw = options.grid.borderWidth;
+ ctx.lineWidth = bw;
+ ctx.strokeStyle = options.grid.borderColor;
+ ctx.strokeRect(-bw/2, -bw/2, plotWidth + bw, plotHeight + bw);
+ }
+
+ ctx.restore();
+ }
+
+ function insertLabels() {
+ placeholder.find(".tickLabels").remove();
+
+ var html = [''];
+
+ function addLabels(axis, labelGenerator) {
+ for (var i = 0; i < axis.ticks.length; ++i) {
+ var tick = axis.ticks[i];
+ if (!tick.label || tick.v < axis.min || tick.v > axis.max)
+ continue;
+ html.push(labelGenerator(tick, axis));
+ }
+ }
+
+ var margin = options.grid.labelMargin + options.grid.borderWidth;
+
+ addLabels(axes.xaxis, function (tick, axis) {
+ return '
');
+
+ placeholder.append(html.join(""));
+ }
+
+ function drawSeries(series) {
+ if (series.lines.show)
+ drawSeriesLines(series);
+ if (series.bars.show)
+ drawSeriesBars(series);
+ if (series.points.show)
+ drawSeriesPoints(series);
+ }
+
+ function drawSeriesLines(series) {
+ function plotLine(datapoints, xoffset, yoffset, axisx, axisy) {
+ var points = datapoints.points,
+ ps = datapoints.pointsize,
+ prevx = null, prevy = null;
+
+ ctx.beginPath();
+ for (var i = ps; i < points.length; i += ps) {
+ var x1 = points[i - ps], y1 = points[i - ps + 1],
+ x2 = points[i], y2 = points[i + 1];
+
+ if (x1 == null || x2 == null)
+ continue;
+
+ // clip with ymin
+ if (y1 <= y2 && y1 < axisy.min) {
+ if (y2 < axisy.min)
+ continue; // line segment is outside
+ // compute new intersection point
+ x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+ y1 = axisy.min;
+ }
+ else if (y2 <= y1 && y2 < axisy.min) {
+ if (y1 < axisy.min)
+ continue;
+ x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+ y2 = axisy.min;
+ }
+
+ // clip with ymax
+ if (y1 >= y2 && y1 > axisy.max) {
+ if (y2 > axisy.max)
+ continue;
+ x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+ y1 = axisy.max;
+ }
+ else if (y2 >= y1 && y2 > axisy.max) {
+ if (y1 > axisy.max)
+ continue;
+ x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+ y2 = axisy.max;
+ }
+
+ // clip with xmin
+ if (x1 <= x2 && x1 < axisx.min) {
+ if (x2 < axisx.min)
+ continue;
+ y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+ x1 = axisx.min;
+ }
+ else if (x2 <= x1 && x2 < axisx.min) {
+ if (x1 < axisx.min)
+ continue;
+ y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+ x2 = axisx.min;
+ }
+
+ // clip with xmax
+ if (x1 >= x2 && x1 > axisx.max) {
+ if (x2 > axisx.max)
+ continue;
+ y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+ x1 = axisx.max;
+ }
+ else if (x2 >= x1 && x2 > axisx.max) {
+ if (x1 > axisx.max)
+ continue;
+ y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+ x2 = axisx.max;
+ }
+
+ if (x1 != prevx || y1 != prevy)
+ ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset);
+
+ prevx = x2;
+ prevy = y2;
+ ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset);
+ }
+ ctx.stroke();
+ }
+
+ function plotLineArea(datapoints, axisx, axisy) {
+ var points = datapoints.points,
+ ps = datapoints.pointsize,
+ bottom = Math.min(Math.max(0, axisy.min), axisy.max),
+ top, lastX = 0, areaOpen = false;
+
+ for (var i = ps; i < points.length; i += ps) {
+ var x1 = points[i - ps], y1 = points[i - ps + 1],
+ x2 = points[i], y2 = points[i + 1];
+
+ if (areaOpen && x1 != null && x2 == null) {
+ // close area
+ ctx.lineTo(axisx.p2c(lastX), axisy.p2c(bottom));
+ ctx.fill();
+ areaOpen = false;
+ continue;
+ }
+
+ if (x1 == null || x2 == null)
+ continue;
+
+ // clip x values
+
+ // clip with xmin
+ if (x1 <= x2 && x1 < axisx.min) {
+ if (x2 < axisx.min)
+ continue;
+ y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+ x1 = axisx.min;
+ }
+ else if (x2 <= x1 && x2 < axisx.min) {
+ if (x1 < axisx.min)
+ continue;
+ y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
+ x2 = axisx.min;
+ }
+
+ // clip with xmax
+ if (x1 >= x2 && x1 > axisx.max) {
+ if (x2 > axisx.max)
+ continue;
+ y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+ x1 = axisx.max;
+ }
+ else if (x2 >= x1 && x2 > axisx.max) {
+ if (x1 > axisx.max)
+ continue;
+ y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
+ x2 = axisx.max;
+ }
+
+ if (!areaOpen) {
+ // open area
+ ctx.beginPath();
+ ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom));
+ areaOpen = true;
+ }
+
+ // now first check the case where both is outside
+ if (y1 >= axisy.max && y2 >= axisy.max) {
+ ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max));
+ ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max));
+ lastX = x2;
+ continue;
+ }
+ else if (y1 <= axisy.min && y2 <= axisy.min) {
+ ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min));
+ ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min));
+ lastX = x2;
+ continue;
+ }
+
+ // else it's a bit more complicated, there might
+ // be two rectangles and two triangles we need to fill
+ // in; to find these keep track of the current x values
+ var x1old = x1, x2old = x2;
+
+ // and clip the y values, without shortcutting
+
+ // clip with ymin
+ if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) {
+ x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+ y1 = axisy.min;
+ }
+ else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) {
+ x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
+ y2 = axisy.min;
+ }
+
+ // clip with ymax
+ if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) {
+ x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+ y1 = axisy.max;
+ }
+ else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) {
+ x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
+ y2 = axisy.max;
+ }
+
+
+ // if the x value was changed we got a rectangle
+ // to fill
+ if (x1 != x1old) {
+ if (y1 <= axisy.min)
+ top = axisy.min;
+ else
+ top = axisy.max;
+
+ ctx.lineTo(axisx.p2c(x1old), axisy.p2c(top));
+ ctx.lineTo(axisx.p2c(x1), axisy.p2c(top));
+ }
+
+ // fill the triangles
+ ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
+ ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
+
+ // fill the other rectangle if it's there
+ if (x2 != x2old) {
+ if (y2 <= axisy.min)
+ top = axisy.min;
+ else
+ top = axisy.max;
+
+ ctx.lineTo(axisx.p2c(x2), axisy.p2c(top));
+ ctx.lineTo(axisx.p2c(x2old), axisy.p2c(top));
+ }
+
+ lastX = Math.max(x2, x2old);
+ }
+
+ if (areaOpen) {
+ ctx.lineTo(axisx.p2c(lastX), axisy.p2c(bottom));
+ ctx.fill();
+ }
+ }
+
+ ctx.save();
+ ctx.translate(plotOffset.left, plotOffset.top);
+ ctx.lineJoin = "round";
+
+ var lw = series.lines.lineWidth,
+ sw = series.shadowSize;
+ // FIXME: consider another form of shadow when filling is turned on
+ if (lw > 0 && sw > 0) {
+ // draw shadow as a thick and thin line with transparency
+ ctx.lineWidth = sw;
+ ctx.strokeStyle = "rgba(0,0,0,0.1)";
+ // position shadow at angle from the mid of line
+ var angle = Math.PI/18;
+ plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis);
+ ctx.lineWidth = sw/2;
+ plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis);
+ }
+
+ ctx.lineWidth = lw;
+ ctx.strokeStyle = series.color;
+ var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight);
+ if (fillStyle) {
+ ctx.fillStyle = fillStyle;
+ plotLineArea(series.datapoints, series.xaxis, series.yaxis);
+ }
+
+ if (lw > 0)
+ plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis);
+ ctx.restore();
+ }
+
+ function drawSeriesPoints(series) {
+ function plotPoints(datapoints, radius, fillStyle, offset, circumference, axisx, axisy) {
+ var points = datapoints.points, ps = datapoints.pointsize;
+
+ for (var i = 0; i < points.length; i += ps) {
+ var x = points[i], y = points[i + 1];
+ if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
+ continue;
+
+ ctx.beginPath();
+ ctx.arc(axisx.p2c(x), axisy.p2c(y) + offset, radius, 0, circumference, false);
+ if (fillStyle) {
+ ctx.fillStyle = fillStyle;
+ ctx.fill();
+ }
+ ctx.stroke();
+ }
+ }
+
+ ctx.save();
+ ctx.translate(plotOffset.left, plotOffset.top);
+
+ var lw = series.lines.lineWidth,
+ sw = series.shadowSize,
+ radius = series.points.radius;
+ if (lw > 0 && sw > 0) {
+ // draw shadow in two steps
+ var w = sw / 2;
+ ctx.lineWidth = w;
+ ctx.strokeStyle = "rgba(0,0,0,0.1)";
+ plotPoints(series.datapoints, radius, null, w + w/2, Math.PI,
+ series.xaxis, series.yaxis);
+
+ ctx.strokeStyle = "rgba(0,0,0,0.2)";
+ plotPoints(series.datapoints, radius, null, w/2, Math.PI,
+ series.xaxis, series.yaxis);
+ }
+
+ ctx.lineWidth = lw;
+ ctx.strokeStyle = series.color;
+ plotPoints(series.datapoints, radius,
+ getFillStyle(series.points, series.color), 0, 2 * Math.PI,
+ series.xaxis, series.yaxis);
+ ctx.restore();
+ }
+
+ function drawBar(x, y, b, barLeft, barRight, offset, fillStyleCallback, axisx, axisy, c, horizontal) {
+ var left, right, bottom, top,
+ drawLeft, drawRight, drawTop, drawBottom,
+ tmp;
+
+ if (horizontal) {
+ drawBottom = drawRight = drawTop = true;
+ drawLeft = false;
+ left = b;
+ right = x;
+ top = y + barLeft;
+ bottom = y + barRight;
+
+ // account for negative bars
+ if (right < left) {
+ tmp = right;
+ right = left;
+ left = tmp;
+ drawLeft = true;
+ drawRight = false;
+ }
+ }
+ else {
+ drawLeft = drawRight = drawTop = true;
+ drawBottom = false;
+ left = x + barLeft;
+ right = x + barRight;
+ bottom = b;
+ top = y;
+
+ // account for negative bars
+ if (top < bottom) {
+ tmp = top;
+ top = bottom;
+ bottom = tmp;
+ drawBottom = true;
+ drawTop = false;
+ }
+ }
+
+ // clip
+ if (right < axisx.min || left > axisx.max ||
+ top < axisy.min || bottom > axisy.max)
+ return;
+
+ if (left < axisx.min) {
+ left = axisx.min;
+ drawLeft = false;
+ }
+
+ if (right > axisx.max) {
+ right = axisx.max;
+ drawRight = false;
+ }
+
+ if (bottom < axisy.min) {
+ bottom = axisy.min;
+ drawBottom = false;
+ }
+
+ if (top > axisy.max) {
+ top = axisy.max;
+ drawTop = false;
+ }
+
+ left = axisx.p2c(left);
+ bottom = axisy.p2c(bottom);
+ right = axisx.p2c(right);
+ top = axisy.p2c(top);
+
+ // fill the bar
+ if (fillStyleCallback) {
+ c.beginPath();
+ c.moveTo(left, bottom);
+ c.lineTo(left, top);
+ c.lineTo(right, top);
+ c.lineTo(right, bottom);
+ c.fillStyle = fillStyleCallback(bottom, top);
+ c.fill();
+ }
+
+ // draw outline
+ if (drawLeft || drawRight || drawTop || drawBottom) {
+ c.beginPath();
+
+ // FIXME: inline moveTo is buggy with excanvas
+ c.moveTo(left, bottom + offset);
+ if (drawLeft)
+ c.lineTo(left, top + offset);
+ else
+ c.moveTo(left, top + offset);
+ if (drawTop)
+ c.lineTo(right, top + offset);
+ else
+ c.moveTo(right, top + offset);
+ if (drawRight)
+ c.lineTo(right, bottom + offset);
+ else
+ c.moveTo(right, bottom + offset);
+ if (drawBottom)
+ c.lineTo(left, bottom + offset);
+ else
+ c.moveTo(left, bottom + offset);
+ c.stroke();
+ }
+ }
+
+ function drawSeriesBars(series) {
+ function plotBars(datapoints, barLeft, barRight, offset, fillStyleCallback, axisx, axisy) {
+ var points = datapoints.points, ps = datapoints.pointsize;
+
+ for (var i = 0; i < points.length; i += ps) {
+ if (points[i] == null)
+ continue;
+ drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, offset, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal);
+ }
+ }
+
+ ctx.save();
+ ctx.translate(plotOffset.left, plotOffset.top);
+
+ // FIXME: figure out a way to add shadows (for instance along the right edge)
+ ctx.lineWidth = series.bars.lineWidth;
+ ctx.strokeStyle = series.color;
+ var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2;
+ var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top); } : null;
+ plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, 0, fillStyleCallback, series.xaxis, series.yaxis);
+ ctx.restore();
+ }
+
+ function getFillStyle(filloptions, seriesColor, bottom, top) {
+ var fill = filloptions.fill;
+ if (!fill)
+ return null;
+
+ if (filloptions.fillColor)
+ return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor);
+
+ var c = $.color.parse(seriesColor);
+ c.a = typeof fill == "number" ? fill : 0.4;
+ c.normalize();
+ return c.toString();
+ }
+
+ function insertLegend() {
+ placeholder.find(".legend").remove();
+
+ if (!options.legend.show)
+ return;
+
+ var fragments = [], rowStarted = false,
+ lf = options.legend.labelFormatter, s, label;
+ for (i = 0; i < series.length; ++i) {
+ s = series[i];
+ label = s.label;
+ if (!label)
+ continue;
+
+ if (i % options.legend.noColumns == 0) {
+ if (rowStarted)
+ fragments.push('');
+ fragments.push('' + tick.label + "
";
+ });
+
+
+ addLabels(axes.yaxis, function (tick, axis) {
+ return '' + tick.label + "
";
+ });
+
+ addLabels(axes.x2axis, function (tick, axis) {
+ return '' + tick.label + "
";
+ });
+
+ addLabels(axes.y2axis, function (tick, axis) {
+ return '' + tick.label + "
";
+ });
+
+ html.push('' + table.replace('style="', 'style="position:absolute;' + pos +';') + '
').appendTo(placeholder);
+ if (options.legend.backgroundOpacity != 0.0) {
+ // put in the transparent background
+ // separately to avoid blended labels and
+ // label boxes
+ var c = options.legend.backgroundColor;
+ if (c == null) {
+ c = options.grid.backgroundColor;
+ if (c && typeof c == "string")
+ c = $.color.parse(c);
+ else
+ c = $.color.extract(legend, 'background-color');
+ c.a = 1;
+ c = c.toString();
+ }
+ var div = legend.children();
+ $('${_("put %(site)s buttons on your site") % dict(site=c.site.name)}
@@ -90,6 +90,10 @@ ${_("useful in places like blogs, where you want to link to the post's permalink")}${drawoption('url','[URL]')}
+ ${_("specify a community to target")}
+${drawoption('target','[COMMUNITY]')}
+ ${_("specify a title")}
${drawoption('title','[TITLE]')}
@@ -174,9 +178,9 @@ $(function() {
<%def name="draw_interactive(type)">
%if type:
+ src="http://${domain}/static/button/button${type}.js">
%else:
-
+
%endif
@@ -190,6 +194,6 @@ $(function() {
reddit_bgcolor = "FF3";
reddit_bordercolor = "00F";
-
+
diff --git a/r2/r2/templates/link.html b/r2/r2/templates/link.html
index 9db7baae5..5dd3b07b0 100644
--- a/r2/r2/templates/link.html
+++ b/r2/r2/templates/link.html
@@ -24,6 +24,7 @@
from r2.lib.template_helpers import get_domain
from r2.lib.pages.things import LinkButtons
from r2.lib.pages import WrappedUser
+ from r2.lib.template_helpers import static
%>
<%inherit file="printable.html"/>
@@ -61,7 +62,7 @@
<%def name="bottom_buttons()">
-
%if thing.nsfw:
-
- +
-
${_("NSFW")}
@@ -77,16 +78,21 @@
<%call expr="make_link('title', 'title')">
${thing.title}
+ %if getattr(thing, "approval_checkmark", None):
+
} "${thing.approval_checkmark}")
+ %endif
+
${self.domain()}
%if c.user_is_admin:
- %if thing._deleted:
- [link deleted]
- %endif
- %if thing.on_trial:
- [on trial]
- %endif
+ %for link_note in thing.link_notes:
+ [${link_note}]
+ %endfor
%endif
@@ -108,8 +114,9 @@
expand = thing.link_child and thing.link_child.expand
%>
- ##if we're not on a permalink page we'll render the buttons on top
- %if not expand:
+ ## if we're not on a permalink page we'll render the buttons on top
+ ## (unless it's also a jury duty listing)
+ %if not (expand or getattr(thing, "trial_mode", None)):
${bottom_buttons()}
%endif
@@ -206,13 +213,15 @@ ${parent.thing_css_class(what)} ${"over18" if thing.over_18 else ""}
<%def name="buttons(comments=True, delete=True, report=True, additional='')">
- ${LinkButtons(thing, comments = comments, delete = delete,
- report = report)}
+ ${LinkButtons(thing, comments = comments, delete = delete,
+ report = report,
+ )}
<%def name="thumbnail()">
%if thing.thumbnail and not getattr(thing, "trial_mode", None):
<%call expr="make_link('thumbnail', 'thumbnail')">
+
%endif diff --git a/r2/r2/templates/link.xml b/r2/r2/templates/link.xml index 10b790c08..6a49079e7 100644 --- a/r2/r2/templates/link.xml +++ b/r2/r2/templates/link.xml @@ -24,6 +24,7 @@ from pylons.i18n import _, ungettext from r2.lib.template_helpers import add_sr, get_domain from r2.models import FakeSubreddit + from r2.lib.filters import unsafe, safemarkdown %> <% permalink = add_sr(thing.permalink, force_hostname = True) @@ -50,6 +51,9 @@ <% domain = get_domain(cname = c.cname, subreddit = False) %> + %if getattr(thing, 'selftext', None): + ${unsafe(safemarkdown(thing.selftext))} + %endif submitted by ${thing.author.name} diff --git a/r2/r2/templates/linkontrial.html b/r2/r2/templates/linkontrial.html index 989ada02c..f7000c008 100644 --- a/r2/r2/templates/linkontrial.html +++ b/r2/r2/templates/linkontrial.html @@ -47,6 +47,10 @@ ${parent.entry()}
+ + ${_("how would you classify this link?")} + + <% pos_class = "positive" neg_class = "negative" @@ -59,17 +63,13 @@ neg_class += " pressed" %> - - ${_("how would you classify this link?")} - - ${pretty_button(_("off-topic / spam"), "juryvote", -1, neg_class)} ${pretty_button(_("kosher"), "juryvote", 1, pos_class)} ${_("thanks for voting!")} - + ${_("Click here for more info.").lower()} diff --git a/r2/r2/templates/linkpromoteinfobar.html b/r2/r2/templates/linkpromoteinfobar.html index b645a68d9..63fe080cf 100644 --- a/r2/r2/templates/linkpromoteinfobar.html +++ b/r2/r2/templates/linkpromoteinfobar.html @@ -24,33 +24,3 @@ %> <%namespace file="printablebuttons.html" import="ynbutton" /> <%namespace file="utils.html" import="plain_link" /> - -%if thing.a.promoted: - %if hasattr(thing.a, "promoted_on"): -- - %endif - %if hasattr(thing.a, "unpromoted_on"): -${_('promoted on')} -- ${thing.a.promoted_on.strftime(thing.datefmt)} - -- - %endif - %if thing.a.promote_until: -${_('unpromoted on')} -- ${thing.a.unpromoted_on.strftime(thing.datefmt)} - -- - %endif -%endif diff --git a/r2/r2/templates/messagecompose.html b/r2/r2/templates/messagecompose.html index d5458249a..4b88f52ee 100644 --- a/r2/r2/templates/messagecompose.html +++ b/r2/r2/templates/messagecompose.html @@ -67,7 +67,7 @@ function admincheck(elem) {${_('promote until')} -- ${thing.a.promote_until.strftime(thing.datefmt)} - %if thing.a.promote_until < datetime.now(g.tz): - ${_('(this link has expired and is no longer being promoted)')} - %endif - -<%utils:round_field title="${_('message')}"> - ${UserText(None, have_form = False, creating = True)} + ${UserText(None, text=thing.message, have_form = False, creating = True)}diff --git a/r2/r2/templates/morechildren.html b/r2/r2/templates/morechildren.html index a1b78c3e5..1c0b2e815 100644 --- a/r2/r2/templates/morechildren.html +++ b/r2/r2/templates/morechildren.html @@ -31,7 +31,7 @@ %> ${_("load more comments")} (${thing.count} ${ungettext("reply", "replies", thing.count)}) diff --git a/r2/r2/templates/moremessages.html b/r2/r2/templates/moremessages.html index d627ba41c..0306d47fe 100644 --- a/r2/r2/templates/moremessages.html +++ b/r2/r2/templates/moremessages.html @@ -32,7 +32,7 @@ message ${parent.thing_css_class(what)} message-parent <%def name="tagline(collapse=False)"> ${_("[+] load the full conversation.")} diff --git a/r2/r2/templates/newlink.html b/r2/r2/templates/newlink.html index 7ced7f68b..05863dc76 100644 --- a/r2/r2/templates/newlink.html +++ b/r2/r2/templates/newlink.html @@ -26,7 +26,7 @@ from r2.lib.template_helpers import add_sr %> -<%namespace file="utils.html" import="error_field, submit_form, plain_link, text_with_links"/> +<%namespace file="utils.html" import="error_field, submit_form, plain_link, text_with_links, reddit_selector"/> <%namespace name="utils" file="utils.html"/>${_("submit to reddit")}
@@ -76,37 +76,7 @@ ${thing.formtabs_menu}<%utils:round_field title="${_('reddit')}" id="reddit-field"> -diff --git a/r2/r2/templates/paymentform.html b/r2/r2/templates/paymentform.html index 91ee0efbe..14a0e33a1 100644 --- a/r2/r2/templates/paymentform.html +++ b/r2/r2/templates/paymentform.html @@ -33,28 +33,18 @@- -- - ${error_field("SUBREDDIT_NOEXIST", "sr", "div")} - ${error_field("SUBREDDIT_NOTALLOWED", "sr", "div")} - ${error_field("SUBREDDIT_REQUIRED", "sr", "div")} - --
-
- nothin -
- ${_("popular choices")} -+ ${reddit_selector(thing.default_sr, thing.sr_searches, thing.subreddits)}-
- %for name in thing.subreddits:
-
- - ${name} - - %endfor -
${_("set up payment for this link")}
@@ -365,8 +421,9 @@ ### originally in commentbutton <%def name="comment_button(name, link_text, link,\ - a_class='', title='', newwindow = False)"> + _sr_path = True, a_class='', title='', newwindow = False)"> ${plain_link(link_text, link, + _sr_path = _sr_path, _class=a_class, title=title, target='_blank' if newwindow else '_parent')} diff --git a/r2/r2/templates/promo_email.email b/r2/r2/templates/promo_email.email index 1195afe7e..e0fe9b807 100644 --- a/r2/r2/templates/promo_email.email +++ b/r2/r2/templates/promo_email.email @@ -30,9 +30,9 @@ %> %if thing.kind == Email.Kind.NEW_PROMO: -This email is to confirm reddit.com's receipt of your submitted self-serve ad. To set up payment for your ad, please go here: +This email is to confirm reddit.com's receipt of your submitted self-serve ad. At the moment you have no campaigns associated with this link. To set up a campaign and payment if you haven't already, please visit the link's edit page: -${g.payment_domain}promoted/pay/${thing.link._id36} + ${edit_url} Please note that we can't approve your ad until you have set up payment, and that your ad must be approved before it goes live on your selected dates. @@ -43,13 +43,13 @@ If your ad is rejected your credit card will not be charged. Don't take it pers http://www.reddit.com/help/selfservicepromotion %elif thing.kind == Email.Kind.BID_PROMO: -This email is to confirm that your bid of $${"%.2f" % thing.link.promote_bid} for a self-serve ad on reddit.com has been accepted. The credit card number you provided will be charged 24 hours prior to the date your self-serve ad is set to run. +This email is to confirm that your bid of $${"%.2f" % thing.bid} for a self-serve ad on reddit.com has been accepted. The credit card number you provided will be charged 24 hours prior to the date your self-serve ad is set to run. -Having second thoughts about your bid? Want to be sure you're outbidding the competition? You'll have until ${(thing.link._date - timedelta(1)).strftime("%Y-%m-%d")} to change your bid here: +Having second thoughts about your bid? Want to be sure you're outbidding the competition? You'll have until ${(thing.start_date - timedelta(1)).strftime("%Y-%m-%d")} to change your bid here: ${edit_url} %elif thing.kind == Email.Kind.ACCEPT_PROMO: -This email is to confirm that your self-serve reddit.com ad has been approved by reddit! The credit card you provided will not be charged until 24 hours prior to the date you have set your ad to run. If you make any changes to your ad, they will have to be re-approved. Keep in mind that after we have charged your credit card you will not be able to change your ad. +This email is to confirm that your self-serve reddit.com ad has been approved by reddit! The credit card you provided will not be charged until 24 hours prior to the date you have set your ad to run. If you make any changes to your ad, they will have to be re-approved. It won't be long now until your ad is being displayed to hundreds of thousands of the Internet's finest surfers. @@ -67,21 +67,21 @@ and we'll reconsider it for sumbission. %elif thing.kind == Email.Kind.QUEUED_PROMO: This email is to inform you that your self-serve ad on reddit.com is about to go live. Feel free to reply to this email if you have any questions. -%if thing.link.promote_trans_id > 0: +%if thing.trans_id > 0: Your credit card has been successfully charged by reddit for the amount you bid. Please use this email as your receipt. ================================================================================ -TRANSACTION #${thing.link.promote_trans_id} +TRANSACTION #${thing.trans_id} DATE: ${datetime.now(g.tz).strftime("%Y-%m-%d")} ................................................................................ -AMOUNT CHARGED: $${"%.2f" % thing.link.promote_bid} +AMOUNT CHARGED: $${"%.2f" % thing.bid} SPONSORSHIP PERMALINK: ${thing.link.make_permalink_slow(force_domain = True)} ================================================================================ %else: -Your promotion was a freebie in the amount of $${"%.2f" % thing.link.promote_bid}. +Your promotion was a freebie in the amount of $${"%.2f" % thing.bid}. %endif %elif thing.kind == Email.Kind.LIVE_PROMO: This email is to inform you that your self-serve ad on reddit.com is now live and can be found at the following link: diff --git a/r2/r2/templates/promote_graph.html b/r2/r2/templates/promote_graph.html index 09b3c9c54..86bb1eaab 100644 --- a/r2/r2/templates/promote_graph.html +++ b/r2/r2/templates/promote_graph.html @@ -20,7 +20,9 @@ ## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! + from r2.lib.template_helpers import static import datetime, locale + from r2.lib import promote def num(x): return locale.format('%d', x, True) def money(x): @@ -28,6 +30,8 @@ %>Sponsored link calendar
+ + %if not c.user_is_sponsor:+Below is a calendar of your scheduled and completed promotions (if you have any, of course), along with some site-wide averages to use as a guide for setting up future promotions. These values are:
@@ -77,7 +81,7 @@ %else: YOUR COMMIT %endif -
- $${int(link.promote_bid)}
+ ${sr}$${int(bid)}
${_("total promotion traffic")}
%if thing.imp_graph:
- 
+ ${thing.imp_graph}
%endif
%if thing.cli_graph:
- 
+ ${thing.cli_graph}
%endif
%if thing.money_graph:
- 
+ ${thing.money_graph}
%endif
%endif
@@ -179,16 +184,13 @@
${_("historical site performance")}
%if thing.cpm_graph:
- 
+ ${thing.cpm_graph}
%endif
%if thing.cpc_graph:
- 
+ ${thing.cpc_graph}
%endif
%if thing.cpc_graph and c.user_is_sponsor:
- 
+ ${thing.ctr_graph}
%endif
@@ -264,7 +266,8 @@
%if thing.is_author or c.user_is_sponsor: - %if thing.promote_status == STATUS.unpaid: - ${_('unpaid sponsored link')} - %elif thing.promote_status == STATUS.unseen: - ${_('unapproved sponsored link')} - %elif thing.promote_status == STATUS.accepted: - ${_('accepted sponsored link')} - %elif thing.promote_status == STATUS.rejected: - ${_('rejected sponsored link')} - %elif thing.promote_status == STATUS.pending: - ${_('pending sponsored link')} - %elif thing.promote_status == STATUS.promoted: - ${_('sponsored link')} - %else: - ${_('finished sponsored link')} - %endif - %if c.user_is_sponsor: - <% days = (thing.promote_until - thing._date).days %> - | $${thing.promote_bid} | ${days} ${ungettext("day", "days", days)} + %if not promote.is_promo(thing): + ${_('deleted sponsored link')} + %elif promote.is_unpaid(thing): + ${_('unpaid sponsored link')} + %elif promote.is_unapproved(thing): + ${_('unapproved sponsored link')} + %elif promote.is_rejected(thing): + ${_('rejected sponsored link')} + %elif promote.is_promoted(thing): + ${_('sponsored link')} + %elif promote.is_accepted(thing): + ${_('accepted sponsored link')} %endif %else: - ${_('sponsored link')} + ${_('sponsored link')} %endif
- %if thing.promote_status == STATUS.promoted: -
+
@@ -46,12 +49,10 @@ ${thing.viewers}
%if thing.imp_graph:
-
+ ${thing.imp_graph}
%endif
%if thing.cli_graph:
-
+ ${thing.cli_graph}
%endif
+
-
| ${y} | - %endfor + %if x[1] != '0' or x[2] != '0': + %for y in x: +${y} | + %endfor + %endif|||
})
- %endif
-
-%endif
- ${error_field("BAD_BID", "bid")}
-
-## provide a way to give refunds, but only if the link isn't already a freebie
-<%
- cur_bid = getattr(thing.link, "promote_bid", g.min_promote_bid)
- cur_refund = cur_bid - getattr(thing.link, "promo_refund", 0)
-%>
-%if c.user_is_sponsor and getattr(thing.link, "promote_paid", False) and \
- getattr(thing.link, "promote_trans_id", -1) > 0 and cur_refund > 0:
- <%utils:line_field title="${_('refund')}" id="bid-field">
-
-
-%endif
-
-%if not thing.link or thing.link.promote_status != STATUS.finished:
- %if thing.link:
- <%
- thumb = None if not thing.link.has_thumbnail else thumbnail_url(thing.link) %>
- <%utils:line_field title="${_('look and feel')}">
- | date | +CPM | +CPC | +count | ++ |
|---|---|---|---|---|
| + ${unsafe("»" if i == 14 else '')} + ${day.strftime("%m/%d/%Y")} | +${CPM} | +${CPC} | +${thing.promo_counter.get(i, 0)} | +
+ %endfor
+ |
@@ -382,6 +447,7 @@
date
user
transaction id
+ campaign id
pay id
amount
status
@@ -394,6 +460,7 @@
${bid.date}
${accounts[bid.account_id].name}
${bid.transaction}
+ ${bid.campaign}
${bid.pay_id}
$${"%.2f" % bid.bid}
${status}
@@ -406,10 +473,14 @@
%endif
-Traffic for ${c.site.name}
++ Below are the traffic stats for your reddit. Each graph represents one of the following over the interval specified +
+-
+
- + pageviews are all hits to ${c.site.name}, including both listing pages and comment pages. + +
- + uniques are the total number of unique visitors (IP and U/A combo) that generate the above pageviews. This is independent of whether or not they are logged in. + +
- + subscriptions is the number of new subscriptions in a given day that have been generated. This number is less accurate than the first two metrics, as, though we can track new subscriptions, we have no way to track unsubscriptions (which are when a subscription is actually deleted from the db). + +
+ Note: there are a couple of places outside of your reddit where someone can click "subscribe", so it is possible (though unlikely) that the subscription count can exceed the unique count on a given day. +
+ %if not thing.has_data:${_("There doesn't seem to be any traffic data at the moment. Please check back later.")}
%else: +| + ${thing.uniques_hour} + | ++ ${thing.impressions_hour} + | +
| + ${thing.uniques_day} + | ++ ${thing.impressions_day} + | +
| + ${thing.uniques_month} + | ++ ${thing.impressions_month} + | +
| + ${thing.subscriptions_day} + | ++ | +
-
-
- 
-
-
- 
-
- %if c.default_sr:
-
- 
-
- %endif
${weekly_summary()}
- %if c.default_sr:
- ${daily_summary()}
- %endif
+ %if c.default_sr:
+ ${daily_summary()}
+ %endif
- 
-
-
- 
-
- %if c.default_sr:
-
- 
-
- <% data = thing.monthly_summary() %>
- | Monthly data | ||
|---|---|---|
reddit has created a system where you can buy sponsored links on the front page using our self-serve tool. Overall, we've been quite pleased to find a ridiculously successful (2% CTR to upwards of 10% CTR) means of advertising that doesn't diminish the user experience.
-Even if your budget is only $20 a day, you can get in on the action. Here's how: we'll allow you to submit a sponsored link (set the title, upload an image), and set the start date and duration. Then, you can bid on how much you want to spend on that link (we've set a minimum of $20 per link per day). This bid is exactly how much you'll pay for the link once it starts running.
+Even if your budget is only $20 a day, you can get in on the action. Here's how: we'll allow you to submit a sponsored link (set the title, upload an image), and set the start date and duration. Then, you can bid on how much you want to spend on that link (we've set a minimum of $20 per link per day, and $30/day for targeted ads). This bid is exactly how much you'll pay for the link once it starts running.
On each day, we tally up the total number of bids, and use the total to figure out how large a piece of the pie each sponsored link gets. For example, if you were to bid $20, and the total for the day is $200, you'll get 10% of sponsored link impressions for the day.
diff --git a/r2/r2/templates/selfserviceoatmeal.html b/r2/r2/templates/selfserviceoatmeal.html new file mode 100644 index 000000000..c9c281c16 --- /dev/null +++ b/r2/r2/templates/selfserviceoatmeal.html @@ -0,0 +1,40 @@ +## The contents of this file are subject to the Common Public Attribution +## License Version 1.0. (the "License"); you may not use this file except in +## compliance with the License. You may obtain a copy of the License at +## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public +## License Version 1.1, but Sections 14 and 15 have been added to cover use of +## software over a computer network and provide for limited attribution for the +## Original Developer. In addition, Exhibit A has been modified to be consistent +## with Exhibit B. +## +## Software distributed under the License is distributed on an "AS IS" basis, +## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for +## the specific language governing rights and limitations under the License. +## +## The Original Code is Reddit. +## +## The Original Developer is the Initial Developer. The Initial Developer of +## the Original Code is CondeNet, Inc. +## +## All portions of the code written by CondeNet are Copyright (c) 2006-2010 +## CondeNet, Inc. All Rights Reserved. +################################################################################ + + diff --git a/r2/r2/templates/spotlightlisting.html b/r2/r2/templates/spotlightlisting.html index 13e82be44..a066029f4 100644 --- a/r2/r2/templates/spotlightlisting.html +++ b/r2/r2/templates/spotlightlisting.html @@ -23,20 +23,16 @@ <%namespace file="printablebuttons.html" import="ynbutton"/> <% from r2.lib.template_helpers import static - from r2.lib.promote import get_promoted %>
+
+
+
+
+
+
+
+
+
+
+
<%
lookup = dict((t._fullname, t) for t in thing.things)
seen = set([])
- promoted = set(get_promoted())
- promoted = [o for o in thing.spotlight_links if o in promoted ]
%>
%for name in thing.spotlight_links:
%if name in seen:
@@ -71,9 +67,9 @@
- ${_("Sometimes reddit needs input from the community to train its spam filter. This is your chance to help.")} + ${_("Sometimes reddit needs to ask the community to help fight spam. This is your chance to take part in that.")} - + ${_("Click here for more info.")}
diff --git a/r2/r2/templates/subredditinfobar.html b/r2/r2/templates/subredditinfobar.html index 74432ac06..d58cc2cf4 100644 --- a/r2/r2/templates/subredditinfobar.html +++ b/r2/r2/templates/subredditinfobar.html @@ -73,16 +73,16 @@ %if c.user_is_admin: %if thing.sr._spam: - ${state_button("unban", _("unban this reddit"), - "return change_state(this, 'unban');", _("unbanned"), + ${state_button("approve", _("approve this reddit"), + "return change_state(this, 'approve');", _("approved"), hidden_data = dict(id = thing.sr._fullname))} %if thing.sr._spam and hasattr(thing.sr, "banner"): (${strings.banned_by % thing.sr.banner}) %endif %else: - ${state_button("ban", _("ban this reddit"), - "return change_state(this, 'ban');", _("banned"), + ${state_button("remove", _("ban this reddit"), + "return change_state(this, 'remove');", _("banned"), hidden_data = dict(id = thing.sr._fullname))} %endif %endif diff --git a/r2/r2/templates/subredditstylesheet.html b/r2/r2/templates/subredditstylesheet.html index 3ef37dc2b..93f753da5 100644 --- a/r2/r2/templates/subredditstylesheet.html +++ b/r2/r2/templates/subredditstylesheet.html @@ -37,7 +37,7 @@ + value="http://${g.s3_thumb_bucket}/${c.site._fullname}" />${_("stylesheet")}
@@ -206,7 +206,7 @@
<%
if img is not None:
- img = "http:/%s%s_%d.png" % \
+ img = "http://%s/%s_%d.png" % \
(g.s3_thumb_bucket, c.site._fullname, img)
else:
img = "/static/kill.png"
diff --git a/r2/r2/templates/trafficgraph.html b/r2/r2/templates/trafficgraph.html
new file mode 100644
index 000000000..d6cabda49
--- /dev/null
+++ b/r2/r2/templates/trafficgraph.html
@@ -0,0 +1,74 @@
+## The contents of this file are subject to the Common Public Attribution
+## License Version 1.0. (the "License"); you may not use this file except in
+## compliance with the License. You may obtain a copy of the License at
+## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+## License Version 1.1, but Sections 14 and 15 have been added to cover use of
+## software over a computer network and provide for limited attribution for the
+## Original Developer. In addition, Exhibit A has been modified to be consistent
+## with Exhibit B.
+##
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+## the specific language governing rights and limitations under the License.
+##
+## The Original Code is Reddit.
+##
+## The Original Developer is the Initial Developer. The Initial Developer of
+## the Original Code is CondeNet, Inc.
+##
+## All portions of the code written by CondeNet are Copyright (c) 2006-2010
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+<%!
+ from random import random
+ import simplejson
+ %>
+
+
+<%
+ _id = str(random()).split('.')[-1]
+ %>
+
+ ${_("view code")}
+
+ ${unsafe(content)}
+
+
+
+
+<%def name="draw_point_button(image)">
+
+
+
+<%def name="point_option_example()" buffered="True">
+
+
+
+<%def name="draw_interactive(type)">
+%if type:
+
+%else:
+
+%endif
+
+
+<%def name="drawoption(option, val)" buffered="True">
+
+
+
+<%def name="draw_interactive_example()">
+
+
+
diff --git a/r2/r2/templates/utils.html b/r2/r2/templates/utils.html
index 1304c6af6..9b73b67f3 100644
--- a/r2/r2/templates/utils.html
+++ b/r2/r2/templates/utils.html
@@ -439,6 +439,40 @@ ${unsafe(txt)}
+<%def name="reddit_selector(default_sr, sr_searches, subreddits)">
+
+
+
+
diff --git a/r2/r2/templates/upgradebuttons.html b/r2/r2/templates/upgradebuttons.html
new file mode 100644
index 000000000..452cb6047
--- /dev/null
+++ b/r2/r2/templates/upgradebuttons.html
@@ -0,0 +1,149 @@
+## The contents of this file are subject to the Common Public Attribution
+## License Version 1.0. (the "License"); you may not use this file except in
+## compliance with the License. You may obtain a copy of the License at
+## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+## License Version 1.1, but Sections 14 and 15 have been added to cover use of
+## software over a computer network and provide for limited attribution for the
+## Original Developer. In addition, Exhibit A has been modified to be consistent
+## with Exhibit B.
+##
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+## the specific language governing rights and limitations under the License.
+##
+## The Original Code is Reddit.
+##
+## The Original Developer is the Initial Developer. The Initial Developer of
+## the Original Code is CondeNet, Inc.
+##
+## All portions of the code written by CondeNet are Copyright (c) 2006-2010
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+<%!
+ from r2.lib.template_helpers import get_domain
+ %>
+
+<% domain = get_domain(False) %>
+
+${thing.title}
+
+
+
+
+
+
+
+<%def name="demo(content)">
+You need to upgrade your buttons
++ You were redirected here because the site you came from has out of date buttons and were linking directly to our iframe contents rather than our JS (tsk tsk). If you are the site administrator, use the code snippets below to fix it. +
+ +${_('simple interactive button')}
+${_('put this code on your page:')}
+
+ ${capture(draw_interactive,False)}
+
+ ${_("and you'll get something like this:")}
+ + ${draw_interactive(False)} + + +${_("more interactive buttons")}
+ + +${_('interactive button advanced settings')}
+ + ++
+ ${content}
+
+
+
+
+
+ ${error_field("SUBREDDIT_NOEXIST", "sr", "div")}
+ ${error_field("SUBREDDIT_NOTALLOWED", "sr", "div")}
+ ${error_field("SUBREDDIT_REQUIRED", "sr", "div")}
+
+ -
+
- nothin +
+ ${_("popular choices")}
+
+
+
<%def name="percentage(slice, total)">
%if total is None or total == "" or total == 0 or slice is None or slice == "":
--
diff --git a/r2/r2/tests/testfile b/r2/r2/tests/testfile
new file mode 100644
index 000000000..e88600031
--- /dev/null
+++ b/r2/r2/tests/testfile
@@ -0,0 +1 @@
+testing 4
diff --git a/r2/setup.py b/r2/setup.py
index 3f245b4cc..3315d6ff7 100644
--- a/r2/setup.py
+++ b/r2/setup.py
@@ -75,13 +75,13 @@ except ImportError:
# we're using a custom build of pylibmc at the moment, so we need to
# be sure that we have the right version
-pylibmc_version = '1.0-reddit-01'
+pylibmc_version = '1.0-reddit-03'
try:
import pylibmc
assert pylibmc.__version__ == pylibmc_version
except (ImportError, AssertionError):
print "Installing pylibmc"
- easy_install(["http://github.com/downloads/ketralnis/pylibmc/pylibmc-1.0-reddit-01.tar.gz"])
+ easy_install(["http://github.com/downloads/ketralnis/pylibmc/pylibmc-1.0-reddit-03.tar.gz"])
filtermod = Extension('Cfilters',
sources = ['r2/lib/c/filters.c'])
@@ -116,6 +116,7 @@ setup(
#url="",
install_requires=["Routes<=1.8",
"Pylons<=0.9.6.2",
+ "boto",
"pytz",
"pycrypto",
"Babel>=0.9.1",
-
+ %for name in subreddits:
+
- + ${name} + + %endfor +