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

Merge branch 'testing' into 'master'

Browse Source 
Daily Big Update, Search bar in title



See merge request !6
This commit is contained in:
Yukimi Kazari 2016-09-16 06:13:25 -04:00
commit 82a6858e69
10 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/layouts/_news.php
View File

@ -1,7 +1,8 @@
<?php if (!CONFIG()->enable_news_ticker) return; ?>
<div id="news-ticker" style="display: none">
<ul>
<li>Sequenzia @ <a href="https://code.acr.moe/kazari/myimouto">ACR Code</a>, 100% Open! NEW! Ultra Dense Layout! More Content, Less Waste!</li>
<li>Sequenzia @ <a href="https://code.acr.moe/kazari/myimouto">ACR Code</a>! Feel free to modify and fork your own server!!</li>
<li>NEW! Ultra compact layout! More Content, Less Waste! More updates to colors! Please leave feedback!!</li>
</ul>
<a href="#" id="close-news-ticker-link"><?= $this->t('.close') ?></a>

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

@ -132,7 +132,16 @@ 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' => '195x40', '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) ?><div style="margin-right: 0.0em;">
<?= $this->formTag('post#index', array('method' => 'get', 'accept-charset' => 'UTF-8'), function(){ ?>
<div style="margin:0;padding:0;display:inline"></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 //<?= $this->submitTag($this->t('.search'), array('style' => 'display: none;', 'name' => '')) ?>
</div>
<?php }) ?>
</div>
<?= $this->tag_completion_box('$("tags")', ['$("tags").up("form")', '$("tags")', null], true) ?> </h2></div>
<?= $this->partial('layouts/menu') ?>
</div>
<?= $this->partial('layouts/login') ?>

4
app/views/post/_search.php
View File

@ -1,8 +1,8 @@
<div style="margin-bottom: 0.5em;">
<div style="margin-right: 0.0em;">
<?= $this->formTag('post#index', array('method' => 'get', 'accept-charset' => 'UTF-8'), function(){ ?>
<div style="margin:0;padding:0;display:inline"></div>
<div>
<?= $this->textFieldTag("tags", $this->h($this->params()->tags), array('size' => '20', 'autocomplete' => 'off')) ?>
<?= $this->textFieldTag("tags", $this->h($this->params()->tags), array('size' => '38', 'autocomplete' => 'off', 'style' => 'font-size: 20pt; padding: 0 0 1px 4px; margin: 4px 0 0 8px; border-style: none; background: #2b0000;')) ?>
<?= $this->submitTag($this->t('.search'), array('style' => 'display: none;', 'name' => '')) ?>
</div>
<?php }) ?>

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

@ -18,7 +18,7 @@
?>
<div class="sidebar">
<?= $this->partial('search') ?>
<?php /* <?= $this->partial('search') ?> */ ?>
<?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="">

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

@ -12,17 +12,15 @@
<?php endif ?>
<?= $this->partial('post/show_partials/status_notices', array('pools' => $this->pools)) ?>
<div class="sidebar">
<?= $this->partial('search') ?>
<?= $this->partial('tags') ?>
<?= $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 ?>
<br />
<?php if (CONFIG()->can_show_ad('post#show-sidebar', current_user())) : ?>
<?= $this->partial('vertical') ?>
<?php endif ?>
</div>
<div class="content content-post" id="right-col">
<?php if (CONFIG()->can_show_ad('post#show-top', current_user())) : ?>

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

