the categories theme was using the frameset theme's templates...

This commit is contained in:
Michael Save 2012-03-03 23:41:14 +11:00
parent d446ba94b9
commit bbe8660244
3 changed files with 32 additions and 32 deletions

View File

@ -23,18 +23,31 @@
</ul>
</fieldset>
<fieldset>
<legend>Boards</legend>
<ul>
{% for category, boards in categories %}
<fieldset>
<legend>
{{ category }}
</legend>
{% for board in boards %}
<li>
<a href="{{ config.board_path|sprintf(board.uri) }}">
{{ board.title }}
</a>
<a href="{{ board.uri }}">{{ board.title }}</a>
</li>
{% endfor %}
</ul>
</fieldset>
</fieldset>
{% endfor %}
{% for category, links in config.custom_categories %}
<fieldset>
<legend>
{{ category }}
</legend>
{% for title, uri in links %}
<li>
<a href="{{ uri }}">{{ title }}</a>
</li>
{% endfor %}
</fieldset>
{% endfor %}
</body>
</html>
{% endfilter %}

View File

@ -29,7 +29,7 @@
public static function homepage($settings) {
global $config;
return Element('themes/frameset/frames.html', Array('config' => $config, 'settings' => $settings));
return Element('themes/categories/frames.html', Array('config' => $config, 'settings' => $settings));
}
// Build news page
@ -39,7 +39,7 @@
$query = query("SELECT * FROM `news` ORDER BY `time` DESC") or error(db_error());
$news = $query->fetchAll(PDO::FETCH_ASSOC);
return Element('themes/frameset/news.html', Array(
return Element('themes/categories/news.html', Array(
'settings' => $settings,
'config' => $config,
'news' => $news
@ -61,7 +61,7 @@
}
}
return Element('themes/frameset/sidebar.html', Array(
return Element('themes/categories/sidebar.html', Array(
'settings' => $settings,
'config' => $config,
'categories' => $categories

View File

@ -23,31 +23,18 @@
</ul>
</fieldset>
{% for category, boards in categories %}
<fieldset>
<legend>
{{ category }}
</legend>
<fieldset>
<legend>Boards</legend>
<ul>
{% for board in boards %}
<li>
<a href="{{ board.uri }}">{{ board.title }}</a>
<a href="{{ config.board_path|sprintf(board.uri) }}">
{{ board.title }}
</a>
</li>
{% endfor %}
</fieldset>
{% endfor %}
{% for category, links in config.custom_categories %}
<fieldset>
<legend>
{{ category }}
</legend>
{% for title, uri in links %}
<li>
<a href="{{ uri }}">{{ title }}</a>
</li>
{% endfor %}
</fieldset>
{% endfor %}
</ul>
</fieldset>
</body>
</html>
{% endfilter %}