Christopher Johnson (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/243634

Change subject: updates owl with dataSourceURIs for new data adds comment 
annotations for metric descriptions adds isDefinedBy for Content Class Metrics 
adds 2 axis view for active users removes unneeded js and css files
......................................................................

updates owl with dataSourceURIs for new data
adds comment annotations for metric descriptions
adds isDefinedBy for Content Class Metrics
adds 2 axis view for active users
removes unneeded js and css files

Change-Id: I7dd7887904d1740d3870d3b2a90364a8bf3ab9d3
---
M assets/catalog-v001.xml
M assets/metrics.owl
M server.R
M ui.R
A www/app-events.js
D www/rainbow.js
D www/stylesheet.css
7 files changed, 211 insertions(+), 140 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/analytics/dashboard 
refs/changes/34/243634/1

diff --git a/assets/catalog-v001.xml b/assets/catalog-v001.xml
index 4784b14..4775607 100644
--- a/assets/catalog-v001.xml
+++ b/assets/catalog-v001.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
     <group id="Folder Repository, directory=, recursive=true, 
Auto-Update=true, version=2" prefer="public" xml:base="">
-        <uri id="Automatically generated entry, Timestamp=1443425901459" 
name="http://wikiba.se/metrics"; uri="metrics.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1444029417262" 
name="http://wikiba.se/metrics"; uri="metrics.owl"/>
     </group>
 </catalog>
diff --git a/assets/metrics.owl b/assets/metrics.owl
index c53d253..300d35f 100644
--- a/assets/metrics.owl
+++ b/assets/metrics.owl
@@ -16,10 +16,10 @@
      xmlns:xsd="http://www.w3.org/2001/XMLSchema#";
      xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#";>
     <owl:Ontology rdf:about="http://wikiba.se/metrics#"/>
+    
 
 
-
-    <!--
+    <!-- 
     
///////////////////////////////////////////////////////////////////////////////////////
     //
     // Annotation properties
@@ -27,22 +27,22 @@
     
///////////////////////////////////////////////////////////////////////////////////////
      -->
 
+    
 
 
+    <!-- http://wikiba.se/metrics#dataSourceURI -->
 
-    <!-- http://wikiba.se/metrics#dataSourceFile -->
-
-    <owl:AnnotationProperty 
rdf:about="http://wikiba.se/metrics#dataSourceFile"/>
-
+    <owl:AnnotationProperty 
rdf:about="http://wikiba.se/metrics#dataSourceURI"/>
+    
 
 
     <!-- http://wikiba.se/metrics#updateFrequency -->
 
     <owl:AnnotationProperty 
rdf:about="http://wikiba.se/metrics#updateFrequency"/>
+    
 
 
-
-    <!--
+    <!-- 
     
///////////////////////////////////////////////////////////////////////////////////////
     //
     // Classes
@@ -50,7 +50,7 @@
     
///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-
+    
 
 
     <!-- http://wikiba.se/metrics#Community_Health -->
@@ -58,25 +58,31 @@
     <owl:Class rdf:about="http://wikiba.se/metrics#Community_Health";>
         <rdfs:subClassOf rdf:resource="http://wikiba.se/metrics#KPI"/>
     </owl:Class>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Content -->
 
     <owl:Class rdf:about="http://wikiba.se/metrics#Content"/>
+    
 
+
+    <!-- http://wikiba.se/metrics#Daily -->
+
+    <owl:Class rdf:about="http://wikiba.se/metrics#Daily"/>
+    
 
 
     <!-- http://wikiba.se/metrics#Developer -->
 
     <owl:Class rdf:about="http://wikiba.se/metrics#Developer"/>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Engagement -->
 
     <owl:Class rdf:about="http://wikiba.se/metrics#Engagement"/>
-
+    
 
 
     <!-- http://wikiba.se/metrics#External_Use -->
@@ -84,7 +90,7 @@
     <owl:Class rdf:about="http://wikiba.se/metrics#External_Use";>
         <rdfs:subClassOf rdf:resource="http://wikiba.se/metrics#KPI"/>
     </owl:Class>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Internal_Use -->
@@ -92,13 +98,13 @@
     <owl:Class rdf:about="http://wikiba.se/metrics#Internal_Use";>
         <rdfs:subClassOf rdf:resource="http://wikiba.se/metrics#KPI"/>
     </owl:Class>
-
+    
 
 
     <!-- http://wikiba.se/metrics#KPI -->
 
     <owl:Class rdf:about="http://wikiba.se/metrics#KPI"/>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Mailing_Lists -->
@@ -106,7 +112,7 @@
     <owl:Class rdf:about="http://wikiba.se/metrics#Mailing_Lists";>
         <rdfs:subClassOf rdf:resource="http://wikiba.se/metrics#Engagement"/>
     </owl:Class>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Partnerships -->
@@ -114,7 +120,7 @@
     <owl:Class rdf:about="http://wikiba.se/metrics#Partnerships";>
         <rdfs:subClassOf rdf:resource="http://wikiba.se/metrics#KPI"/>
     </owl:Class>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Quality -->
@@ -122,7 +128,7 @@
     <owl:Class rdf:about="http://wikiba.se/metrics#Quality";>
         <rdfs:subClassOf rdf:resource="http://wikiba.se/metrics#KPI"/>
     </owl:Class>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Social_Media -->
@@ -130,10 +136,10 @@
     <owl:Class rdf:about="http://wikiba.se/metrics#Social_Media";>
         <rdfs:subClassOf rdf:resource="http://wikiba.se/metrics#Engagement"/>
     </owl:Class>
+    
 
 
-
-    <!--
+    <!-- 
     
///////////////////////////////////////////////////////////////////////////////////////
     //
     // Individuals
@@ -141,18 +147,18 @@
     
///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-
+    
 
 
     <!-- http://wikiba.se/metrics#Active_Users -->
 
     <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Active_Users";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Engagement"/>
-        <updateFrequency>Monthly</updateFrequency>
-        <rdfs:isDefinedBy># of editors who did an edit in the last 30 
days</rdfs:isDefinedBy>
-        <dataSourceFile>wikidata_eng_active_users.tsv</dataSourceFile>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/site_stats_active_users.tsv</dataSourceURI>
+        <rdfs:comment>any account with an action recorded in the RC table 
during the last 30 days - see the source code of SpecialActiveusers.php for 
more details.</rdfs:comment>
+        <updateFrequency>Daily</updateFrequency>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Descriptions_per_Item -->
@@ -160,38 +166,69 @@
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#Descriptions_per_Item";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
         <updateFrequency>Monthly</updateFrequency>
-        <dataSourceFile>wikidata_content_descriptions_item.tsv</dataSourceFile>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Edits -->
 
     <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Edits";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Engagement"/>
-        <updateFrequency>Monthly</updateFrequency>
-        <rdfs:isDefinedBy># of Edits on wikidata</rdfs:isDefinedBy>
-        <dataSourceFile>wikidata_eng_edits.tsv</dataSourceFile>
+        <rdfs:comment>updates to countable pages (in #Content namespaces).  
Also includes new page creation.</rdfs:comment>
+        <updateFrequency>Daily</updateFrequency>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/site_stats_total_edits.tsv</dataSourceURI>
     </owl:NamedIndividual>
+    
 
 
+    <!-- http://wikiba.se/metrics#Edits_Day -->
 
-    <!-- http://wikiba.se/metrics#Facebook_Fans -->
+    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Edits_Day";>
+        <rdf:type rdf:resource="http://wikiba.se/metrics#Daily"/>
+        <rdfs:label>Edits per Day</rdfs:label>
+        <rdfs:seeAlso>http://wikiba.se/metrics#Edits</rdfs:seeAlso>
+    </owl:NamedIndividual>
+    
 
-    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Facebook_Fans";>
+
+    <!-- http://wikiba.se/metrics#Facebook -->
+
+    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Facebook";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Social_Media"/>
-        <updateFrequency>Monthly</updateFrequency>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_facebook.tsv</dataSourceURI>
+        <updateFrequency>Daily</updateFrequency>
     </owl:NamedIndividual>
+    
 
 
+    <!-- http://wikiba.se/metrics#GooglePlus -->
 
-    <!-- http://wikiba.se/metrics#GooglePlus_Fans -->
-
-    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#GooglePlus_Fans";>
+    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#GooglePlus";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Social_Media"/>
-        <updateFrequency>Monthly</updateFrequency>
+        <updateFrequency>Daily</updateFrequency>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_googleplus.tsv</dataSourceURI>
     </owl:NamedIndividual>
+    
 
+
+    <!-- http://wikiba.se/metrics#IRC -->
+
+    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#IRC";>
+        <rdf:type rdf:resource="http://wikiba.se/metrics#Social_Media"/>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_irc.tsv</dataSourceURI>
+        <updateFrequency>Daily</updateFrequency>
+    </owl:NamedIndividual>
+    
+
+
+    <!-- http://wikiba.se/metrics#Identica -->
+
+    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Identica";>
+        <rdf:type rdf:resource="http://wikiba.se/metrics#Social_Media"/>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_identica.tsv</dataSourceURI>
+        <updateFrequency>Daily</updateFrequency>
+    </owl:NamedIndividual>
+    
 
 
     <!-- http://wikiba.se/metrics#Items -->
@@ -199,9 +236,9 @@
     <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Items";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
         <updateFrequency>Monthly</updateFrequency>
-        <dataSourceFile>wikidata_content_items.tsv</dataSourceFile>
+        <rdfs:isDefinedBy>http://wikiba.se/ontology#Item</rdfs:isDefinedBy>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Labels_per_Item -->
@@ -210,58 +247,78 @@
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
         <updateFrequency>Monthly</updateFrequency>
     </owl:NamedIndividual>
+    
 
+
+    <!-- http://wikiba.se/metrics#New_Pages_Day -->
+
+    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#New_Pages_Day";>
+        <rdf:type rdf:resource="http://wikiba.se/metrics#Daily"/>
+        <rdfs:label>New Pages per Day</rdfs:label>
+        <rdfs:seeAlso>http://wikiba.se/metrics#Pages</rdfs:seeAlso>
+    </owl:NamedIndividual>
+    
+
+
+    <!-- http://wikiba.se/metrics#New_Users_Day -->
+
+    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#New_Users_Day";>
+        <rdf:type rdf:resource="http://wikiba.se/metrics#Daily"/>
+        <rdfs:label>New Active Users per Day</rdfs:label>
+        <rdfs:seeAlso>http://wikiba.se/metrics#Active_Users</rdfs:seeAlso>
+    </owl:NamedIndividual>
+    
 
 
     <!-- http://wikiba.se/metrics#Pages -->
 
     <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Pages";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
-        <dataSourceFile>wikidata_content_pages.tsv</dataSourceFile>
-        <rdfs:isDefinedBy># of pages created on wikidata</rdfs:isDefinedBy>
-        <updateFrequency>Monthly</updateFrequency>
+        <updateFrequency>Daily</updateFrequency>
+        <rdfs:comment>countable pages are pages which contain an internal link 
(aka wikilink), category or property link, and are not a redirect 
page.</rdfs:comment>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/site_stats_total_pages.tsv</dataSourceURI>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Properties -->
 
     <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Properties";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
-        <dataSourceFile>wikidata_content_properties.tsv</dataSourceFile>
         <updateFrequency>Monthly</updateFrequency>
+        <rdfs:isDefinedBy>http://wikiba.se/ontology#Property</rdfs:isDefinedBy>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Referenced_Statements_by_Type -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#Referenced_Statements_by_Type";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
-        <dataSourceFile>wikidata_content_refstmts.tsv</dataSourceFile>
         <updateFrequency>Monthly</updateFrequency>
+        
<rdfs:isDefinedBy>http://wikiba.se/ontology#Statement</rdfs:isDefinedBy>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- 
http://wikiba.se/metrics#Referenced_Statements_to_Other_Sources_by_Type -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#Referenced_Statements_to_Other_Sources_by_Type";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
+        
<rdfs:isDefinedBy>http://wikiba.se/ontology#Statement</rdfs:isDefinedBy>
         <updateFrequency>Monthly</updateFrequency>
-        <dataSourceFile>wikidata_content_refstmts_other.tsv</dataSourceFile>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Referenced_Statements_to_Wikipedia_by_Type 
-->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#Referenced_Statements_to_Wikipedia_by_Type";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
-        
<dataSourceFile>wikidata_content_refstmts_wikipedia.tsv</dataSourceFile>
+        
<rdfs:isDefinedBy>http://wikiba.se/ontology#Statement</rdfs:isDefinedBy>
         <updateFrequency>Monthly</updateFrequency>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#References_Overview -->
@@ -269,59 +326,69 @@
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#References_Overview";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
         <updateFrequency>Monthly</updateFrequency>
-        
<dataSourceFile>wikidata_content_references_overview.tsv</dataSourceFile>
+        
<rdfs:isDefinedBy>http://wikiba.se/ontology#Reference</rdfs:isDefinedBy>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#References_by_Type -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#References_by_Type";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
-        <dataSourceFile>wikidata_content_references.tsv</dataSourceFile>
+        
<rdfs:isDefinedBy>http://wikiba.se/ontology#Reference</rdfs:isDefinedBy>
         <updateFrequency>Monthly</updateFrequency>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Statement_Ranks -->
 
     <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Statement_Ranks";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
+        <rdfs:isDefinedBy>http://wikiba.se/ontology#Rank</rdfs:isDefinedBy>
         <updateFrequency>Monthly</updateFrequency>
-        <dataSourceFile>wikidata_content_statement_ranks.tsv</dataSourceFile>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Statements_per_Item -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#Statements_per_Item";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
-        <dataSourceFile>wikidata_content_statement_item.tsv</dataSourceFile>
+        
<rdfs:isDefinedBy>http://wikiba.se/ontology#Statement</rdfs:isDefinedBy>
         <updateFrequency>Monthly</updateFrequency>
     </owl:NamedIndividual>
+    
 
 
+    <!-- http://wikiba.se/metrics#Twitter -->
 
-    <!-- http://wikiba.se/metrics#Twitter_Subscribers -->
-
-    <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#Twitter_Subscribers";>
+    <owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Twitter";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Social_Media"/>
-        <updateFrequency>Monthly</updateFrequency>
-        <rdfs:isDefinedBy># of new twitter subscribers</rdfs:isDefinedBy>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_twitter.tsv</dataSourceURI>
+        <updateFrequency>Daily</updateFrequency>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#Wikimedia_links_per_item -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#Wikimedia_links_per_item";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
-        
<dataSourceFile>wikidata_content_wikimedia_links_item.tsv</dataSourceFile>
         <updateFrequency>Monthly</updateFrequency>
     </owl:NamedIndividual>
+    
 
+
+    <!-- http://wikiba.se/metrics#getClaim_Property_Use_count -->
+
+    <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#getClaim_Property_Use_count";>
+        <rdf:type rdf:resource="http://wikiba.se/metrics#Developer"/>
+        <rdfs:label>getClaim Property Use count</rdfs:label>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/getclaims_property_use.tsv</dataSourceURI>
+        <updateFrequency>Daily</updateFrequency>
+    </owl:NamedIndividual>
+    
 
 
     <!-- http://wikiba.se/metrics#mailing_list_messages_-l -->
@@ -330,7 +397,7 @@
         <rdf:type rdf:resource="http://wikiba.se/metrics#Mailing_Lists"/>
         <updateFrequency>Monthly</updateFrequency>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#mailing_list_messages_-tech -->
@@ -339,97 +406,119 @@
         <rdf:type rdf:resource="http://wikiba.se/metrics#Mailing_Lists"/>
         <updateFrequency>Monthly</updateFrequency>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#mailing_list_subscribers_-l -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#mailing_list_subscribers_-l";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Mailing_Lists"/>
-        <updateFrequency>Monthly</updateFrequency>
-        <rdfs:isDefinedBy># of new mailinglist subscribers - 
l-</rdfs:isDefinedBy>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_mail.tsv</dataSourceURI>
+        <updateFrequency>Daily</updateFrequency>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#mailing_list_subscribers_-tech -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#mailing_list_subscribers_-tech";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Mailing_Lists"/>
-        <updateFrequency>Monthly</updateFrequency>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_techmail.tsv</dataSourceURI>
+        <updateFrequency>Daily</updateFrequency>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- http://wikiba.se/metrics#newsletter_subscribers -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#newsletter_subscribers";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Mailing_Lists"/>
-        <updateFrequency>Monthly</updateFrequency>
+        
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_newsletter.tsv</dataSourceURI>
+        <updateFrequency>Daily</updateFrequency>
     </owl:NamedIndividual>
+    
 
+
+    <!-- 
http://wikiba.se/metrics#number_of_editors_who_first_edited_in_the_specified_month_and_also_went_on_to_make_at_least_one_edit_12_months_later
 -->
+
+    <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#number_of_editors_who_first_edited_in_the_specified_month_and_also_went_on_to_make_at_least_one_edit_12_months_later";>
+        <rdf:type rdf:resource="http://wikiba.se/metrics#Community_Health"/>
+        <rdfs:label>number of editors who first edited in the specified month 
and also went on to make at least one edit 12 months later</rdfs:label>
+    </owl:NamedIndividual>
+    
 
 
     <!-- 
http://wikiba.se/metrics#percentage_of_statements_with_a_non-Wikimedia_reference_as_of_a_given_month
 -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#percentage_of_statements_with_a_non-Wikimedia_reference_as_of_a_given_month";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Quality"/>
+        <rdfs:label>percentage of statements with a non-Wikimedia reference as 
of a given month</rdfs:label>
         <rdfs:seeAlso 
rdf:datatype="&xsd;anyURI">https://tools.wmflabs.org/wikidata-todo/stats.php</rdfs:seeAlso>
         <rdfs:comment>Total number is reported every two weeks in 
&quot;Statements referenced to other sources&quot;</rdfs:comment>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- 
http://wikiba.se/metrics#number_of_active_editors_who_make_5,_100_edits_in_given_month,_rolling_30_day_window
 -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#number_of_active_editors_who_make_5,_100_edits_in_given_month,_rolling_30_day_window";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Community_Health"/>
+        <rdfs:label>number of active editors who make 5, 100 edits in given 
month, rolling 30 day window</rdfs:label>
         
<rdfs:seeAlso>https://stats.wikimedia.org/wikispecial/EN/TablesWikipediaWIKIDATA.htm</rdfs:seeAlso>
-        <rdfs:comment>Reported by month in &quot;Statistics Wikidata&quot; per 
longstanding standard definitions.</rdfs:comment>
-    </owl:NamedIndividual>
+        <rdfs:comment>Reported by month in &quot;Statistics Wikidata&quot;. 
(seeAlso)
 
+An &apos;active editor&apos; is a registered (and signed in) person (not known 
as a bot) who makes 5 or more edits in any month in mainspace on countable 
pages.
+
+Note: This definition differs from that of &quot;active users&quot; in 
Special:Statistics, which counts any account with an action recorded in the RC 
table during the last 30 days - see the source code of SpecialActiveusers.php 
for more details.)</rdfs:comment>
+    </owl:NamedIndividual>
+    
 
 
     <!-- 
http://wikiba.se/metrics#number_of_items_or_statements_contributed_by_partnership_A,_..._partnership_Z_in_a_given_month,_broken_down_by_quality,_edited_statements,_setup_length,_community_onboarding_time,_technical_audit,_size_of_institution,_usage_of_data_after_launch
 -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#number_of_items_or_statements_contributed_by_partnership_A,_..._partnership_Z_in_a_given_month,_broken_down_by_quality,_edited_statements,_setup_length,_community_onboarding_time,_technical_audit,_size_of_institution,_usage_of_data_after_launch";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Partnerships"/>
+        <rdfs:label>number of items or statements contributed by partnership 
A, ... partnership Z in a given month, broken down by quality, edited 
statements, setup length, community onboarding time, technical audit, size of 
institution, usage of data after launch</rdfs:label>
         <rdfs:comment>Should be fairly straightforward to track once actual 
partnerships exist and quality/usage measures mature; see 
https://commons.wikimedia.org/wiki/Commons:Partnerships for pre-existing models 
in Wikimedia Commons</rdfs:comment>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- 
http://wikiba.se/metrics#number_of_queries_by_non-browser_app_A,_...,_non-browser_app_Z_in_given_month,_rolling_30_day_window
 -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#number_of_queries_by_non-browser_app_A,_...,_non-browser_app_Z_in_given_month,_rolling_30_day_window";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#External_Use"/>
+        <rdfs:label>number of queries by non-browser app A,...,non-browser app 
Z in given month, rolling 30 day window</rdfs:label>
         <rdfs:comment>In principle obtainable via Hadoop analysis of logs; 
application-breakdown can be tricky as we don&apos;t require API keys and 
user-agents may be unhelpful</rdfs:comment>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- 
http://wikiba.se/metrics#percentage/number_of_infoboxes_in_Wikipedia_which_use_1,_...,_n_statements_from_Wikidata_as_of_a_given_month
 -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#percentage/number_of_infoboxes_in_Wikipedia_which_use_1,_...,_n_statements_from_Wikidata_as_of_a_given_month";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Internal_Use"/>
+        <rdfs:label>percentage/number of infoboxes in Wikipedia which use 1, 
..., n statements from Wikidata as of a given_month</rdfs:label>
         <rdfs:comment>Depends on usage tracking support for items, which is 
being gradually rolled out as of May 2015, see 
https://phabricator.wikimedia.org/T49288</rdfs:comment>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- 
http://wikiba.se/metrics#percentage/number_of_pages_in_Wikimedia_wikis_which_use_1,_...,_n_statements_from_Wikidata_as_of_a_given_month
 -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#percentage/number_of_pages_in_Wikimedia_wikis_which_use_1,_...,_n_statements_from_Wikidata_as_of_a_given_month";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Internal_Use"/>
+        <rdfs:label>percentage/number of pages in Wikimedia wikis which use 1, 
..., n statements from Wikidata as of a given month</rdfs:label>
         <rdfs:comment>Depends on usage tracking support for items, which is 
being gradually rolled out as of May 2015, see 
https://phabricator.wikimedia.org/T49288</rdfs:comment>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- 
http://wikiba.se/metrics#percentage_of_items_with_a_quality_score_according_to_scoring_algorithm_A,_...,_scoring_algorithm_Z_higher_than_0,_...,_1
 -->
 
     <owl:NamedIndividual 
rdf:about="http://wikiba.se/metrics#percentage_of_items_with_a_quality_score_according_to_scoring_algorithm_A,_...,_scoring_algorithm_Z_higher_than_0,_...,_1";>
         <rdf:type rdf:resource="http://wikiba.se/metrics#Quality"/>
+        <rdfs:label>percentage of items with a quality score according to 
scoring algorithm A, ..., scoring algorithm Z higher than 0, ..., 1</rdfs:label>
         <rdfs:comment>Experimental Wikipedia-centric work ongoing at 
https://meta.wikimedia.org/wiki/Research:Revision_scoring_as_a_service , 
Wikidatan User:Ladsgroup is peripherally involved to assess value for fighting 
spam on Wikidata</rdfs:comment>
     </owl:NamedIndividual>
 </rdf:RDF>
@@ -437,3 +526,4 @@
 
 
 <!-- Generated by the OWL API (version 3.5.0) http://owlapi.sourceforge.net -->
+
diff --git a/server.R b/server.R
index 33b110e..8113e22 100644
--- a/server.R
+++ b/server.R
@@ -70,14 +70,18 @@
     output$wikidata_daily_users_delta_plot <- renderDygraph({
       wikidata_daily_users_delta <- dt_recent_users[, list(date, count, 
diff_count=diff(count)*-1)]
       return(dygraph(wikidata_daily_users_delta,
-                     main = "Wikidata New Users/Day Last 7 Days",
-                     ylab = "") %>%
+                     main = "Wikidata New Active Users/Day Last 7 Days") %>%
                dyLegend(width = 400, show = "always", labelsDiv = 
"legend_daily_users", labelsSeparateLines = TRUE) %>%
+               dyAxis("y", label = "Active Users", valueRange = c(-200, 200)) 
%>%
+               dySeries("count", axis = 'y2') %>%
                dyOptions(useDataTimezone = TRUE,
                          labelsKMB = TRUE,
+                         fillGraph = TRUE,
+                         includeZero = TRUE,
+                         drawPoints = TRUE,
                          strokeWidth = 2, colors = brewer.pal(5, "Set2")[5:1]) 
%>%
                dyCSS(css = custom_css) %>%
-               dyVisibility(visibility=c(input$checkbox_total_users, TRUE)))
+               dyVisibility(visibility=c(TRUE, input$checkbox_total_users)))
     })
     # http://wikiba.se/metrics#Social
     wikidata_recent_social <- data.frame(wikidata_facebook, 
wikidata_googleplus, wikidata_twitter, wikidata_identica, wikidata_irc)
@@ -125,7 +129,7 @@
       edits_delta_percentage <- percent(edits_delta/edits_last_total)
       form_edits <- prettyNum(edits_delta, big.mark=",")
       box_title <- paste0("Edit 30 Day Delta")
