Replace BLOG setting variables by SITE ones.

This commit is contained in:
Alexis Metaireau 2010-10-30 00:58:32 +01:00
commit 6192d5a647
6 changed files with 21 additions and 21 deletions

View file

@ -1,6 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<h1>Archives for {{ BLOGNAME }}</h2> <h1>Archives for {{ SITENAME }}</h2>
<dl> <dl>
{% for date, articles in dates %} {% for date, articles in dates %}

View file

@ -1,13 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>{% block title %}{{ BLOGNAME }}{%endblock%}</title> <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
</head> </head>
<body id="index" class="home"> <body id="index" class="home">
<header id="banner" class="body"> <header id="banner" class="body">
<h1><a href="{{ BLOGURL }}">{{ BLOGNAME }} <strong>{{ BLOGSUBTITLE }}</strong></a></h1> <h1><a href="{{ SITEURL }}">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
</header><!-- /#banner --> </header><!-- /#banner -->
{% if categories %}<ul> {% if categories %}<ul>
{% for category, articles in categories %} {% for category, articles in categories %}

View file

@ -1,6 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<h1>Archives for {{ BLOGNAME }}</h1> <h1>Archives for {{ SITENAME }}</h1>
<dl> <dl>
{% for date, articles in dates %} {% for date, articles in dates %}

View file

@ -11,7 +11,7 @@
</abbr> </abbr>
<address class="vcard author"> <address class="vcard author">
By <a class="url fn" href="#">{{ article.author }}</a> By <a class="url fn" href="#">{{ article.author }}</a>
</address>In <a href="{{ BLOGURL }}/category/{{ article.category }}.html">{{ article.category }}</a> </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
</footer><!-- /.post-info --> </footer><!-- /.post-info -->
{{ article.content }} {{ article.content }}
</div><!-- /.entry-content --> </div><!-- /.entry-content -->

View file

@ -1,21 +1,21 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>{% block title %}{{ BLOGNAME }}{%endblock%}</title> <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="stylesheet" href="{{ BLOGURL }}/css/main.css" type="text/css" /> <link rel="stylesheet" href="{{ SITEURL }}/css/main.css" type="text/css" />
<link href="{{ BLOGURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ BLOGNAME }} ATOM Feed" /> <link href="{{ SITEURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
<!--[if IE]> <!--[if IE]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]--> <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<!--[if lte IE 7]> <!--[if lte IE 7]>
<link rel="stylesheet" type="text/css" media="all" href="{{ BLOGURL }}/css/ie.css"/> <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
<script src="{{ BLOGURL }}/js/IE8.js" type="text/javascript"></script><![endif]--> <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
<!--[if lt IE 7]> <!--[if lt IE 7]>
<link rel="stylesheet" type="text/css" media="all" href="{{ BLOGURL }}/css/ie6.css"/><![endif]--> <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
</head> </head>
@ -23,24 +23,24 @@
<a href="http://github.com/ametaireau"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a> <a href="http://github.com/ametaireau"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>
<header id="banner" class="body"> <header id="banner" class="body">
<h1><a href="{{ BLOGURL }}">{{ BLOGNAME }} {% if BLOGSUBTITLE %} <strong>{{ BLOGSUBTITLE }}</strong>{% endif %}</a></h1> <h1><a href="{{ SITEURL }}">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
<nav><ul> <nav><ul>
{% for title, link in MENUITEMS %} {% for title, link in MENUITEMS %}
<li><a href="{{ link }}">{{ title }}</a></li> <li><a href="{{ link }}">{{ title }}</a></li>
{% endfor %} {% endfor %}
{% for cat, null in categories %} {% for cat, null in categories %}
<li {% if cat == category %}class="active"{% endif %}><a href="{{ BLOGURL }}/category/{{ cat }}.html">{{ cat }}</a></li> <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
{% endfor %} {% endfor %}
</ul></nav> </ul></nav>
</header><!-- /#banner --> </header><!-- /#banner -->
{% block content %} {% block content %}
{% endblock %} {% endblock %}
<section id="extras" class="body"> <section id="extras" class="body">
{% if BLOGROLL %} {% if SITEROLL %}
<div class="blogroll"> <div class="blogroll">
<h2>blogroll</h2> <h2>blogroll</h2>
<ul> <ul>
{% for name, link in BLOGROLL %} {% for name, link in SITEROLL %}
<li><a href="{{ link }}">{{ name }}</a></li> <li><a href="{{ link }}">{{ name }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
@ -50,7 +50,7 @@
<div class="social"> <div class="social">
<h2>social</h2> <h2>social</h2>
<ul> <ul>
<li><a href="{{ BLOGURL }}/feeds/all.atom.xml" rel="alternate">atom feed</a></li> <li><a href="{{ SITEURL }}/feeds/all.atom.xml" rel="alternate">atom feed</a></li>
{% for name, link in SOCIAL %} {% for name, link in SOCIAL %}
<li><a href="{{ link }}">{{ name }}</a></li> <li><a href="{{ link }}">{{ name }}</a></li>
{% endfor %} {% endfor %}

View file

@ -4,7 +4,7 @@
{% for article in articles %} {% for article in articles %}
{% if loop.index == 1 %} {% if loop.index == 1 %}
<aside id="featured" class="body"><article> <aside id="featured" class="body"><article>
<h2 class="entry-title"><a href="{{ BLOGURL }}/{{ article.url }}">{{ article.title }}</a></h2> <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
<footer class="post-info"> <footer class="post-info">
<abbr class="published" title="{{ article.date.isoformat() }}"> <abbr class="published" title="{{ article.date.isoformat() }}">
{{ article.date.strftime('%a %d %B %Y') }} {{ article.date.strftime('%a %d %B %Y') }}
@ -12,7 +12,7 @@
<address class="vcard author"> <address class="vcard author">
By <a class="url fn" href="#">{{ article.author }}</a> By <a class="url fn" href="#">{{ article.author }}</a>
</address>In <a href="{{ BLOGURL }}/category/{{ article.category }}.html">{{ article.category }}</a> </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
</footer><!-- /.post-info --> </footer><!-- /.post-info -->
{{ article.content }} {{ article.content }}
</article></aside><!-- /#featured --> </article></aside><!-- /#featured -->
@ -25,7 +25,7 @@
{% else %} {% else %}
<li><article class="hentry"> <li><article class="hentry">
<header> <header>
<h2><a href="{{ BLOGURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2> <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2>
</header> </header>
<div class="entry-content"> <div class="entry-content">
@ -36,10 +36,10 @@
<address class="vcard author"> <address class="vcard author">
By <a class="url fn" href="#">{{ article.author }}</a> By <a class="url fn" href="#">{{ article.author }}</a>
</address>In <a href="{{ BLOGURL }}/category/{{ article.category }}.html">{{ article.category }}</a> </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
</footer><!-- /.post-info --> </footer><!-- /.post-info -->
{{ article.summary }} {{ article.summary }}
<a class="readmore" href="{{ BLOGURL }}/{{ article.url }}">read more</a> <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
</div><!-- /.entry-content --> </div><!-- /.entry-content -->
</article></li> </article></li>
{% endif %} {% endif %}