RF: make consistent use of baseurl, avoid replace '//','/'

Author: Ben Cipollini

Diff for: _config.yml

@@ -8,7 +8,7 @@ author:
   url: "nipy.github.io"
 
 # Build settings
-baseurl: "/"  # this must be line 11; see circle_urls.sh
+baseurl: ""  # this must be line 11; see circle_urls.sh
 markdown: kramdown
 source: .
 destination: ./_site  # this must be line 14; see circle_urls.sh

Diff for: _data/contribute.yml

@@ -5,7 +5,7 @@
       questions:
         - tag: "add-a-package"
           question: "How do I add a package?"
-          answer: "<h3>Infrastructure and workflow</h3><p>Let's first look at the infrastructure and workflow of the site</p><p><ul class='list-group'><li class='list-group-item'><strong>Github</strong>:The site is a repo under the nipy organization on<a href='nipy.github.com' target='_blank'> github</a>.This means that contribution to it goes by way of forking the repo and doing a pull request (PR).</li><li class='list-group-item'><strong>Github pages</strong>: We also use hosting on github pages, which only means that the site lives on a branch called gh-pages that gets rendered at nipy.github.io.</li><li class='list-group-item'><strong>CI</strong>: We use continuous integration to preview all PRs by way of viewing <a href='https://circle-artifacts.com/gh/vsoch/nipy-jekyll/63/artifacts/0/home/ubuntu/nipy-jekyll/_site/index.html' target='_blank'>artifacts</a>.</li></ul></p><h3>Your Workflow</h3><p>You should do the following:</p><ul><li>Fork the nipy jekyll repo</li><li>Make your changes</li><li>Submit a PR</li><li>We will review the PR, and push to master and ghpages branches.</li></ul></p><h3>Details</h3><ol><li>Add your package info to the data file, in the same format. This will have it rendered automatically in the navigation, and added to the animated brain on all pages.</li><li>Add a base page for your package in the base directory of the site repo. It should be named [packagetag].html where [packagetag] corresponds with the tag variable in the data file. We have a page template for packages, and the easiest thing to do is copy another package's page to start.</li><li>Static site content can be put in the js,css,img folders in the base directory. Any static content can be linked to like '{{ site.baseurl }}/img/myimage.png'. Keep it organized.</li><li>To contribute an svg image, put it in the '_includes/svg' folder and include like {% include svg/mysvg.svg %}</li><li>Subpages should be contributed as posts to <a href='http://neuroimaging.tumblr.com'>blog content</a>.</li></ol><p>"
+          answer: "<h3>Infrastructure and workflow</h3><p>Let's first look at the infrastructure and workflow of the site</p><p><ul class='list-group'><li class='list-group-item'><strong>Github</strong>:The site is a repo under the nipy organization on<a href='nipy.github.com' target='_blank'> github</a>.This means that contribution to it goes by way of forking the repo and doing a pull request (PR).</li><li class='list-group-item'><strong>Github pages</strong>: We also use hosting on github pages, which only means that the site lives on a branch called gh-pages that gets rendered at nipy.github.io.</li><li class='list-group-item'><strong>CI</strong>: We use continuous integration to preview all PRs by way of viewing <a href='https://circle-artifacts.com/gh/vsoch/nipy-jekyll/63/artifacts/0/home/ubuntu/nipy-jekyll/_site/index.html' target='_blank'>artifacts</a>.</li></ul></p><h3>Your Workflow</h3><p>You should do the following:</p><ul><li>Fork the nipy jekyll repo</li><li>Make your changes</li><li>Submit a PR</li><li>We will review the PR, and push to master and ghpages branches.</li></ul></p><h3>Details</h3><ol><li>Add your package info to the data file, in the same format. This will have it rendered automatically in the navigation, and added to the animated brain on all pages.</li><li>Add a base page for your package in the base directory of the site repo. It should be named [packagetag].html where [packagetag] corresponds with the tag variable in the data file. We have a page template for packages, and the easiest thing to do is copy another package's page to start.</li><li>Static site content can be put in the js,css,img folders in the base directory. Any static content can be linked to like '{{ '/img/myimage.png' | prepend: site.baseurl }}'. Keep it organized.</li><li>To contribute an svg image, put it in the '_includes/svg' folder and include like {% include svg/mysvg.svg %}</li><li>Subpages should be contributed as posts to <a href='http://neuroimaging.tumblr.com'>blog content</a>.</li></ol><p>"
         - tag: "write-a-post"
           question: "How do I write a post?"
           answer: "<h3>Quick and Easy</h3><p>The fastest way to contribute is to <a href='http://neuroimaging.tumblr.com/submit'> submit </a> an idea, link, or video right away, or <a href='http://neuroimaging.tumblr.com/ask'>ask us a question</a>. Your submission will be reviewed and immediately available on the site and for social media integration.</p><h3>Contribute Regularly</h3><p>If you like writing tutorials, or regularly write about your research, we encourage you to <a href='https://www.tumblr.com/docs/en/posting' target='_blank'> read more about posting</a> and <a href='mailto:[email protected]'>contact us</a> with your email or tumblr username, and you will be added as a contributor to the blog. As an official contributor you can write posts in several formats, receive notifications, integrate apps, and contribute via email. Contributors are subject to the same standards of conduct as non-affiliated posters.</p><h3>Package Specific</h3><p>To contribute content, or a 'blogroll' for your package, we encourage you to become a tumblr contributor, tag your posts with your package, and <a href='https://www.tumblr.com/docs/en/using_tags#specific' target='_blank'>link to the tagged posts</a> from your package page.</p>"

