TESTING - Revert Option Menu, Search in title bar

This commit is contained in:
Yukimi Kazari 2016-09-15 20:59:36 -04:00
parent 7876d40ac4
commit ff72929ef7
2 changed files with 2 additions and 5 deletions

View File

@ -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' => '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) ?><span><?= $this->partial('search') ?> <?= $this->tag_header($this->h($this->params()->tags)) ?></span></h2></div>
<?= $this->partial('layouts/menu') ?>
</div>
<?= $this->partial('layouts/login') ?>

View File

@ -16,8 +16,7 @@
unset($total, $count);
endif
?>
<li class="wiki"><?= $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;">
<div class="sidebar">
<?= $this->partial('search') ?>
<?php if (current_user()->is_privileged_or_higher()) : ?>
@ -77,8 +76,6 @@
<?= $this->partial('vertical') ?>
<?php endif ?>
</div>
</ul>
</li>
<div class="content">
<?php if (!empty($this->ambiguous_tags)) : ?>
<div class="status-notice">