r90446 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r90445‎ \| r90446 \| r90447 >
Date:	08:20, 20 June 2011
Author:	rfaulk
Status:	deferred
Tags:
Comment:	Updated django templates to reflect view definitions
Modified paths:	/trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/LML/index.html (modified) (history) /trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/LML/mine_logs.html (modified) (history) /trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/base.html (modified) (history) /trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/campaigns/index.html (replaced) (history) /trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/campaigns/show_campaigns.html (modified) (history) /trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/index.html (modified) (history) /trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/tests/index.html (modified) (history) /trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/tests/results_banner.html (modified) (history) /trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/tests/results_lp.html (modified) (history)

Diff [purge]

Index: trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/campaigns/show_campaigns.html
—	—	@@ -31,7 +31,11 @@
32	32	<label for="test_name">
33	33	<pre>TEST NAME: </pre>
34	34	</label>
35		~~- <input type="text" name="test_name" />~~
	35	+{% if test_name != '' %}
	36	+<input type="text" name="test_name" value="{{ test_name }}" />
	37	+{% else %}
	38	+<input type="text" name="test_name" value="{{ utm_campaign }}" />
	39	+{% endif %}
36	40	<br/>
37	41	<label for="start_time">
38	42	<pre>START TIMESTAMP: </pre>
—	—	@@ -42,7 +46,17 @@
43	47	<pre>END TIMESTAMP: </pre>
44	48	</label>
45	49	<input type="text" name="end_time" value="{{ end_time }}"/>
46		~~-<br><br>~~
	50	+<br/>
	51	+<label for="test_type_override">
	52	+<pre>Overrride the Test Type? (leave blank if not) </pre>
	53	+</label>
	54	+<select name="test_type_override">
	55	+<option></option>
	56	+<option>Banner</option>
	57	+<option>Landing Page</option>
	58	+<option>Banner and LP</option>
	59	+</select>
	60	+<br/><br/>
47	61	<input type="submit" value="Test" />
48	62	</form>
49	63
—	—	@@ -52,6 +66,8 @@
53	67	<a href="https://www.mediawiki.org/campaigns">Latest Campaigns</a>
54	68	<br><br>
55	69	<a href="https://www.mediawiki.org/tests">Test Generation</a>
	70	+<br><br>
	71	+<a href="https://www.mediawiki.org/">Home</a>
56	72	<br>
57	73
58	74	{% endblock %}
\ No newline at end of file
Index: trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/campaigns/index.html
—	—	@@ -3,14 +3,14 @@
4	4	{% block content %}
5	5
6	6	<h1>Choose a Campaign:</h1><br>
7		~~-<u><h3>Campaign, Donations (>50) </h1></u><br>~~
	7	+<u><h3>Report name -- Earliest Access -- Campaign -- Donations -- Report Link </h1></u><br>
8	8	{% if campaigns %}
9	9	<ul>
10	10	{% for c in campaigns %}
11		~~- {% if c.4 %}~~
12		- <li>{{ c.2 }} , {{ c.3 }}, <a href="https://www.mediawiki.org/campaigns/{{ c.0 }}">{{ c.0 }}</a> , {{ c.1 }}, <a href="https://www.mediawiki.org/tests/report/{{ c.0 }}">view report</a></li><br>
	11	+ {% if c.5 %}
	12	+ <li>{{ c.2 }} -- {{ c.3 }} -- <a href="https://www.mediawiki.org/campaigns/{{ c.0 }}">{{ c.0 }}</a> -- {{ c.4 }} -- <a href="https://www.mediawiki.org/tests/report/{{ c.0 }}">view report</a></li><br>
13	13	{% else %}
14		~~- <li>{{ c.2 }} , {{ c.3 }}, <a href="https://www.mediawiki.org/campaigns/{{ c.0 }}">{{ c.0 }}</a> , {{ c.1 }}</li><br>~~
	14	+ <li>{{ c.2 }} -- {{ c.3 }} -- <a href="https://www.mediawiki.org/campaigns/{{ c.0 }}">{{ c.0 }}</a> -- {{ c.4 }}</li><br>
15	15	{% endif %}
16	16	{% endfor %}
17	17	</ul>
—	—	@@ -22,6 +22,8 @@
23	23	<u>Go to:</u>
24	24	<br><br>
25	25	<a href="https://www.mediawiki.org/tests">Test Generation</a>
	26	+<br><br>
	27	+<a href="https://www.mediawiki.org/">Home</a>
