From: Tom Rees Date: Wed, 30 Oct 2013 01:40:31 +0000 Subject: [903] Integrated 777 branch and updated to fit the new look. X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=e59dc10259964f7b21936410567aa44c53e0da23 --- [903] Integrated 777 branch and updated to fit the new look. --- --- a/ckanext/ga_report/public/css/ga_report.css +++ b/ckanext/ga_report/public/css/ga_report.css @@ -66,4 +66,7 @@ margin-top: 4px; float: left; } +.tab-content { + padding-top: 12px; +} --- a/ckanext/ga_report/templates/ga_report/ga_util.html +++ b/ckanext/ga_report/templates/ga_report/ga_util.html @@ -57,42 +57,19 @@ - -
- - - Site-wide - | - Publishers - | - Datasets - -
- -
-
-

Download

-

- Download as CSV
-

-
-
-

Graph Legend

-
- -
-
-
-

Notes

+ +
+
Notes
+
    -
  • "Views" is the number of times a page was loaded in users' browsers.
    • -
  • "Downloads" is the number of times a user has clicked to download either an original or cached resource for a particular dataset. Download information is only available from 2nd December 2012; 'No data' is shown for records before that date.
    • -
  • These usage statistics are confined to users with javascript enabled, which excludes web crawlers and API calls.
    • -
  • The results are not shown when the number of views/visits is tiny. Where these relate to site pages, results are available in full in the CSV download. Where these relate to users' web browser information, results are not disclosed, for privacy reasons.
    • +
  • "Views" is the number of times a page was loaded in users' browsers.
    • +
  • "Downloads" is the number of times a user has clicked to download either an original or cached resource for a particular dataset. Download information is only available from 2nd December 2012; 'No data' is shown for records before that date.
    • +
  • These usage statistics are confined to users with javascript enabled, which excludes web crawlers and API calls.
    • +
  • The results are not shown when the number of views/visits is tiny. Where these relate to site pages, results are available in full in the CSV download. Where these relate to users' web browser information, results are not disclosed, for privacy reasons.
