testing removing folders for pages, too complicated

vsoch · Aug 16, 2015 · c72756a · c72756a
1 parent 3fafe68
commit c72756a
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 55 deletions.
diff --git a/_config.yml b/_config.yml
@@ -8,13 +8,13 @@ author:
   url: "nipy.github.io"
 
 # Build settings
-baseurl: "" # Change this to your relative path (ex: /blog/), or leave just a /
+baseurl: "/" # Change this to your relative path (ex: /blog/), or leave just a /
 markdown: kramdown
 source: .
 destination: ./_site
-permalink: /blog/:title
+permalink: /:title
 paginate: 8
-paginate_path: /blog/page:num/
+paginate_path: /page:num/
 
 # Default values
 defaults:

diff --git a/_includes/link.html b/_includes/link.html
@@ -1,5 +1,5 @@
-<a href="{{ site.baseurl }}blog">Blog</a>
-<a href="{{ site.baseurl }}help">Help</a>
-<a href="{{ site.baseurl }}conduct">Conduct</a>
-<a href="{{ site.baseurl }}contribute">Contribute</a>
+<a href="{{ site.baseurl }}">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>
 
diff --git a/_includes/menu.html b/_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="/">Home</a>
+        <a href="{{ site.baseurl }}home.html">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>

diff --git a/blog/index.html b/blog/index.html
diff --git a/conduct/index.html → conduct.html b/conduct/index.html → conduct.html
diff --git a/contribute/index.html → contribute.html b/contribute/index.html → contribute.html
diff --git a/help/index.html → help.html b/help/index.html → help.html
diff --git a/home.html b/home.html
@@ -0,0 +1,32 @@
+---
+layout: default
+---
+
+<h2 style="margin-top:20px; margin-bottom:20px">nipy.github.io</h2>
+<a href="{{ site.baseurl }}">
+    <img src="{{ prepend: site.baseurl }}" >
+</a>
+
+
+<div class="panel-group" id="accordion">
+        {% for grouping in site.data.packages %}
+            {% for category in grouping.categories %}
+                {% for package in category.packages %}
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4 class="panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#pr{{ package.tag }}">{{ package.name }} </a>
+                            <a href="{{ package.github }}" target="_blank"><i style="color:#666;float:right;" class="fa fa-github"> </i></a>
+                            <a href="{{ package.doc }}" target="_blank"><i style="color:#333;float:right; margin-right:5px" class="fa fa-home"></i></a>
+                        </h4>
+                    </div>
+                    <div id="pr{{ package.tag }}" class="panel-collapse collapse in">
+                        <div class="panel-body">
+                        <p>{{ package.description }}</p> <a href="{{ site.baseurl }}{{ package.tag }}.html"> <span style="float:right">learn more</a></span></p>
+                        </div>
+                    </div>
+                </div>
+                {% endfor %}
+             {% endfor %}
+</div>
+       {% endfor %}
diff --git a/index.html b/index.html
@@ -2,31 +2,23 @@
 layout: default
 ---
 
-<h2 style="margin-top:20px; margin-bottom:20px">nipy.github.io</h2>
+<h2>nipy.github.io</h2>
 <a href="{{ site.baseurl }}">
     <img src="{{ prepend: site.baseurl }}" >
 </a>
 
 
-<div class="panel-group" id="accordion">
-        {% for grouping in site.data.packages %}
-            {% for category in grouping.categories %}
-                {% for package in category.packages %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h4 class="panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#pr{{ package.tag }}">{{ package.name }} </a>
-                            <a href="{{ package.github }}" target="_blank"><i style="color:#666;float:right;" class="fa fa-github"> </i></a>
-                            <a href="{{ package.doc }}" target="_blank"><i style="color:#333;float:right; margin-right:5px" class="fa fa-home"></i></a>
-                        </h4>
-                    </div>
-                    <div id="pr{{ package.tag }}" class="panel-collapse collapse in">
-                        <div class="panel-body">
-                        <p>{{ package.description }}</p> <a href="{{ site.baseurl }}{{ package.tag }}.html"> <span style="float:right">learn more</a></span></p>
-                        </div>
-                    </div>
-                </div>
-                {% endfor %}
-             {% endfor %}
-</div>
-       {% endfor %}
+<!-- Posts -->
+<ul id="posts">
+
+	{% for post in paginator.posts %}
+
+	  <li class="post">
+	  	<h2><a href="{% if site.baseurl == "/" %}{{ post.url }}{% else %}{{ post.url | prepend: site.baseurl }}{% endif %}">{{ post.title }}</a></h2>
+	  	<time datetime="{{ post.date | date_to_xmlschema }}" class="by-line">{{ post.date | date_to_string }}</time>
+	  	<p>{{ post.content | strip_html | truncatewords:50 }}</p>
+	  </li>
+
+    {% endfor %}
+
+</ul>