remove repository_owner/name config in favor of github vars. closes #36

timwis · Mar 28, 2016 · 98136e4 · 98136e4
1 parent 367805b
commit 98136e4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/_config.yml b/_config.yml
@@ -2,10 +2,6 @@ title: JKAN
 description: A lightweight, backend-free open data portal, powered by Jekyll.
 baseurl: /jkan
 
-# GitHub Repo Info
-repository_owner: timwis
-repository_name: jkan
-
 # Authentication
 github_client_id: 
 gatekeeper_host: 
@@ -27,6 +23,9 @@ category_list:
   - Transportation
   - Uncategorized
 
+# Link for the "fork me on github" banner. Remove this line to suppress banner.
+fork_me_url: https://github.com/timwis/jkan
+
 # Nav bar
 navigation:
   - title: Datasets

diff --git a/_includes/head.html b/_includes/head.html
@@ -20,8 +20,8 @@
     FILE_PATH: {{ page.path | jsonify }},
     DATASETS_DIR: {{ datasets.relative_directory | jsonify }},
     BRANCH: {% if site.github.is_user_page %}"master"{% else %}"gh-pages"{% endif %},
-    REPO_OWNER: {{ site.github.owner_name | default: site.repository_owner | jsonify }},
-    REPO_NAME: {{ site.github.project_title | default: site.repository_name | jsonify }},
+    REPO_OWNER: {{ site.github.owner_name | jsonify }},
+    REPO_NAME: {{ site.github.project_title | jsonify }},
     GITHUB_CLIENT_ID: {{ site.github_client_id | jsonify }},
     GATEKEEPER_HOST: {{ site.gatekeeper_host | jsonify }}
   }

diff --git a/_layouts/dataset.html b/_layouts/dataset.html
@@ -27,7 +27,7 @@ <h3><a href="{{ site.baseurl }}/datasets/?organization={{ organization.title | s
   {% endif %}
     <h1>
       {{ page.title }}
-      <a href="https://github.com/{{ site.repository_owner }}/{{ site.repository_name }}/edit/gh-pages/{{ page.path }}" class="pull-right btn btn-default" role="button" data-hook="edit-button">Edit</a>
+      <a href="https://github.com/{{ site.github.owner_name }}/{{ site.github.project_title }}/edit/gh-pages/{{ page.path }}" class="pull-right btn btn-default" role="button" data-hook="edit-button">Edit</a>
     </h1>
     <p>{{ page.notes }}</p>
 

diff --git a/index.html b/index.html
@@ -2,7 +2,9 @@
 layout: default
 ---
 
-<a href="https://github.com/{{ site.repository_owner }}/{{ site.repository_name }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>
+{% if site.fork_me_url %}
+<a href="{{ site.fork_me_url }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>
+{% endif %}
 
 <div class="jumbotron">
   <h1>Welcome to {{ site.title }}</h1>