-      box_subtitle <- paste0(period_current, " to ", period_last)
+      box_subtitle <- paste0(period_last, " to ", period_current)
       box_value <- paste0(form_edits, " | ", edits_delta_percentage)
       infoBox(box_title, box_value, box_subtitle, icon = icon("arrow-up"),
         color = "green"
@@ -135,12 +139,12 @@
       box(title = "Individual", width = 6, status = "primary", tags$a(href = 
engagement_obj[1], engagement_obj[1]))
     })
     output$metric_meta_edits_datasource <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",engagement_obj[1],">"), 
"<http://wikiba.se/metrics#dataSourceFile>")
-      box(title = "dataSourceFile", width = 6, status = "info", 
tags$a(href=paste0(source_data_uri, metric_desc[1]), metric_desc[1]))
+      metric_desc <- get_rdf_metadata(paste0("<",engagement_obj[1],">"), 
"<http://wikiba.se/metrics#dataSourceURI>")
+      box(title = "dataSourceURI", width = 6, status = "info", 
tags$a(href=metric_desc[1], metric_desc[1]))
     })
     output$metric_meta_edits_notes <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",engagement_obj[1],">"), 
"<http://www.w3.org/2000/01/rdf-schema#isDefinedBy>")
-      box(title = "Definition", width = 6, status = "info", metric_desc[1])
+      metric_desc <- get_rdf_metadata(paste0("<",engagement_obj[1],">"), 
"<http://www.w3.org/2000/01/rdf-schema#comment>")
+      box(title = "Comment", width = 6, status = "info", metric_desc[1])
     })
     # http://wikiba.se/metrics#Active_Users
     output$wikidata_active_users_plot <- renderDygraph({
@@ -151,12 +155,12 @@
       box(title = "Individual", width = 6, status = "primary", tags$a(href = 
engagement_obj[2], engagement_obj[2]))
     })
     output$metric_meta_active_users_datasource <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",engagement_obj[2],">"), 
