diff options
| author | czaks <marcin@6irc.net> | 2013-08-05 06:03:40 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-05 06:03:40 -0400 |
| commit | a84c4510fccfdc0cfb6f187633daea10dc70f326 (patch) | |
| tree | 6077f5211196ae40cac0184bb7cc67b81d320b0b /templates/themes/categories | |
| parent | 33c7abf11f3a9b5c0964a2d7a25533c2849dbc78 (diff) | |
| parent | a8327c3a37fd22d2aa5d63061c9d3eaa30ae425a (diff) | |
Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts:
js/post-hider.js
Diffstat (limited to 'templates/themes/categories')
| -rw-r--r-- | templates/themes/categories/news.html | 8 | ||||
| -rw-r--r-- | templates/themes/categories/theme.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html index 9c7d8340..b3bea2b1 100644 --- a/templates/themes/categories/news.html +++ b/templates/themes/categories/news.html @@ -7,7 +7,7 @@ <link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/> </head> <body> - <h1>{{ settings.title }}</h1> + {{ boardlist.top }} <header> <h1>{{ settings.title }}</h1> <div class="subtitle">{{ settings.subtitle }}</div> @@ -15,16 +15,16 @@ <div class="ban"> {% if news|count == 0 %} - <p style="text-align:center" class="unimportant">(No news to show.)</p> + <p style="text-align:center" class="unimportant">{% trans %}(No news to show.){% endtrans %}</p> {% else %} {% for entry in news %} <h2 id="{{ entry.id }}"> {% if entry.subject %} {{ entry.subject }} {% else %} - <em>no subject</em> + <em>{% trans %}no subject{% endtrans %}</em> {% endif %} - <span class="unimportant"> — by {{ entry.name }} at {{ entry.time|date(config.post_date) }}</span> + <span class="unimportant"> — {% trans %}by{% endtrans %} {{ entry.name }} {% trans %}at{% endtrans %} {{ entry.time|date(config.post_date) }}</span> </h2> <p>{{ entry.body }}</p> {% endfor %} diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php index 7d468d0d..74ed61ed 100644 --- a/templates/themes/categories/theme.php +++ b/templates/themes/categories/theme.php @@ -36,7 +36,7 @@ public static function news($settings) { global $config; - $query = query("SELECT * FROM `news` ORDER BY `time` DESC") or error(db_error()); + $query = query("SELECT * FROM ``news`` ORDER BY `time` DESC") or error(db_error()); $news = $query->fetchAll(PDO::FETCH_ASSOC); return Element('themes/categories/news.html', Array( |