- -
+
+ --- a/ckanext/ga_report/templates/ga_report/publisher/index.html +++ b/ckanext/ga_report/templates/ga_report/publisher/index.html @@ -6,12 +6,6 @@ Usage by Publisher - - - - ${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publisher_csv',month=c.month or 'all'))} - - @@ -30,46 +24,51 @@
  • Publishers
    • +
    + +   Download as CSV + +

    Site Usage

    - -
    - -

    - Site-wide - | - Publishers - | - Datasets -

    - - -
    - - ${rickshaw_graph(c.top_publishers_graph,'publishers')} +
    +
    +
    + Graph Legend +
    + +
    +
    +
    +
    +
    + Publishers + ${rickshaw_graph(c.top_publishers_graph,'publishers')} +
    +
    +
    -

    Statistics for

    +

    Statistics for

    ${month_selector(c.month, c.months, c.day)}
    - - - - - - - - - - - -
    PublisherDataset Views
    - ${h.link_to(publisher.title, h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport', action='read_publisher', id=publisher.name) + (("?month=" + c.month) if c.month else ''))} - ${views}
    -
    + + + + + + + + + + + +
    PublisherDataset Views
    + ${h.link_to(publisher.title, h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport', action='read_publisher', id=publisher.name) + (("?month=" + c.month) if c.month else ''))} + ${views}
    --- a/ckanext/ga_report/templates/ga_report/publisher/read.html +++ b/ckanext/ga_report/templates/ga_report/publisher/read.html @@ -19,75 +19,86 @@ - - ${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='dataset_csv',id=c.publisher_name or 'all',month=c.month or 'all'))} -
  • Site Analytics
    • -
  • Datasets
    • -
  • ${c.publisher.title}
    • + +
  • Publishers
    • +
  • ${c.publisher.title}
    • +     + +
  • Usage By Dataset
    • +     +
    + +   Download as CSV + +

    Site Usage

    -
    -

    - Site-wide - | - Publishers - | - Datasets -

    +
    +
    +
    + Graph Legend +
    + +
    +
    +
    +
    +
    + Datasets From ${c.publisher.title} + All Datasets + + ${rickshaw_graph(c.graph_data,'dataset-downloads',debug=True)} + +
    +
    +
    +
    + +

    Statistics for ${h.month_option_title(c.month,c.months,c.day)}:

    +     + +

    Statistics for all months

    +     +
    +
    + ${month_selector(c.month, c.months, c.day)} -
    -

    ${c.publisher.title}

    + + +
    + +
    No page views in this period.
    + + + + + + + + + + + + + + +
    DatasetViewsDownloads
    + ${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))} + ${views}${downloads}
    +     - - ${rickshaw_graph(c.graph_data,'dataset-downloads',debug=True)} - -
    -
    - - ${month_selector(c.month, c.months, c.day)} - - - -
    -
    - -

    Statistics for ${h.month_option_title(c.month,c.months,c.day)}:

    -     - -

    Statistics for all months:

    -     -
    No page views in this period.
    - - - - - - - - - - - - - - -
    DatasetViewsDownloads
    - ${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))} - ${views}${downloads}
    -     - -
    + ${ga_footer()}
    --- a/ckanext/ga_report/templates/ga_report/site/index.html +++ b/ckanext/ga_report/templates/ga_report/site/index.html @@ -19,159 +19,184 @@ - - ${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month or 'all'))} - - -
  • Site Analytics
  • Site-wide
    •  -
    - -

    - Site-wide - | - Publishers - | - Datasets -

    - -
    -
    -
      -
    • Totals
      • -
    • - Browsers - - -
      -
      -
      -

      Show stats table for:

      - ${month_selector(c.month, c.months, c.day)} -
      - - - - - - - - - - - - - -
      NameValueHistory
      ${name}${value} - - ${','.join([y for x,y in graph])} - -
      -
      -
      - ${rickshaw_graph(c.browser_versions_graph,'browser-versions',mode='stack')} -
      -

      Note: Where a browser has a large number of versions, these have been grouped together.

      -
      -

      Show stats table for:

      - ${month_selector(c.month, c.months, c.day)} -
      - ${stat_table(c.browser_versions)} -
      -
      - ${rickshaw_graph(c.browsers_graph,'browsers',mode='stack')} -
      -
      -

      Show stats table for:

      - ${month_selector(c.month, c.months, c.day)} -
      - ${stat_table(c.browsers)} -
      -
      - ${rickshaw_graph(c.os_graph,'os',mode='stack')} -
      -
      -

      Show stats table for:

      - ${month_selector(c.month, c.months, c.day)} -
      - ${stat_table(c.os)} -
      -
      - ${rickshaw_graph(c.os_versions_graph,'os_versions',mode='stack')} -
      -
      -

      Show stats table for:

      - ${month_selector(c.month, c.months, c.day)} -
      - ${stat_table(c.os_versions)} -
      -
      -

      Number of visits that were referred from social networks

      -
      -

      Show stats table for:

      - ${month_selector(c.month, c.months, c.day)} -
      - ${social_table(c.social_referrer_totals)} -
      -
      - ${rickshaw_graph(c.social_networks_graph, 'social_networks',mode='stack')} -
      -

      Percentage of visits that were referred from these social networks

      -
      -

      Show stats table for:

      - ${month_selector(c.month, c.months, c.day)} -
      - ${stat_table(c.social_networks, 'Visits')} -
      -
      - ${rickshaw_graph(c.languages_graph,'languages',mode='stack')} -
      -
      -

      Show stats table for:

      - ${month_selector(c.month, c.months, c.day)} -
      - ${stat_table(c.languages)} -
      -
      - ${rickshaw_graph(c.country_graph,'country',mode='stack')} -
      -
      -

      Show stats table for:

      - ${month_selector(c.month, c.months, c.day)} -
      - ${stat_table(c.country)} -
      +
      +
      +
      +

      Show stats table for:

      + ${month_selector(c.month, c.months, c.day)} +
      + + + + + + + + + + + + + +
      NameValueHistory
      ${name}${value} + + ${','.join([y for x,y in graph])} + +
      +
      +
      + ${rickshaw_graph(c.browser_versions_graph,'browser-versions',mode='stack')} +
      +

      Note: Where a browser has a large number of versions, these have been grouped together.

      +
      +

      Show stats table for:

      + ${month_selector(c.month, c.months, c.day)} +
      +
      + ${stat_table(c.browser_versions)} +
      +
      + ${rickshaw_graph(c.browsers_graph,'browsers',mode='stack')} +
      +
      +

      Show stats table for:

      + ${month_selector(c.month, c.months, c.day)} +
      +
      + ${stat_table(c.browsers)} +
      +
      + ${rickshaw_graph(c.os_graph,'os',mode='stack')} +
      +
      +

      Show stats table for:

      + ${month_selector(c.month, c.months, c.day)} +
      +
      + ${stat_table(c.os)} +
      +
      + ${rickshaw_graph(c.os_versions_graph,'os_versions',mode='stack')} +
      +
      +

      Show stats table for:

      + ${month_selector(c.month, c.months, c.day)} +
      +
      + ${stat_table(c.os_versions)} +
      +
      +

      Number of visits that were referred from social networks

      +
      +

      Show stats table for:

      + ${month_selector(c.month, c.months, c.day)} +
      + ${social_table(c.social_referrer_totals)} +
      +
      + ${rickshaw_graph(c.social_networks_graph, 'social_networks',mode='stack')} +
      +

      Percentage of visits that were referred from these social networks

      +
      +

      Show stats table for:

      + ${month_selector(c.month, c.months, c.day)} +
      +
      + ${stat_table(c.social_networks, 'Visits')} +
      +
      + ${rickshaw_graph(c.languages_graph,'languages',mode='stack')} +
      +
      +

      Show stats table for:

      + ${month_selector(c.month, c.months, c.day)} +
      +
      + ${stat_table(c.languages)} +
      +
      + ${rickshaw_graph(c.country_graph,'country',mode='stack')} +
      +
      +

      Show stats table for:

      + ${month_selector(c.month, c.months, c.day)} +
      +
      + ${stat_table(c.country)} +
      +
      +
    -
    -
    +
    +
    +