@ -15,7 +15,7 @@
<h4><?= $this->t('.guidelines.title') ?></h4>
<p><?= $this->t('.guidelines.info') ?></p>
<ul>
<li><?= $this->t(['.guidelines.do_not.tags_html', 'tags' => substr_replace(($str = implode(', ', array_map(function($t){return $this->linkTo(str_replace('_', ' ', $t), ['wiki#show', 'title' => $t]);}, ['furry', 'yaoi', 'guro', 'toon', 'poorly_drawn']))), ' or', strrpos($str, ','), 1) ]) ?></li>
<li><?= $this->t(['.guidelines.do_not.tags_html', 'tags' => substr_replace(($str = implode(', ', array_map(function($t){return $this->linkTo(str_replace('_', ' ', $t), ['wiki#show', 'title' => $t]);}, ['furry', 'scat', 'toon', 'poorly_drawn']))), ' or', strrpos($str, ','), 1) ]) ?></li>
<li><?= $this->t(['.guidelines.do_not.with_html', 'with' => $this->linkTo($this->t('.guidelines.do_not.compression_artifacts'), array('wiki#show', 'title' => 'compression_artifacts'))]) ?></li>
<li><?= $this->t(['.guidelines.do_not.with_html', 'with' => $this->linkTo($this->t('.guidelines.do_not.obnoxious_watermarks'), array('wiki#show', 'title' => 'watermark'))]) ?></li>
<li><?= $this->linkTo($this->t('.guidelines.group'), 'help#post_relationships') ?></li>

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

@ -21,7 +21,7 @@
<?php if (current_user()->is_member_or_higher()) : ?>
<?= $this->mailTo(CONFIG()->admin_contact, "Contact", ['encode' => "javascript"]) ?> &ndash;
<?php endif ?>
<?= $this->t('static_serve') ?><?= number_format($this->post_count, 0) ?><?= $this->t('static_posts2') ?>&ndash; <?= str_replace('Moebooru', 'MyImouto', $this->t('static_running')) ?><?= CONFIG()->version ?>
<?= $this->t('static_serve') ?><?= number_format($this->post_count, 0) ?><?= $this->t('static_posts2') ?>&ndash; <?= str_replace('Moebooru', 'Sequenzia', $this->t('static_running')) ?><?= CONFIG()->version ?>
<br />
<?= $this->t('static_translation') ?>
</p>

4
config/default_config.php
View File

