Skip to content

Commit 0af0341

Browse files
loicfreringloicfrering
committed
Markup review.
1 parent ff969b1 commit 0af0341

File tree

5 files changed

+92
-105
lines changed

5 files changed

+92
-105
lines changed

‎_includes/comments.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<script type="text/javascript">
2+
var disqus_shortname = 'pullrequest';
3+
var disqus_developer = 1;
4+
(function() {
5+
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
6+
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
7+
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
8+
})();
9+
</script>
10+
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus</a>.</noscript>

‎_includes/tags.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Tags:
22
<ul>
3-
{% for tag in post.tags %}
4-
<a href="{{ tag }}.html" title="View posts tagged with &quot;{{ tag }}&quot;">{{ tag }}, </a>
5-
{% endfor %}
3+
{% for tag in post.tags %}
4+
{% unless forloop.last %}
5+
<a href="tags.html#{{ tag }}" title="Voir les posts ayant le tag {{ tag }} ">{{ tag }}</a> ,
6+
{% else %}
7+
<a href="tags.html#{{ tag }}" title="Voir les posts ayant le tag {{ tag }} ">{{ tag }}</a>.
8+
{% endunless %}
9+
{% endfor %}
610
</ul>

‎_layouts/default.html‎

Lines changed: 44 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<title>.::PullRequest.org::. {{ page.title }}</title>
1212
<meta name="description" content="">
13-
<meta name="author" content="">
13+
<meta name="author" content="PullRequest team">
1414

1515
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1616

@@ -23,66 +23,57 @@
2323
<body>
2424

2525
<div id="container">
26-
<header class="header">
27-
<h1><a href="/"><img src="/public/img/pullrequest-logo.png" alt="Pull Request"/></a></h1>
26+
<header>
27+
<h1><a href="/"><img src="/public/img/pullrequest-logo.png" alt="PullRequest"/></a></h1>
2828
</header>
2929

3030
<div id="main" role="main">
31-
<div id="sticky-wrapper">
32-
<section id="main-content">
33-
{{ content }}
31+
{{ content }}
32+
33+
<aside>
34+
<section id="about">
35+
<h1>A propos</h1>
36+
<p>PullRequest est un blog de développeurs ouvert à toute contribution appropriée.</p>
37+
</section>
38+
<section id="follow">
39+
<h1>Suivez nous!</h1>
40+
<ul>
41+
<li><a href="http://twitter.com/pullrequest">Sur Twitter</a></li>
42+
<li><a rel="alternate" type="application/rss+xml" href="http://feeds.feedburner.com/pullrequest/blog-posts">Via RSS</a></li>
43+
</ul>
44+
</section>
45+
<section id="contribute">
46+
<h1>Participer</h1>
47+
<p>
48+
Les articles sont écrits en <a href="http://daringfireball.net/projects/markdown/syntax">MarkDown</a> et stockés dans un repository Git sur <a href="http://github.com/pullrequest/pullrequest.github.com">Github</a>.
49+
N'hésitez pas à <strong>forker</strong> puis à faire une <strong><a href="https://github.com/pullrequest/pullrequest.github.com/pull/new/master">Pull Request</a></strong> ;)
50+
</p>
51+
</section>
52+
<section id="licensing">
53+
<h1>Licence</h1>
54+
<p>
55+
Les articles sont mis à disposition selon les termes de la <a rel="license" href="http://creativecommons.org/licenses/by/2.0/fr/">Licence Creative Commons Paternité 2.0 France</a>.
56+
<a rel="license" href="http://creativecommons.org/licenses/by/2.0/fr/">
57+
<br><img alt="Contrat Creative Commons" style="border-width:0" src="http://i.creativecommons.org/l/by/2.0/fr/88x31.png" />
58+
</a>
59+
</p>
60+
</section>
61+
<section id="opensource">
62+
<h1>OpenSource</h1>
63+
<p>Les auteurs de PullRequest sont à l'origine, ou contributeurs, entre autre, de ces projets:</p>
64+
<a href="http://openscales.org">OpenScales</a>
65+
<a href="http://resthub.org">RestHub</a>
66+
<a href="https://github.com/loicfrering/LosoBundle">LosoBundle</a>
67+
<a href="https://github.com/loicfrering/losolib">LoSoLib</a>
68+
<a href="https://bitbucket.org/feugy/myth">Myth</a>
3469
</section>
70+
</aside>
3571