26	28	<br>
27	29
28	30	{% endblock %}
\ No newline at end of file
Index: trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/tests/results_lp.html
—	—	@@ -5,17 +5,19 @@
6	6	<h1><u>{{ utm_campaign }}: Test Report</u></h1>
7	7	<u>The winning banner is <b>{{ winner }}</b>.</u><br><br>
8	8	{% if winner != 'inconclusive' %}
9		~~- The {{ winner_dpv }} had a {{ percent_win_dpv }}% increase in donations / view on average. {{ conf_dpv }}<br>~~
10		~~- The {{ winner_apv }} had a {{ percent_win_apv }}% increase in amount50 / view on average. {{ conf_apv }}<br>~~
	9	+ The winner, {{ winner_dpv }}, had a {{ percent_win_dpv }}% increase in donations / view on average. {{ conf_dpv }}<br>
	10	+ The winner, {{ winner_apv }}, had a {{ percent_win_apv }}% increase in amount50 / view on average. {{ conf_apv }}<br>
11	11	{% endif %}
12	12
13	13	<br>
14	14
15	15	<u><h3>{{ utm_campaign }} -- Test Results:</h3></u><br>
16		-
17		~~-{% for m in metric_names %}~~
18		~~- <OBJECT WIDTH="1000" HEIGHT="600" data="/static/images/{{ utm_campaign }}_LP_{{ m }}.png" type="image/png"></OBJECT>~~
19		~~- <br><p>Measured minutely {{ m }}.</p><br>~~
	16	+<br>
	17	+{{ summary_table\|safe }}
	18	+<br>
	19	+{% for key, value in metric_names_full.items %}
	20	+ <OBJECT WIDTH="1000" HEIGHT="600" data="/static/images/{{ utm_campaign }}_LP_{{ key }}.png" type="image/png"></OBJECT>
	21	+ <br><p>{{ value }} measure over {{ sample_interval }} minute intervals.</p><br>
20	22	{% endfor %}
21	23
22	24	<OBJECT WIDTH="1000" HEIGHT="600" data="/static/images/{{ utm_campaign }}_campaign_views.png" type="image/png"></OBJECT>
—	—	@@ -49,6 +51,8 @@
50	52	<a href="https://www.mediawiki.org/campaigns">Latest Campaigns</a>
51	53	<br><br>
52	54	<a href="https://www.mediawiki.org/tests">Test Generation</a>
	55	+<br><br>
	56	+<a href="https://www.mediawiki.org/">Home</a>
53	57	<br>
54	58
55	59	{% endblock %}
\ No newline at end of file
Index: trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/tests/results_banner.html
—	—	@@ -3,22 +3,24 @@
4	4
5	5
6	6	<h1><u>{{ utm_campaign }}: Test Report</u></h1>
7		~~-<u>The winning banner is <b>{{ winner }}</b>.</u><br><br>~~
	7	+<h3><u>The winning banner is <b>{{ winner }}</b>.</u></h3><br><br>
8	8	{% if winner != 'inconclusive' %}
9		~~- The {{ winner_dpi }} had a {{ percent_win_dpi }}% increase in donations / impression on average. {{ conf_dpi }}<br>~~
10		~~- The {{ winner_api }} had a {{ percent_win_api }}% increase in amount50 / impression on average. {{ conf_api }}<br>~~
	9	+ The winner, {{ winner }}, had a {{ percent_win_dpi }}% increase in donations / impression on average. {{ conf_dpi }}<br>
	10	+ The winner, {{ winner }}, had a {{ percent_win_api }}% increase in amount50 / impression on average. {{ conf_api }}<br>
11	11	{% endif %}
12	12
13	13	<br>
14	14
15	15	<u><h3>{{ utm_campaign }} -- Test Results:</h3></u><br>
16		-
17		~~-{% for m in metric_names %}~~
18		~~- <OBJECT WIDTH="1000" HEIGHT="600" data="/static/images/{{ utm_campaign }}_banner_{{ m }}.png" type="image/png"></OBJECT>~~
19		~~- <br><p>Measured minutely {{ m }}.</p><br>~~
	16	+<br>
	17	+{{ summary_table\|safe }}
	18	+<br>
	19	+{% for key, value in metric_names_full.items %}
	20	+ <OBJECT WIDTH="1000" HEIGHT="600" data="/static/images/{{ utm_campaign }}_banner_{{ key }}.png" type="image/png"></OBJECT>
	21	+ <br><p>{{ value }} measure over {{ sample_interval }} minute intervals.</p><br>
