updating analytics branch based on PR comments

_config.yml

@@ -1,7 +1,7 @@
 title: JKAN
 description: A lightweight, backend-free open data portal, powered by Jekyll.
 baseurl: /jkan
-logo:
+logo: /img/jkan.png
 
 # Authentication
 github_client_id:
@@ -76,7 +76,7 @@ hypothesis:
 # Twitter
 twittercard:
   enabled: false
-  site: ""
+  username: "@"
 
 # Open Graph
 opengraph:

_datasets/sample-dataset.md

@@ -4,7 +4,7 @@ notes: This is an example dataset that comes with a new installation of JKAN
 maintainer: Tim Wisniewski
 maintainer_email: [email protected]
 organization: Sample Department
-category: Education
+category: [Education, Environment]
 resources:
   - url: http://data.phl.opendata.arcgis.com/datasets/1839b35258604422b0b520cbb668df0d_0.csv
     name: Air Monitoring Stations CSV

_includes/addons/twittercard.html

@@ -1,7 +1,7 @@
 <meta name="twitter:card" content="summary" />
-<meta name="twitter:site" content="{{ site.title }}" />
+<meta name="twitter:site" content="{{ site.twittercard.username }}" />
 <!-- Twitter truncates twitter:title to 70 characters. -->
-<meta name="twitter:title" content="{{ site.title | truncate: 70 }}" />
+<meta name="twitter:title" content="{{ page.title | truncate: 70 }}" />
 <!-- Twitter truncates twitter:description at the word to 200 characters. -->
-<meta name="twitter:description" content="{{ site.description | truncate: 200 }}" />
-<meta name="twitter:image" content="{{ site.url }}{{ site.logo }}" />
+<meta name="twitter:description" content="{{ page.note | truncate: 200 }}" />
+<meta name="twitter:image" content="{{ site.logo }}" />

_layouts/dataset.html

@@ -12,18 +12,22 @@
 </div>
 
 {% assign organization = site.organizations | where:"title",page.organization | first %}
-<div class="row" data-hook="read-view">
+<div data-hook="read-view">
   {% if organization %}
-  <div class="col-sm-3">
-    <div class="panel panel-default">
-    {% if organization.logo %}
-      <a href="{{ site.baseurl }}/datasets/?organization={{ organization.title | slugify }}" class="thumbnail"><img src="{{ organization.logo }}" alt="{{ organization.title }} logo"></a>
-    {% endif %}
-      <div class="panel-heading"><h3><a href="{{ site.baseurl }}/datasets/?organization={{ organization.title | slugify }}">{{ organization.title }}</a></h3>
-        <div class="panel-body">{{ organization.description }}</p></div>
+    <div class="col-sm-3">
+      <div class="panel panel-default">
+          <div class="panel-heading">
+            {% if organization.logo %}
+            <a href="{{ site.baseurl }}/datasets/?organization={{ organization.title | slugify }}" class="thumbnail"><img src="{{ organization.logo }}" alt="{{ organization.title }} logo"></a>
+            {% endif %}
+          </div>
+          <div class="panel-body">
+            <h3><a href="{{ site.baseurl }}/datasets/?organization={{ organization.title | slugify }}">{{ organization.title }}</a></h3>
+            {{ organization.description }}
+          </div>
+        </div>
       </div>
     </div>
-  </div>
   <div class="col-sm-9">
   {% else %}
   <div class="col-sm-12">
@@ -52,10 +56,12 @@ <h2>Additional Info</h2>
       <dd>
         {% if page.category.size %}
           {% for category in page.category %}
-            <a href="{{ site.baseurl }}/datasets/?category={{ category | slugify }}"><h4><span class="label label-danger">{{ category }}</span></a></h4><br>
+            <div class="btn-group" role="group" aria-label="...">
+              <a href="{{ site.baseurl }}/datasets/?category={{ category | slugify }}" class="btn btn-primary">{{ category }}</a>
+            </div>
           {% endfor %}
         {% else %}
-          <a href="{{ site.baseurl }}/datasets/?category={{ page.category | slugify }}">{{ page.category }}</a>
+          <a href="{{ site.baseurl }}/datasets/?category={{ page.category | slugify }}" class="btn btn-primary">{{ page.category }}</a>
         {% endif %}
       </dd>
       {% endif %}