36-
<aside>
37-
<!--
38-
<section class="about">
39-
<h1>About</h1>
40-
<p>Pull Request, c'est un blog ... &lt;placer la suite ici&gt;</p>
41-
</section>
42-
-->
43-
<section class="about">
44-
<h1>A propos</h1>
45-
<p>PullRequest est un blog de développeur ouvert à toute contribution que nous jugerons intéressante.</p>
46-
</section>
47-
<section class="follow">
48-
<h1>Suivez nous!</h1>
49-
<ul>
50-
<li><a href="http://twitter.com/pullrequest">Sur Twitter</a></li>
51-
<li><a rel="alternate" type="application/rss+xml" href="http://feeds.feedburner.com/pullrequest/blog-posts">Via RSS</a></li>
52-
</ul>
53-
</section>
54-
<section id="participate">
55-
<h1>Participer</h1>
56-
<p>
57-
Les articles sont écrits en <a href="http://daringfireball.net/projects/markdown/syntax">MarkDown</a> et stockés dans un repository Git sur <a href="http://github.com/pullrequest/pullrequest.github.com">Github</a>.
58-
N'hésitez pas à <strong>forker</strong> puis à faire une <strong><a href="https://github.com/pullrequest/pullrequest.github.com/pull/new/master">Pull Request</a></strong> ;)
59-
</p>
60-
</section>
61-
<section class="licensing">
62-
<h1>Licence</h1>
63-
<p>
64-
Les articles sont mis à disposition selon les termes de la <a rel="license" href="http://creativecommons.org/licenses/by/2.0/fr/">Licence Creative Commons Paternité 2.0 France</a>.
65-
<a rel="license" href="http://creativecommons.org/licenses/by/2.0/fr/">
66-
<br><img alt="Contrat Creative Commons" style="border-width:0" src="http://i.creativecommons.org/l/by/2.0/fr/88x31.png" />
67-
</a>
68-
</p>
69-
</section>
70-
<section id="opensource">
71-
<h1>OpenSource</h1>
72-
<p>Les auteurs de PullRequest sont à l'origine, ou contributeurs, entre autre, de ces projets:</p>
73-
<a href="http://openscales.org">OpenScales</a>
74-
<a href="http://resthub.org">RestHub</a>
75-
<a href="https://github.com/loicfrering/losolib">LoSoLib</a>
76-
<a href="https://bitbucket.org/feugy/myth">Myth</a>
77-
</section>
78-
</aside>
79-
80-
</div>
8172
</div>
8273

8374
<footer>
84-
<small id="legal">&copy; 2011 pullrequest.org</small>—
85-
<small id="poweredby">Propuls&eacute; par <a href="https://github.com/mojombo/jekyll">Jekyll</a></small>
75+
<small id="legal">© 2011 pullrequest.org</small>—
76+
<small id="poweredby">Propulsé par <a href="https://github.com/mojombo/jekyll">Jekyll</a></small>
8677
</footer>
8778
</div>
8879

‎_layouts/post.html‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
---
22
layout: default
33
---
4+
{% assign post = page %}
45
<article>
56
<header>
6-
<h1><a href="/article/${article.name}">{{ page.title }}</a></h1>
7-
<time class="publishing" data-timestamp="{{ page.date }}" datetime="${article.parsedDate}" pubdate="pubdate" title="{{ page.date }}">{{ page.date | date_to_string }}</time>
8-
<cite class="author"><a href="#">{{ page.author }}</a></cite>
7+
<h1><a href="{{ post.url }}">{{ post.title }}</a></h1>
8+
<p>
9+
<time datetime="{{ post.date | date:'%Y-%m-%d' }}" pubdate="pubdate">{{ post.date | date_to_string }}</time>
10+
<span class="author"><a href="#">{{ post.author }}</a></span>
11+
</p>
912
</header>
1013
{{ content }}
14+
<footer>
15+
<section class="tags">
16+
{% include tags.html %}
17+
</section>
18+
<section class="comments">
19+
{% include comments.html %}
20+
</section>
21+
</footer>
1122
</article>
12-
<div id="disqus_thread"></div>
13-
<script type="text/javascript">
14-
var disqus_shortname = 'pullrequest';
15-
var disqus_developer = 1;
16-
(function() {
17-
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
18-
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
19-
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
20-
})();
21-
</script>
22-
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
23-
<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>

‎index.html‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,21 @@
22
layout: default
33
title: Pull Request
44
---
5-
{% for post in paginator.posts %}
6-
<article>
7-
8-
<header>
9-
<h1><a href="{{ post.url }}">{{ post.title }}</a></h1>
10-
<time class="publishing" datetime="{{ post.date | date:'%Y-%m-%d' }}" pubdate="pubdate" title="{{ post.date | date_to_string }}">{{ post.date | date_to_string }}</time>
11-
<cite class="author">{{ post.author }}</cite>
12-
</header>
13-
14-
{{ post.content | truncatewords:60 }}
15-
<a href="{{ post.url }}" class="read-more">Lire la suite</a>
16-
17-
<footer>
18-
{% include tags.html %}
19-
</footer>
20-
21-
</article>
5+
{% for post in site.posts %}
6+
<article>
7+
<header>
8+
<h1><a href="{{ post.url }}">{{ post.title }}</a></h1>
9+
<p>
10+
<time datetime="{{ post.date | date:'%Y-%m-%d' }}" pubdate="pubdate">{{ post.date | date_to_string }}</time>
11+
<span class="author"><a href="#">{{ post.author }}</a></span>
12+
</p>
13+
</header>
14+
{{ post.content | truncatewords:60 }}
15+
<footer>
16+
<p><a href="{{ post.url }}" class="read-more" title="Lire l'article complet">Lire la suite</a></p>j
17+
<section class="tags">
18+
{% include tags.html %}
19+
</section>
20+
</footer>
21+
</article>
2222
{% endfor %}
23-
24-
25-
<div class="pagination">
26-
{% if paginator.previous_page %}
27-
<a href="/page{{paginator.previous_page}}" class="previous">Previous</a>
28-
{% else %}
29-
<span class="previous">Previous</span>
30-
{% endif %}
31-
32-
<span class="page_number ">Page: {{paginator.page}} of {{paginator.total_pages}}</span>
33-
34-
{% if paginator.next_page %}
35-
<a href="/page{{paginator.next_page}}" class="next ">Next</a>
36-
{% else %}
37-
<span class="next ">Next</span>
38-
{% endif %}
39-
</div>

0 commit comments

Comments
 (0)