20	22	{% endfor %}
21	23
22		~~-<OBJECT WIDTH="1000" HEIGHT="600" data="/tests/static/images/{{ utm_campaign }}_campaign_views.png" type="image/png"></OBJECT>~~
	24	+<OBJECT WIDTH="1000" HEIGHT="600" data="/static/images/{{ utm_campaign }}_campaign_views.png" type="image/png"></OBJECT>
23	25	<br><p>Campaign views / minute.</p><br>
24	26	<OBJECT WIDTH="1000" HEIGHT="600" data="/static/images/{{ utm_campaign }}_campaign_donations.png" type="image/png"></OBJECT>
25	27	<br><p>Campaign donations / minute.</p><br>
—	—	@@ -49,6 +51,8 @@
50	52	<a href="https://www.mediawiki.org/campaigns">Latest Campaigns</a>
51	53	<br><br>
52	54	<a href="https://www.mediawiki.org/tests">Test Generation</a>
	55	+<br><br>
	56	+<a href="https://www.mediawiki.org/">Home</a>
53	57	<br>
54	58
55	59	{% endblock %}
\ No newline at end of file
Index: trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/tests/index.html
—	—	@@ -64,7 +64,8 @@
65	65	<br><br><br>
66	66	<u>Go to:</u>
67	67	<br><br>
68		~~-<a href="https://www.mediawiki.org/campaigns">Latest Campaigns</a>~~
	68	+<a href="https://www.mediawiki.org/campaigns">Latest Campaigns</a><br><br>
	69	+<a href="https://www.mediawiki.org/">Home</a>
69	70	<br>
70	71
71	72	{% endblock %}
Index: trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/LML/mine_logs.html
—	—	@@ -29,7 +29,7 @@
30	30	<input type="text" name="hour" value="{{ hour }}" />
31	31	<br/>
32	32	<br/>
33		~~-<input type="submit" value="Copy" />~~
	33	+<input type="submit" value="Mine" />
34	34	</form>
35	35
36	36	<br><br><br>
Index: trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/LML/index.html
—	—	@@ -3,7 +3,7 @@
4	4	{% block content %}
5	5
6	6	<h1>Log Mining Logs:</h1><br>
7		~~-<u><h3>Campaign, Donations (>50) </h1></u><br>~~
	7	+<h4>The table below is a listing of all of the squid logs that have been mined:</h4><br>
8	8
9	9	<!-- Table listing all tests run -->
10	10
Index: trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/index.html
—	—	@@ -3,10 +3,14 @@
4	4	{% block content %}
5	5
6	6	<body>
7		~~-<h1><u>Fundraiser Reporting</u></h1>~~
	7	+<h1><u>Fundraiser Reporting</u></h1><br>
8	8
9	9	<a href="https://www.mediawiki.org/campaigns/">Latest Campaigns</a><br><br>
10	10
11		~~-<a href="https://www.mediawiki.org/tests/">Test Generation</a>~~
	11	+<a href="https://www.mediawiki.org/tests/">Test Generation</a><br><br>
12	12
	13	+<a href="https://www.mediawiki.org/LML/">Squid Log Mining</a><br><br>
	14	+
	15	+<a href="https://www.mediawiki.org/live_stats/">Live Results</a>
	16	+
13	17	{% endblock %}
\ No newline at end of file
Index: trunk/fundraiser-statistics/fundraiser-scripts/web_reporting/templates/base.html
—	—	@@ -3,9 +3,14 @@
4	4	<html>
5	5
6	6	<head>
	7	+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
7	8	<title>{% block title %}Fundraiser Reporting{% endblock %}</title>
8	9	<link rel="stylesheet" href="https://www.mediawiki.org/static/css/style.css">
9		~~-<script type="text/javascript" src="/media/jquery-1.2.6.min.js"></script>~~
	10	+<!-- <script type="text/javascript" src="/static/jquery-1.2.6.min.js"></script> -->
	11	+<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../excanvas.min.js"></script><![endif]-->
	12	+<script language="javascript" type="text/javascript" src="/media/js/jquery-1.4.1.js"></script>
	13	+<!-- <script language="javascript" type="text/javascript" src="/media/js/flot/jquery.js"></script> -->
	14	+<script language="javascript" type="text/javascript" src="/media/js/flot/jquery.flot.js"></script>
10	15	</head>
11	16
12	17	<body>

Status & tagging log

12:05, 20 June 2011 Reedy (talk | contribs) changed the status of r90446 [removed: new added: deferred]