Merge branch 'testing' into 'master'

Major Update



See merge request !5

app/views/layouts/admin.php

@@ -2,7 +2,7 @@
   <div id="header">
     <div id="title">
       <h2 id="site-title">
-        <?= $this->linkTo($this->imageTag('/images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '389x40', 'id' => 'logo']), $this->rootPath()) ?>
+        <?= $this->linkTo($this->imageTag('/images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '195x40', 'id' => 'logo']), $this->rootPath()) ?>
       </h2>
     </div>
     <?= $this->partial('layouts/menu') ?>

app/views/layouts/default.php

@@ -132,7 +132,7 @@ container
 </script>
   <?= $this->partial('layouts/news') ?>
   <div id="header">
-    <div id="title"><h2 id="site-title"><?= $this->linkTo($this->imageTag('images/logo_small.png', array('alt' => CONFIG()->app_name, 'size' => '389x40', 'id' => 'logo')), CONFIG()->url_base) ?><span><?= $this->tag_header($this->h($this->params()->tags)) ?></span></h2></div>
+    <div id="title"><h2 id="site-title"><?= $this->linkTo($this->imageTag('images/logo_small.png', array('alt' => CONFIG()->app_name, 'size' => '195x40', 'id' => 'logo')), CONFIG()->url_base) ?><span><?= $this->tag_header($this->h($this->params()->tags)) ?></span></h2></div>
     <?= $this->partial('layouts/menu') ?>
   </div>
   <?= $this->partial('layouts/login') ?>

app/views/layouts/settings.php

@@ -2,7 +2,7 @@
   <div id="header">
     <div id="title">
       <h2 id="site-title">
-        <?= $this->linkTo($this->imageTag('/images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '389x40', 'id' => 'logo']), $this->rootPath()) ?>
+        <?= $this->linkTo($this->imageTag('/images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '195x40', 'id' => 'logo']), $this->rootPath()) ?>
       </h2>
     </div>
     <?= $this->partial('layouts/menu') ?>

app/views/post/_search.php

@@ -1,5 +1,4 @@
-<div style="margin-bottom: 1em;">
+<div style="margin-bottom: 0.5em;">
-  <h5><?= $this->t('.title') ?></h5>
   <?= $this->formTag('post#index', array('method' => 'get', 'accept-charset' => 'UTF-8'), function(){ ?>
     <div style="margin:0;padding:0;display:inline"></div>
     <div>

app/views/post/_tags.php

@@ -2,8 +2,7 @@
 !isset($this->include_tag_hover_highlight) && $this->include_tag_hover_highlight = false;
 !isset($this->include_tag_reverse_aliases) && $this->include_tag_reverse_aliases = false;
 ?>
-<div>
+<div style="margin-bottom: 0.5em;>
-  <h5><?= $this->t('.title') ?></h5>
   <ul id="tag-sidebar">
     <?php !empty($this->tags['exclude']) && print $this->tag_links($this->tags['exclude'], array('prefix' => '-', 'with_hover_highlight' => 'true', 'with_hover_highlight' => $this->include_tag_hover_highlight)) ?>
     <?php !empty($this->tags['include']) && print $this->tag_links($this->tags['include'], array('with_aliases' => $this->include_tag_reverse_aliases, 'with_hover_highlight' => $this->include_tag_hover_highlight)) ?>

app/views/post/index.php

@@ -20,8 +20,7 @@
   <div class="sidebar">
     <?= $this->partial('search') ?>
     <?php if (current_user()->is_privileged_or_higher()) : ?>
-    <div style="margin-bottom: 1em;" id="mode-box" class="advanced-editing">
+    <div style="margin-bottom: 0.5em;" id="mode-box" class="advanced-editing">
-      <h5><?= $this->t('.mode') ?></h5>
       <form onsubmit="return false;" action="">
         <div>
           <select name="mode" id="mode" onchange="PostModeMenu.change()" onkeyup="PostModeMenu.change()" style="width: 13em; padding: 0 0 .2em 0; background: black; color: #BF5E65; border-style: solid; border-width: 0px 0px 1px 0px; border-color: darkred;">

app/views/post/show.php

@@ -16,9 +16,9 @@
     <div class="sidebar">
       <?= $this->partial('search') ?>
       <?= $this->partial('tags') ?>
+	  <?= $this->partial('post/show_partials/related_posts_panel') ?>
       <?= $this->partial('post/show_partials/statistics_panel') ?>
       <?= $this->partial('post/show_partials/options_panel') ?>
-      <?= $this->partial('post/show_partials/related_posts_panel') ?>
  <br />
   <?php if (CONFIG()->can_show_ad('post#show-sidebar', current_user())) : ?>
     <?= $this->partial('vertical') ?>

app/views/post/show_partials/_options_panel.php

@@ -1,27 +1,14 @@
-<div>
+<div class="clearfix" >
-  <h5><?= $this->t('.title') ?></h5>
   <ul>
-    <li><?= $this->linkToFunction($this->t('buttons.edit'), "$('comments').hide(); $('edit').show().scrollTo(); $('post_tags').focus(); Cookie.put('show_defaults_to_edit', 1);") ?></li>
+	<li class="wiki"><?php if ($this->post->image() && $this->post->can_be_seen_by(current_user())) : ?>
-    <!-- <?php //if (!$this->post->is_deleted() && $this->post->image() && $this->post->width && $this->post->width > 700) : ?>
-      <li><?php //echo $this->linkToFunction($this->t('.resize'), "post->resize_image()") ?></li>
-    <?php //endif ?> -->
-    <?php if ($this->post->image() && $this->post->can_be_seen_by(current_user())) : ?>
 			  <?php $file_jpeg = $this->post->get_file_jpeg() ?>
-      <?php if ($this->post->use_sample(current_user()) or current_user()->always_resize_images) : ?>
-      <li><?php if (!array_key_exists("dakimakura", $this->post->tags()) || current_user()->is_contributor_or_higher());
-                    echo $this->linkTo($this->t('.view_larger'), $file_jpeg['url'], [
-                      'class' => ($this->post->has_sample() ? "original-file-changed":"original-file-unchanged") . " highres-show",
-                      'id' => 'highres-show', 'large_width' => $this->post->width, 'large_height' => $this->post->height])
-          ?>
-      </li>
-      <?php endif ?>
 			  <li><?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']) . ' ' . strtoupper($file_sample['ext']) . ')', $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",
 							  'id' => 'highres'));
 					  else:
-                      echo $this->linkTo(($this->post->has_sample() ? $this->t('.download.larger') : $this->t('.download.image')) . ' (' . $this->numberToHumanSize($file_jpeg['size']) . ' ' . strtoupper($file_jpeg['ext']) . ')', $file_jpeg['url'], array(
+							  echo $this->linkTo(($this->post->has_sample() ? $this->t('.download.larger') : $this->t('.download.image')) . ' (' . $this->numberToHumanSize($file_jpeg['size']) . ')', $file_jpeg['url'], array(
 							  'class' => ($this->post->has_sample() ? "original-file-changed":"original-file-unchanged"),
 							  'id' => 'highres'));
 					  endif
@@ -37,6 +24,23 @@
 				</li>
 			  <?php endif ?>
 			<?php endif ?>
+		<?= $this->linkTo('Options ■', '#', ['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->linkToFunction($this->t('buttons.edit'), "$('comments').hide(); $('edit').show().scrollTo(); $('post_tags').focus(); Cookie.put('show_defaults_to_edit', 1);") ?></li>
+			<!-- <?php //if (!$this->post->is_deleted() && $this->post->image() && $this->post->width && $this->post->width > 700) : ?>
+			  <li><?php //echo $this->linkToFunction($this->t('.resize'), "post->resize_image()") ?></li>
+			<?php //endif ?> -->
+			<?php if ($this->post->image() && $this->post->can_be_seen_by(current_user())) : ?>
+			  <?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(
+								'class' => 'original-file-unchanged',
+								'id' => 'png'));
+						?>
+				</li>
+			  <?php endif ?>
+			<?php endif ?>
 			<?php if ($this->post->can_user_delete(current_user())) : ?>
 			<li><?= $this->linkTo($this->t('.delete'), array('#delete', 'id' => $this->post->id)) ?></li>
 			<?php endif ?>
@@ -68,8 +72,7 @@
 			  <li id="set-avatar"><?= $this->linkTo($this->t('.set_avatar'), array('user#set_avatar', 'id' => $this->post->id)) ?></li>
 			<?php endif ?>
 			<li><?= $this->linkTo($this->t('.history'), array('history#index', 'search' => 'post:'.$this->post->id)) ?></li>
-    <?php if (CONFIG()->enable_find_external_data && current_user()->is_mod_or_higher()) : ?>
+		</ul>
-    <li><?= $this->linkTo('Search external data', array('post#search_external_data', 'ids' => $this->post->id)) ?></li>
+	</li>
-    <?php endif ?>
   </ul>
 </div>

app/views/post/show_partials/_related_posts_panel.php

@@ -1,21 +1,6 @@
 <div>
-  <h5><?= $this->t('.title') ?></h5>
   <ul>
-    <li><?= $this->linkToIf($this->post->previous_id(), $this->t('.previous'), array('post#show', 'id' => $this->post->previous_id())) ?></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 ?></li>
-    <li><?= $this->linkToIf($this->post->next_id(), $this->t('.next'), array('post#show', 'id' => $this->post->next_id())) ?></li>
-    <?php if ($this->post->parent_id) : ?>
-      <li><?= $this->linkTo($this->t('.parent'), array('post#show', 'id' => $this->post->parent_id)) ?></li>
-    <?php endif ?>
 	<li><?= $this->linkTo($this->t('.random'), 'post#random') ?></li>
-    <?php if (current_user()->is_member_or_higher()) : ?>
-    <?php if (!$this->post->is_deleted() || $this->post->image()) : ?>
-      <li><a id="find-dupes"><?= $this->t('.find.duplicate') ?></a><?php #= linkTo "Find dupes", 'post#similar', 'id' => $this->post->id, 'services' => 'local' ?></li>
-      <li><a id="find-similar"><?= $this->t('.find.similar') ?></a><?php #= linkTo "Find similar", 'post#similar', 'id' => $this->post->id, 'services' => 'all' ?></li>
-      <script type="text/javascript">
-        $("find-dupes").href = '<?= $this->urlFor(array('post#similar', 'id' => $this->post->id, 'services'=>'local')) ?>';
-        $("find-similar").href = '<?= $this->urlFor(array('post#similar', 'id' => $this->post->id, 'services'=>'all')) ?>';
-      </script>
-    <?php endif ?>
-    <?php endif ?>
   </ul>
 </div>

app/views/post/show_partials/_statistics_panel.php

@@ -1,5 +1,4 @@
 <div id="stats" class="vote-container">
-  <h5><?= $this->t('.title') ?></h5>
   <ul>
     <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>

app/views/static/more.php

@@ -1,5 +1,5 @@
 <div id="static-more">
-  <div id="title"><h2><?= $this->linkTo($this->imageTag('images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '389x40', 'id' => 'logo']), 'root') ?></h2></div>
+  <div id="title"><h2><?= $this->linkTo($this->imageTag('images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '195x40', 'id' => 'logo']), 'root') ?></h2></div>
   <div>
     <ul>
       <li><h4><?= $this->t('static_t1') ?></h4></li>

config/locales/en.yml

@@ -842,7 +842,7 @@ en:
         delete: Delete
         download:
           image: Image
-          larger: Download larger version
+          larger: Download Hi-Res
           normal: Download
         favorites:
           add: Add to favorites
@@ -869,15 +869,15 @@ en:
         find:
           duplicate: Find dupes
           similar: Find similar
-        next: Next
+        next: 'Next »'
-        parent: Parent
+        parent: 'Up'
-        previous: Previous
+        previous: '« Previous'
         random: Random
         title: Related Posts
       statistics_panel:
         approver: Approver
         favorited_by: Favorited by
-        id: Id
+        id: PID
         posted: Posted
         posted_data_html: '%{time} by %{user}'
         rating: Rating
@@ -913,7 +913,7 @@ en:
         resized:
           always_view_original: Always view original
           hide: Hide this message
-          info_html: This image has been resized. Click on the %{larger} link in the sidebar for a high-quality version.
+          info_html: This image has been resized. %{larger} for a high-quality version.
           view_larger: View larger version
         samples_disabled: Image samples have been disabled. If you find this to be too slow, you can turn samples back on in your profile settings.
     similar: