More updates

This commit is contained in:
Yukimi Kazari 2017-01-25 06:24:01 -05:00
parent e191493d08
commit fa92641baf
3 changed files with 10 additions and 5 deletions

View File

@ -17,7 +17,8 @@
endif endif
?> ?>
<div class="sidebar" style="display: none;"> <div class="content">
<div class="sidebar" style="display: none;">
<?php if (current_user()->is_privileged_or_higher()) : ?> <?php if (current_user()->is_privileged_or_higher()) : ?>
<?= $this->partial('tag_script') ?> <?= $this->partial('tag_script') ?>
<?php endif ?> <?php endif ?>
@ -34,7 +35,6 @@
<?= $this->partial('blacklists') ?> <?= $this->partial('blacklists') ?>
</div> </div>
<div class="content">
<?php if (current_user()->is_member_or_lower()) : ?> <?php if (current_user()->is_member_or_lower()) : ?>
<div class="status-notice">Youre not logged in! You are required to have an account to access <a href="/wiki/show?title=restricted_content">restricted content</a>! <a href="/user/login">Login</a> <div class="status-notice">Youre not logged in! You are required to have an account to access <a href="/wiki/show?title=restricted_content">restricted content</a>! <a href="/user/login">Login</a>
</div> </div>

View File

@ -14,9 +14,11 @@
<?= $this->partial('post/show_partials/status_notices', array('pools' => $this->pools)) ?> <?= $this->partial('post/show_partials/status_notices', array('pools' => $this->pools)) ?>
<div class="sidebar"> <div class="sidebar">
<?= $this->partial('post/show_partials/related_posts_panel') ?> <?= $this->partial('post/show_partials/related_posts_panel') ?>
<?php if ($this->post->can_be_seen_by(current_user())) : ?>
<?= $this->partial('tags') ?> <?= $this->partial('tags') ?>
<?= $this->partial('post/show_partials/statistics_panel') ?> <?= $this->partial('post/show_partials/statistics_panel') ?>
<?= $this->partial('post/show_partials/options_panel') ?> <?= $this->partial('post/show_partials/options_panel') ?>
<?php endif ?>
<br /> <br />
<?php if (CONFIG()->can_show_ad('post#show-sidebar', current_user())) : ?> <?php if (CONFIG()->can_show_ad('post#show-sidebar', current_user())) : ?>
<?= $this->partial('vertical') ?> <?= $this->partial('vertical') ?>
@ -26,12 +28,15 @@
<?php if (CONFIG()->can_show_ad('post#show-top', current_user())) : ?> <?php if (CONFIG()->can_show_ad('post#show-top', current_user())) : ?>
<?= $this->partial('horizontal', ['position' => 'top']) ?> <?= $this->partial('horizontal', ['position' => 'top']) ?>
<?php endif ?> <?php endif ?>
<?php if (!$this->post->can_be_seen_by(current_user())) : ?>
<p>This post is restricted</p>
<?php endif ?>
<?php if ($this->post->can_be_seen_by(current_user())) : ?>
<?= $this->partial('post/show_partials/image') ?> <?= $this->partial('post/show_partials/image') ?>
<?= $this->partial('post/show_partials/image_footer', ['post_id' => $this->post->id]) ?> <?= $this->partial('post/show_partials/image_footer', ['post_id' => $this->post->id]) ?>
<?= $this->partial('post/show_partials/edit') ?> <?= $this->partial('post/show_partials/edit') ?>
<?= $this->partial('post/show_partials/comments') ?> <?= $this->partial('post/show_partials/comments') ?>
<?php endif ?>
<?php if (CONFIG()->can_show_ad('post#show-bottom', current_user())) : ?> <?php if (CONFIG()->can_show_ad('post#show-bottom', current_user())) : ?>
<?= $this->partial('horizontal', ['position' => 'bottom']) ?> <?= $this->partial('horizontal', ['position' => 'bottom']) ?>
<?php endif ?> <?php endif ?>

View File

@ -1,7 +1,7 @@
<?php if (!$this->post->is_deleted()) : ?> <?php if (!$this->post->is_deleted()) : ?>
<div<?php if (CONFIG()->dblclick_resize_image) echo ' ondblclick="Post.resize_image(); return false;"' ?>> <div<?php if (CONFIG()->dblclick_resize_image) echo ' ondblclick="Post.resize_image(); return false;"' ?>>
<?php if (!$this->post->can_be_seen_by(current_user())) : ?> <?php if (!$this->post->can_be_seen_by(current_user())) : ?>
<p><?= $this->t('.text') ?></p> <p>This post is restricted</p>
<?php elseif ($this->post->image()) : ?> <?php elseif ($this->post->image()) : ?>
<div id="note-container"> <div id="note-container">
<?php foreach ($this->post->active_notes() as $note) : ?> <?php foreach ($this->post->active_notes() as $note) : ?>