From: David Schoonover Date: Thu, 7 Jun 2012 09:29:41 +0000 (-0700) Subject: Adds project-to-color mapping for metrics with no color defined. X-Git-Url: http://git.lttlst.com:3516/?a=commitdiff_plain;h=1dd2b7e0cd4278f78c271bc49eb8235a011451e0;p=limn-bak.git Adds project-to-color mapping for metrics with no color defined. --- diff --git a/data/datasources/rc/rc_active_editors_target.yaml b/data/datasources/rc/rc_active_editors_target.yaml index 5fe5a85..833b288 100644 --- a/data/datasources/rc/rc_active_editors_target.yaml +++ b/data/datasources/rc/rc_active_editors_target.yaml @@ -1,6 +1,6 @@ id: rc_active_editors_target -name: Target for Active Editors (5+) -shortName : Target Active editors (5+) +name: Target for Active Editors (5+) +shortName : Target Active editors (5+) format: csv notes: Are notes being displayed? url: /data/datasources/rc/rc_active_editors_target.csv @@ -15,7 +15,7 @@ columns: - Month - Total - Projected - - Target + - Target types: - date - int diff --git a/data/datasources/rc/rc_page_requests_mobile.yaml b/data/datasources/rc/rc_page_requests_mobile.yaml index d3d1481..26ea846 100644 --- a/data/datasources/rc/rc_page_requests_mobile.yaml +++ b/data/datasources/rc/rc_page_requests_mobile.yaml @@ -2,7 +2,7 @@ id: rc_page_requests_mobile name: Mobile Page Request shortName : Mobile format: csv -notes: +notes: url: /data/datasources/rc/rc_page_requests_mobile.csv timespan: diff --git a/data/datasources/rc/rc_page_requests_mobile_target.yaml b/data/datasources/rc/rc_page_requests_mobile_target.yaml index d94c3b1..1b43011 100644 --- a/data/datasources/rc/rc_page_requests_mobile_target.yaml +++ b/data/datasources/rc/rc_page_requests_mobile_target.yaml @@ -14,7 +14,7 @@ columns: labels: - Month - Total - - Target + - Target types: - date - int diff --git a/data/graphs/active_editors.json b/data/graphs/active_editors.json index 83165bf..0be4627 100644 --- a/data/graphs/active_editors.json +++ b/data/graphs/active_editors.json @@ -1,308 +1,298 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "active_editors", - "lines": [], + "id": "active_editors", + "lines": [], "metrics": [ { - "color": "rgb(116,173,209)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Total", - "scale": 1, - "source_col": 1, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Total", + "scale": 1, + "source_col": 1, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(49,54,149)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "English", - "scale": 1, - "source_col": 2, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "English", + "scale": 1, + "source_col": 2, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(69,117,180)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Commons", - "scale": 1, - "source_col": 3, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Commons", + "scale": 1, + "source_col": 3, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(254,224,144)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "French", - "scale": 1, - "source_col": 4, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "French", + "scale": 1, + "source_col": 4, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(244,109,67)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "German", - "scale": 1, - "source_col": 5, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "German", + "scale": 1, + "source_col": 5, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(224,243,248)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Russian", - "scale": 1, - "source_col": 6, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Russian", + "scale": 1, + "source_col": 6, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(255,255,191)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Japanese", - "scale": 1, - "source_col": 7, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Japanese", + "scale": 1, + "source_col": 7, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(171,217,233)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Spanish", - "scale": 1, - "source_col": 8, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Spanish", + "scale": 1, + "source_col": 8, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(165,0,38)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Italian", - "scale": 1, - "source_col": 9, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Italian", + "scale": 1, + "source_col": 9, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(215,48,39)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Chinese", - "scale": 1, - "source_col": 10, - "source_id": "rc_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Chinese", + "scale": 1, + "source_col": 10, + "source_id": "rc_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "Aug 2010: Editors on Commons are no longer included in overall total, on the assumption that most also edit on one or more other projects. More precise detection of double counts between any projects and languages is in development (using Single User Login registration).", - "height": 250, - "id": "active_editors", - "name": "Active Wikimedia Editors for All Wikimedia Projects (5+ edits per month)", - "notes": "", + }, + "desc": "Aug 2010: Editors on Commons are no longer included in overall total, on the assumption that most also edit on one or more other projects. More precise detection of double counts between any projects and languages is in development (using Single User Login registration).", + "height": 250, + "id": "active_editors", + "name": "Active Wikimedia Editors for All Wikimedia Projects (5+ edits per month)", + "notes": "", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Number of Editors" - }, + }, "parents": [ "root" - ], - "slug": "active_editors", + ], + "slug": "active_editors", "width": "auto" } diff --git a/data/graphs/active_editors_target.json b/data/graphs/active_editors_target.json index 8f97fe2..4c92d56 100644 --- a/data/graphs/active_editors_target.json +++ b/data/graphs/active_editors_target.json @@ -1,173 +1,173 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "commons", - "lines": [], + "id": "commons", + "lines": [], "metrics": [ { - "color": "rgb(116,173,209)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Total", - "scale": 1, - "source_col": 1, - "source_id": "rc_active_editors_target", + "color": "rgb(116,173,209)", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Total", + "scale": 1, + "source_col": 1, + "source_id": "rc_active_editors_target", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(116,173,209)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Target", - "scale": 1, - "source_col": 2, - "source_id": "rc_active_editors_target", + "color": "rgb(116,173,209)", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Target", + "scale": 1, + "source_col": 2, + "source_id": "rc_active_editors_target", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Projected", - "scale": 1, - "source_col": 3, - "source_id": "rc_active_editors_target", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Projected", + "scale": 1, + "source_col": 3, + "source_id": "rc_active_editors_target", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "", - "height": 250, - "id": "active_editors_target", - "name": "Active Editors - Target", + }, + "desc": "", + "height": 250, + "id": "active_editors_target", + "name": "Active Editors - Target", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": true, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": true, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": true, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": true, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": null - }, + }, "parents": [ "root" - ], - "slug": "active_editors_target", + ], + "slug": "active_editors_target", "width": "auto" } diff --git a/data/graphs/articles.json b/data/graphs/articles.json index d414ad8..a9f2086 100644 --- a/data/graphs/articles.json +++ b/data/graphs/articles.json @@ -1,143 +1,270 @@ { - "chartType": "dygraphs", - "desc": "", - "height": 250, - "id": "articles", - "name": "Wikipedia Articles", - "parents": [ - "root" - ], - "slug": "articles", - "width": "auto", + "chartType": "dygraphs", + "data": { + "id": "commons", + "lines": [], + "metrics": [ + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Total", + "scale": 1, + "source_col": 1, + "source_id": "rc_article_count", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "English", + "scale": 1, + "source_col": 2, + "source_id": "rc_article_count", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "French", + "scale": 1, + "source_col": 3, + "source_id": "rc_article_count", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Italian", + "scale": 1, + "source_col": 4, + "source_id": "rc_article_count", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "German", + "scale": 1, + "source_col": 5, + "source_id": "rc_article_count", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Russian", + "scale": 1, + "source_col": 6, + "source_id": "rc_article_count", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Japanese", + "scale": 1, + "source_col": 7, + "source_id": "rc_article_count", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Portuguese", + "scale": 1, + "source_col": 8, + "source_id": "rc_article_count", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + } + ], + "palette": null + }, + "desc": "", + "height": 250, + "id": "articles", + "name": "Wikipedia Articles", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.29999999999999999, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.14999999999999999, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.29999999999999999, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, "visibility": [ - 0, - 1, - 1, - 1, - 1, - 1, - 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, 1 - ], - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Number of Articles" - }, - - "data": { - "palette": null, - "lines": [], - "id": "commons", - "metrics": [ - {"timespan": {"start": null, "step": null, "end": null}, "color": "rgb(116,173,209)", "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "Total", "format_value": null, "source_id": "rc_article_count", "type": "int", "source_col": 1} - , - {"timespan": {"start": null, "step": null, "end": null}, "color": "rgb(49,54,149)", "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "English", "format_value": null, "source_id": "rc_article_count", "type": "int", "source_col": 2} - , - {"timespan": {"start": null, "step": null, "end": null}, "color": "rgb(254,224,144)", "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "French", "format_value": null, "source_id": "rc_article_count", "type": "int", "source_col": 3} - , - {"timespan": {"start": null, "step": null, "end": null}, "color": "rgb(165,0,38)", "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "Italian", "format_value": null, "source_id": "rc_article_count", "type": "int", "source_col": 4} - , - {"timespan": {"start": null, "step": null, "end": null}, "color": "rgb(244,109,67)", "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "German", "format_value": null, "source_id": "rc_article_count", "type": "int", "source_col": 5} - , - {"timespan": {"start": null, "step": null, "end": null}, "color": "rgb(224,243,248)", "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "Russian", "format_value": null, "source_id": "rc_article_count", "type": "int", "source_col": 6} - , - {"timespan": {"start": null, "step": null, "end": null}, "color": "rgb(255,255,191)", "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "Japanese", "format_value": null, "source_id": "rc_article_count", "type": "int", "source_col": 7} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "Portuguese", "format_value": null, "source_id": "rc_article_count", "type": "int", "source_col": 8} - ] - } - + }, + "parents": [ + "root" + ], + "slug": "articles", + "width": "auto" } diff --git a/data/graphs/articles_per_day.json b/data/graphs/articles_per_day.json index 329c31d..20a0f21 100644 --- a/data/graphs/articles_per_day.json +++ b/data/graphs/articles_per_day.json @@ -1,211 +1,207 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "articles_per_day", - "lines": [], + "id": "articles_per_day", + "lines": [], "metrics": [ { - "color": "rgb(116,173,209)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Total", - "scale": 1, - "source_col": 1, - "source_id": "rc_new_article_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Total", + "scale": 1, + "source_col": 1, + "source_id": "rc_new_article_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(49,54,149)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "English", - "scale": 1, - "source_col": 2, - "source_id": "rc_new_article_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "English", + "scale": 1, + "source_col": 2, + "source_id": "rc_new_article_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(215,48,39)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Chinese", - "scale": 1, - "source_col": 3, - "source_id": "rc_new_article_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Chinese", + "scale": 1, + "source_col": 3, + "source_id": "rc_new_article_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(254,224,144)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "French", - "scale": 1, - "source_col": 4, - "source_id": "rc_new_article_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "French", + "scale": 1, + "source_col": 4, + "source_id": "rc_new_article_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Swedish", - "scale": 1, - "source_col": 5, - "source_id": "rc_new_article_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Swedish", + "scale": 1, + "source_col": 5, + "source_id": "rc_new_article_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "", - "height": 250, - "id": "articles_per_day", - "name": "New Wikipedia Articles per Day", + }, + "desc": "", + "height": 250, + "id": "articles_per_day", + "name": "New Wikipedia Articles per Day", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Number of Articles" - }, + }, "parents": [ "root" - ], - "slug": "articles_per_day", + ], + "slug": "articles_per_day", "width": "auto" } diff --git a/data/graphs/commons.json b/data/graphs/commons.json index 9525f8e..2b0fe0f 100644 --- a/data/graphs/commons.json +++ b/data/graphs/commons.json @@ -1,138 +1,316 @@ { + "chartType": "dygraphs", + "data": { + "id": "commons", + "lines": [], + "metrics": [ + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Total", + "scale": 1, + "source_col": 1, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "jpg", + "scale": 1, + "source_col": 2, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "png", + "scale": 1, + "source_col": 3, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "svg", + "scale": 1, + "source_col": 4, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "ogg", + "scale": 1, + "source_col": 5, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "gif", + "scale": 1, + "source_col": 6, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "tif", + "scale": 1, + "source_col": 7, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "pdf", + "scale": 1, + "source_col": 8, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "djvu", + "scale": 1, + "source_col": 9, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "ogv", + "scale": 1, + "source_col": 10, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + }, + { + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "mid", + "scale": 1, + "source_col": 11, + "source_id": "rc_binary_files", + "timespan": { + "end": null, + "start": null, + "step": null + }, + "transforms": [], + "type": "int", + "visible": true + } + ], + "palette": null + }, + "desc": "", + "height": 250, + "id": "commons", + "name": "Commons Binaries (log scale)", + "notes": "", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.29999999999999999, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.14999999999999999, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.29999999999999999, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Number of Files (log)" - }, - "slug": "commons", - "id": "commons", - "name": "Commons Binaries (log scale)", - "desc": "", - "notes": "", - "height": 250, - "width": "auto", - "parents": ["root"], - "chartType": "dygraphs", - - "data": { - "palette": null, - "lines": [], - "id": "commons", - "metrics": [ - {"timespan": {"start": null, "step": null, "end": null}, "color": "rgb(116,173,209)", "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "Total", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 1} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "jpg", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 2} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "png", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 3} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "svg", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 4} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "ogg", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 5} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "gif", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 6} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "tif", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 7} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "pdf", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 8} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "djvu", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 9} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "ogv", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 10} - , - {"timespan": {"start": null, "step": null, "end": null}, "disabled": false, "visible": true, "transforms": [], "index": 0, "scale": 1, "format_axis": null, "label": "mid", "format_value": null, "source_id": "rc_binary_files", "type": "int", "source_col": 11} - ] - } + }, + "parents": [ + "root" + ], + "slug": "commons", + "width": "auto" } diff --git a/data/graphs/edits.json b/data/graphs/edits.json index 410c9da..f19f427 100644 --- a/data/graphs/edits.json +++ b/data/graphs/edits.json @@ -1,213 +1,207 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "edits", - "lines": [], + "id": "edits", + "lines": [], "metrics": [ { - "color": "rgb(116,173,209)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Total", - "scale": 1, - "source_col": 1, - "source_id": "rc_edits_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Total", + "scale": 1, + "source_col": 1, + "source_id": "rc_edits_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(49,54,149)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "English", - "scale": 1, - "source_col": 2, - "source_id": "rc_edits_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "English", + "scale": 1, + "source_col": 2, + "source_id": "rc_edits_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(244,109,67)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "German", - "scale": 1, - "source_col": 3, - "source_id": "rc_edits_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "German", + "scale": 1, + "source_col": 3, + "source_id": "rc_edits_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(254,224,144)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "French", - "scale": 1, - "source_col": 4, - "source_id": "rc_edits_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "French", + "scale": 1, + "source_col": 4, + "source_id": "rc_edits_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(224,243,248)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Russian", - "scale": 1, - "source_col": 5, - "source_id": "rc_edits_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Russian", + "scale": 1, + "source_col": 5, + "source_id": "rc_edits_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "dataset": "/data/datasources/rc/rc_edits_count.csv", - "desc": "", - "height": 320, - "id": "edits", - "name": "Wikipedia Edits per Month", + }, + "desc": "", + "height": 320, + "id": "edits", + "name": "Wikipedia Edits per Month", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Number of edits" - }, + }, "parents": [ "root" - ], - "slug": "edits", + ], + "slug": "edits", "width": "auto" } diff --git a/data/graphs/mobile_devices.json b/data/graphs/mobile_devices.json index 1690e58..a7db4af 100644 --- a/data/graphs/mobile_devices.json +++ b/data/graphs/mobile_devices.json @@ -1 +1,111 @@ -{"options":{"animatedZooms":true,"avoidMinZero":false,"axis":null,"axisLabelColor":"#666666","axisLabelFontSize":11,"axisLabelFormatter":null,"axisLabelWidth":50,"axisLineColor":"#AAAAAA","axisLineWidth":0.3,"axisTickSize":3,"colorSaturation":1,"colorValue":0.5,"colors":["#FF0097","#EF8158","#83BB32","#182B53","#4596FF","#553DC9","#AD3238","#00FFBC","#F1D950"],"connectSeparatedPoints":false,"customBars":false,"dateWindow":null,"delimiter":",","digitsAfterDecimal":2,"displayAnnotations":false,"drawPoints":true,"drawXAxis":true,"drawXGrid":true,"drawYAxis":true,"drawYGrid":true,"errorBars":false,"file":null,"fillAlpha":0.15,"fillGraph":false,"fractions":false,"gridLineColor":"#D8D8D8","gridLineWidth":0.3,"hideOverlayOnMouseOut":false,"highlightCircleSize":4,"includeZero":false,"interactionModel":null,"isZoomedIgnoreProgrammaticZoom":false,"labels":null,"labelsDiv":null,"labelsDivStyles":null,"labelsDivWidth":250,"labelsKMB":true,"labelsKMG2":false,"labelsSeparateLines":true,"labelsShowZeroValues":true,"legend":"always","logscale":true,"maxNumberWidth":30,"panEdgeFraction":null,"pixelsPerLabel":null,"pixelsPerXLabel":null,"pixelsPerYLabel":null,"pointSize":1,"rangeSelectorHeight":40,"rangeSelectorPlotFillColor":"#A7B1C4","rangeSelectorPlotStrokeColor":"#808FAB","rightGap":20,"rollPeriod":1,"showLabelsOnHighlight":true,"showRangeSelector":false,"showRoller":false,"sigFigs":null,"sigma":2,"stackedGraph":false,"stepPlot":false,"strokePattern":null,"strokeWidth":3,"ticker":null,"title":null,"titleHeight":18,"valueFormatter":null,"valueRange":null,"visibility":null,"wilsonInterval":true,"xAxisHeight":null,"xAxisLabelFormatter":null,"xAxisLabelWidth":55,"xLabelHeight":18,"xValueFormatter":null,"xValueParser":null,"xlabel":null,"y2label":null,"yAxisLabelFormatter":null,"yAxisLabelWidth":50,"yLabelWidth":18,"yValueFormatter":null,"ylabel":"Number of Pageviews"},"slug":"mobile_devices","name":"Pageviews by mobile devices","desc":"","dataset":"/data/datasources/mobile_devices/mobile_devices.csv","width":"auto","height":320,"chartType":"dygraphs","parents":["root"],"id":"mobile_devices"} \ No newline at end of file +{ + "chartType": "dygraphs", + "dataset": "/data/datasources/mobile_devices/mobile_devices.csv", + "desc": "", + "height": 320, + "id": "mobile_devices", + "name": "Pageviews by mobile devices", + "options": { + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.29999999999999999, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, + "colors": [ + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", + "#F1D950" + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.14999999999999999, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.29999999999999999, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, + "ylabel": "Number of Pageviews" + }, + "parents": [ + "root" + ], + "slug": "mobile_devices", + "width": "auto" +} diff --git a/data/graphs/new_editors.json b/data/graphs/new_editors.json index ceb6b73..3ed81b3 100644 --- a/data/graphs/new_editors.json +++ b/data/graphs/new_editors.json @@ -1,307 +1,297 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "new_editors", - "lines": [], + "id": "new_editors", + "lines": [], "metrics": [ { - "color": "rgb(116,173,209)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Total", - "scale": 1, - "source_col": 1, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Total", + "scale": 1, + "source_col": 1, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(49,54,149)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "English", - "scale": 1, - "source_col": 2, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "English", + "scale": 1, + "source_col": 2, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(69,117,180)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Commons", - "scale": 1, - "source_col": 3, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Commons", + "scale": 1, + "source_col": 3, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(254,224,144)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "French", - "scale": 1, - "source_col": 4, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "French", + "scale": 1, + "source_col": 4, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(224,243,248)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Russian", - "scale": 1, - "source_col": 5, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Russian", + "scale": 1, + "source_col": 5, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(255,255,191)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Japanese", - "scale": 1, - "source_col": 6, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Japanese", + "scale": 1, + "source_col": 6, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(171,217,233)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Spanish", - "scale": 1, - "source_col": 7, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Spanish", + "scale": 1, + "source_col": 7, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(165,0,38)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Italian", - "scale": 1, - "source_col": 8, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Italian", + "scale": 1, + "source_col": 8, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(244,109,67)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "German", - "scale": 1, - "source_col": 9, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "German", + "scale": 1, + "source_col": 9, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(215,48,39)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Chinese", - "scale": 1, - "source_col": 10, - "source_id": "rc_new_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Chinese", + "scale": 1, + "source_col": 10, + "source_id": "rc_new_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "Registered users with 10+ edits since their registration", - "height": 250, - "id": "new_editors", - "name": "New Editors Per Month for All Wikimedia Projects", + }, + "desc": "Registered users with 10+ edits since their registration", + "height": 250, + "id": "new_editors", + "name": "New Editors Per Month for All Wikimedia Projects", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.29999999999999999, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.14999999999999999, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.29999999999999999, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Number of Editors" - }, + }, "parents": [ "root" - ], - "slug": "new_editors", + ], + "slug": "new_editors", "width": "auto" } diff --git a/data/graphs/pageviews.json b/data/graphs/pageviews.json index 6eb248d..d496fc7 100644 --- a/data/graphs/pageviews.json +++ b/data/graphs/pageviews.json @@ -1,250 +1,243 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "pageviews", - "lines": [], + "id": "pageviews", + "lines": [], "metrics": [ { - "color": "rgb(215,48,39)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "All projects", - "scale": 1, - "source_col": 1, - "source_id": "rc_page_requests", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "All projects", + "scale": 1, + "source_col": 1, + "source_id": "rc_page_requests", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(49,54,149)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "English", - "scale": 1, - "source_col": 2, - "source_id": "rc_page_requests", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "English", + "scale": 1, + "source_col": 2, + "source_id": "rc_page_requests", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(171,217,233)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Spanish", - "scale": 1, - "source_col": 3, - "source_id": "rc_page_requests", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Spanish", + "scale": 1, + "source_col": 3, + "source_id": "rc_page_requests", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(255,255,191)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Japanese", - "scale": 1, - "source_col": 4, - "source_id": "rc_page_requests", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Japanese", + "scale": 1, + "source_col": 4, + "source_id": "rc_page_requests", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(244,109,67)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "German", - "scale": 1, - "source_col": 5, - "source_id": "rc_page_requests", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "German", + "scale": 1, + "source_col": 5, + "source_id": "rc_page_requests", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(224,243,248)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Russian", - "scale": 1, - "source_col": 6, - "source_id": "rc_page_requests", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Russian", + "scale": 1, + "source_col": 6, + "source_id": "rc_page_requests", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(254,224,144)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "French", - "scale": 1, - "source_col": 7, - "source_id": "rc_page_requests", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "French", + "scale": 1, + "source_col": 7, + "source_id": "rc_page_requests", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "Due to server problems page view counts from squid logs for December 2009 - March 2010 are too low, estimated underreporting 10%-25%. View counts for all months have been normalized to 30 days.", - "height": 320, - "id": "pageviews", - "name": "Pageviews for All Wikimedia Projects", + }, + "desc": "Due to server problems page view counts from squid logs for December 2009 - March 2010 are too low, estimated underreporting 10%-25%. View counts for all months have been normalized to 30 days.", + "height": 320, + "id": "pageviews", + "name": "Pageviews for All Wikimedia Projects", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Number of Pageviews" - }, + }, "parents": [ "root" - ], - "slug": "pageviews", + ], + "slug": "pageviews", "width": "auto" } diff --git a/data/graphs/pageviews_mobile.json b/data/graphs/pageviews_mobile.json index 741e816..d64d695 100644 --- a/data/graphs/pageviews_mobile.json +++ b/data/graphs/pageviews_mobile.json @@ -1,262 +1,261 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "pageviews_mobile", - "lines": [], + "id": "pageviews_mobile", + "lines": [], "metrics": [ { - "color": "rgb(215,48,39)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "All projects", - "scale": 1, - "source_col": 1, - "source_id": "rc_page_requests_mobile", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "All projects", + "scale": 1, + "source_col": 1, + "source_id": "rc_page_requests_mobile", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "English Mobile", - "scale": 1, - "source_col": 2, - "source_id": "rc_page_requests_mobile", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "English Mobile", + "scale": 1, + "source_col": 2, + "source_id": "rc_page_requests_mobile", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Japanese Mobile", - "scale": 1, - "source_col": 3, - "source_id": "rc_page_requests_mobile", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Japanese Mobile", + "scale": 1, + "source_col": 3, + "source_id": "rc_page_requests_mobile", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "German Mobile", - "scale": 1, - "source_col": 4, - "source_id": "rc_page_requests_mobile", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "German Mobile", + "scale": 1, + "source_col": 4, + "source_id": "rc_page_requests_mobile", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Spanish Mobile", - "scale": 1, - "source_col": 5, - "source_id": "rc_page_requests_mobile", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Spanish Mobile", + "scale": 1, + "source_col": 5, + "source_id": "rc_page_requests_mobile", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "French Mobile", - "scale": 1, - "source_col": 6, - "source_id": "rc_page_requests_mobile", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "French Mobile", + "scale": 1, + "source_col": 6, + "source_id": "rc_page_requests_mobile", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Russian Mobile", - "scale": 1, - "source_col": 7, - "source_id": "rc_page_requests_mobile", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Russian Mobile", + "scale": 1, + "source_col": 7, + "source_id": "rc_page_requests_mobile", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Italian Mobile", - "scale": 1, - "source_col": 8, - "source_id": "rc_page_requests_mobile", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Italian Mobile", + "scale": 1, + "source_col": 8, + "source_id": "rc_page_requests_mobile", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "", - "height": 250, - "id": "pageviews_mobile", - "name": "Page Views to Mobile Site", + }, + "desc": "", + "height": 250, + "id": "pageviews_mobile", + "name": "Page Views to Mobile Site", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 14, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 14, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": null - }, + }, "parents": [ "root" - ], - "slug": "pageviews_mobile", + ], + "slug": "pageviews_mobile", "width": "auto" } diff --git a/data/graphs/pageviews_mobile_target.json b/data/graphs/pageviews_mobile_target.json index b83c42d..5ce2a65 100644 --- a/data/graphs/pageviews_mobile_target.json +++ b/data/graphs/pageviews_mobile_target.json @@ -1,155 +1,155 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "pageviews_mobile_target", - "lines": [], + "id": "pageviews_mobile_target", + "lines": [], "metrics": [ { - "color": "rgb(116,173,209)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Total", - "scale": 1, - "source_col": 1, - "source_id": "rc_page_requests_mobile_target", + "color": "rgb(116,173,209)", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Total", + "scale": 1, + "source_col": 1, + "source_id": "rc_page_requests_mobile_target", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(116,173,209)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Target", - "scale": 1, - "source_col": 2, - "source_id": "rc_page_requests_mobile_target", + "color": "rgb(116,173,209)", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Target", + "scale": 1, + "source_col": 2, + "source_id": "rc_page_requests_mobile_target", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "", - "height": 250, - "id": "pageviews_mobile_target", - "name": "Page Views to Mobile Site - Target", + }, + "desc": "", + "height": 250, + "id": "pageviews_mobile_target", + "name": "Page Views to Mobile Site - Target", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 14, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 14, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": true, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": false, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": true, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": false, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": null - }, + }, "parents": [ "root" - ], - "slug": "pageviews_mobile_target", + ], + "slug": "pageviews_mobile_target", "width": "auto" } diff --git a/data/graphs/reach.json b/data/graphs/reach.json index c126fe7..c225a5b 100644 --- a/data/graphs/reach.json +++ b/data/graphs/reach.json @@ -1,262 +1,262 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "reach", - "lines": [], + "id": "reach", + "lines": [], "metrics": [ { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "World", - "scale": 1, - "source_col": 1, - "source_id": "rc_comscore_region_reach", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "World", + "scale": 1, + "source_col": 1, + "source_id": "rc_comscore_region_reach", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "China", - "scale": 1, - "source_col": 2, - "source_id": "rc_comscore_region_reach", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "China", + "scale": 1, + "source_col": 2, + "source_id": "rc_comscore_region_reach", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Europe", - "scale": 1, - "source_col": 3, - "source_id": "rc_comscore_region_reach", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Europe", + "scale": 1, + "source_col": 3, + "source_id": "rc_comscore_region_reach", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "India", - "scale": 1, - "source_col": 4, - "source_id": "rc_comscore_region_reach", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "India", + "scale": 1, + "source_col": 4, + "source_id": "rc_comscore_region_reach", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Latin-America", - "scale": 1, - "source_col": 5, - "source_id": "rc_comscore_region_reach", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Latin America", + "scale": 1, + "source_col": 5, + "source_id": "rc_comscore_region_reach", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Middle-East/Africa", - "scale": 1, - "source_col": 6, - "source_id": "rc_comscore_region_reach", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Middle East/Africa", + "scale": 1, + "source_col": 6, + "source_id": "rc_comscore_region_reach", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "North-America", - "scale": 1, - "source_col": 7, - "source_id": "rc_comscore_region_reach", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "North America", + "scale": 1, + "source_col": 7, + "source_id": "rc_comscore_region_reach", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Asia Pacific", - "scale": 1, - "source_col": 8, - "source_id": "rc_comscore_region_reach", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Asia Pacific", + "scale": 1, + "source_col": 8, + "source_id": "rc_comscore_region_reach", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "", - "height": 250, - "id": "reach", - "name": "Wikimedia Projects Reach by Region (comScore)", + }, + "desc": "", + "height": 250, + "id": "reach", + "name": "Wikimedia Projects Reach by Region (comScore)", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": false, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": false, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Reach (%)" - }, + }, "parents": [ "root" - ], - "result": "ok", - "slug": "reach", + ], + "result": "ok", + "slug": "reach", "width": "auto" } diff --git a/data/graphs/root.yaml b/data/graphs/root.yaml index bbfcfa6..90e0612 100644 --- a/data/graphs/root.yaml +++ b/data/graphs/root.yaml @@ -7,7 +7,7 @@ width : 'auto' height : 400 chartType : 'dygraphs' parents : [] -options : +options : animatedZooms : true avoidMinZero : false axis : null diff --git a/data/graphs/unique_visitors.json b/data/graphs/unique_visitors.json index 44c5fae..5185bd8 100644 --- a/data/graphs/unique_visitors.json +++ b/data/graphs/unique_visitors.json @@ -1,261 +1,261 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "unique_visitors", - "lines": [], + "id": "unique_visitors", + "lines": [], "metrics": [ { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "World", - "scale": 1, - "source_col": 1, - "source_id": "rc_comscore_region_uv", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "World", + "scale": 1, + "source_col": 1, + "source_id": "rc_comscore_region_uv", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "China", - "scale": 1, - "source_col": 2, - "source_id": "rc_comscore_region_uv", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "China", + "scale": 1, + "source_col": 2, + "source_id": "rc_comscore_region_uv", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Europe", - "scale": 1, - "source_col": 3, - "source_id": "rc_comscore_region_uv", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Europe", + "scale": 1, + "source_col": 3, + "source_id": "rc_comscore_region_uv", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "India", - "scale": 1, - "source_col": 4, - "source_id": "rc_comscore_region_uv", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "India", + "scale": 1, + "source_col": 4, + "source_id": "rc_comscore_region_uv", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Latin-America", - "scale": 1, - "source_col": 5, - "source_id": "rc_comscore_region_uv", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Latin America", + "scale": 1, + "source_col": 5, + "source_id": "rc_comscore_region_uv", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Middle-East/Africa", - "scale": 1, - "source_col": 6, - "source_id": "rc_comscore_region_uv", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Middle East/Africa", + "scale": 1, + "source_col": 6, + "source_id": "rc_comscore_region_uv", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "North-America", - "scale": 1, - "source_col": 7, - "source_id": "rc_comscore_region_uv", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "North America", + "scale": 1, + "source_col": 7, + "source_id": "rc_comscore_region_uv", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Asia Pacific", - "scale": 1, - "source_col": 8, - "source_id": "rc_comscore_region_uv", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Asia Pacific", + "scale": 1, + "source_col": 8, + "source_id": "rc_comscore_region_uv", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "", - "height": 250, - "id": "unique_visitors", - "name": "Unique Visitors per Region (comScore)", + }, + "desc": "", + "height": 250, + "id": "unique_visitors", + "name": "Unique Visitors per Region (comScore)", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Number of visitors" - }, + }, "parents": [ "root" - ], - "slug": "unique_visitors", + ], + "slug": "unique_visitors", "width": "auto" } diff --git a/data/graphs/very_active_editors.json b/data/graphs/very_active_editors.json index 85ecc68..60f4133 100644 --- a/data/graphs/very_active_editors.json +++ b/data/graphs/very_active_editors.json @@ -1,307 +1,297 @@ { - "chartType": "dygraphs", + "chartType": "dygraphs", "data": { - "id": "very_active_editors", - "lines": [], + "id": "very_active_editors", + "lines": [], "metrics": [ { - "color": "rgb(116,173,209)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Total", - "scale": 1, - "source_col": 1, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Total", + "scale": 1, + "source_col": 1, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(49,54,149)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "English", - "scale": 1, - "source_col": 2, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "English", + "scale": 1, + "source_col": 2, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(69,117,180)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Commons", - "scale": 1, - "source_col": 3, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Commons", + "scale": 1, + "source_col": 3, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(254,224,144)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "French", - "scale": 1, - "source_col": 4, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "French", + "scale": 1, + "source_col": 4, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(224,243,248)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Russian", - "scale": 1, - "source_col": 5, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Russian", + "scale": 1, + "source_col": 5, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(244,109,67)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "German", - "scale": 1, - "source_col": 6, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "German", + "scale": 1, + "source_col": 6, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(165,0,38)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Italian", - "scale": 1, - "source_col": 7, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Italian", + "scale": 1, + "source_col": 7, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(255,255,191)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Japanese", - "scale": 1, - "source_col": 8, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Japanese", + "scale": 1, + "source_col": 8, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(171,217,233)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Spanish", - "scale": 1, - "source_col": 9, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Spanish", + "scale": 1, + "source_col": 9, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true - }, + }, { - "color": "rgb(215,48,39)", - "disabled": false, - "format_axis": null, - "format_value": null, - "index": 0, - "label": "Chinese", - "scale": 1, - "source_col": 10, - "source_id": "rc_very_active_editors_count", + "disabled": false, + "format_axis": null, + "format_value": null, + "index": 0, + "label": "Chinese", + "scale": 1, + "source_col": 10, + "source_id": "rc_very_active_editors_count", "timespan": { - "end": null, - "start": null, + "end": null, + "start": null, "step": null - }, - "transforms": [], - "type": "int", + }, + "transforms": [], + "type": "int", "visible": true } - ], + ], "palette": null - }, - "desc": "Aug 2010: Editors on Commons are no longer included in overall total, on the assumption that most also edit on one or more other projects. More precise detection of double counts between any projects and languages is in development(using Single User Login registration).", - "height": 250, - "id": "very_active_editors", - "name": "Very Active Editors for All Wikimedia Projects (100+ edits per month)", + }, + "desc": "Aug 2010: Editors on Commons are no longer included in overall total, on the assumption that most also edit on one or more other projects. More precise detection of double counts between any projects and languages is in development(using Single User Login registration).", + "height": 250, + "id": "very_active_editors", + "name": "Very Active Editors for All Wikimedia Projects (100+ edits per month)", "options": { - "animatedZooms": true, - "avoidMinZero": false, - "axis": null, - "axisLabelColor": "#666666", - "axisLabelFontSize": 11, - "axisLabelFormatter": null, - "axisLabelWidth": 50, - "axisLineColor": "#AAAAAA", - "axisLineWidth": 0.3, - "axisTickSize": 3, - "colorSaturation": 1, - "colorValue": 0.5, + "animatedZooms": true, + "avoidMinZero": false, + "axis": null, + "axisLabelColor": "#666666", + "axisLabelFontSize": 11, + "axisLabelFormatter": null, + "axisLabelWidth": 50, + "axisLineColor": "#AAAAAA", + "axisLineWidth": 0.3, + "axisTickSize": 3, + "colorSaturation": 1, + "colorValue": 0.5, "colors": [ - "#FF0097", - "#EF8158", - "#83BB32", - "#182B53", - "#4596FF", - "#553DC9", - "#AD3238", - "#00FFBC", + "#FF0097", + "#EF8158", + "#83BB32", + "#182B53", + "#4596FF", + "#553DC9", + "#AD3238", + "#00FFBC", "#F1D950" - ], - "connectSeparatedPoints": false, - "customBars": false, - "dateWindow": null, - "delimiter": ",", - "digitsAfterDecimal": 2, - "displayAnnotations": false, - "drawPoints": true, - "drawXAxis": true, - "drawXGrid": true, - "drawYAxis": true, - "drawYGrid": true, - "errorBars": false, - "file": null, - "fillAlpha": 0.15, - "fillGraph": false, - "fractions": false, - "gridLineColor": "#D8D8D8", - "gridLineWidth": 0.3, - "hideOverlayOnMouseOut": false, - "highlightCircleSize": 4, - "includeZero": false, - "interactionModel": null, - "isZoomedIgnoreProgrammaticZoom": false, - "labels": null, - "labelsDiv": null, - "labelsDivStyles": null, - "labelsDivWidth": 250, - "labelsKMB": true, - "labelsKMG2": false, - "labelsSeparateLines": true, - "labelsShowZeroValues": true, - "legend": "always", - "logscale": true, - "maxNumberWidth": 30, - "panEdgeFraction": null, - "pixelsPerLabel": null, - "pixelsPerXLabel": null, - "pixelsPerYLabel": null, - "pointSize": 1, - "rangeSelectorHeight": 40, - "rangeSelectorPlotFillColor": "#A7B1C4", - "rangeSelectorPlotStrokeColor": "#808FAB", - "rightGap": 20, - "rollPeriod": 1, - "showLabelsOnHighlight": true, - "showRangeSelector": false, - "showRoller": false, - "sigFigs": null, - "sigma": 2, - "stackedGraph": false, - "stepPlot": false, - "strokePattern": null, - "strokeWidth": 3, - "ticker": null, - "title": null, - "titleHeight": 18, - "valueFormatter": null, - "valueRange": null, - "visibility": null, - "wilsonInterval": true, - "xAxisHeight": null, - "xAxisLabelFormatter": null, - "xAxisLabelWidth": 55, - "xLabelHeight": 18, - "xValueFormatter": null, - "xValueParser": null, - "xlabel": null, - "y2label": null, - "yAxisLabelFormatter": null, - "yAxisLabelWidth": 50, - "yLabelWidth": 18, - "yValueFormatter": null, + ], + "connectSeparatedPoints": false, + "customBars": false, + "dateWindow": null, + "delimiter": ",", + "digitsAfterDecimal": 2, + "displayAnnotations": false, + "drawPoints": true, + "drawXAxis": true, + "drawXGrid": true, + "drawYAxis": true, + "drawYGrid": true, + "errorBars": false, + "file": null, + "fillAlpha": 0.15, + "fillGraph": false, + "fractions": false, + "gridLineColor": "#D8D8D8", + "gridLineWidth": 0.3, + "hideOverlayOnMouseOut": false, + "highlightCircleSize": 4, + "includeZero": false, + "interactionModel": null, + "isZoomedIgnoreProgrammaticZoom": false, + "labels": null, + "labelsDiv": null, + "labelsDivStyles": null, + "labelsDivWidth": 250, + "labelsKMB": true, + "labelsKMG2": false, + "labelsSeparateLines": true, + "labelsShowZeroValues": true, + "legend": "always", + "logscale": true, + "maxNumberWidth": 30, + "panEdgeFraction": null, + "pixelsPerLabel": null, + "pixelsPerXLabel": null, + "pixelsPerYLabel": null, + "pointSize": 1, + "rangeSelectorHeight": 40, + "rangeSelectorPlotFillColor": "#A7B1C4", + "rangeSelectorPlotStrokeColor": "#808FAB", + "rightGap": 20, + "rollPeriod": 1, + "showLabelsOnHighlight": true, + "showRangeSelector": false, + "showRoller": false, + "sigFigs": null, + "sigma": 2, + "stackedGraph": false, + "stepPlot": false, + "strokePattern": null, + "strokeWidth": 3, + "ticker": null, + "title": null, + "titleHeight": 18, + "valueFormatter": null, + "valueRange": null, + "visibility": null, + "wilsonInterval": true, + "xAxisHeight": null, + "xAxisLabelFormatter": null, + "xAxisLabelWidth": 55, + "xLabelHeight": 18, + "xValueFormatter": null, + "xValueParser": null, + "xlabel": null, + "y2label": null, + "yAxisLabelFormatter": null, + "yAxisLabelWidth": 50, + "yLabelWidth": 18, + "yValueFormatter": null, "ylabel": "Number of Editors" - }, + }, "parents": [ "root" - ], - "slug": "very_active_editors", + ], + "slug": "very_active_editors", "width": "auto" } diff --git a/lib/data/dataset-model.co b/lib/data/dataset-model.co index e24a6aa..5bc6c25 100644 --- a/lib/data/dataset-model.co +++ b/lib/data/dataset-model.co @@ -151,7 +151,7 @@ DataSet = exports.DataSet = BaseModel.extend do # {{{ getColors: -> return [] unless @ready - @metrics.onlyOk().pluck 'color' + @metrics.onlyOk().invoke 'getColor' # }}} diff --git a/lib/data/metric-model.co b/lib/data/metric-model.co index a5ecd35..3077fd6 100644 --- a/lib/data/metric-model.co +++ b/lib/data/metric-model.co @@ -2,8 +2,13 @@ } = require 'kraken/util' { BaseModel, BaseList, } = require 'kraken/base' +ProjectColors = require 'kraken/data/project-colors' DataSource = DataSourceList = null + + + + /** * @class */ @@ -53,6 +58,12 @@ Metric = exports.Metric = BaseModel.extend do # {{{ @load() + # toJSON: -> + # json = Metric.__super__.toJSON ... + # json.color or= ProjectColors.lookup(json.label) or 'black' + # json + + getDateColumn: -> @source.getDateColumn() @@ -71,6 +82,9 @@ Metric = exports.Metric = BaseModel.extend do # {{{ col = @get 'source_col' @source.getColumnName col if @source and col > 0 + getColor: -> + @get('color') or ProjectColors.lookup(@get('label')) or 'black' + load: (opts={}) -> source_id = @get 'source_id' diff --git a/lib/data/project-colors.co b/lib/data/project-colors.co new file mode 100644 index 0000000..958155a --- /dev/null +++ b/lib/data/project-colors.co @@ -0,0 +1,37 @@ +/** + * @fileOverview Applies consistent coloring to language/project Metrics with a null `color` field. + */ + + +PROJECT_COLORS = exports.PROJECT_COLORS = + 'target' : '#cccccc' + 'total' : '#182B53' + 'all projects' : '#182B53' + 'world' : '#182B53' + 'commons' : '#d73027' + 'north america' : '#4596FF' + 'english' : '#4596FF' + 'asia pacific' : '#83BB32' + 'japanese' : '#83BB32' + 'china' : '#AD3238' + 'chinese' : '#AD3238' + 'europe' : '#FF0097' + 'german' : '#FF0097' + 'dutch' : '#EF8158' + 'french' : '#1A9380' + 'italian' : '#FF87FF' + 'portuguese' : '#B64926' + 'swedish' : '#5DD2A4' + 'russian' : '#FA0000' + 'latin america' : '#FFB719' + 'spanish' : '#FFB719' + 'middle east' : '#00675B' + 'india' : '#553DC9' + +PROJECT_TESTS = ( { pat://\b#{project.replace(/ /g, '[ _-]')}\b//i, project, color } for project, color in PROJECT_COLORS ) + + +lookupColor = exports.lookup = (label) -> + for project, {pat, color} in PROJECT_TESTS + return color if pat.test label + diff --git a/lib/graph/graph-edit-view.co b/lib/graph/graph-edit-view.co index 12ef920..a791be1 100644 --- a/lib/graph/graph-edit-view.co +++ b/lib/graph/graph-edit-view.co @@ -33,6 +33,7 @@ GraphEditView = exports.GraphEditView = GraphView.extend do # {{{ 'click .load-button' : 'load' 'click .save-button' : 'save' 'click .done-button' : 'done' + 'keypress .graph-name' : 'onNameKeypress' 'keypress .graph-details input[type="text"]' : 'onKeypress' 'keypress .chart-options .value' : 'onKeypress' 'submit form.graph-details' : 'onDetailsSubmit' @@ -205,6 +206,9 @@ GraphEditView = exports.GraphEditView = GraphView.extend do # {{{ onKeypress: (evt) -> $(evt.target).submit() if evt.keyCode is 13 + onNameKeypress: (evt) -> + @$ 'form.graph-details' .submit() if evt.keyCode is 13 + onDetailsSubmit: -> console.log "#this.onDetailsSubmit!" details = @$ 'form.graph-details' .formData() diff --git a/www/modules.yaml b/www/modules.yaml index 8e40043..371a1e2 100644 --- a/www/modules.yaml +++ b/www/modules.yaml @@ -113,6 +113,7 @@ dev: - chart-type - index - data: + - project-colors - metric-model - metric-edit-view - datasource-model