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

Merge branch 'testing' into 'master'

Browse Source 
Small updates and fixes



See merge request !8
This commit is contained in:
Yukimi Kazari 2016-11-24 23:33:43 -05:00
commit 5cfe02bd8b
9 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/_menu.php
View File

@ -46,11 +46,7 @@
<li><?= $this->linkTo($this->t('.posts.upload'), ['controller' => 'post', 'action' => 'upload']) ?></li> <li><?= $this->linkTo($this->t('.posts.upload'), ['controller' => 'post', 'action' => 'upload']) ?></li>
<li><?= $this->linkTo($this->t('.posts.random'), ['controller' => 'post', 'tags' => 'order:random']) ?></li> <li><?= $this->linkTo($this->t('.posts.random'), ['controller' => 'post', 'tags' => 'order:random']) ?></li>
<li><?= $this->linkTo($this->t('.posts.popular'), ['controller' => 'post', 'action' => 'popular_recent']) ?></li> <li><?= $this->linkTo($this->t('.posts.popular'), ['controller' => 'post', 'action' => 'popular_recent']) ?></li>
<li><?= $this->linkTo($this->t('.posts.image_search'), ['controller' => 'post', 'action' => 'similar']) ?></li>
<li><?= $this->linkTo($this->t('.posts.history'), ['controller' => 'history', 'action' => 'index']) ?></li> <li><?= $this->linkTo($this->t('.posts.history'), ['controller' => 'history', 'action' => 'index']) ?></li>
<?php if (current_user()->is_contributor_or_higher()) : ?>
<li><?= $this->linkTo($this->t('.posts.batch'), ['controller' => 'batch', 'action' => 'index']) ?></li>
<?php endif ?>
<?php if (current_user()->is_janitor_or_higher()) : ?> <?php if (current_user()->is_janitor_or_higher()) : ?>
<li><?= $this->linkTo($this->t('.posts.moderate'), ['controller' => 'post', 'action' => 'moderate'], ['class' => 'moderate']) ?></li> <li><?= $this->linkTo($this->t('.posts.moderate'), ['controller' => 'post', 'action' => 'moderate'], ['class' => 'moderate']) ?></li>
<?php endif ?> <?php endif ?>

9
app/views/layouts/default.php
View File

@ -136,12 +136,15 @@ container
<?= $this->formTag('post#index', array('method' => 'get', 'accept-charset' => 'UTF-8'), function(){ ?> <?= $this->formTag('post#index', array('method' => 'get', 'accept-charset' => 'UTF-8'), function(){ ?>
<div style="margin:0;padding:0;display:inline"></div> <div style="margin:0;padding:0;display:inline"></div>
<div> <div>
<?= $this->textFieldTag("tags", $this->h($this->params()->tags), array('size' => '38', 'autocomplete' => 'off', 'placeholder' => 'Search', 'style' => 'font-size: 20pt; padding: 0 0 1px 4px; margin: 4px 0 0 8px; border-style: dotted; background: #2b0000;')) ?> <?php
<?php //<?= $this->submitTag($this->t('.search'), array('style' => 'display: none;', 'name' => '')) ?> if ($this->request()->controller() == 'post') : ?>
<?= $this->textFieldTag("tags", $this->h($this->params()->tags), array('size' => '36', 'autocomplete' => 'off', 'placeholder' => 'Search Posts...', 'style' => 'font-size: 20pt; padding: 0 0 1px 4px; margin: 4px 0 0 8px; border-style: dotted; background: #2b0000;')) ?>
<?= $this->tag_completion_box('$("tags")', ['$("tags").up("form")', '$("tags")', null], true) ?>
<?php endif ?>
</div> </div>
<?php }) ?> <?php }) ?>
</div> </div>
<?= $this->tag_completion_box('$("tags")', ['$("tags").up("form")', '$("tags")', null], true) ?> </h2></div> </h2></div>
<?= $this->partial('layouts/menu') ?> <?= $this->partial('layouts/menu') ?>
</div> </div>
<?= $this->partial('layouts/login') ?> <?= $this->partial('layouts/login') ?>

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