Diff for: _includes/head.html

@@ -5,18 +5,18 @@
 	<meta name="generator" content="Jekyll">
 
 	<title>{%if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
-       
+
        <!-- JS -->
        <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
        <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-       <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script> 
-       <script src="{{ "js/tipsy.js" | prepend: site.baseurl }}"></script>
-       
+       <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
+       <script src="{{ '/js/tipsy.js' | prepend: site.baseurl }}"></script>
+
 
 	<!-- CSS & fonts -->
-       <link rel="stylesheet" href="{{ "css/bootstrap.min.css" | prepend: site.baseurl }}">
-       <link rel="stylesheet" href="{{ "css/main.css" | prepend: site.baseurl }}">
+       <link rel="stylesheet" href="{{ '/css/bootstrap.min.css' | prepend: site.baseurl }}">
+       <link rel="stylesheet" href="{{ '/css/main.css' | prepend: site.baseurl }}">
        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
 	<link href='https://fonts.googleapis.com/css?family=Roboto:300' rel='stylesheet' type='text/css'>
 

Diff for: _includes/link.html

@@ -1,5 +1,5 @@
 <a href="http://neuroimaging.tumblr.com">Blog</a>
-<a href="{{ site.baseurl }}help.html">Help</a>
-<a href="{{ site.baseurl }}conduct.html">Conduct</a>
-<a href="{{ site.baseurl }}contribute.html">Contribute</a>
+<a href="{{ '/help.html' | prepend: site.baseurl }}">Help</a>
+<a href="{{ '/conduct.html' | prepend: site.baseurl }}">Conduct</a>
+<a href="{{ '/contribute.html' | prepend: site.baseurl }}">Contribute</a>
 

Diff for: _includes/menu.html

@@ -1,7 +1,7 @@
 <nav {% if site.reverse == true %}id="nav-left"{% else %}id="nav"{% endif %}>
 
     <div id="nav-list">
-        <a href="{{ site.baseurl }}">Home</a>
+        <a href="{{ '/' | prepend: site.baseurl }}">Home</a>
 
         <!-- Nav pages -->
         <a href="#projects" class="list-group-item list-group-item" data-toggle="collapse">Projects <i class="fa fa-caret-down"></i></a>
@@ -11,7 +11,7 @@
             <div class="collapse" id="{{ category.tag }}" style="color:lime">
             {% for package in site.packages %}
                 {% if package.category == category.tag %}
-                <a href="{{ site.baseurl }}packages/{{ package.tag }}.html" style="border-radius:0px; color:lime;" id="{{ package.tag }}" class="list-group-item list-project">{{ package.name }}</a>
+                <a href="{{ package.url | prepend: site.baseurl }}" style="border-radius:0px; color:lime;" id="{{ package.tag }}" class="list-group-item list-project">{{ package.name }}</a>
                 {% endif %}
             {% endfor %}
             </div>

Diff for: _includes/script.html

@@ -1 +1 @@
-<script src="{{ "js/main.js" | prepend: site.baseurl }}"></script>
+<script src="{{ '/js/main.js' | prepend: site.baseurl }}"></script>

Diff for: _includes/snakey.html

@@ -5,7 +5,7 @@
             <div id="snakey"></div>
         </div>
         <div class="col-md-10">
-            <img src="{{ site.baseurl }}img/nipy.svg" width="150px">
+            <img src="{{ '/img/nipy.svg' | prepend: site.baseurl }}" width="150px">
         </div>
    </div>
 </div>
@@ -38,7 +38,7 @@
                     radius: "10",
                     color: colors[{{ category.count }}],
                     tag: "{{ package.tag }}",
-                    url: "{{ package.url | prepend: site.baseurl | replace:'//','/'}}"
+                    url: "{{ package.url | prepend: site.baseurl }}"
                   },
                  {% endif %}
               {% endfor %}

Diff for: _layouts/default.html

@@ -8,44 +8,44 @@
 
     <!-- Navigation -->
     {% include menu.html %}
