Permalink
Browse files

overhaul (posts, github comments, etc)

  • Loading branch information...
1 parent b21ea74 commit 210921e3cd3f2015d37cf025c9bbc08734602e39 Andrei Neculau committed Nov 17, 2012
Showing with 1,151 additions and 2,673 deletions.
  1. +2 −4 .gitignore
  2. +16 −10 _config.sample.strap-jekyll.yml
  3. +7 −4 _includes/strap-jekyll/default/content.html
  4. +16 −13 _includes/strap-jekyll/default/footer.html
  5. +1 −1 _includes/strap-jekyll/default/header.html
  6. +45 −0 _includes/strap-jekyll/default/layouts/archive.html
  7. +92 −0 _includes/strap-jekyll/default/layouts/post.html
  8. +7 −7 _includes/strap-jekyll/default/navbar.html
  9. +16 −16 _includes/strap-jekyll/default/sidebar-footer.html
  10. +42 −15 _includes/strap-jekyll/default/sidebar.html
  11. +23 −12 _includes/strap-jekyll/default/vars.html
  12. +5 −0 _layouts/strap-jekyll-default-archive.html
  13. +5 −0 _layouts/strap-jekyll-default-post.html
  14. +56 −8 assets/strap-jekyll/css/bootstrap-responsive.css
  15. +9 −0 assets/strap-jekyll/css/bootstrap-responsive.min.css
  16. +567 −298 assets/strap-jekyll/css/bootstrap.css
  17. +9 −0 assets/strap-jekyll/css/bootstrap.min.css
  18. +88 −24 assets/strap-jekyll/css/strap-jekyll-default.css
  19. +0 −106 assets/strap-jekyll/js/README.md
  20. +0 −104 assets/strap-jekyll/js/bootstrap-affix.js
  21. +0 −90 assets/strap-jekyll/js/bootstrap-alert.js
  22. +0 −96 assets/strap-jekyll/js/bootstrap-button.js
  23. +0 −176 assets/strap-jekyll/js/bootstrap-carousel.js
  24. +0 −158 assets/strap-jekyll/js/bootstrap-collapse.js
  25. +0 −150 assets/strap-jekyll/js/bootstrap-dropdown.js
  26. +0 −239 assets/strap-jekyll/js/bootstrap-modal.js
  27. +0 −103 assets/strap-jekyll/js/bootstrap-popover.js
  28. +0 −151 assets/strap-jekyll/js/bootstrap-scrollspy.js
  29. +0 −135 assets/strap-jekyll/js/bootstrap-tab.js
  30. +0 −275 assets/strap-jekyll/js/bootstrap-tooltip.js
  31. +0 −60 assets/strap-jekyll/js/bootstrap-transition.js
  32. +0 −300 assets/strap-jekyll/js/bootstrap-typeahead.js
  33. +107 −109 assets/strap-jekyll/js/bootstrap.js
  34. +2 −2 assets/strap-jekyll/js/bootstrap.min.js
  35. 0 assets/strap-jekyll/js/bootstrap.min.tmp.js
  36. +0 −4 assets/strap-jekyll/js/jquery.js
  37. +2 −0 assets/strap-jekyll/js/jquery.min.js
  38. +20 −0 assets/strap-jekyll/js/strap-jekyll-comments-github.js
  39. +14 −3 assets/strap-jekyll/js/strap-jekyll-default.js
