Moved page tags to sidebar

Fixed #238
This commit is contained in:
Dan Brown 2016-11-27 19:37:57 +00:00
parent c403d05755
commit 286f9b0c7d
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
6 changed files with 35 additions and 29 deletions

View File

@ -135,7 +135,10 @@
border-left: 3px solid #BBB; border-left: 3px solid #BBB;
background-color: #EEE; background-color: #EEE;
padding: $-s; padding: $-s;
display: flex; display: block;
> * {
display: inline-block;
}
&:before { &:before {
font-family: 'Material-Design-Iconic-Font'; font-family: 'Material-Design-Iconic-Font';
padding-right: $-s; padding-right: $-s;

View File

@ -110,6 +110,8 @@
border-left: 0px solid #FFF; border-left: 0px solid #FFF;
background-color: #FFF; background-color: #FFF;
&.fixed { &.fixed {
background-color: #FFF;
z-index: 5;
position: fixed; position: fixed;
top: 0; top: 0;
padding-left: $-l; padding-left: $-l;

View File

@ -248,29 +248,32 @@
} }
.tag-display { .tag-display {
margin: $-xl $-m; width: 100%;
border: 1px solid #DDD; //opacity: 0.7;
min-width: 180px;
max-width: 320px;
opacity: 0.7;
z-index: 5;
position: relative; position: relative;
table { table {
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
tr:first-child td {
padding-top: 0;
}
.heading th { .heading th {
padding: $-xs $-s; padding: $-xs $-s;
color: #333; color: rgba(100, 100, 100, 0.7);
border: 0;
font-weight: 400; font-weight: 400;
} }
td { td {
border: 0; border: 0;
border-bottom: 1px solid #DDD; border-bottom: 1px solid #EEE;
padding: $-xs $-s; padding: $-xs $-s;
color: #444; color: #444;
} }
tr td:first-child {
padding-left:0;
}
.tag-value { .tag-value {
color: #888; color: #888;
} }

View File

@ -2,26 +2,6 @@
<h1 id="bkmrk-page-title" class="float left">{{$page->name}}</h1> <h1 id="bkmrk-page-title" class="float left">{{$page->name}}</h1>
@if(count($page->tags) > 0)
<div class="tag-display float right">
<table>
<thead>
<tr class="text-left heading primary-background-light">
<th colspan="2">Page Tags</th>
</tr>
</thead>
<tbody>
@foreach($page->tags as $tag)
<tr class="tag">
<td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
@if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
</tr>
@endforeach
</tbody>
</table>
</div>
@endif
<div style="clear:left;"></div> <div style="clear:left;"></div>
@if (isset($diff) && $diff) @if (isset($diff) && $diff)

View File

@ -115,6 +115,8 @@
</div> </div>
@endif @endif
@include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav]) @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav])
</div> </div>

View File

@ -1,6 +1,22 @@
<div class="book-tree" ng-non-bindable> <div class="book-tree" ng-non-bindable>
@if(isset($page) && $page->tags->count() > 0)
<div class="tag-display">
<h6 class="text-muted">Page Tags</h6>
<table>
<tbody>
@foreach($page->tags as $tag)
<tr class="tag">
<td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
@if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
</tr>
@endforeach
</tbody>
</table>
</div>
@endif
@if (isset($page) && $page->attachments->count() > 0) @if (isset($page) && $page->attachments->count() > 0)
<h6 class="text-muted">Attachments</h6> <h6 class="text-muted">Attachments</h6>
@foreach($page->attachments as $attachment) @foreach($page->attachments as $attachment)