Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2016-11-27 19:37:57 +0000
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
286f9b0c7d2d85613680af3198efc967104ab6d6
286f9b0c
1 parent
c403d057
Moved page tags to sidebar
Fixed #238
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
35 additions
and
29 deletions
resources/assets/sass/_blocks.scss
resources/assets/sass/_lists.scss
resources/assets/sass/_pages.scss
resources/views/pages/page-display.blade.php
resources/views/pages/show.blade.php
resources/views/pages/sidebar-tree-list.blade.php
resources/assets/sass/_blocks.scss
View file @
286f9b0
...
...
@@ -135,7 +135,10 @@
border-left
:
3px
solid
#BBB
;
background-color
:
#EEE
;
padding
:
$-s
;
display
:
flex
;
display
:
block
;
>
*
{
display
:
inline-block
;
}
&
:before
{
font-family
:
'Material-Design-Iconic-Font'
;
padding-right
:
$-s
;
...
...
resources/assets/sass/_lists.scss
View file @
286f9b0
...
...
@@ -110,6 +110,8 @@
border-left
:
0px
solid
#FFF
;
background-color
:
#FFF
;
&
.fixed
{
background-color
:
#FFF
;
z-index
:
5
;
position
:
fixed
;
top
:
0
;
padding-left
:
$-l
;
...
...
resources/assets/sass/_pages.scss
View file @
286f9b0
...
...
@@ -248,29 +248,32 @@
}
.tag-display
{
margin
:
$-xl
$-m
;
border
:
1px
solid
#DDD
;
min-width
:
180px
;
max-width
:
320px
;
opacity
:
0
.7
;
z-index
:
5
;
width
:
100%
;
//opacity: 0.7;
position
:
relative
;
table
{
width
:
100%
;
margin
:
0
;
padding
:
0
;
}
tr
:first-child
td
{
padding-top
:
0
;
}
.heading
th
{
padding
:
$-xs
$-s
;
color
:
#333
;
color
:
rgba
(
100
,
100
,
100
,
0
.7
);
border
:
0
;
font-weight
:
400
;
}
td
{
border
:
0
;
border-bottom
:
1px
solid
#
DDD
;
border-bottom
:
1px
solid
#
EEE
;
padding
:
$-xs
$-s
;
color
:
#444
;
}
tr
td
:first-child
{
padding-left
:
0
;
}
.tag-value
{
color
:
#888
;
}
...
...
resources/views/pages/page-display.blade.php
View file @
286f9b0
...
...
@@ -2,26 +2,6 @@
<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>
@if (isset($diff)
&&
$diff)
...
...
resources/views/pages/show.blade.php
View file @
286f9b0
...
...
@@ -115,6 +115,8 @@
</div>
@endif
@include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav])
</div>
...
...
resources/views/pages/sidebar-tree-list.blade.php
View file @
286f9b0
<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)
<h6
class=
"text-muted"
>
Attachments
</h6>
@foreach($page->attachments as $attachment)
...
...
Please
register
or
sign in
to post a comment