minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FEATURE: make nested margin on subpages

Browse Source
This commit is contained in:
Michal Kváček
2018-04-11 23:04:16 +02:00
parent 8acfcabb3c
commit cf90d1b91e
4 changed files with 109 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+6 -6
View File
@@ -5136,12 +5136,6 @@
"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
"dev": true "dev": true
}, },
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
"dev": true
},
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -5153,6 +5147,12 @@
"strip-ansi": "3.0.1" "strip-ansi": "3.0.1"
} }
}, },
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
"dev": true
},
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
resources/assets/sass/admin/_common/items-list.scss
-5
View File
@@ -49,11 +49,6 @@
********************************************** */ ********************************************** */
.item-list { .item-list {
.subpage {
padding-left: 35px;
}
.thumbnail { .thumbnail {
width: 100%; width: 100%;
height: 80px; height: 80px;
resources/assets/sass/admin/_main.scss
+4
View File
@@ -16,6 +16,10 @@ body {
overflow-x: hidden; overflow-x: hidden;
} }
.p-l-25 {
padding-left: 25px;
}
.main-wrapper { .main-wrapper {
width: 100%; width: 100%;
position: absolute; position: absolute;
resources/views/admin/content/_partials/overviewRow.blade.php
+99 -97
View File
@@ -1,127 +1,129 @@
<div data-id="{{$page->id}}" class="row p-tb-15 parent-page-{{$page->parentId or 'none'}} {{$extraClass or ''}}"> <div class="{{$page->parentId ? 'p-l-25' : ''}}">
<div class="col-md-1 hidden-sm-down text-center with-placeholder"> <div data-id="{{$page->id}}" class="row p-tb-15 parent-page-{{$page->parentId or 'none'}} {{$extraClass or ''}}">
@can('update', $page) <div class="col-md-1 hidden-sm-down text-center with-placeholder">
<a href="{{route('content.edit', ['page' => $page])}}"> @can('update', $page)
@if(!view()->exists(template_name($page->template, false))) <a href="{{route('content.edit', ['page' => $page])}}">
<i class="fa fa-2x text-warning fa-warning" data-toggle="tooltip" title="@lang('admin/contents.invalidTemplateSelected')"></i> @if(!view()->exists(template_name($page->template, false)))
@else <i class="fa fa-2x text-warning fa-warning" data-toggle="tooltip" title="@lang('admin/contents.invalidTemplateSelected')"></i>
@if(!empty($page->titlePhoto))
<div class="thumbnail" style="background-image: url(@thumbnail($page->titlePhoto))"></div>
@else @else
<img src="{{asset('resources/assets/admin/img/placeholder.png')}}" class="placeholder" alt="{{$page->title}}" /> @if(!empty($page->titlePhoto))
<div class="thumbnail" style="background-image: url(@thumbnail($page->titlePhoto))"></div>
@else
<img src="{{asset('resources/assets/admin/img/placeholder.png')}}" class="placeholder" alt="{{$page->title}}" />
@endif
@endif @endif
</a>
@else
@if(!empty($page->titlePhoto))
<img src="@thumbnail($page->titlePhoto)" class="placeholder" alt="{{$page->title}}" />
@endif @endif
</a> @endcan
@else </div>
@if(!empty($page->titlePhoto)) <div class="col-xs-10 col-md-3 col-lg-4">
<img src="@thumbnail($page->titlePhoto)" class="placeholder" alt="{{$page->title}}" /> @can('update', $page)
@endif <a href="{{route('content.edit', ['page' => $page])}}">
@endcan {{$page->title}}
</div> </a>
<div class="col-xs-10 col-md-3 col-lg-4"> @else
@can('update', $page)
<a href="{{route('content.edit', ['page' => $page])}}">
{{$page->title}} {{$page->title}}
</a> @endcan
@else
{{$page->title}}
@endcan
@if ($page->subpages->count() > 0) @if ($page->subpages->count() > 0)
&nbsp;({{$page->subpages->count()}}) &nbsp;({{$page->subpages->count()}})
@endif @endif
@if($page->isHomepage) <span class="m-l-10 tag tag-primary">@lang('admin/contents.homepage')</span> @endif @if($page->isHomepage) <span class="m-l-10 tag tag-primary">@lang('admin/contents.homepage')</span> @endif
</div> </div>
<div class="col-lg-2 col-md-3 hidden-sm-down"> <div class="col-lg-2 col-md-3 hidden-sm-down">
<span class="tag @if($page->isPublic()) tag-success <span class="tag @if($page->isPublic()) tag-success
@elseif ($page->isDraft()) tag-danger @elseif ($page->isDraft()) tag-danger
@else tag-warning @endif">{{$statuses[$page->status]}}</span> @else tag-warning @endif">{{$statuses[$page->status]}}</span>
</div> </div>
<div class="col-lg-2 col-md-3 hidden-sm-down"> <div class="col-lg-2 col-md-3 hidden-sm-down">
<a href="{{route('content.overview', ['module' => $page->module->alias])}}"> <a href="{{route('content.overview', ['module' => $page->module->alias])}}">
@lang($page->module->name) @lang($page->module->name)
</a> </a>
<br> <br>
@if(!is_null($page->templateModel)) @if(!is_null($page->templateModel))
<small>({{$page->templateModel->name}})</small> <small>({{$page->templateModel->name}})</small>
@endif @endif
</div> </div>
<div class="col-lg-2 hidden-md-down">@date($page->created_at)</div> <div class="col-lg-2 hidden-md-down">@date($page->created_at)</div>
<div class="col-xs-2 col-lg-1 text-center"> <div class="col-xs-2 col-lg-1 text-center">
<div class="item-actions-dropdown"> <div class="item-actions-dropdown">
<a class="item-actions-toggle-btn"> <a class="item-actions-toggle-btn">
<span class="inactive"> <span class="inactive">
<i class="fa fa-cog"></i> <i class="fa fa-cog"></i>
</span> </span>
<span class="active"> <span class="active">
<i class="fa fa-chevron-circle-right"></i> <i class="fa fa-chevron-circle-right"></i>
</span> </span>
</a> </a>
<div class="item-actions-block"> <div class="item-actions-block">
<ul class="item-actions-list"> <ul class="item-actions-list">
@if(!$page->isHomepage) @if(!$page->isHomepage)
@can('set-homepage', $page) @can('set-homepage', $page)
<li>
<a href="{{route('content.setHomepage', ['page' => $page])}}" data-toggle="tooltip" title="@lang('admin/contents.setHomepage')">
<i class="fa fa-home"></i>
</a>
</li>
@endcan
@endif
@can('update', $page)
<li> <li>
<a href="{{route('content.setHomepage', ['page' => $page])}}" data-toggle="tooltip" title="@lang('admin/contents.setHomepage')"> <a class="edit" href="{{route('content.edit', ['page' => $page])}}" data-toggle="tooltip" title="@lang('admin/contents.editPlain')">
<i class="fa fa-home"></i> <i class="fa fa-pencil"></i>
</a> </a>
</li> </li>
@endcan @endcan
@endif
@can('update', $page) @if($page->isDraft())
<li> @can('publish', $page)
<a class="edit" href="{{route('content.edit', ['page' => $page])}}" data-toggle="tooltip" title="@lang('admin/contents.editPlain')"> <li>
<i class="fa fa-pencil"></i> <a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'public'])}}" class="confirm" data-toggle="tooltip" title="@lang('admin/contents.makePublic')">
</a> <i class="fa fa-eye"></i>
</li> </a>
@endcan </li>
@endcan
@if($page->isDraft()) @can('protect', $page)
@can('publish', $page) <li>
<a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'protected'])}}" class="confirm" data-toggle="tooltip" title="@lang('admin/contents.makeProtected')">
<i class="fa fa-lock"></i>
</a>
</li>
@endcan
@else
<li> <li>
<a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'public'])}}" class="confirm" data-toggle="tooltip" title="@lang('admin/contents.makePublic')"> <a href="{{route('page.content', ['url' => $page->url])}}" target="_blank" data-toggle="tooltip" title="@lang('admin/contents.viewPage')" class="button tiny secondary"><i class="fa fa-globe"></i>
<i class="fa fa-eye"></i> </a>
</li>
@can('draft', $page)
<li>
<a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'draft'])}}" class="button tiny warning confirm" data-toggle="tooltip" title="@lang('admin/contents.makeDraft')">
<i class="fa fa-eye-slash"></i>
</a>
</li>
@endcan
@endif
@can('delete', $page)
<li>
<a href="{{route('content.delete', ['page' => $page])}}" class="button tiny alert remove confirm" data-toggle="tooltip" title="@lang('admin/contents.deletePage')"><i class="fa fa-trash-o"></i>
</a> </a>
</li> </li>
@endcan @endcan
@can('protect', $page)
<li>
<a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'protected'])}}" class="confirm" data-toggle="tooltip" title="@lang('admin/contents.makeProtected')">
<i class="fa fa-lock"></i>
</a>
</li>
@endcan
@else
<li>
<a href="{{route('page.content', ['url' => $page->url])}}" target="_blank" data-toggle="tooltip" title="@lang('admin/contents.viewPage')" class="button tiny secondary"><i class="fa fa-globe"></i>
</a>
</li>
@can('draft', $page)
<li>
<a href="{{route('content.changeStatus', ['page' => $page, 'status' => 'draft'])}}" class="button tiny warning confirm" data-toggle="tooltip" title="@lang('admin/contents.makeDraft')">
<i class="fa fa-eye-slash"></i>
</a>
</li>
@endcan
@endif
@can('delete', $page) </ul>
<li> </div>
<a href="{{route('content.delete', ['page' => $page])}}" class="button tiny alert remove confirm" data-toggle="tooltip" title="@lang('admin/contents.deletePage')"><i class="fa fa-trash-o"></i>
</a>
</li>
@endcan
</ul>
</div> </div>
</div> </div>
</div> </div>
</div>
@foreach($page->subpages as $s) @foreach($page->subpages as $s)
@include('admin.content._partials.overviewRow', ['page' => $s, 'extraClass' => $s->subpages->isEmpty() ? 'subpage hidden-xs-up' : 'subpage hidden-xs-up has-subpages']) @include('admin.content._partials.overviewRow', ['page' => $s, 'extraClass' => $s->subpages->isEmpty() ? 'subpage hidden-xs-up' : 'subpage hidden-xs-up has-subpages'])
@endforeach @endforeach
</div>