Permalink
Browse files

Merge pull request #96 from fmr/gh-pages

README, JS, cosmetic changes
  • Loading branch information...
2 parents 1b06d3f + 127f697 commit aeac6e3396dd6b78158c4bd7fc58abe52f34b10d @codeinthehole codeinthehole committed Jan 30, 2012
Showing with 69 additions and 38 deletions.
  1. +27 −0 README.md
  2. +16 −14 _layouts/default.html
  3. +0 −2 _posts/2012-01-25-coming-soon.md
  4. +2 −1 css/styles.css
  5. +23 −20 index.html
  6. +1 −1 js/fixed_nav.js
View
27 README.md
@@ -0,0 +1,27 @@
+# Django Oscar Information Page #
+
+This repository contains the source for the [Django Oscar information page](http://tangentlabs.github.com/django-oscar/).
+
+## Dependencies ##
+
+[Jekyll](https://github.com/mojombo/jekyll/) is required. Follow the install instructions at the Jekyll [wiki](https://github.com/mojombo/jekyll/wiki/Install). You can install this via RubyGems:
+
+ sudo gem install jekyll
+
+OSX users might need to update RubyGems:
+
+ sudo gem update --system
+
+## Building and Viewing ##
+
+GitHub automatically builds Jekyll-based sites. If you want to make changes and edit locally, you'll need to install Jekyll (see above).
+
+### Running a local server ###
+
+cd into the `django-oscar` directory, and build by:
+
+ jekyll --server --base-url=""
+
+…where `--base-url` is an option to override the baseurl setting in `_config.yml`. This setting is used in the templates as the placeholder `{{ site.baseurl }}`
+
+The generated site is available at `http://localhost:4000/`
View
30 _layouts/default.html
@@ -4,6 +4,10 @@
<meta charset="utf-8" />
<title>{{ page.title }}</title>
<link rel="stylesheet" href="{{ site.baseurl }}/css/styles.css" type="text/css" />
+ <script type="text/javascript" src="{{ site.baseurl }}/js/jquery-1.7.1.min.js"></script>
+ <script type="text/javascript" src="{{ site.baseurl }}/js/smooth.pack.js"></script>
+ <script type="text/javascript" src="{{ site.baseurl }}/js/scrollspy.js"></script>
+ <script type="text/javascript" src="{{ site.baseurl }}/js/fixed_nav.js"></script>
<!--[if IE]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -24,14 +28,18 @@
</header>
<div id="nav" class="topbar" data-scrollspy="scrollspy">
<ul>
- <li><a href="{{ site.baseurl }}/#home"><span class="snowcone">H</span></a></li>
- <li><a href="{{ site.baseurl }}/#synopsis">Synopsis</a></li>
- <li><a href="{{ site.baseurl }}/#installation">Installation</a></li>
- <li><a href="{{ site.baseurl }}/#quick_try">Quick try</a></li>
- <li><a href="{{ site.baseurl }}/#community">Community</a></li>
- <li><a href="{{ site.baseurl }}/#news">News</a></li>
- <li><a href="{{ site.baseurl }}/#contributing">Contributing</a></li>
- <li><a href="{{ site.baseurl }}/#about">About</a></li>
+ {% capture base_url %}{{ site.baseurl }}/{% endcapture %}
+ {% if page.url contains 'index.html' %}
+ {% assign base_url = '' %}
+ {% endif %}
+ <li><a href="{{ base_url }}#home"><span class="snowcone">H</span></a></li>
+ <li><a href="{{ base_url }}#synopsis">Synopsis</a></li>
+ <li><a href="{{ base_url }}#installation">Installation</a></li>
+ <li><a href="{{ base_url }}#quick_try">Quick try</a></li>
+ <li><a href="{{ base_url }}#community">Community</a></li>
+ <li><a href="{{ base_url }}#news">News</a></li>
+ <li><a href="{{ base_url }}#contributing">Contributing</a></li>
+ <li><a href="{{ base_url }}#about">About</a></li>
</ul>
</div>
<section id="page_content">
@@ -48,15 +56,9 @@
</footer>
</body>
-
-<script type="text/javascript" src="{{ site.baseurl }}/js/jquery-1.7.1.min.js"></script>
-<script type="text/javascript" src="{{ site.baseurl }}/js/fixed_nav.js"></script>
-<script type="text/javascript" src="{{ site.baseurl }}/js/smooth.pack.js"></script>
-<script type="text/javascript" src="{{ site.baseurl }}/js/scrollspy.js"></script>
<script>
$(document).ready(function () {
$('body > .topbar').scrollSpy();
});
</script>
-
</html>
View
2 _posts/2012-01-25-coming-soon.md
@@ -3,6 +3,4 @@ layout: post
title: Coming Soon
---
-## News ##
-
More details coming soon…
View
3 css/styles.css
@@ -12,6 +12,7 @@
@import url(http://fonts.googleapis.com/css?family=Ubuntu:700);
@import url(http://fonts.googleapis.com/css?family=Droid+Sans);
@import url(http://fonts.googleapis.com/css?family=Droid+Sans:700);
+@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);
@import url("snowcone.css");
/*** Global ***/
@@ -327,7 +328,7 @@ header .featured ul li a {
}
code {
- font-family: 'courier', helvetica, arial, sans-serif;
+ font-family: 'Droid Sans Mono', helvetica, arial, sans-serif;
}
code.block {
View
43 index.html
@@ -54,30 +54,33 @@
<section id="news" class="body">
<h1>News</h1>
+ {% if site.posts != empty %}
<ol id="posts_list" class="hfeed">
- {% if site.posts %}
{% for post in site.posts %}
- <li>
- <article class="hentry">
- <header>
- <h2 class="entry_title">
- <a href="{{ site.baseurl }}{{ post.url }}" rel="bookmark" title="Permalink to this {Article_header}">{{ post.title }}</a>
- </h2>
- </header>
- <abbr class="published" title="{{ post.date }}">{{ post.date | date_to_string }}</abbr>
- <!--
- <address class="vcard author">
- Posted by <a class="author" href="#">{author}</a>
- </address>
- -->
- <div class="entry_content">
- <p>{{ post.content | strip_html | truncatewords:"30" }} <a href="{{ site.baseurl }}{{ post.url }}">Read More &raquo;</a></p>
- </div>
- </article>
- </li>
+ {% capture post_url %}{{ site.baseurl }}{{ post.url }}{% endcapture %}
+ <li>
+ <article class="hentry">
+ <header>
+ <h2 class="entry_title">
+ <a href="{{ post_url }}" rel="bookmark" title="Permalink to {{ post.title }}">{{ post.title }}</a>
+ </h2>
+ </header>
+ <abbr class="published" title="{{ post.date }}">{{ post.date | date_to_string }}</abbr>
+ <!--
+ <address class="vcard author">
+ Posted by <a class="author" href="#">{author}</a>
+ </address>
+ -->
+ <div class="entry_content">
+ <p>{{ post.content | strip_html | truncatewords:"30" }} <a href="{{ post_url }}">Read More &raquo;</a></p>
+ </div>
+ </article>
+ </li>
{% endfor %}
- {% endif %}
</ol>
+ {% else %}
+ <p>More details soon&hellip;</p>
+ {% endif %}
<hr />
</section>
View
2 js/fixed_nav.js
@@ -26,4 +26,4 @@ if (window.addEventListener){
window.attachEvent('onscroll', handleScroll);
}
-$.scrollTo( '#section', 800, {easing:'elasout'} );
+// $.scrollTo( '#section', 800, {easing:'elasout'} );

0 comments on commit aeac6e3

Please sign in to comment.