diff options
| -rw-r--r-- | .gitmodules | 14 | ||||
| m--------- | bluegrasshopper | 0 | ||||
| -rw-r--r-- | bootstrap/static/images/icons/careers.stackoverflow.png | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | bootstrap/static/local.css | 1 | ||||
| -rw-r--r-- | bootstrap/templates/base.html | 19 | ||||
| -rw-r--r-- | bootstrap/templates/metadata.html | 5 | ||||
| -rw-r--r-- | martyalchin/templates/index.html | 6 | ||||
| m--------- | pelican-cait | 0 | ||||
| m--------- | water-iris | 0 |
9 files changed, 34 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules index c9d1fa6..200aff6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,4 +27,16 @@ url = git://github.com/jsliang/pelican-fresh [submodule "variant-note"] path = pelican-variant-note - url = git://github.com/mpancorbo/pelican-variant-note.git + url = git://github.com/mpancorbo/pelican-variant-note.git +[submodule "water-iris"] + path = water-iris + url = git://github.com/jarv/water-iris +[submodule "whispers"] + path = whispersTheme + url = git://github.com/deBorn/whispersTheme.git +[submodule "bluegrasshopper"] + path = bluegrasshopper + url = git@github.com:gregseth/pelican-bgh.git +[submodule "pelican-cait"] + path = pelican-cait + url = git://github.com/hdra/pelican-cait.git diff --git a/bluegrasshopper b/bluegrasshopper new file mode 160000 +Subproject a4bbcadcd14279a9d4b3b3f919442767b7c42e3 diff --git a/bootstrap/static/images/icons/careers.stackoverflow.png b/bootstrap/static/images/icons/careers.stackoverflow.png Binary files differnew file mode 100644 index 0000000..e1bbf0f --- /dev/null +++ b/bootstrap/static/images/icons/careers.stackoverflow.png diff --git a/bootstrap/static/local.css b/bootstrap/static/local.css index c933851..0657af7 100644 --- a/bootstrap/static/local.css +++ b/bootstrap/static/local.css @@ -33,5 +33,6 @@ div.highlight pre { .social a[href*='linkedin.com']:before {content: url('./images/icons/linkedin.png'); margin-right: 2px; vertical-align: -3px;} .social a[href*='rss.xml']:before {content: url('./images/icons/rss.png'); margin-right: 2px; vertical-align: -3px;} .social a[href*='stackoverflow.com']:before {content: url('./images/icons/stackoverflow.png'); margin-right: 2px; vertical-align: -3px;} +.social a[href*='careers.stackoverflow.com']:before {content: url('./images/icons/careers.stackoverflow.png'); margin-right: 2px; vertical-align: -3px;} .social a[href*='twitter.com']:before {content: url('./images/icons/twitter.png'); margin-right: 2px; vertical-align: -3px;} .social a[href*='weibo.com']:before {content: url('./images/icons/weibo.png'); margin-right: 2px; vertical-align: -3px;} diff --git a/bootstrap/templates/base.html b/bootstrap/templates/base.html index 49fbd7d..45ddcdc 100644 --- a/bootstrap/templates/base.html +++ b/bootstrap/templates/base.html @@ -6,15 +6,24 @@ <meta name="description" content=""> <meta name="author" content="{{ AUTHOR }}"> - <!-- Le HTML5 shim, for IE6-8 support of HTML elements --> + <!-- HTML5 shim, for IE6-8 support of HTML elements --> <!--[if lt IE 9]> <script src="{{ SITEURL }}/theme/html5.js"></script> <![endif]--> - <!-- Le styles --> + <!-- Styles --> <link href="{{ SITEURL }}/theme/bootstrap.min.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/pygments.css" rel="stylesheet"> + + <!-- Feeds --> + {% if FEED_ALL_ATOM %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" /> + {% endif %} + {% if FEED_ALL_RSS %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> + {% endif %} + {% include "analytics.html" %} {% include "disqus.html" %} </head> @@ -24,7 +33,7 @@ <div class="topbar"> <div class="topbar-inner"> <div class="container-fluid"> - <a class="brand" href="{{ SITEURL }}/index.html">{{ SITENAME }}</a> + <a class="brand" href="{{ SITEURL }}/">{{ SITENAME }}</a> <ul class="nav"> {% for title, link in MENUITEMS %} <li><a href="{{ link }}">{{ title }}</a></li> @@ -66,8 +75,8 @@ {% block indextitle %}<div class="page-header"><h1>{% block title %} {{ self.windowtitle() }} {% endblock %}</h1></div>{% endblock %} {% block content %}{% endblock %} <footer> - <p> Powered by <a href="http://alexis.notmyidea.org/pelican/">Pelican</a>, theme based on <a href="http://twitter.github.com/bootstrap/">Bootstrap, from Twitter</a>.</p> - <p>© {{ AUTHOR }} 2011</p> + <p>Powered by <a href="http://getpelican.com/">Pelican</a>. Theme based on <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap</a>.</p> + <p>© {{ AUTHOR }}</p> </footer> </div> diff --git a/bootstrap/templates/metadata.html b/bootstrap/templates/metadata.html index 8c9f261..68a76bf 100644 --- a/bootstrap/templates/metadata.html +++ b/bootstrap/templates/metadata.html @@ -1,4 +1,5 @@ Permalink: <a class="more" href="{{ SITEURL }}/{{ article.url }}">{{ article.date }}</a> -{% if article.author %}by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>{% endif %} -in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> +{% if article.author %}by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }} </a>{% endif %} + + in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> {% if article.tags %}tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% endfor %}{% endif %} diff --git a/martyalchin/templates/index.html b/martyalchin/templates/index.html index 6286ef6..6e2e789 100644 --- a/martyalchin/templates/index.html +++ b/martyalchin/templates/index.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block content %} - <h1><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1> + <h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1> {% if SITESUBTITLE %} <div class="info">{{ SITESUBTITLE }}</div> {% endif %} - {% for article in articles %} - <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> + {% for article in articles_page.object_list %} + <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> <p class="published">{{ article.locale_date }}</p> {{ article.summary }} {% endfor %} diff --git a/pelican-cait b/pelican-cait new file mode 160000 +Subproject 5bdf0ba008962d24c11d726b81aafc4d52a0784 diff --git a/water-iris b/water-iris new file mode 160000 +Subproject 2f648ad497e5b21579ac3bbc773a51ad7f84631 |