-    
+
     <!-- Icon menu -->
     <a href="#" {% if site.reverse == true %}id="nav-menu-left"{% else %}id="nav-menu"{% endif %}>
         <div id="menu"></div>
     </a>
 
     <!-- Header -->
     {% include header.html %}
-    
+
     <!-- Main content -->
     <div id="container">
         <main>
 	    {{ content }}
         </main>
-		
+
         <!-- Pagination links -->
         {% if paginator.total_pages > 1 %}
             <div class="pagination">
             {% if paginator.previous_page == 1 %}
-            <a href="{{ '/' | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">&laquo;</a>
+            <a href="{{ '/' | prepend: site.baseurl }}" class="page-item">&laquo;</a>
             {% elsif paginator.previous_page%}
-            <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">&laquo;</a>
+            <a href="{{ paginator.previous_page_path | prepend: site.baseurl }}" class="page-item">&laquo;</a>
             {% else %}
             <span class="page-item">&laquo;</span>
             {% endif %}
-        
+
             {% for page in (1..paginator.total_pages) %}
                 {% if page == paginator.page %}
                 <span class="page-item">{{ page }}</span>
                 {% elsif page == 1 %}
-                <a href="{{ '/' | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">{{ page }}</a>
+                <a href="{{ '/' | prepend: site.baseurl }}" class="page-item">{{ page }}</a>
                 {% else %}
-                <a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}" class="page-item">{{ page }}</a>
+                <a href="{{ site.paginate_path | prepend: site.baseurl | replace: ':num', page }}" class="page-item">{{ page }}</a>
                 {% endif %}
             {% endfor %}
-        
+
             {% if paginator.next_page %}
-            <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="page-item">&raquo;</a>
+            <a href="{{ paginator.next_page_path | prepend: site.baseurl }}" class="page-item">&raquo;</a>
             {% else %}
             <span class="page-item">&raquo;</span>
             {% endif %}

Diff for: circle_urls.sh

@@ -1,3 +1,3 @@
-BASEURL=https://circle-artifacts.com/gh/nipy/nipy.github.com/$CIRCLE_BUILD_NUM/artifacts/0/home/ubuntu/nipy.github.com/_site/
+BASEURL=https://circle-artifacts.com/gh/nipy/nipy.github.com/$CIRCLE_BUILD_NUM/artifacts/0/home/ubuntu/nipy.github.com/_site
 sed -i "14 s,.*,destination: ./_site,g" "_config.yml"
 sed -i "11 s,.*,baseurl: $BASEURL,g" "_config.yml"

Diff for: contribute.html

@@ -73,6 +73,6 @@ <h4 class="panel-title">
 {% endfor %}
 
 <p>Thanks for stopping by!</p>
-<img src="{{ site.baseurl }}img/reggie.png"/>
+<img src="{{ '/img/reggie.png | prepend: site.baseurl }}"/>
 
 </div>

Diff for: index.html

@@ -3,11 +3,8 @@
 ---
 
 <h2 style="margin-top:20px; margin-bottom:20px">nipy.github.io</h2>
-<a href="{{ site.baseurl }}">
-    <img src="{{ site.baseurl }}" >
-</a>
 
-<p>Welcome to NIPY. The NIPY community is a community of practice devoted to the use of the Python programming language in the analysis of neuroimaging data. You can find us on <a href="https://github.com/nipy" target="_blank">github</a>, as well as <a href="http://neuroimaging.tumblr.com" target="_blank">social media</a>. We welcome <a href="{{ site.baseurl }}contribute.html">contributions</a> and welcome you to read about our <a href="{{ site.baseurl }}conduct.html">standards of conduct</a>, or <a href="{{ site.baseurl }}help.html">ask for help.</a> We develop the following projects:</p>
+<p>Welcome to NIPY. The NIPY community is a community of practice devoted to the use of the Python programming language in the analysis of neuroimaging data. You can find us on <a href="https://github.com/nipy" target="_blank">github</a>, as well as <a href="http://neuroimaging.tumblr.com" target="_blank">social media</a>. We welcome <a href="{{ '/contribute.html' | prepend: site.baseurl">contributions</a> and welcome you to read about our <a href="{{ '/conduct.html' | prepend: site.baseurl }}">standards of conduct</a>, or <a href="{{ '/help.html' | prepend: site.baseurl }}">ask for help.</a> We develop the following projects:</p>
 
 <div class="panel-group" id="accordion">
         {% for category in site.data.package-categories %}
@@ -24,7 +21,7 @@ <h4 class="panel-title">
                     <div id="pr{{ package.tag }}" class="panel-collapse collapse in">
                         <div class="panel-body">
                         <p>{{ package.description }}</p>
-                        <a href="{{ package.url | prepend: site.baseurl | replace:'//','/'}}">
+                        <a href="{{ package.url | prepend: site.baseurl }}">
                             <span style="float:right">learn more</span>
                         </a>
                         </div>