@ -26,7 +26,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;"> <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="view"><?= $this->t('.mode_form.view') ?></option>
<option value="edit"><?= $this->t('.mode_form.edit') ?></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-q">Rate questionable</option>
<option value="rating-e">Rate explicit</option> <option value="rating-e">Rate explicit</option>
<?php if (current_user()->is_privileged_or_higher()) : ?> <?php if (current_user()->is_privileged_or_higher()) : ?>

1
public/500.html
View File

@ -9,7 +9,6 @@
<body> <body>
<div style="text-align: center;"> <div style="text-align: center;">
<img src="/images/errors.png" alt="errors" style="margin: auto;" /> <img src="/images/errors.png" alt="errors" style="margin: auto;" />
<p style="width: 30em; margin: auto;">An error has occurred.</p>
</div> </div>
</body> </body>
</html> </html>

14
public/504.html Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C/DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Error</title>
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" type="text/css" media="screen" href="/assets/application.css" title="default" />
</head>
<body>
<div style="text-align: center;">
<img src="/images/504.png" alt="errors" style="margin: auto;" />
</div>
</body>
</html>

4
public/assets/application-0b1f0761b0f488c409a80b516518e0e1.css
View File

@ -561,7 +561,7 @@ ul.link-page>li{list-style-type:none;margin:0;padding:0}
.tag-type-copyright>a:hover{color:#33cfff} .tag-type-copyright>a:hover{color:#33cfff}
.upload-progress-bar{border:1px solid #FFF;display:inline-block;height:1em;width:100px} .upload-progress-bar{border:1px solid #FFF;display:inline-block;height:1em;width:100px}
.upload-progress-bar-fill{background-color:#48F;height:100%} .upload-progress-bar-fill{background-color:#48F;height:100%}
.tag-completion-box{background-color:rgba(43, 0, 0, 0.81);left:0;position:absolute;top:0;z-index:10} .tag-completion-box{background-color:#2b0000;left:0;position:absolute;top:0;z-index:10}
.tag-completion-box ul{list-style-type:none;margin:.5em} .tag-completion-box ul{list-style-type:none;margin:.5em}
.tag-completion-box .completed-tag{cursor:default;margin:0;position:relative} .tag-completion-box .completed-tag{cursor:default;margin:0;position:relative}
.tag-completion-box .completed-tag-alias{float:right;margin-left:1em} .tag-completion-box .completed-tag-alias{float:right;margin-left:1em}
@ -726,7 +726,7 @@ a.directlink:hover>.directlink-info{display:none}
.largeimg .directlink-icon-small{display:none} .largeimg .directlink-icon-small{display:none}
.smallimg .directlink-icon-large{display:none} .smallimg .directlink-icon-large{display:none}
.similar .directlink-icon{display:none} .similar .directlink-icon{display:none}
.top-corner-float{background:#222;border:solid #000 2px;padding:6px;position:fixed;right:2px;top:2px;z-index:5} .top-corner-float{background:#222;border:solid #000 2px;padding:6px;position:fixed;right:2px;top:2px;z-index:5;font-size: 12px}
.post-hover{background:#222;border:2px solid #000;max-width:30em;min-width:20em;padding:2px;position:absolute;z-index:2} .post-hover{background:#222;border:2px solid #000;max-width:30em;min-width:20em;padding:2px;position:absolute;z-index:2}
.post-hover-overlay{position:absolute;z-index:2} .post-hover-overlay{position:absolute;z-index:2}
.post-hover-overlay>a>img{border-color:#000;border-style:solid;border-width:0 2px 2px;margin-left:-2px;vertical-align:top} .post-hover-overlay>a>img{border-color:#000;border-style:solid;border-width:0 2px 2px;margin-left:-2px;vertical-align:top}

BIN
public/images/504.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 175 KiB

BIN
public/images/errors.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 179 KiB

BIN
public/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 KiB

After

Width:  |  Height:  |  Size: 144 KiB