diff --git a/ckanext/stats/controller.py b/ckanext/stats/controller.py index 72d87592b72..7c24c385a93 100644 --- a/ckanext/stats/controller.py +++ b/ckanext/stats/controller.py @@ -1,8 +1,9 @@ import ckan.plugins as p -from ckan.lib.base import BaseController, config +from ckan.lib.base import BaseController import stats as stats_lib import ckan.lib.helpers as h + class StatsController(BaseController): def index(self): @@ -19,13 +20,8 @@ def index(self): c.num_packages_by_week = rev_stats.get_num_packages_by_week() c.package_revisions_by_week = rev_stats.get_by_week('package_revisions') - # Used in the legacy CKAN templates. - c.packages_by_week = [] - - # Used in new CKAN templates gives more control to the templates for formatting. c.raw_packages_by_week = [] for week_date, num_packages, cumulative_num_packages in c.num_packages_by_week: - c.packages_by_week.append('[new Date(%s), %s]' % (week_date.replace('-', ','), cumulative_num_packages)) c.raw_packages_by_week.append({'date': h.date_str_to_datetime(week_date), 'total_packages': cumulative_num_packages}) c.all_package_revisions = [] @@ -41,10 +37,3 @@ def index(self): c.raw_new_datasets.append({'date': h.date_str_to_datetime(week_date), 'new_packages': num_packages}) return p.toolkit.render('ckanext/stats/index.html') - - def leaderboard(self, id=None): - c = p.toolkit.c - c.solr_core_url = config.get('ckanext.stats.solr_core_url', - 'http://solr.okfn.org/solr/ckan') - return p.toolkit.render('ckanext/stats/leaderboard.html') - diff --git a/ckanext/stats/public/ckanext/stats/app.js b/ckanext/stats/public/ckanext/stats/app.js deleted file mode 100644 index 2b3657345b5..00000000000 --- a/ckanext/stats/public/ckanext/stats/app.js +++ /dev/null @@ -1,59 +0,0 @@ -jQuery(document).ready(function($) { - $('form').submit(function(e) { - e.preventDefault(); - attribute = $('#form-attribute').val(); - loadSolr(attribute); - }) - // default! (also in html) - loadSolr('tags'); - - function loadSolr(attribute) { - var url = solrCoreUrl + '/select?indent=on&wt=json&facet=true&rows=0&indent=true&facet.mincount=1&facet.limit=30&q=*:*&facet.field=' + attribute; - function handleSolr(data) { - var results = []; - ourdata = data.facet_counts.facet_fields[attribute]; - var newrow = {}; - for (ii in ourdata) { - if (ii % 2 == 0) { - newrow.name = ourdata[ii]; - if (!newrow.name) { - newrow.name = '[Not Specified]'; - } - } else { - newrow.count = ourdata[ii]; - results.push(newrow); - newrow = {}; - } - } - display(results); - } - - $.ajax({ - url: url, - success: handleSolr, - dataType: 'jsonp', - jsonp: 'json.wrf' - }); - } - - function display(results) { - var list = $('#category-counts'); - list.html(''); - if (results.length == 0) { - return - } - var maximum = results[0]['count']; - for(ii in results) { - maximum = Math.max(maximum, results[ii]['count']); - } - - $.each(results, function(idx, row) { - var newentry = $('
  • '); - newentry.append($('' + row['name'] + '')); - newentry.append($('' + row['count'] + '')); - var percent = 100 * row['count'] / maximum; - newentry.append($('')); - list.append(newentry); - }); - } -}); diff --git a/ckanext/stats/public/ckanext/stats/demo.html b/ckanext/stats/public/ckanext/stats/demo.html deleted file mode 100644 index fee3713d0d1..00000000000 --- a/ckanext/stats/public/ckanext/stats/demo.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - -

    CKAN Dataset Leaderboard

    -

    Choose a dataset attribute and find out which categories in that area have the most datasets. E.g. tags, groups, license, res_format, country.

    -
    - - - -
    - -
    - -
    - - diff --git a/ckanext/stats/public/ckanext/stats/style.css b/ckanext/stats/public/ckanext/stats/style.css deleted file mode 100644 index afd7d965853..00000000000 --- a/ckanext/stats/public/ckanext/stats/style.css +++ /dev/null @@ -1,59 +0,0 @@ -div.category-counts { -} - -div.category-counts-over-time { - clear: both; -} - -/*************************** - * CHART LISTS - **************************/ - -.chartlist { - float: left; - border-top: 1px solid #EEE; - width: 90%; - padding-left: 0; - margin-left: 0; -} - -.chartlist li { - position: relative; - display: block; - border-bottom: 1px solid #EEE; - _zoom: 1; -} -.chartlist li a { - display: block; - padding: 0.4em 4.5em 0.4em 0.5em; - position: relative; - z-index: 2; -} -.chartlist .count { - display: block; - position: absolute; - top: 0; - right: 0; - margin: 0 0.3em; - text-align: right; - color: #999; - font-weight: bold; - font-size: 0.875em; - line-height: 2em; - z-index: 999; -} -.chartlist .index { - display: block; - position: absolute; - top: 0; - left: 0; - height: 100%; - background: #B8E4F5; - text-indent: -9999px; - overflow: hidden; - line-height: 2em; -} -.chartlist li:hover { - background: #EFEFEF; -} - diff --git a/ckanext/stats/templates_legacy/__init__.py b/ckanext/stats/templates_legacy/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ckanext/stats/templates_legacy/ckanext/__init__.py b/ckanext/stats/templates_legacy/ckanext/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ckanext/stats/templates_legacy/ckanext/stats/__init__.py b/ckanext/stats/templates_legacy/ckanext/stats/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ckanext/stats/templates_legacy/ckanext/stats/index.html b/ckanext/stats/templates_legacy/ckanext/stats/index.html deleted file mode 100644 index 1fb5206254b..00000000000 --- a/ckanext/stats/templates_legacy/ckanext/stats/index.html +++ /dev/null @@ -1,163 +0,0 @@ - - - Statistics - - - Statistics - - - - - - - - - - - - - - - -
    -

    Total number of Datasets

    -
    - -

    Revisions to Datasets per week

    -
    - -

    Top Rated Datasets

    - - - - - -
    DatasetAverage ratingNumber of ratings
    ${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))}${rating}${num_ratings}
    -

    No ratings

    - -

    Most Edited Datasets

    - - - - - -
    DatasetNumber of edits
    ${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))}${edits}
    - -

    Largest Groups

    - - - - - -
    GroupNumber of datasets
    ${h.link_to(group.title or group.name, h.url_for(controller='group', action='read', id=group.name))}${num_packages}
    - -

    Top Tags

    - - - - -
    ${h.link_to(tag.name, h.url_for(controller='tag', action='read', id=tag.name))}${num_packages}
    - -

    Users creating most datasets

    - - - - -
    ${h.linked_user(user)}${num_packages}
    - -

    - Page last updated: - - ${datetime.datetime.now().strftime('%c')} -

    -
    - - - - - ${jsConditionalForIe(8, '<script language="javascript" type="text/javascript" src="' + h.url_for_static('/scripts/vendor/flot/0.7/excanvas.js') + '"></script>', 'lte')} - - - - - - - diff --git a/ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html b/ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html deleted file mode 100644 index 60fd61caf32..00000000000 --- a/ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html +++ /dev/null @@ -1,33 +0,0 @@ - - - Leaderboard - Stats - - - - - - - -
    -

    Dataset Leaderboard

    -

    Choose a dataset attribute and find out which categories in that area have the most datasets. E.g. tags, groups, license, res_format, country.

    -
    - - - -
    - -
    -
      -
    -
    -
    - - - -