TESTING - Menu

This commit is contained in:
Yukimi Kazari 2016-09-17 15:14:52 -04:00
parent 55d4b004ae
commit 16003af8d7
4 changed files with 9 additions and 11 deletions

View File

@ -12,12 +12,8 @@
<?php endif ?> <?php endif ?>
<?= $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="clearfix">
<?= $this->partial('post/show_partials/related_posts_panel') ?> <?= $this->partial('post/show_partials/related_posts_panel') ?> <?= $this->partial('tags') ?> <?= $this->partial('post/show_partials/statistics_panel') ?> <?= $this->partial('post/show_partials/options_panel') ?>
<?= $this->partial('tags') ?>
<?= $this->partial('post/show_partials/statistics_panel') ?>
<?= $this->partial('post/show_partials/options_panel') ?>
<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') ?>
<?php endif ?> <?php endif ?>

View File

@ -2,7 +2,7 @@
<ul> <ul>
<li class="wiki"><?php if ($this->post->image() && $this->post->can_be_seen_by(current_user())) : ?> <li class="wiki"><?php if ($this->post->image() && $this->post->can_be_seen_by(current_user())) : ?>
<?php $file_jpeg = $this->post->get_file_jpeg() ?> <?php $file_jpeg = $this->post->get_file_jpeg() ?>
<li><?php if (array_key_exists("dakimakura", $this->post->tags()) && !current_user()->is_contributor_or_higher()) : <?php if (array_key_exists("dakimakura", $this->post->tags()) && !current_user()->is_contributor_or_higher()) :
$file_sample = $this->post->get_file_sample(current_user()); $file_sample = $this->post->get_file_sample(current_user());
echo $this->linkTo(($this->post->has_sample() ? $this->t('.download.larger') : $this->t('.download.normal')) . ' ' . $this->numberToHumanSize($file_sample['size']), $file_sample['url'], array( echo $this->linkTo(($this->post->has_sample() ? $this->t('.download.larger') : $this->t('.download.normal')) . ' ' . $this->numberToHumanSize($file_sample['size']), $file_sample['url'], array(
'class' => $this->post->has_sample() ? "original-file-changed":"original-file-unchanged", 'class' => $this->post->has_sample() ? "original-file-changed":"original-file-unchanged",
@ -13,11 +13,10 @@
'id' => 'highres')); 'id' => 'highres'));
endif endif
?> ?>
</li>
<?php if ($this->post->has_jpeg()) : ?> <?php if ($this->post->has_jpeg()) : ?>
<?php $file_image = $this->post->get_file_image() ?> <?php $file_image = $this->post->get_file_image() ?>
<?php # If we have a JPEG, the above link was the JPEG. Link to the PNG here. ?> <?php # If we have a JPEG, the above link was the JPEG. Link to the PNG here. ?>
<li><?= $this->linkTo($this->t('.download.normal').' '.strtoupper($file_image['ext']).' ('.$this->numberToHumanSize($file_image['size']).')', $file_image['url'], array( <?= $this->linkTo($this->t('.download.normal').' '.strtoupper($file_image['ext']).' ('.$this->numberToHumanSize($file_image['size']).')', $file_image['url'], array(
'class' => 'original-file-unchanged', 'class' => 'original-file-unchanged',
'id' => 'png')); 'id' => 'png'));
?> ?>

View File

@ -1,6 +1,5 @@
<div> <div>
<ul> <ul>
<li><?= $this->linkToIf($this->post->previous_id(), $this->t('.previous'), array('post#show', 'id' => $this->post->previous_id())) ?> <?= $this->linkToIf($this->post->next_id(), $this->t('.next'), array('post#show', 'id' => $this->post->next_id())) ?> <?php if ($this->post->parent_id) : ?><?= $this->linkTo($this->t('.parent'), array('post#show', 'id' => $this->post->parent_id)) ?><?php endif ?></li> <li><?= $this->linkToIf($this->post->previous_id(), $this->t('.previous'), array('post#show', 'id' => $this->post->previous_id())) ?> <?= $this->linkToIf($this->post->next_id(), $this->t('.next'), array('post#show', 'id' => $this->post->next_id())) ?> <?php if ($this->post->parent_id) : ?><?= $this->linkTo($this->t('.parent'), array('post#show', 'id' => $this->post->parent_id)) ?><?php endif ?> <?= $this->linkTo($this->t('.random'), 'post#random') ?></li>
<li><?= $this->linkTo($this->t('.random'), 'post#random') ?></li>
</ul> </ul>
</div> </div>

View File

@ -1,5 +1,7 @@
<div id="stats" class="vote-container"> <div id="stats" class="vote-container">
<ul> <ul>
<li class="wiki"><?= $this->linkTo('Info ■', '#', ['class' => 'submenu-button']) ?>
<ul class="submenu" style="display: none; margin-left: 0em; margin-top: .2em; width: 115px; padding: 0.3em; border: 1px solid #bf5e65;">
<li><?= $this->t('.id') ?>: <?= $this->post->id ?></li> <li><?= $this->t('.id') ?>: <?= $this->post->id ?></li>
<li><?= $this->t('.posted') ?>: <?= $this->t(['.posted_data_html', 'time' => $this->linkTo($this->t(['time.x_ago', 't' => $this->timeAgoInWords($this->post->created_at)]), ["#index", 'tags' => "date:" . substr($this->post->created_at, 0, 10)], ['title' => substr(date('r', strtotime($this->post->created_at)), 0, -6)]), 'user' => $this->linkToIf($this->post->user_id, $this->post->author(), ['user#show', 'id' => $this->post->user_id])]) ?></li> <li><?= $this->t('.posted') ?>: <?= $this->t(['.posted_data_html', 'time' => $this->linkTo($this->t(['time.x_ago', 't' => $this->timeAgoInWords($this->post->created_at)]), ["#index", 'tags' => "date:" . substr($this->post->created_at, 0, 10)], ['title' => substr(date('r', strtotime($this->post->created_at)), 0, -6)]), 'user' => $this->linkToIf($this->post->user_id, $this->post->author(), ['user#show', 'id' => $this->post->user_id])]) ?></li>
<?php if (current_user()->is_admin() && $this->post->approver) : ?> <?php if (current_user()->is_admin() && $this->post->approver) : ?>
@ -26,6 +28,8 @@
</li> </li>
<li><?= $this->t('.favorited_by') ?>: <span id="favorited-by"><?= $this->favorite_list($this->post) ?></span> <span id="favorited-by-more"></span></li> <li><?= $this->t('.favorited_by') ?>: <span id="favorited-by"><?= $this->favorite_list($this->post) ?></span> <span id="favorited-by-more"></span></li>
</li>
</ul>
</ul> </ul>
</div> </div>