Mirrors/Sequenzia
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TESTING - No Sidebar

Browse Source
This commit is contained in:
Yukimi Kazari 2016-09-19 01:54:32 -04:00
parent 9594818e9c
commit 2b6d478b54
5 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/views/post/index.php
View File

@ -16,8 +16,7 @@
unset($total, $count);
endif
?>
<div class="sidebar">
<div class="sidebar" style="display:none">
<?php /* <?= $this->partial('search') ?> */ ?>
<?php if (current_user()->is_privileged_or_higher()) : ?>
<div style="margin-bottom: 0.5em;" id="mode-box" class="advanced-editing">
@ -26,7 +25,7 @@
<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;">
<option value="view"><?= $this->t('.mode_form.view') ?></option>
<option value="edit"><?= $this->t('.mode_form.edit') ?></option>
<!-- <option value="rating-s">Rate safe</option>
<!-- <option value="rating-s">Rate safe</option>
<option value="rating-q">Rate questionable</option>
<option value="rating-e">Rate explicit</option>
<?php if (current_user()->is_privileged_or_higher()) : ?>
@ -68,7 +67,7 @@
<?php endif ?>
<?= $this->partial('blacklists') ?>
<?= $this->partial('tags', array('include_tag_hover_highlight' => 'true')) ?>
<?php # <?= $this->partial('tags', array('include_tag_hover_highlight' => 'true')) ?>
<br />
@ -77,7 +76,41 @@
<?php endif ?>
</div>
<div class="content">
<?php if (!empty($this->ambiguous_tags)) : ?>
<?php if (current_user()->is_privileged_or_higher()) : ?>
<div style="margin-bottom: 0.5em;" id="mode-box" class="advanced-editing">
<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;">
<option value="view"><?= $this->t('.mode_form.view') ?></option>
<option value="edit"><?= $this->t('.mode_form.edit') ?></option>
<!-- <option value="rating-s">Rate safe</option>
<option value="rating-q">Rate questionable</option>
<option value="rating-e">Rate explicit</option>
<?php if (current_user()->is_privileged_or_higher()) : ?>
<option value="lock-rating">Lock rating</option>
<option value="lock-note">Lock notes</option>
<?php endif ?> -->
<?php if (current_user()->is_mod_or_higher()) : ?>
<option value="approve"><?= $this->t('.mode_form.approve') ?></option>
<?php endif ?>
<option value="flag"><?= $this->t('.mode_form.flag') ?></option>
<option value="apply-tag-script"><?= $this->t('.mode_form.script') ?></option>
<option value="reparent-quick"><?= $this->t('.mode_form.reparent') ?></option>
<?php if ($this->searching_pool) : ?>
<option value="remove-from-pool"><?= $this->t('.mode_form.pool_remove') ?></option>
<?php endif ?>
<?php if (CONFIG()->delete_post_mode && current_user()->is_admin()) : ?>
<option value="destroy">Delete posts</option>
<?php endif ?>
</select>
</div>
</form>
</div>
<?= $this->partial('tag_script') ?>
<?php endif ?>
<?= $this->partial('blacklists') ?>
<?php if (!empty($this->ambiguous_tags)) : ?>
<div class="status-notice">
<?= $this->t('.ambiguous') ?>: <?= implode(', ', array_map(function($x){ return $this->linkTo($this->h($x), ['wiki#show', 'title' => $x]); }, $this->ambiguous_tags)) ?>
</div>

8
app/views/post/show.php
View File

@ -12,8 +12,12 @@
<?php endif ?>
<?= $this->partial('post/show_partials/status_notices', array('pools' => $this->pools)) ?>
<div class="clearfix" id="main-menu" style="list-style-type:none;margin:0">
<?= $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') ?>
<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 />
<?php if (CONFIG()->can_show_ad('post#show-sidebar', current_user())) : ?>
<?= $this->partial('vertical') ?>
<?php endif ?>

5
app/views/post/show_partials/_options_panel.php
View File

@ -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() ?>
<?php if (array_key_exists("dakimakura", $this->post->tags()) && !current_user()->is_contributor_or_higher()) :
<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']), $file_sample['url'], array(
'class' => $this->post->has_sample() ? "original-file-changed":"original-file-unchanged",
@ -13,10 +13,11 @@
'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. ?>
<?= $this->linkTo($this->t('.download.normal').' '.strtoupper($file_image['ext']).' ('.$this->numberToHumanSize($file_image['size']).')', $file_image['url'], array(
<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'));
?>

3
app/views/post/show_partials/_related_posts_panel.php
View File

@ -1,5 +1,6 @@
<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 ?> <?= $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 ?></li>
<li><?= $this->linkTo($this->t('.random'), 'post#random') ?></li>
</ul>
</div>

4
app/views/post/show_partials/_statistics_panel.php
View File

@ -1,7 +1,5 @@
<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) : ?>
@ -28,8 +26,6 @@
</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>