Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75258
Change subject: small UI touch-ups
......................................................................
small UI touch-ups
Change-Id: I8daf03e21b5e3186073c0968aea5005b4c62129f
---
M wikimetrics/static/js/cohortUpload.js
M wikimetrics/templates/cohorts.html
M wikimetrics/templates/form_for_metrics.html
M wikimetrics/templates/request.html
4 files changed, 18 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/58/75258/1
diff --git a/wikimetrics/static/js/cohortUpload.js
b/wikimetrics/static/js/cohortUpload.js
index 8aae272..4145efd 100644
--- a/wikimetrics/static/js/cohortUpload.js
+++ b/wikimetrics/static/js/cohortUpload.js
@@ -6,6 +6,8 @@
$('form.upload-cohort').validate({
onkeyup: false,
+ // would be nice to not have to turn this off, but it conflicts with
typeaheads
+ onfocusout: false,
messages: {
name: {
remote: 'This cohort name is taken.',
diff --git a/wikimetrics/templates/cohorts.html
b/wikimetrics/templates/cohorts.html
index 4f3c2d1..5e82c64 100644
--- a/wikimetrics/templates/cohorts.html
+++ b/wikimetrics/templates/cohorts.html
@@ -4,7 +4,7 @@
<h2>Cohorts</h2>
<div>
- <a class="btn btn-primary btn-large"
href="{{url_for('cohort_upload')}}">Create New</a>
+ <a class="btn btn-primary btn-large"
href="{{url_for('cohort_upload')}}">Upload Cohort</a>
<input type="text" class="search-query" placeholder="find below"/>
@@ -21,6 +21,9 @@
<div class="hero-unit">
<h5 data-bind="text: name"></h5>
<p data-bind="text: description"></p>
+ <a href="{{url_for('jobs_request')}}" class="btn btn-primary">
+ Create Report
+ </a>
</div>
<table class="table table-striped">
<tbody data-bind="foreach: wikiusers">
diff --git a/wikimetrics/templates/form_for_metrics.html
b/wikimetrics/templates/form_for_metrics.html
index 4031d7a..4d272c9 100644
--- a/wikimetrics/templates/form_for_metrics.html
+++ b/wikimetrics/templates/form_for_metrics.html
@@ -19,12 +19,22 @@
</ul>
{% endif %}
</div>
+ {% if f.name == 'namespaces' %}
+ <div class="controls">
+ <p>refers to the division of pages by namespace in wiki
projects, example:</p>
+ <ul>
+ <li><a target="_blank"
href="http://de.wikipedia.org/wiki/Wikipedia:Namespace";>German Wikipedia
Namespaces</a></li>
+ <li><a target="_blank"
href="http://commons.wikimedia.org/wiki/Help:Namespaces";>Wikimedia Commons
Namespaces</a></li>
+ <li><a target="_blank"
href="http://en.wikipedia.org/wiki/Wikipedia:Namespace";>English Wikipedia
Namespaces</a></li>
+ </ul>
+ </div>
+ {% endif %}
</div>
{% else %}
{{ f }}
{% endif %}
{% endfor %}
<div class="form-actions">
- <input class="btn btn-primary" type="submit" value="Save
Configuration"/>
+ <input class="btn btn-primary" type="submit" value="Validate
Configuration"/>
</div>
</form>
diff --git a/wikimetrics/templates/request.html
b/wikimetrics/templates/request.html
index 6f04666..46294ac 100644
--- a/wikimetrics/templates/request.html
+++ b/wikimetrics/templates/request.html
@@ -5,7 +5,7 @@
<div class="navbar-inner">
<h3 class="pull-left">Pick Cohorts</h3>
<div class="navbar-search pull-right">
- <a href="{{url_for('cohort_upload')}}">create cohort</a>
+ <a href="{{url_for('cohort_upload')}}">upload a new cohort</a>
<input type="text" class="search-query" placeholder="find"/>
</div>
--
To view, visit https://gerrit.wikimedia.org/r/75258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8daf03e21b5e3186073c0968aea5005b4c62129f
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