"<http://wikiba.se/metrics#dataSourceFile>")
-      box(title = "dataSourceFile", width = 6, status = "info", 
tags$a(href=paste0(source_data_uri, metric_desc[1]), metric_desc[1]))
+      metric_desc <- get_rdf_metadata(paste0("<",engagement_obj[2],">"), 
"<http://wikiba.se/metrics#dataSourceURI>")
+      box(title = "dataSourceURI", width = 6, status = "info", 
tags$a(href=metric_desc[1], metric_desc[1]))
     })
     output$metric_meta_active_users_notes <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",engagement_obj[2],">"), 
"<http://www.w3.org/2000/01/rdf-schema#isDefinedBy>")
-      box(title = "Definition", width = 6, status = "info", metric_desc[1])
+      metric_desc <- get_rdf_metadata(paste0("<",engagement_obj[2],">"), 
"<http://www.w3.org/2000/01/rdf-schema#comment>")
+      box(title = "Comment", width = 6, status = "info", metric_desc[1])
     })
     # http://wikiba.se/metrics#Social_Media
     output$wikidata_social_media_plot <- renderDygraph({
@@ -202,12 +206,12 @@
       box(title = "Individual", width = 6, status = "primary", tags$a(href = 
content_obj[13], content_obj[13]))
     })
     output$metric_meta_pages_datasource <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",content_obj[13],">"), 