@ -8,7 +8,7 @@ namespace MyImouto;
abstract class DefaultConfig
{
# The name of this booru.
public $app_name = 'my.imouto';
public $app_name = 'Sequenzia';
# Host name. Must not include scheme (i.e. http(s)://) nor trailing slash.
public $server_host = '127.0.0.1:3000';
@ -17,7 +17,7 @@ abstract class DefaultConfig
public $url_base = 'http://127.0.0.1:3000';
# The version of this MyImouto
public $version = '1.0.8';
public $version = '1.1';
# This is a salt used to make dictionary attacks on account passwords harder.
public $user_password_salt = 'choujin-steiner';

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

@ -1,4 +1,8 @@
@charset UTF-8;
::-webkit-input-placeholder {color:#4a0707;}
:-moz-placeholder {color:#4a0707; opacity:1;}
::-moz-placeholder {color:#4a0707; opacity:1;}
:-ms-input-placeholder {color:#4a0707;}
.ui-helper-hidden{display:none}
.ui-helper-hidden-accessible{border:0;clip:rect(0000);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}
.ui-helper-reset{border:0;font-size:100%;line-height:1.3;list-style:none;margin:0;outline:0;padding:0;text-decoration:none}
@ -478,8 +482,8 @@ input{background:transparent;border-color:darkred;border-style:solid;border-widt
{color:#FFF}
input[type=text]:focus{background:#401212;color:#d8d1d1}
input[type=password]:focus{background:#401212;color:#d8d1d1}
input[type=button]{background:darkred;color:#b39393}
input[type=submit]{background:darkred;color:#b39393}
input[type=button]{background:#3a0404;color:#b78e8e}
input[type=submit]{background:#631717;color:#b78e8e}
HTML.webkit input[type=file]{background:darkred;color:#b39393}
label{font-weight:bold;white-space:nowrap}
ol{margin-left:1em}
@ -539,29 +543,29 @@ ul.link-page>li{list-style-type:none;margin:0;padding:0}
#history .tag-type-artist{color:#b4b48f}
.color-tag-types .tag-type-artist{color:#b4b48f}
.tag-type-artist>a:hover{color:#33cfff}
.tag-type-faults>a{color:#ff2020}
#history .tag-type-faults{color:#ff2020}
.color-tag-types .tag-type-faults{color:#ff2020}
.tag-type-faults>a{color:#b39e6e}
#history .tag-type-faults{color:#b39e6e}
.color-tag-types .tag-type-faults{color:#b39e6e}
.tag-type-faults>a:hover{color:#33cfff}
.tag-type-circle>a{color:#88d1d1}
#history .tag-type-circle{color:#88d1d1}
.color-tag-types .tag-type-circle{color:#88d1d1}
.tag-type-circle>a{color:#63899c}
#history .tag-type-circle{color:#63899c}
.color-tag-types .tag-type-circle{color:#63899c}
.tag-type-circle>a:hover{color:#33cfff}
.tag-type-character>a{color:#5A875A}
#history .tag-type-character{color:#5A875A}
.color-tag-types .tag-type-character{color:#5A875A}
.tag-type-character>a{color:#7a9a7a}
#history .tag-type-character{color:#7a9a7a}
.color-tag-types .tag-type-character{color:#7a9a7a}
.tag-type-character>a:hover{color:#33cfff}
.tag-type-copyright>a{color:#AD6096}
#history .tag-type-copyright{color:#AD6096}
.color-tag-types .tag-type-copyright{color:#AD6096}
.tag-type-copyright>a{color:#9c639a}
#history .tag-type-copyright{color:#9c639a}
.color-tag-types .tag-type-copyright{color:#9c639a}
.tag-type-copyright>a:hover{color:#33cfff}
.upload-progress-bar{border:1px solid #FFF;display:inline-block;height:1em;width:100px}
.upload-progress-bar-fill{background-color:#48F;height:100%}
.tag-completion-box{background-color:#002;left:0;position:absolute;top:0;z-index:10}
.tag-completion-box{background-color:rgba(43, 0, 0, 0.81);left:0;position:absolute;top:0;z-index:10}
.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-alias{float:right;margin-left:1em}
.tag-completion-box .completed-tag.focused{background-color:#005}
.tag-completion-box .completed-tag.focused{background-color:#52003}
.tag-completion-box .completed-tag.recent-tag{font-weight:bold}
.tag-completion-box .remove-recent-tag{background-color:#002;left:-1.5em;padding-left:.25em;padding-right:.5em;position:absolute}
.added{color:#0c0}
@ -627,7 +631,7 @@ div#static_notice{color:red;font-size:1.2em;font-weight:bold;margin-bottom:1em;p
div#old-browser{background:black;border:1px solid #eaeaea;color:red;font-size:1.2em;font-weight:bold;margin:1em;margin-bottom:1em;padding:1em;text-align:center}
div#old-browser>#old-browser-hide{font-size:.8em}
div.page{width:40em}
div#paginator{clear:both;display:block;font-size:1em;font-weight:bold;padding:2em 0 1em;text-align:center}
div#paginator{clear:both;display:block;font-size:1em;font-weight:bold;padding:1em 0 1em;text-align:center}
div#paginator a{border:1px solid #540a0a;font-weight:normal;margin:0 3px;padding:2px 6px}
div#paginator a.arrow{border:0}
.text-button{border:1px solid #eaeaea;padding:0 2px}
@ -696,9 +700,9 @@ div#wiki-diff ins{background-color:#8f8}
ul#post-list-posts{display:inline;list-style-type:none}
ul#post-list-posts .deleted{opacity:.5}
ul#post-list-posts .inner{margin-left:auto;margin-right:auto;overflow:hidden}
ul#post-list-posts li{display:inline;float:left;list-style-type:none;margin:0 0 10px;vertical-align:bottom;zoom:1}
ul#post-list-posts li{display:inline;float:left;list-style-type:none;margin:0 0 4px;vertical-align:bottom;zoom:1}
img.preview{vertical-align:top}
a.directlink{background:#191919;display:block;font-size:10px;height:15px;margin-top:15px;padding:1px 0;text-align:center;white-space:nowrap}
a.directlink{background:#191919;display:block;font-size:12px;height:15px;margin-top:4px;padding:1px 0;text-align:center;white-space:nowrap}
a.largeimg{background:#312f0d}
.highlighted-post>a.directlink{background:#2f2f2f}
a.directlink:hover{background-image:none}

BIN
public/download-preview.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB