categories

biodatasets · Sep 8, 2016 · 9d7e2ff · 9d7e2ff
1 parent 24e994c
commit 9d7e2ff
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 383 deletions.
diff --git a/_config.yml b/_config.yml
@@ -42,7 +42,7 @@ kramdown:
 # port
 # port: 1234
 
-biocaddie_categories: [Phenotype, Genotype, TestMe]
+biocaddie_categories: [Phenotype, Genotype, Exposome]
 
 # url
 category_dir: category/

diff --git a/_includes/category.html b/_includes/category.html
@@ -1,11 +1,11 @@
 {% capture categories %}
   {% if post %}
     {% for category in post.categories %}
-        <a href="{{ root_url }}/{{ site.category_dir }}#{{ category }}" title="Category: {{ category }}" rel="category">{{ category | join: "/" }}</a>{% unless forloop.last %}&nbsp;{% endunless %}
+        <a href="{{ site.baseurl }}{{ root_url }}/{{ site.category_dir }}#{{ category }}" title="Category: {{ category }}" rel="category">{{ category | join: "/" }}</a>{% unless forloop.last %}&nbsp;{% endunless %}
     {% endfor %}
   {% else %}
     {% for category in page.categories %}
-        <a href="{{ root_url }}/{{ site.category_dir }}#{{ category }}" title="Category: {{ category }}" rel="category">{{ category | join: "/" }}</a>{% unless forloop.last %}&nbsp;{% endunless %}
+        <a href="{{ site.baseurl }}{{ root_url }}/{{ site.category_dir }}#{{ category }}" title="Category: {{ category }}" rel="category">{{ category | join: "/" }}</a>{% unless forloop.last %}&nbsp;{% endunless %}
     {% endfor %}
   {% endif %}
 {% endcapture %}

diff --git a/_metadata/my-first-dataset.md b/_metadata/my-first-dataset.md
@@ -2,9 +2,7 @@
 layout: dataset
 title:  "My DataSet1"
 date:   2015-05-20
-categories: Exposome Phenotype Genotype TestMe
-category: foo
-tags: mosquitoes microcephaly
+categories: Exposome Phenotype Genotype
 index: biocaddie
 ---
 

diff --git a/_metadata/my-second-dataset.md b/_metadata/my-second-dataset.md
@@ -2,9 +2,7 @@
 layout: dataset
 title:  "My DataSet2"
 date:   2015-05-20
-categories: Genome Human
-category: foo
-tags: exome
+categories: Exome Genome Human Analysis
 index: biocaddie
 ---
 

diff --git a/_posts/2015-02-10-welcome-to-jekyll.markdown b/_posts/2015-02-10-welcome-to-jekyll.markdown
diff --git a/_posts/2016-08-01-welcome-to-mybiocaddie.markdown b/_posts/2016-08-01-welcome-to-mybiocaddie.markdown
@@ -0,0 +1,10 @@
+---
+layout: post
+title:  "Welcome"
+date:   2016-08-01
+categories: Announce
+tags: announcement
+excerpt: Welcome to mybiocaddie!
+---
+
+See the about page for more info!
diff --git a/index.html b/index.html
@@ -4,8 +4,13 @@
 
 <div class="page clearfix" index>
     <div class="left">
-        <h1>My Datasets</h1>
+      <h1>My Datasets</h1>
+      <p>
+        This is where all of my data is. Enjoy!
+      </p>
         <hr>
+        {% assign newcars = site.metadata | where: "category", "new" %}
+
         <ul>
             {% for post in site.metadata %}
               <li>

diff --git a/page/1category.html b/page/1category.html
@@ -11,48 +11,27 @@
         <h1>{{page.title}}</h1>
         <hr>
         <ul>
-            {% for category in site.categories %}
-            <h2 id="{{category | first}}">{{category | first}}</h2>
-                {% for posts in category  %}
-                    {% for post in posts %}
-                        {% if post.url %}
-                        <li>
-                            <time>
-                            {{ post.date | date:"%F" }} {{ post.date | date: "%a" }}.
-                            </time>
-                            <a class="title" href="{{ post.url }}">{{ post.title }}</a>
-
-                            {% include category.html %}
-                            {% include tag.html %}
-                        </li>
-                        {% endif %}
-                    {% endfor %}
-                {% endfor %}
-            {% endfor %}
+          {% for category in site.biocaddie_categories %}
+          <h2 id="{{category}}">{{category}}</h2>
+          <h3>FILTERED: {{filtered_sets}} </h3>
+          {% for post in site.metadata %}
+          {% if post.categories contains {{category}} %}
+          <li>
+            <time>
+              {{ post.date | date:"%F" }} {{ post.date | date: "%a" }}.
+            </time>
+            <a class="title" href="{{ post.url }}">{{ post.title }}</a>
+
+            {% include category.html %}
+            {% include tag.html %}
+          </li>
+          {% endif %}
+          {% endfor %}
+          {% endfor %}
         </ul>
     </div>
     <button class="anchor"><i class="fa fa-anchor"></i></button>
     <div class="right">
-        <div class="wrap">
-
-            <!-- Content -->
-            <div class="side content">
-                <div>
-                    Content
-                </div>
-                <ul id="content-side" class="content-ul">
-                    {% for category in site.categories%}
-                        <li>
-                            <a class="scroll" href="#{{ category | first }}">
-                                {{ category | first }} ({{ category | last | size }})
-                            </a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </div>
-            <!-- 其他div框放到这里 -->
-            <!-- <div class="side">bbbb</div> -->
-        </div>
     </div>
 </div>
 <script src="{{ "/js/pageContent.js " | prepend: site.baseurl }}" charset="utf-8"></script>
diff --git a/page/2tags.html b/page/2tags.html