View
@@ -1,7 +1,5 @@
-/_includes/strap-jekyll-default-head.html
-/_includes/strap-jekyll-default-header.html
-/_includes/strap-jekyll-default-navbar-right.html
-/_includes/strap-jekyll-default-footer.html
+/_includes/strap-jekyll-default-*-custom.html
+/assets/strap-jekyll-default-*-custom.*
/_site
/assets/strap-jekyll-default-custom.css
/assets/strap-jekyll-default-custom.js
@@ -16,8 +16,8 @@ base_url: *base_url
future: false
markdown: kramdown
-permalink: date
-#paginate:
+permalink: none
+paginate: true
#exclude:
#include:
#limit_posts:
@@ -86,15 +86,15 @@ description: Simple Twitter Bootstrap for Jekyll
pages_url: null
repo_url: null
repo: strap-jekyll
-author: &github_author andreineculau
+author: andreineculau
authors:
andreineculau:
display_name: Andrei Neculau
gravatar: a990f5b18007f1a360ebd163626fe3f4
email:
url: "http://andreineculau.com"
twitter: andreineculau
- github: *github_author
+ github: andreineculau
#theme.tools
annotator: null
github_watch_btn: false
@@ -147,11 +147,17 @@ sidebars:
url: /develop/titlul_2.capitolul_4.html
#theme.text
text:
- index: index
- downloadZipFile: Download ZIP File
- downloadTarBall: Download TAR Ball
- forkMeOnGitHub: Fork me on <strong>GitHub</strong>
- maintainedBy: project maintained by
+ index: null
+ download_zip: Download ZIP File
+ download_tarball: Download TAR Ball
+ fork_me_on_github: Fork me on <strong>GitHub</strong>
+ maintained_by: maintained by
contact: contact
toc: Table of Contents
- related: Related Pages
+ related: Related
+ comments: Comments
+ posts: Posts
+ categories: is relevant to
+ tags: and focuses on
+ leave_a_comment_on_github: Want to leave a comment?
+ leave_a_comment_on_twitter_to: Tweet your comment to
@@ -3,12 +3,15 @@
<div class="container">
<div class="row">
- <div class="span4">
- {% include strap-jekyll/default/sidebar.html %}
+ <div class="span7" id="content">
+ {{ content }}
</div><!--/span-->
- <div class="span6" id="content">
- {{ content }}
+ <div class="span1">
+ </div><!--/span-->
+
+ <div class="span4">
+ {% include strap-jekyll/default/sidebar.html %}
</div><!--/span-->
</div><!--/row-->
@@ -2,24 +2,27 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/jquery.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-transition.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-alert.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-modal.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-dropdown.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-scrollspy.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-tab.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-tooltip.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-popover.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-button.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-collapse.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-carousel.js"></script>
- <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap-typeahead.js"></script>
+ <script src="{{ site.base_url }}/assets/strap-jekyll/js/jquery.min.js"></script>
+ <script src="{{ site.base_url }}/assets/strap-jekyll/js/bootstrap.min.js"></script>
<script src="{{ site.base_url }}/assets/strap-jekyll/js/strap-jekyll-default.js"></script>
<script src="{{ site.base_url }}/assets/strap-jekyll/rainbow.js/rainbow.min.js"></script>
<script src="{{ site.base_url }}/assets/strap-jekyll-default-custom.js"></script>
+ {% if page.commentIssueId %}
+ <script src="//cdnjs.cloudflare.com/ajax/libs/datejs/1.0/date.min.js"></script>
+ <script src="{{ site.base_url }}/assets/strap-jekyll/js/strap-jekyll-comments-github.js"></script>
+ <script>
+ $.ajax('https://api.github.com/repos/{{ site.author }}/{{ site.repo }}/issues/{{ page.commentIssueId }}/comments', {
+ headers: {
+ accept: 'application/vnd.github.full+json'
+ },
+ dataType: 'json',
+ success: loadGithubComments
+ });
+ </script
+ {% endif %}
+
{% if page.annotator %}
{% assign annotator = true %}
{% else %}{% if site.annotator %}
@@ -7,7 +7,7 @@
<title>{% if page.title %}{{ page.title }} | {% endif %}{{ site.name }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="{% if page.description %}{{ page.description }} | {% endif %}{{ description }}">
- <meta name="author" content="{% if page.author %}{{{ site.authors[page.author].display_name }} <{{ site.authors[page.author].email }}>{% else %}{{ author.display_name }} <{{ author.email }}>{% endif %}">
+ <meta name="author" content="{{ page_author.display_name }}">
<!-- Le styles -->
<link href="{{ site.base_url }}/assets/strap-jekyll/css/bootstrap.css" rel="stylesheet">
@@ -0,0 +1,45 @@
+{% include strap-jekyll/default/vars.html %}
+
+<ul class="posts">
+ {% for post in site.posts %}
+ <li class="post">
+ <a href="{{ site.base_url }}{{ post.url }}" title="{{ post.date | date_to_string }}">{{ post.title }}</a>
+ <span class="post-meta">
+ {% capture category_size %}{{ post.categories | size }}{% endcapture %}
+ {% if category_size != '0' %}
+ <span class="post-categories">
+ {% for category in post.categories %}
+ <div class="btn-group">
+ <button class="btn btn-mini btn-inverse">
+ {{ category }}
+ </button>
+ </div>
+ {% endfor %}
+ </span>
+ {% endif %}
+ {% capture tag_size %}{{ post.tags | size }}{% endcapture %}
+ {% if tag_size != '0' %}
+ <span class="post-tags">
+ {% for tag in post.tags %}
+ <div class="btn-group">
+ <button class="btn btn-mini">
+ {{ tag }}
+ </button>
+ </div>
+ {% endfor %}
+ </span>
+ {% endif %}
+ </span>
+ </li>
+
+ {% if post.next %}
+ {% capture yearmonth %}{{ post.date | date: '%Y %m' }}{% endcapture %}
+ {% capture nyearmonth %}{{ post.next.date | date: '%Y %m' }}{% endcapture %}
+ {% if yearmonth != nyearmonth %}
+ </ul>
+ <h3>{{ post.next.date | date: '%Y m' }}</h3>
+ <ul class="posts">
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+</ul>
@@ -0,0 +1,92 @@
+{% include strap-jekyll/default/vars.html %}
+
+<div id="post">
+ <div class="page-header">
+ <h1>{{ page.title }} <small class="post-date">{{ page.date | date_to_string }}</small></h1>
+ </div>
+
+ <div class="post-meta">
+ {% capture category_size %}{{ page.categories | size }}{% endcapture %}
+ {% if category_size != '0' %}
+ <div class="post-categories">
+ <span>{{ text.categories }}</span>
+ {% for category in page.categories %}
+ {% capture category_size %}{{ site.categories[category] | size }}{% endcapture %}
+ <div class="btn-group">
+ {% if category_size == '1' %}
+ <button class="btn btn-mini btn-inverse">
+ {{ category }}
+ </button>
+ {% else %}
+ <button class="btn btn-mini btn-inverse dropdown-toggle" data-toggle="dropdown">
+ {{ category }}
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ {% for post_in_category in site.categories[category] %}
+ {% if post_in_category.url != page.url %}
+ <li><a href="{{ site.base_url }}{{ post_in_category.url }}">{{ post_in_category.title }}</a></li>
+ {% endif %}
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
+ {% endif %}
+ {% capture tag_size %}{{ page.tags | size }}{% endcapture %}
+ {% if tag_size != '0' %}
+ <div class="post-tags">
+ <span>{{ text.tags }}</span>
+ {% for tag in page.tags %}
+ {% capture tag_size %}{{ site.tags[tag] | size }}{% endcapture %}
+ <div class="btn-group">
+ {% if tag_size == '1' %}
+ <button class="btn btn-mini">
+ {{ tag }}
+ </button>
+ {% else %}
+ <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
+ {{ tag }}
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ {% for post_in_tag in site.tags[tag] %}
+ {% if post_in_tag.url != page.url %}
+ <li><a href="{{ site.base_url }}{{ post_in_tag.url }}">{{ post_in_tag.title }}</a></li>
+ {% endif %}
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
+ {% endif %}
+ </div>
+
+ {{ content }}
+</div>
+
+<div id="post-comments">
+ {% if text.leave_a_comment_on_twitter_to and page_author.twitter %}
+ <a href="https://twitter.com/intent/tweet?screen_name={{ page_author.twitter }}&amp;text=re:&amp;url={{ site_pages_url | escape }}{{ page.url | escape }}">{{ text.leave_a_comment_on_twitter_to }} @{{ page_author.twitter }}</a>
+ <br><br>
+ {% endif %}
+
+ {% if text.leave_a_comment_on_github and page.commentIssueId %}
+ <!-- http://ivanzuzak.info/2011/02/18/github-hosted-comments-for-github-hosted-blogs.html -->
+ <a id="post-comments-url" href="https://github.com/{{ site.author }}/{{ site.repo }}/issues/{{ page.commentIssueId }}">{{ text.leave_a_comment_on_github }}</a>
+ <div id="post-comments-placeholder"></div>
+ {% endif %}
+</div>
+
+<!--<script type="text/javascript">
+ $("#post p,#post li").each( function(index) {
+ if (index > 0 && $.trim($(this).text()).length > 0) {
+ $(this).attr("id", "par" + index.toString());
+ var html = $(this).html();
+ $(this).html(html + " <a href='#par" + index.toString() + "'>#</a>");
+ }
+ });
+</script>
+-->
@@ -6,23 +6,23 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
- <a class="brand" href="{{ site.base_url }}/index.html">{{ site.name }}</a>
+ <a id="title" class="brand" href="{{ site.base_url }}/index.html" title="{{ site.description }}">{{ site.name }}</a>
<div class="btn-group pull-right">
{% include strap-jekyll-default-navbar-right-custom.html %}
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<i class="icon-user"></i> {{ site_pages_url }}
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
- {% if text.downloadZipFile %}
- <li><a href="{{ site_github_repo_url }}/zipball/master">{{ text.downloadZipFile }}</a></li>
+ {% if text.download_zip %}
+ <li><a href="{{ site_github_repo_url }}/zipball/master">{{ text.download_zip }}</a></li>
{% endif %}
- {% if text.downloadTarBall %}
- <li><a href="{{ site_github_repo_url }}/tarball/master">{{ text.downloadTarBall }}</a></li>
+ {% if text.download_tarball %}
+ <li><a href="{{ site_github_repo_url }}/tarball/master">{{ text.download_tarball }}</a></li>
{% endif %}
- {% if text.forkMe %}
+ {% if text.fork_me_on_github %}
<li class="divider"></li>
- <li><a href="{{ site_repo_url }}">{{ text.forkMe }}</strong></a></li>
+ <li><a href="{{ site_repo_url }}">{{ text.fork_me_on_github }}</strong></a></li>
{% endif %}
</ul>
</div>
@@ -1,12 +1,12 @@
-<footer id="footer">
+<footer id="sidebar-footer">
<hr>
- {% if text.maintainedBy %}
+ {% if text.maintained_by %}
<div class="btn-group" id="author">
<button class="btn disabled">
- {{ text.maintainedBy }}
+ {{ text.maintained_by }}
</button>
- <button class="btn{% if author.url == null %} disabled{% endif %}"{% if author.url %} data-href="{{ author.url }}{% endif %}">
- {{ author.display_name }}
+ <button class="btn{% if site_author.url == null %} disabled{% endif %}"{% if site_author.url %} data-href="{{ site_author.url }}{% endif %}">
+ {{ site_author.display_name }}
</button>
</div>
<br>
@@ -16,31 +16,31 @@
<button class="btn disabled">
{{ text.contact }}
</button>
- {% if author.email %}
- <button class="btn" data-href="mailto:{{ author.email }}">
- {{ author.email }}
+ {% if site_author.email %}
+ <button class="btn" data-href="mailto:{{ site_author.email }}">
+ {{ site_author.email }}
</button>
{% endif %}
- {% if author.twitter %}
- <button class="btn" data-href="http://twitter.com/{{ author.twitter }}">
+ {% if site_author.twitter %}
+ <button class="btn" data-href="http://twitter.com/{{ site_author.twitter }}">
<img src="{{ site.base_url }}/assets/strap-jekyll/img/icon-twitter.png"> on Twitter
</button>
{% endif %}
- {% if author.github %}
- <button class="btn" data-href="http://github.com/{{ author.github }}">
+ {% if site_author.github %}
+ <button class="btn" data-href="http://github.com/{{ site_author.github }}">
<img src="{{ site.base_url }}/assets/strap-jekyll/img/icon-github.png"> on GitHub
</button>
{% endif %}
</div>
<br>
{% endif %}
- {% if site.github_watch_btn %}
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ site.author }}&amp;repo={{ site.repo }}&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+ {% if site.github_star_btn %}
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ site.author }}&amp;repo={{ site.repo }}&amp;type=watch" allowtransparency="true" frameborder="0" scrolling="0" width="62" height="20"></iframe>
{% endif %}
{% if site.github_fork_btn %}
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ site.author }}&amp;repo={{ site.repo }}&amp;type=fork&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="85px" height="20px"></iframe>
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ site.author }}&amp;repo={{ site.repo }}&amp;type=fork" allowtransparency="true" frameborder="0" scrolling="0" width="53" height="20"></iframe>
{% endif %}
{% if site.github_follow_btn %}
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ site.author }}&amp;repo={{ site.repo }}&amp;type=follow&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="165px" height="20px"></iframe>
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ site.author }}&amp;repo={{ site.repo }}&amp;type=follow" allowtransparency="true" frameborder="0" scrolling="0" width="180" height="20"></iframe>
{% endif %}
</footer>
Oops, something went wrong.

0 comments on commit 210921e

Please sign in to comment.