From cf90d1b91ea016979a8925a17d957f5893a06a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Wed, 11 Apr 2018 23:04:16 +0200 Subject: [PATCH] FEATURE: make nested margin on subpages --- package-lock.json | 12 +- .../assets/sass/admin/_common/items-list.scss | 5 - resources/assets/sass/admin/_main.scss | 4 + .../content/_partials/overviewRow.blade.php | 196 +++++++++--------- 4 files changed, 109 insertions(+), 108 deletions(-) diff --git a/package-lock.json b/package-lock.json index 367e2b1e..c3b6dd31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5136,12 +5136,6 @@ "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", "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": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -5153,6 +5147,12 @@ "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": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", diff --git a/resources/assets/sass/admin/_common/items-list.scss b/resources/assets/sass/admin/_common/items-list.scss index f0c3bd4a..1152e3a1 100644 --- a/resources/assets/sass/admin/_common/items-list.scss +++ b/resources/assets/sass/admin/_common/items-list.scss @@ -49,11 +49,6 @@ ********************************************** */ .item-list { - - .subpage { - padding-left: 35px; - } - .thumbnail { width: 100%; height: 80px; diff --git a/resources/assets/sass/admin/_main.scss b/resources/assets/sass/admin/_main.scss index 1a5ec77a..0616fa9f 100644 --- a/resources/assets/sass/admin/_main.scss +++ b/resources/assets/sass/admin/_main.scss @@ -16,6 +16,10 @@ body { overflow-x: hidden; } +.p-l-25 { + padding-left: 25px; +} + .main-wrapper { width: 100%; position: absolute; diff --git a/resources/views/admin/content/_partials/overviewRow.blade.php b/resources/views/admin/content/_partials/overviewRow.blade.php index 72c4bd05..96f173a5 100644 --- a/resources/views/admin/content/_partials/overviewRow.blade.php +++ b/resources/views/admin/content/_partials/overviewRow.blade.php @@ -1,127 +1,129 @@ -
-
- @can('update', $page) - - @if(!view()->exists(template_name($page->template, false))) - - @else - @if(!empty($page->titlePhoto)) -
+
+
+
+ @can('update', $page) + + @if(!view()->exists(template_name($page->template, false))) + @else - {{$page->title}} + @if(!empty($page->titlePhoto)) +
+ @else + {{$page->title}} + @endif @endif + + @else + @if(!empty($page->titlePhoto)) + {{$page->title}} @endif - - @else - @if(!empty($page->titlePhoto)) - {{$page->title}} - @endif - @endcan -
-
- @can('update', $page) - + @endcan +
+
+ @can('update', $page) + + {{$page->title}} + + @else {{$page->title}} - - @else - {{$page->title}} - @endcan + @endcan - @if ($page->subpages->count() > 0) -  ({{$page->subpages->count()}}) - @endif + @if ($page->subpages->count() > 0) +  ({{$page->subpages->count()}}) + @endif - @if($page->isHomepage) @lang('admin/contents.homepage') @endif -
-
+ @if($page->isHomepage) @lang('admin/contents.homepage') @endif +
+
{{$statuses[$page->status]}} -
-
- - @lang($page->module->name) - -
- @if(!is_null($page->templateModel)) - ({{$page->templateModel->name}}) - @endif -
-
@date($page->created_at)
-
-
- +
+
+ + @lang($page->module->name) + +
+ @if(!is_null($page->templateModel)) + ({{$page->templateModel->name}}) + @endif +
+
@date($page->created_at)
+
+
+ - + - -
-
    + +
    +
      - @if(!$page->isHomepage) - @can('set-homepage', $page) + @if(!$page->isHomepage) + @can('set-homepage', $page) +
    • + + + +
      • + @endcan + @endif + + @can('update', $page)
    • - - + +
      • @endcan - @endif - @can('update', $page) -
    • - - - -
      • - @endcan - - @if($page->isDraft()) - @can('publish', $page) + @if($page->isDraft()) + @can('publish', $page) +
    • + + + +
      • + @endcan + @can('protect', $page) +
    • + + + +
      • + @endcan + @else
    • - - + + +
      • + @can('draft', $page) +
    • + + + +
      • + @endcan + @endif + + @can('delete', $page) +
    • +
      • @endcan - @can('protect', $page) -
    • - - - -
      • - @endcan - @else -
    • - - -
      • - @can('draft', $page) -
    • - - - -
      • - @endcan - @endif - @can('delete', $page) -
    • - - -
      • - @endcan - -
    +
+
-
-@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']) -@endforeach \ No newline at end of file + @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']) + @endforeach +
\ No newline at end of file