Change topbar display

This commit is contained in:
Michael Walker 2014-12-17 05:14:26 +00:00
parent 21f2fdb3d4
commit 2b868ddd48
7 changed files with 49 additions and 40 deletions

View File

@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>
<script type="text/javascript">
{% if not no_post_form %}
var active_page = "index";
@ -14,27 +14,11 @@
{% include 'header.html' %}
<title>{{ board.url }} - {{ board.title|e }}</title>
</head>
<body id="boardfront">
<div class="topbar">
{% if config.page_nav_top %}
<div class="pages top">
<span class="sub">
[
{% for page in pages %}
<a {% if page.selected %}class="selected"{% endif %}{% if not page.selected %}href="{{ page.link }}"{% endif %}>{{ page.num }}</a> {% if not loop.last %}/ {% endif %}
{% endfor %}
]
</span>
<!--{{ btn.next }}!-->
{% if config.catalog_link %}
<span class="sub">
[ <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">Catalog</a> ]
</span>
{% endif %}
</div>
{% endif %}
{{ boardlist.top }}
<body>
<div class="bar top">
{{ boardlist.top }}
</div>
{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
@ -62,6 +46,15 @@
{% include 'boardlist.html' %}
{% endif %}
{% if config.page_nav_top %}
<!--<div class="pages top">
{% for page in pages %}
[<a {% if page.selected %}class="selected"{% endif %}{% if not page.selected %}href="{{ page.link }}"{% endif %}>{{ page.num }}</a>]{% if loop.last %} {% endif %}
{% endfor %}
{{ btn.next }}
</div>-->
{% endif %}
{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
<hr />
<form name="postcontrols" action="{{ config.post_url }}" method="post">
@ -70,20 +63,36 @@
{{ body }}
{% include 'report_delete.html' %}
</form>
{{ config.ad.bottom }}
<footer>
{% include 'badges.html' %}
<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> +
<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
<br><a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel</p>
<p class="unimportant" style="margin-top:20px;text-align:center;">
- <a href="http://tinyboard.org/">Tinyboard</a> + <a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -<br>
<a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group<br>
<a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel
</p>
{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
</footer>
<div class="bar bottom">
<div class="pages">
{{ btn.prev }} [ {% for page in pages %}
<a {% if page.selected %}class="selected"{% endif %}{% if not page.selected %}href="{{ page.link }}"{% endif %}>{{ page.num }}</a>{% if not loop.last %} /{% endif %}
{% endfor %} ] {{ btn.next }}
{% if config.catalog_link %}
| <a href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">Catalog</a>
{% endif %}
</div>
</div>
</div>
<script type="text/javascript">{% raw %}
ready();
{% endraw %}</script>
</body>
</html>

View File

@ -2,18 +2,18 @@
<!doctype html>
<html>
<head>
<link rel="stylesheet" media="screen" href="/stylesheets/style.css"><link rel="stylesheet" type="text/css" id="stylesheet" href="/stylesheets/fauux.css">
<link rel="stylesheet" media="screen" href="/stylesheets/style.css">
<meta charset="utf-8">
<title>{{ settings.title }}</title>
{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
<link rel="stylesheet" media="screen" href="/stylesheets/dark.css">
<!--{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}-->
{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
</head>
<body>
<div class="topbar">
<div class="bar top">
{{ boardlist.top }}
</div>
<header>

View File

@ -9,7 +9,7 @@
<link rel="stylesheet" media="screen" href="/stylesheets/dark.css"/>
</head>
<body>
<div class="topbar">{{ boardlist.top }}</div>
<div class="bar top">{{ boardlist.top }}</div>
<header>
<h1>{{ settings.title }}</h1>

View File

@ -10,7 +10,7 @@
<link rel="stylesheet" media="screen" href="/stylesheets/dark_irc.css"/>
</head>
<body>
<div class="topbar">
<div class="bar top">
{{ boardlist.top }}
</div>

View File

@ -10,7 +10,7 @@
{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %}
</head>
<body>
<div class="topbar">
<div class="bar top">
{{ boardlist.top }}
</div>
<img class="board_image" src="{{ config.url_banner }}"style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};height:{{ config.banner_height }}px;" alt="" />

View File

@ -9,7 +9,7 @@
<link rel="stylesheet" media="screen" href="/stylesheets/dark.css"/>
</head>
<body>
<div class="topbar">
<div class="bar top">
{{ boardlist.top }}
</div>

View File

@ -11,11 +11,11 @@
<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
</head>
<body id="thread">
<div class="topbar">
<div class="bar top">
{{ boardlist.top }}
</div>
{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
<header>
<h1>{{ board.url }} - {{ board.title|e }}</h1>
<div class="subtitle">
@ -51,9 +51,9 @@
<footer>
{% include 'badges.html' %}
<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> +
<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> +
<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
<br><a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel</p>
{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
</footer>