Milimetric has submitted this change and it was merged.
Change subject: changing Job to Report in the UI
......................................................................
changing Job to Report in the UI
Change-Id: I3c1514e351ef75a6ba061cd4cbdcd084a5a9c4d2
---
M wikimetrics/templates/csv_upload_form.html
M wikimetrics/templates/index.html
M wikimetrics/templates/jobs.html
M wikimetrics/templates/layout.html
M wikimetrics/templates/request.html
5 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/wikimetrics/templates/csv_upload_form.html
b/wikimetrics/templates/csv_upload_form.html
index 3385b2c..00b9233 100644
--- a/wikimetrics/templates/csv_upload_form.html
+++ b/wikimetrics/templates/csv_upload_form.html
@@ -19,6 +19,7 @@
<label for="project" class="control-label">Default Project</label>
<div class="controls">
<input type="text" name="project" class="required" id="project"
value="{% if project %}{{project}}{% endif %}"/>
+ <!--TODO: make this an autocomplete box-->
</div>
</div>
<div class="control-group">
diff --git a/wikimetrics/templates/index.html b/wikimetrics/templates/index.html
index 2108ea2..a0a2c01 100644
--- a/wikimetrics/templates/index.html
+++ b/wikimetrics/templates/index.html
@@ -52,7 +52,7 @@
</ul>
</div>
<div class="span4">
- <h4>Your <a href="{{url_for('jobs_index')}}">jobs</a></h4>
+ <h4>Your <a href="{{url_for('jobs_index')}}">reports</a></h4>
<ul data-bind="foreach: jobs">
<li>
<strong data-bind="text:
moment.unix(created).calendar()"></strong> -
@@ -62,7 +62,7 @@
</div>
{% else %}
<div>
- <h4><a href="{{url_for('login')}}">Login</a> to see your cohorts,
metrics, and jobs</h4>
+ <h4><a href="{{url_for('login')}}">Login</a> to see your cohorts,
metrics, and reports</h4>
</div>
{% endif %}
</div>
diff --git a/wikimetrics/templates/jobs.html b/wikimetrics/templates/jobs.html
index 79036d0..310c9b0 100644
--- a/wikimetrics/templates/jobs.html
+++ b/wikimetrics/templates/jobs.html
@@ -1,9 +1,9 @@
{% extends "layout.html" %}
{% block body %}
-<h2>Current Job queue</h2>
+<h2>Current Report queue</h2>
<a href="{{url_for('jobs_request')}}" class="btn btn-primary btn-large">
- Create New Job
+ Create New Report
</a>
<table class="table table-striped">
<caption>
@@ -26,13 +26,13 @@
<td data-bind="text: name"></td>
<td data-bind="if: status === 'SUCCESS'">
<div class="btn-group">
- <button class="btn btn-primary">Details</button>
+ <button class="btn btn-primary">Get Data</button>
<button class="btn btn-primary dropdown-toggle"
data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
- <li><a target="_blank" data-bind="attr: {href:
'/jobs/result/' + id + '.json'}">JSON</a></li>
- <li><a target="_blank" data-bind="attr: {href:
'/jobs/result/' + id + '.csv'}">CSV</a></li>
+ <li><a target="_blank" data-bind="attr: {href:
'/jobs/result/' + id + '.json'}">as JSON</a></li>
+ <li><a target="_blank" data-bind="attr: {href:
'/jobs/result/' + id + '.csv'}">as CSV</a></li>
</ul>
</div>
</td>
diff --git a/wikimetrics/templates/layout.html
b/wikimetrics/templates/layout.html
index 8894a68..99d89ad 100644
--- a/wikimetrics/templates/layout.html
+++ b/wikimetrics/templates/layout.html
@@ -22,7 +22,7 @@
<ul class="nav">
<li><a href="{{ url_for('cohorts_index')
}}">Cohorts</a></li>
<li><a href="{{ url_for('metrics_index')
}}">Metrics</a></li>
- <li><a href="{{ url_for('jobs_index') }}">Jobs</a></li>
+ <li><a href="{{ url_for('jobs_index')
}}">Reports</a></li>
<!--<li><a href="#">About</a></li>-->
<!--<li><a href="#">Contact</a></li>-->
<li class="pull-right">
diff --git a/wikimetrics/templates/request.html
b/wikimetrics/templates/request.html
index 45b1b21..6f04666 100644
--- a/wikimetrics/templates/request.html
+++ b/wikimetrics/templates/request.html
@@ -81,7 +81,7 @@
</div>
<div class="form-actions">
<form class="job-request pull-right" action="/jobs/create/"
data-bind="submit: save">
- <input class="btn btn-primary save" type="submit" value="Run Job"/>
+ <input class="btn btn-primary save" type="submit" value="Run Report"/>
</form>
</div>
{% endblock %}
--
To view, visit https://gerrit.wikimedia.org/r/74269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c1514e351ef75a6ba061cd4cbdcd084a5a9c4d2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
