Skip to content

Commit 61eceb6

Browse files
committed
Updated to use collections for projects and questions
1 parent 8393bef commit 61eceb6

20 files changed

+47
-40
lines changed

_config.yml

+22-14
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,23 @@ permalink: /:categories/:title
1313
excerpt_separator: <!--more--> #use this in posts to define how long the excerpt of the post (that is shown on the Blog page) is
1414

1515
colors: #in hex code if not noted else
16-
primary: "#00b3fe" #"#F70031"
17-
primary_rgb: "0,179,254" #"247,0,49" #rgb of the primary. Needed in some places for the transparency effect.
16+
primary: "#00b3fe" #"#F70031"
17+
primary_rgb: "0,179,254" #"247,0,49" #rgb of the primary. Needed in some places for the transparency effect.
1818
secondary: "#384452" #"#33004D"
1919
link: "#428bca"
2020
link_hover: "#01b2fe"
2121
footer_heading: "#ffffff"
2222
footer_content: "#bfc9d3"
23-
24-
23+
24+
# Making projects separate from posts
25+
collections:
26+
projects:
27+
output: true
28+
permalink: /projects/:title/
29+
questions:
30+
output: true
31+
permalink: /questions/:title/
32+
2533
### CONTACT SETTINGS ###
2634

2735
# Social networks usernames. Many more available: google-plus, flickr, linkedin, etc). Shown in footer.
@@ -31,15 +39,15 @@ social:
3139
- title: facebook
3240
url:
3341
- title: twitter
34-
url:
42+
url:
3543
- title: instagram
36-
url:
44+
url:
3745
- title: tumblr
38-
url:
39-
46+
url:
47+
4048
# Postal address (add as many lines as necessary). Shown in footer and on Contact page.
4149
address:
42-
- lines:
50+
- lines:
4351
- Some Ave, 987,
4452
- 23890, New York,
4553
- United States.
@@ -48,7 +56,7 @@ tel: +34 8493-4893
4856

4957

5058
### GENERAL DATA FOR VARIOUS LOCATIONS ###
51-
59+
5260
# Members information. Shown on About page.
5361
members:
5462
- name: Mark Webber
@@ -87,7 +95,7 @@ members:
8795
url: mailto:[email protected]
8896
- title: twitter
8997
url: http://twitter.com/handle
90-
98+
9199
# Clients information. Shown on Home and About pages.
92100
clients:
93101
- name: dribbble
@@ -98,12 +106,12 @@ clients:
98106
img: client03.png
99107
- name: VimeoPro
100108
img: client04.png
101-
109+
102110
# Short text about your company. Shown in footer on every page and also separately on Home and Contact page.
103111
about: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s."
104112

105-
# Testimonial content. Shown on Home and About page.
113+
# Testimonial content. Shown on Home and About page.
106114
testimonial:
107115
message: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged."
108116
author: Marcel Newman
109-
position: WEB DESIGNER - BLACKTIE.CO
117+
position: WEB DESIGNER - BLACKTIE.CO

_includes/portfolio.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="portfolio-centered">
33
{% if include.title %}<h3>{{ include.title }}</h3>{% endif %}
44
<div class="recentitems portfolio">
5-
{% for project in site.categories['project'] limit:include.limit %}
5+
{% for project in site.projects limit:include.limit %}
66
<div class="portfolio-item graphic-design">
77
<div class="he-wrap tpl6">
88
<img src="{{ "/assets/img/project/" | prepend: site.baseurl }}{{ project.img }}" alt="">
@@ -12,10 +12,10 @@ <h3 class="a1" data-animate="fadeInDown">{{ project.title }}</h3>
1212
<a data-rel="prettyPhoto" href="{{ "/assets/img/project/" | prepend: site.baseurl }}{{ project.img }}" class="dmbutton a2" data-animate="fadeInUp"><i class="fa fa-search"></i></a>
1313
<a href="{{ project.url | prepend: site.baseurl }}" class="dmbutton a2" data-animate="fadeInUp"><i class="fa fa-link"></i></a>
1414
</div><!-- he bg -->
15-
</div><!-- he view -->
15+
</div><!-- he view -->
1616
</div><!-- he wrap -->
1717
</div><!-- end col-12 -->
1818
{% endfor %}
1919
</div><!-- portfolio -->
2020
</div><!-- portfolio container -->
21-
</div><!--/Portfoliowrap -->
21+
</div><!--/Portfoliowrap -->

_includes/sidebar.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,34 @@ <h4>Subscribe</h4>
1414
<div class="spacing"></div>
1515
<h4>Categories</h4>
1616
<div class="hline"></div>
17-
{% for category in site.categories %}{% unless category.first == "blog" or category.first == "project" or category.first == "question" %}
17+
{% for category in site.categories %}
1818
<p>
1919
<a href="{{ '/category/#' | prepend: site.baseurl }}{{ category | first }}"><i class="fa fa-angle-right"></i> {{ category | first | capitalize }}</a>
2020
<span class="badge badge-theme pull-right">{{ category | last | size }}</span>
2121
</p>
22-
{% endunless %}{% endfor %}
22+
{% endfor %}
2323

2424
<div class="spacing"></div>
2525