"<http://wikiba.se/metrics#dataSourceFile>")
-      box(title = "dataSourceFile", width = 6, status = "info", 
tags$a(href=paste0(source_data_uri, metric_desc[1]), metric_desc[1]))
+      metric_desc <- get_rdf_metadata(paste0("<",content_obj[13],">"), 
"<http://wikiba.se/metrics#dataSourceURI>")
+      box(title = "dataSourceURI", width = 6, status = "info", 
tags$a(href=metric_desc[1], metric_desc[1]))
     })
     output$metric_meta_pages_notes <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",content_obj[13],">"), 
"<http://www.w3.org/2000/01/rdf-schema#isDefinedBy>")
-      box(title = "Definition", width = 6, status = "info", metric_desc[1])
+      metric_desc <- get_rdf_metadata(paste0("<",content_obj[13],">"), 
"<http://www.w3.org/2000/01/rdf-schema#comment>")
+      box(title = "Comment", width = 6, status = "info", metric_desc[1])
     })
     # http://wikiba.se/metrics#Items
     output$wikidata_content_items_plot <- renderDygraph({
@@ -227,12 +231,12 @@
       box(title = "Individual", width = 6, status = "primary", tags$a(href = 
content_obj[5], content_obj[5]))
     })
     output$metric_meta_items_datasource <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",content_obj[5],">"), 
