diff options
| -rw-r--r-- | templates/mod/config-editor.html | 4 | ||||
| -rw-r--r-- | templates/mod/inbox.html | 2 | ||||
| -rw-r--r-- | templates/mod/recent_posts.html | 4 | ||||
| -rw-r--r-- | templates/mod/themes.html | 2 | ||||
| -rw-r--r-- | templates/mod/user.html | 2 | ||||
| -rw-r--r-- | templates/mod/view_ip.html | 6 | ||||
| -rw-r--r-- | templates/themes/basic/index.html | 2 | ||||
| -rw-r--r-- | templates/themes/catalog/catalog.html | 3 | ||||
| -rw-r--r-- | templates/themes/catalog/theme.php | 5 | ||||
| -rw-r--r-- | templates/themes/categories/news.html | 2 | ||||
| -rw-r--r-- | templates/themes/donate/donate.html | 7 | ||||
| -rw-r--r-- | templates/themes/frameset/news.html | 2 | ||||
| -rw-r--r-- | templates/themes/recent/recent.css | 29 | ||||
| -rw-r--r-- | templates/themes/recent/recent.html | 13 | ||||
| -rw-r--r-- | templates/themes/ukko2/theme.php | 2 | ||||
| -rw-r--r-- | templates/themes/ukko3/theme.php | 2 |
16 files changed, 57 insertions, 30 deletions
diff --git a/templates/mod/config-editor.html b/templates/mod/config-editor.html index ebf4202b..411d55e6 100644 --- a/templates/mod/config-editor.html +++ b/templates/mod/config-editor.html @@ -23,7 +23,7 @@ <th>{% trans 'Description' %}</th> </tr> {% for var in conf if var.type != 'array' %} - {% if var.name and var.name|length == 1 %} + {% if var.name|count == 1 %} {% set name = 'cf_' ~ var.name %} {% else %} {% set name = 'cf_' ~ var.name|join('/') %} @@ -31,7 +31,7 @@ <tr> <th class="minimal"> - {% if var.name and var.name|length == 1 %} + {% if var.name|count == 1 %} {{ var.name }} {% else %} {{ var.name|join(' → ') }} diff --git a/templates/mod/inbox.html b/templates/mod/inbox.html index 63f4de5c..97afe446 100644 --- a/templates/mod/inbox.html +++ b/templates/mod/inbox.html @@ -1,4 +1,4 @@ -{% if not messages %} +{% if messages|count == 0 %} <p style="text-align:center" class="unimportant">({% trans 'No private messages for you.' %})</p> {% else %} <table class="modlog"> diff --git a/templates/mod/recent_posts.html b/templates/mod/recent_posts.html index e5a95ece..349dcea9 100644 --- a/templates/mod/recent_posts.html +++ b/templates/mod/recent_posts.html @@ -1,5 +1,5 @@ -<script src="{{ config.additional_javascript_url }}js/mod/recent_posts.js"></script> -{% if not posts %} +<script src="{{ config.additional_javascript_url }}js/mod/recent-posts.js"></script> +{% if not posts|count %} <p style="text-align:center" class="unimportant">({% trans 'There are no active posts.' %})</p> {% else %} <h4>Viewing last {{ limit|e }} posts</h4> diff --git a/templates/mod/themes.html b/templates/mod/themes.html index 87639dbc..b230bc48 100644 --- a/templates/mod/themes.html +++ b/templates/mod/themes.html @@ -1,4 +1,4 @@ -{% if not themes %} +{% if themes|count == 0 %} <p style="text-align:center" class="unimportant">({% trans 'There are no themes available.' %})</p> {% else %} <table class="modlog"> diff --git a/templates/mod/user.html b/templates/mod/user.html index 6cc454d8..08598fe5 100644 --- a/templates/mod/user.html +++ b/templates/mod/user.html @@ -87,7 +87,7 @@ </ul> </form> -{% if logs and logslength > 0 %} +{% if logs|count > 0 %} <table class="modlog" style="width:600px"> <tr> <th>{% trans 'IP address' %}</th> diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html index be4119e0..4bacc7f6 100644 --- a/templates/mod/view_ip.html +++ b/templates/mod/view_ip.html @@ -18,7 +18,7 @@ <legend>{{ notes|count }} {% trans notes_on_record %}</legend> </legend> - {% if notes and notes|length > 0 %} + {% if notes|count > 0 %} <table class="modlog"> <tr> <th>{% trans 'Staff' %}</th> @@ -81,7 +81,7 @@ </fieldset> {% endif %} -{% if bans and bans|length > 0 and mod|hasPermission(config.mod.view_ban) %} +{% if bans|count > 0 and mod|hasPermission(config.mod.view_ban) %} <fieldset id="bans"> {% set bans_on_record = 'ban' ~ (bans|count != 1 ? 's' : '') ~ ' on record' %} <legend>{{ bans|count }} {% trans bans_on_record %}</legend> @@ -174,7 +174,7 @@ </fieldset> {% endif %} -{% if logs and logs|length > 0 %} +{% if logs|count > 0 %} <fieldset id="history"> <legend>History</legend> <table class="modlog" style="width:100%"> diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html index 94bc79d0..213e2ede 100644 --- a/templates/themes/basic/index.html +++ b/templates/themes/basic/index.html @@ -24,7 +24,7 @@ <img src="static/lain_is_cute_datass_small_teal.png" alt="mascot"/> </center> <div class="ban"> - {% if not news %} + {% if news|count == 0 %} <p style="text-align:center" class="unimportant">(No news to show.)</p> {% else %} {% for entry in news %} diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html index a932278d..b5f2e832 100644 --- a/templates/themes/catalog/catalog.html +++ b/templates/themes/catalog/catalog.html @@ -68,9 +68,10 @@ <strong>R: {{ post.reply_count }} / I: {{ post.image_count }}{% if post.sticky %} (sticky){% endif %}{% if post.locked %} <span class="fa fa-lock"> </span>{% endif %}</strong> {% if post.subject %} <p class="intro"> + <a href="{{post.link}}"> <span class="subject"> {{ post.subject|e }} - </span> + </span></a> </p> {% else %} <br /> diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php index 81148882..bc312fc0 100644 --- a/templates/themes/catalog/theme.php +++ b/templates/themes/catalog/theme.php @@ -27,7 +27,7 @@ } } } elseif ($action == 'post-thread' || ($settings['update_on_posts'] && $action == 'post') || ($settings['update_on_posts'] && $action == 'post-delete') - || $action == 'sticky' || ($action == 'lock' && in_array($board, $boards))) { + || $action == 'sticky' || ($action == 'lock' && in_array($board, $boards))) { $b = new Catalog($settings); $action = generation_strategy("sb_catalog", array($board)); @@ -37,7 +37,8 @@ } elseif ($action == 'rebuild') { $b->build($settings, $board); - } + } + $b->build($settings, $board); } // FIXME: Check that Ukko is actually enabled diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html index dc6387c5..4ce65128 100644 --- a/templates/themes/categories/news.html +++ b/templates/themes/categories/news.html @@ -14,7 +14,7 @@ </header> <div class="ban"> - {% if not news %} + {% if news|count == 0 %} <p style="text-align:center" class="unimportant">{% trans %}(No news to show.){% endtrans %}</p> {% else %} {% for entry in news %} diff --git a/templates/themes/donate/donate.html b/templates/themes/donate/donate.html index 4cacc030..2931f727 100644 --- a/templates/themes/donate/donate.html +++ b/templates/themes/donate/donate.html @@ -23,9 +23,12 @@ </center> <div class="ban"> <h2>Thanks for donating</h2> - <p>The server costs {{ settings.monthlyamount }} per month. If you buy stickers we get about 45-55% of whatever you spend. Historical donation records to the former owner are ForeverN2Dust is the top donator, giving about $3000. FOOFDOOF is #2 with $1000 and lots of cheap Chinese shit. Please specify what you'd like your money to go towards. If you don't want to buy stickers, but want to donate something else please either ask in /q/ or contact the Lainchan administration on IRC at #lainchan on Laincan IRC at irc.lainchan.org or Freenode. + <p>The server costs {{ settings.monthlyamount }} per month. If you buy stickers we get about 45-55% of whatever you spend. Historical donation records to the former owner are ForeverN2Dust is the top donator, giving about $3000. FOOFDOOF is #2 with $1000 and lots of cheap Chinese shit. Please specify what you'd like your money to go towards. If you don't want to buy stickers, but want to donate something else please either ask in /q/ or contact the Lainchan administration on IRC at #lainchan on Lainchan IRC at irc.lainchan.org or Freenode. </p> - <p><a href="https://www.stickermule.com/marketplace/tags/lainchan"> Buy stickers here</a> + <p>Stickermule shutdown their stickermarket place ages ago. So stickers are no longer avaliable for purcahse. Lainstore is being slowly worked on but isn't finished yet. +</p> + +<p> <a href="/stickers.html">To view the sticker gallery click here </a> </p> <p>Bitcoin donations can be made to {{ settings.bitcoinreceivingaddress }} </p> diff --git a/templates/themes/frameset/news.html b/templates/themes/frameset/news.html index 0719079f..320c64d3 100644 --- a/templates/themes/frameset/news.html +++ b/templates/themes/frameset/news.html @@ -13,7 +13,7 @@ </header> <div class="ban"> - {% if not news %} + {% if news|count == 0 %} <p style="text-align:center" class="unimportant">(No news to show.)</p> {% else %} {% for entry in news %} diff --git a/templates/themes/recent/recent.css b/templates/themes/recent/recent.css index cd34a750..ccae5693 100644 --- a/templates/themes/recent/recent.css +++ b/templates/themes/recent/recent.css @@ -60,12 +60,16 @@ body } .box.left h2 { background: #7fdd57; - color: #677965; + color: #0b000f; } .box.right h2 { background: #7fdd57; color: #0b000f; } +.box.center h2 { + background: #7fdd57; + color: #0b000f; +} .box img { float: none; margin: 0px auto; @@ -145,9 +149,8 @@ p.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.ema div.boardlist a { - font-size: 12px; + font-size: 12px; } - div.boardlist { color: #0b000f; @@ -160,7 +163,7 @@ div.ban -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; - text-align: left!important; + text-align: center; } div.ban h2 { @@ -179,3 +182,21 @@ div.ban h2:not(:nth-child(1)) div.footer{ clear:both; } + +.box.center { + background: #0b000f; + color: #7fdd57; + border: 0px solid #006; + float: left; + width: 100%; + text-align: center; +} + +div.global4{ +clear:both; +} + +.lain_banner { + width: 80%; + +} diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html index 0d131bff..875d46ab 100644 --- a/templates/themes/recent/recent.html +++ b/templates/themes/recent/recent.html @@ -11,7 +11,6 @@ {% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %} {% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %} - {% include 'header.html' %} </head> <body> <div class="bar top"> @@ -31,12 +30,12 @@ <br> - <div class="ban" id="global2"> <h2>CYBERPUNK IS DUCK</h2> Pour out the Soykaf, lurk, and read the <a href="https://lainchan.org/rules">rules</a> before posting! </div> - <center> <img alt="mascot" class="lain_banner" src="static/duck.png"></center> + <div class="ban" id="global2"> <h2>CYBERPUNK IS BUN</h2> Pour out the Soykaf, lurk, and read the <a href="https://lainchan.org/rules">rules</a> before posting! </div> + <center> <img alt="mascot" src="static/bun.png"></center> <br> <div class="ban" id="global3"> <h2>Latest News</h2> - {% if not recent_news %} + {% if recent_news|count == 0 %} <p style="text-align:center" class="unimportant">(No news to show.)</p> {% else %} {% for entry in recent_news %} @@ -79,7 +78,8 @@ </ul> </div> </div> - <div class="box right"> + <div class="ban" id="global4" > + <div class="box center"> <h2>Stats</h2> <ul> <li>Total posts: {{ stats.total_posts }}</li> @@ -87,7 +87,8 @@ <li>Active content: {{ stats.active_content|filesize }}</li> </ul> </div> - </div> + </div> + </div> <div class="footer"> <footer> <center> diff --git a/templates/themes/ukko2/theme.php b/templates/themes/ukko2/theme.php index bb21caa0..c34b5b89 100644 --- a/templates/themes/ukko2/theme.php +++ b/templates/themes/ukko2/theme.php @@ -11,7 +11,7 @@ return; } - $action = generation_strategy('sb_ukko2', array()); + $action = generation_strategy('sb_ukko', array()); if ($action == 'delete') { file_unlink($settings['uri'] . '/index.html'); diff --git a/templates/themes/ukko3/theme.php b/templates/themes/ukko3/theme.php index 53910199..c33b8521 100644 --- a/templates/themes/ukko3/theme.php +++ b/templates/themes/ukko3/theme.php @@ -11,7 +11,7 @@ return; } - $action = generation_strategy('sb_ukko3', array()); + $action = generation_strategy('sb_ukko', array()); if ($action == 'delete') { file_unlink($settings['uri'] . '/index.html'); |