2626
<h4>Recent Posts</h4>
2727
<div class="hline"></div>
2828
<ul class="popular-posts">
29-
{% for post in site.categories['blog'] limit:4 %}
29+
{% for post in site.posts limit:4 %}
3030
<li>
3131
<a href="{{ post.url | prepend: site.baseurl }}"><img src="{{ "/assets/img/blog/thumbs/" | prepend: site.baseurl }}{{ post.thumb }}" alt="Popular Post"></a>
3232
<p><a href="{{ post.url }}">{{ post.title }}</a></p>
3333
<em>Posted on {{ post.date | date_to_string }}</em>
3434
</li>
35-
{% endfor %}
35+
{% endfor %}
3636
</ul>
3737

3838
<div class="spacing"></div>
3939

4040
<h4>Popular Tags</h4>
4141
<div class="hline"></div>
4242
<p>
43-
{% for category in site.categories %}{% unless category.first == "blog" or category.first == "project" or category.first == "question" %}
44-
<a class="btn btn-theme" href="{{ '/category/#' | prepend: site.baseurl }}{{ category | first }}" role="button">{{ category | first | capitalize }} ({{ category | last | size }})</a>
45-
{% endunless %}{% endfor %}
43+
{% for category in site.categories %}
44+
<a class="btn btn-theme" href="{{ '/category/#' | prepend: site.baseurl }}{{ category | first }}" role="button">{{ category | first | capitalize }} ({{ category | last | size }})</a>
45+
{% endfor %}
4646
</p>
47-
</div>
47+
</div>

_posts/blog/2014-04-25-logo-design-contest-starts-now.markdown _posts/2014-04-25-logo-design-contest-starts-now.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ It is a long established fact that a reader will be distracted by the readable c
2828
2929
There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable.
3030

31-
[hampden]: https://github.com/jekyll/jekyll
31+
[hampden]: https://github.com/jekyll/jekyll

assets/js/retina-1.1.0.js

-1
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,3 @@
149149
}
150150

151151
})();
152-

blog.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<! -- BLOG POSTS LIST -->
1111
<div class="col-lg-8">
1212

13-
{% for post in site.categories['blog'] %}
13+
{% for post in site.posts %}
1414
<! -- Blog Post -->
1515
<a href="{{ post.url | prepend: site.baseurl }}">
1616
<img class="img-responsive" src="{{ "/assets/img/blog/" | prepend: site.baseurl }}{{ post.img }}">
17-
</a>
17+
</a>
1818
<a href="{{ post.url | prepend: site.baseurl }}"><h3 class="ctitle">{{ post.title }}</h3></a>
1919
<p><csmall>{{ post.date | date: "%b %-d, %Y" }}. | By: {{ post.author }}</csmall></p>
2020
{{ post.excerpt }}
@@ -29,4 +29,4 @@
2929
{% include sidebar.html %}
3030

3131
</div><! --/row -->
32-
</div><! --/container -->
32+
</div><! --/container -->

category.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div class="col-lg-8">
1010

1111
<! -- BLOG POSTS LIST -->
12-
{% for category in site.categories %}{% unless category.first == "blog" or category.first == "project" or category.first == "question" %}
12+
{% for category in site.categories %}
1313

1414
<a class="anchor" id="{{ category.first }}"></a><h4>{{ category.first }}</h4>
1515
<div class="hline"></div>
@@ -21,15 +21,15 @@
2121
<p><a href="{{ post.url }}">{{ post.title }}</a></p>
2222
<em>Posted on {{ post.date | date_to_string }}</em>
2323
</li>
24-
24+
2525
{% endfor %}
2626
</ul>
2727

2828

29-
{% endunless %}{% endfor %}
29+
{% endfor %}
3030
</div><! --/col-lg-8 -->
3131

3232
{% include sidebar.html %}
3333

3434
</div><! --/row -->
35-
</div><! --/container -->
35+
</div><! --/container -->

index.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h4>Retina Ready</h4>
2424
<h4>Quality Theme</h4>
2525
<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.</p>
2626
<p><br/><a href="#" class="btn btn-theme">More Info</a></p>
27-
</div>
27+
</div>
2828
</div>
2929
</div><! --/container -->
3030
</div><! --/service -->
@@ -42,18 +42,18 @@ <h4>More About Our Agency.</h4>
4242
<div class="col-lg-3">
4343
<h4>Frequently Asked</h4>
4444
<div class="hline"></div>
45-
{% for post in site.categories['question'] %}
46-
<p><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></p>
45+
{% for question in site.questions %}
46+
<p><a href="{{ question.url | prepend: site.baseurl }}">{{ question.title }}</a></p>
4747
{% endfor %}
4848
</div>
4949

5050
<div class="col-lg-3">
5151
<h4>Latest Posts</h4>
5252
<div class="hline"></div>
53-
{% for post in site.categories['blog'] limit:5 %}
53+
{% for post in site.posts limit:5 %}
5454
<p><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}.</a></p>
55-
{% endfor %}
55+
{% endfor %}
5656
</div>
5757

5858
</div><! --/row -->
59-
</div><! --/container -->
59+
</div><! --/container -->

0 commit comments

Comments
 (0)