"<http://wikiba.se/metrics#dataSourceFile>")
-      box(title = "dataSourceFile", width = 6, status = "info", 
tags$a(href=paste0(source_data_uri, metric_desc[1]), metric_desc[1]))
+      metric_desc <- get_rdf_metadata(paste0("<",content_obj[5],">"), 
"<http://wikiba.se/metrics#dataSourceURI>")
+      box(title = "dataSourceURI", width = 6, status = "info", 
tags$a(href=paste0(source_data_uri, metric_desc[1]), metric_desc[1]))
     })
     output$metric_meta_items_notes <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",content_obj[5],">"), 
"<http://www.w3.org/2000/01/rdf-schema#isDefinedBy>")
-      box(title = "Definition", width = 6, status = "info", metric_desc[1])
+      metric_desc <- get_rdf_metadata(paste0("<",content_obj[5],">"), 
"<http://www.w3.org/2000/01/rdf-schema#comment>")
+      box(title = "Comment", width = 6, status = "info", metric_desc[1])
     })
     # http://wikiba.se/metrics#Properties
     output$wikidata_properties_plot <- renderDygraph({
@@ -253,12 +257,12 @@
       box(title = "Individual", width = 6, status = "primary", tags$a(href = 
content_obj[9], content_obj[9]))
     })
     output$metric_meta_properties_datasource <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",content_obj[9],">"), 
