From 16003af8d7b983ebdd41c02dc25c3f449ae5e20c Mon Sep 17 00:00:00 2001
From: Yukimi Kazari <divine-exseed-freya-megna@live.com>
Date: Sat, 17 Sep 2016 15:14:52 -0400
Subject: [PATCH] TESTING - Menu

---
 app/views/post/show.php                               | 8 ++------
 app/views/post/show_partials/_options_panel.php       | 5 ++---
 app/views/post/show_partials/_related_posts_panel.php | 3 +--
 app/views/post/show_partials/_statistics_panel.php    | 4 ++++
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/views/post/show.php b/app/views/post/show.php
index bd10b1c..bfb6281 100755
--- a/app/views/post/show.php
+++ b/app/views/post/show.php
@@ -12,12 +12,8 @@
     <?php endif ?>
 
     <?= $this->partial('post/show_partials/status_notices', array('pools' => $this->pools)) ?>
-    <div class="sidebar">
-	  <?= $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') ?>
-      <br />
+    <div class="clearfix">
+	  <?= $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') ?>
 	  <?php if (CONFIG()->can_show_ad('post#show-sidebar', current_user())) : ?>
 		<?= $this->partial('vertical') ?>
 	  <?php endif ?>
diff --git a/app/views/post/show_partials/_options_panel.php b/app/views/post/show_partials/_options_panel.php
index ddbd356..1aeb6a3 100755
--- a/app/views/post/show_partials/_options_panel.php
+++ b/app/views/post/show_partials/_options_panel.php
@@ -2,7 +2,7 @@
   <ul>
 	<li class="wiki"><?php if ($this->post->image() && $this->post->can_be_seen_by(current_user())) : ?>
 			  <?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());
 							  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",
@@ -13,11 +13,10 @@
 							  'id' => 'highres'));
 					  endif
 				  ?>
-			  </li>
 			  <?php if ($this->post->has_jpeg()) : ?>
 				<?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. ?>
-				<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',
 								'id' => 'png'));
 						?>
diff --git a/app/views/post/show_partials/_related_posts_panel.php b/app/views/post/show_partials/_related_posts_panel.php
index 7159f30..1b03b82 100755
--- a/app/views/post/show_partials/_related_posts_panel.php
+++ b/app/views/post/show_partials/_related_posts_panel.php
@@ -1,6 +1,5 @@
 <div>
   <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->linkTo($this->t('.random'), 'post#random') ?></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>
   </ul>
 </div>
diff --git a/app/views/post/show_partials/_statistics_panel.php b/app/views/post/show_partials/_statistics_panel.php
index 9493c63..a7eb9c6 100755
--- a/app/views/post/show_partials/_statistics_panel.php
+++ b/app/views/post/show_partials/_statistics_panel.php
@@ -1,5 +1,7 @@
 <div id="stats" class="vote-container">
   <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('.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) : ?>
@@ -26,6 +28,8 @@
     </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>
 </div>