"<http://wikiba.se/metrics#dataSourceFile>")
-      box(title = "dataSourceFile", width = 6, status = "info", 
tags$a(href=paste0(source_data_uri, metric_desc[1]), metric_desc[1]))
+      metric_desc <- get_rdf_metadata(paste0("<",content_obj[9],">"), 
"<http://wikiba.se/metrics#dataSourceURI>")
+      box(title = "dataSourceURI", width = 6, status = "info", 
tags$a(href=paste0(source_data_uri, metric_desc[1]), metric_desc[1]))
     })
     output$metric_meta_properties_notes <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",content_obj[9],">"), 
"<http://www.w3.org/2000/01/rdf-schema#isDefinedBy>")
-      box(title = "Definition", width = 6, status = "info", metric_desc[1])
+      metric_desc <- get_rdf_metadata(paste0("<",content_obj[9],">"), 
"<http://www.w3.org/2000/01/rdf-schema#comment>")
+      box(title = "Comment", width = 6, status = "info", metric_desc[1])
     })
     # http://wikiba.se/metrics#References_Overview
     output$wikidata_references_overview_plot <- renderDygraph({
@@ -276,12 +280,12 @@
       box(title = "Individual", width = 6, status = "primary", tags$a(href = 
content_obj[1], content_obj[1]))
     })
     output$metric_meta_references_overview_datasource <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",content_obj[1],">"), 
"<http://wikiba.se/metrics#dataSourceFile>")
-      box(title = "dataSourceFile", width = 6, status = "info", 
tags$a(href=paste0(source_data_uri, metric_desc[1]), metric_desc[1]))
+      metric_desc <- get_rdf_metadata(paste0("<",content_obj[1],">"), 
"<http://wikiba.se/metrics#dataSourceURI>")
+      box(title = "dataSourceURI", width = 6, status = "info", 
tags$a(href=paste0(source_data_uri, metric_desc[1]), metric_desc[1]))
     })
     output$metric_meta_references_overview_notes <- renderUI({
-      metric_desc <- get_rdf_metadata(paste0("<",content_obj[1],">"), 
"<http://www.w3.org/2000/01/rdf-schema#isDefinedBy>")
-      box(title = "Definition", width = 6, status = "info", metric_desc[1])
+      metric_desc <- get_rdf_metadata(paste0("<",content_obj[1],">"), 
"<http://www.w3.org/2000/01/rdf-schema#comment>")
+      box(title = "Comment", width = 6, status = "info", metric_desc[1])
     })
     # http://wikiba.se/metrics#Referenced_Statements_by_Type
     output$wikidata_content_refstmts_plot <- renderDygraph({
diff --git a/ui.R b/ui.R
index 6f56c26..97f922a 100644
--- a/ui.R
+++ b/ui.R
@@ -9,8 +9,8 @@
 #Sidebar elements for the visualisations.
 sidebar <- dashboardSidebar(
   tags$head(
-    tags$link(rel = "stylesheet", type = "text/css", href = "stylesheet.css"),
-    tags$script(src = "app-options.js")
+    tags$script(src = "app-options.js"),
+    tags$script(src = "app-events.js")
   ),
   sidebarMenu(
     id = "tabs",
@@ -19,7 +19,7 @@
     menuItem(text = "Site", icon = icon("signal"),
              menuSubItem(text = "Edits/Day", tabName = 
"wikidata_daily_edits_delta"),
              menuSubItem(text = "New Pages/Day", tabName = 
"wikidata_daily_pages_delta"),
-             menuSubItem(text = "New Users/Day", tabName = 
"wikidata_daily_users_delta")),
+             menuSubItem(text = "New Active Users/Day", tabName = 
"wikidata_daily_users_delta")),
     menuItem(text = "Developer", icon = icon("gears"),
              menuSubItem(text = "getClaims Usage", tabName = 
"wikidata_daily_getclaims_property_use")),
     menuItem(text = "Social Stats", icon = icon("heart"),
diff --git a/www/app-events.js b/www/app-events.js
new file mode 100644
index 0000000..d4e4a6d
--- /dev/null
+++ b/www/app-events.js
@@ -0,0 +1,5 @@
+$(function() {
+    // Reveals the KPI dropdown menu at launch:
+    $('ul.sidebar-menu li.treeview').first().addClass('active');
+
+});
diff --git a/www/rainbow.js b/www/rainbow.js
deleted file mode 100644
index 7f65bc0..0000000
--- a/www/rainbow.js
+++ /dev/null
@@ -1,25 +0,0 @@
-$(function() {
-
-    // Enables linking to specific tabs:
-    if (window.location.hash){
-      var hash = $.trim(window.location.hash);
-      var tab = decodeURI(hash.substring(1, 100));
-      $('a[data-value=\"'+tab+'\"]').click();
-    }
-
-    // Enables clicking on a kpi summary value box to view the time series:
-    $('div[id^=kpi_summary_box_]').click(function(){
-        var parent_id = $(this).closest('div').attr('id');
-        var parent_target = parent_id.replace('_summary_box', '');
-        $('a[data-value=\"'+parent_target+'\"]').click();
-    });
-
-    // Visual feedback that the value box is now something you can click:
-    $('div[id^=kpi_summary_box_]').hover(function() {
-        $(this).css('cursor','pointer');
-    });
-
-    // Reveals the KPI dropdown menu at launch:
-    $('ul.sidebar-menu li.treeview').first().addClass('active');
-
-});
diff --git a/www/stylesheet.css b/www/stylesheet.css
deleted file mode 100644
index 2451b16..0000000
--- a/www/stylesheet.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.kpi_date {
-       margin-top: 0px;
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/243634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7dd7887904d1740d3870d3b2a90364a8bf3ab9d3
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/analytics/dashboard
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to