From e8db640611661414bddf00955097e17c1c633faa Mon Sep 17 00:00:00 2001 From: Bob den Otter Date: Sun, 28 Jul 2019 15:11:12 +0200 Subject: [PATCH 1/4] Working on "Files as Cards" feature --- assets/js/app/listing/Components/Filter.vue | 17 +-- assets/scss/init/_base.scss | 1 + assets/scss/modules/editor/fields/_image.scss | 3 + assets/scss/modules/listing/_filter.scss | 21 +--- .../Backend/FilemanagerController.php | 3 + src/Twig/ImageExtension.php | 5 +- templates/finder/_files_cards.html.twig | 108 ++++++++++++++++++ ..._files.html.twig => _files_list.html.twig} | 2 +- templates/finder/_folders.html.twig | 87 ++++++++------ templates/finder/finder.html.twig | 22 ++-- 10 files changed, 185 insertions(+), 84 deletions(-) create mode 100644 templates/finder/_files_cards.html.twig rename templates/finder/{_files.html.twig => _files_list.html.twig} (97%) diff --git a/assets/js/app/listing/Components/Filter.vue b/assets/js/app/listing/Components/Filter.vue index b0638412..1d5397a3 100644 --- a/assets/js/app/listing/Components/Filter.vue +++ b/assets/js/app/listing/Components/Filter.vue @@ -26,14 +26,7 @@ :class="{ 'is-selected': size === 'small' }" @click="changeSize('small')" > - - - - - - - - + Compact @@ -44,13 +37,7 @@ :class="{ 'is-selected': size === 'normal' }" @click="changeSize('normal')" > - - - - - - - + Expanded diff --git a/assets/scss/init/_base.scss b/assets/scss/init/_base.scss index c2f2ec37..d869e0db 100644 --- a/assets/scss/init/_base.scss +++ b/assets/scss/init/_base.scss @@ -37,6 +37,7 @@ code { .card { box-shadow: $card-box-shadow; background: #fff; + border: 1px solid #E8E8E8 !important; .card-header { font-weight: $font-weight-bold; diff --git a/assets/scss/modules/editor/fields/_image.scss b/assets/scss/modules/editor/fields/_image.scss index 69457e7d..c1159353 100644 --- a/assets/scss/modules/editor/fields/_image.scss +++ b/assets/scss/modules/editor/fields/_image.scss @@ -78,3 +78,6 @@ opacity: 0; } +.filepond--root { + margin-bottom: 0 !important; +} diff --git a/assets/scss/modules/listing/_filter.scss b/assets/scss/modules/listing/_filter.scss index e0435ce4..1c8d2512 100644 --- a/assets/scss/modules/listing/_filter.scss +++ b/assets/scss/modules/listing/_filter.scss @@ -58,6 +58,7 @@ border-radius: $border-radius; box-shadow: $card-box-shadow; padding: $spacer / 2; + font-size: 0.9rem; &:hover { cursor: pointer; @@ -67,34 +68,16 @@ &:focus { outline: none; box-shadow: $input-btn-focus-box-shadow; - - svg, - g { - fill: theme-color('secondary'); - } } &.is-selected { - background: var(--primary); - - svg g { - fill: var(--foreground); - } + background: $disabled; } &.is-active { background: var(--primary); color: var(--foreground); } - - svg { - width: 18px; - height: 18px; - - g { - fill: var(--shade); - } - } } } } diff --git a/src/Controller/Backend/FilemanagerController.php b/src/Controller/Backend/FilemanagerController.php index a0f0aa5b..bf85827c 100644 --- a/src/Controller/Backend/FilemanagerController.php +++ b/src/Controller/Backend/FilemanagerController.php @@ -47,6 +47,8 @@ class FilemanagerController extends TwigAwareController implements BackendZone $path .= '/'; } + $view = $request->query->get('view', 'list'); + $location = $this->fileLocations->get($location); $finder = $this->findFiles($location->getBasepath(), $path); @@ -63,6 +65,7 @@ class FilemanagerController extends TwigAwareController implements BackendZone 'parent' => $parent, 'media' => $media, 'allfiles' => $location->isShowAll() ? $this->buildIndex($location->getBasepath()) : false, + 'view' => $view ]); } diff --git a/src/Twig/ImageExtension.php b/src/Twig/ImageExtension.php index 49c4f939..3820b28b 100644 --- a/src/Twig/ImageExtension.php +++ b/src/Twig/ImageExtension.php @@ -95,7 +95,7 @@ class ImageExtension extends AbstractExtension return sprintf('%s', $link, $alt, (string) $width, (string) $height); } - public function thumbnail($image, int $width = 320, int $height = 240, ?string $location = null, ?string $path = null) + public function thumbnail($image, int $width = 320, int $height = 240, ?string $location = null, ?string $path = null, ?string $fit = null) { $filename = $this->getFilename($image); @@ -114,6 +114,9 @@ class ImageExtension extends AbstractExtension if ($path) { $params['path'] = $path; } + if ($fit) { + $params['fit'] = $fit; + } // Create an instance of the URL builder $urlBuilder = UrlBuilderFactory::create('/thumbs/', $this->secret); diff --git a/templates/finder/_files_cards.html.twig b/templates/finder/_files_cards.html.twig new file mode 100644 index 00000000..cab56f5a --- /dev/null +++ b/templates/finder/_files_cards.html.twig @@ -0,0 +1,108 @@ + + + {% set imageformats = ['gif', 'jpg', 'jpeg', 'png', 'svg'] %} + +
+ {% for file in finder.files() %} +{# {{ dump(file) }}#} + + {% set extension = file.extension() %} + {% set filename = path ~ file.getRelativePathname() %} + {% set icon = 'fa-file' %} + {% set link = path('bolt_file_edit', {'location': location, 'file': filename }) %} + {% set thumbnail = '' %} + {% set title = '' %} + {% set dimensions = '' %} + + {% if extension in imageformats %} + {% set thumbnail = filename|thumbnail(width = 400, height = 300, location = location, fit = 'crop') %} + {% set icon = 'fa-image' %} + {% set link = path('bolt_media_new', {'location': location, 'file': filename}) %} + + {% for image in media|default([]) if image.filename in filename %} + {% set title = image.title %} + {% set dimensions = image.width ~ ' × ' ~ image.height ~ 'px' %} + {% set link = path('bolt_media_edit', {'id': image.id}) %} + {% endfor %} + + {% endif %} + +
+
+ {%- if thumbnail -%} + + + + {%- endif -%} + +
+  {{ file.getRelativePathname|excerpt(12) }} + +
+ +
+ + + View original + + + + Duplicate {{ file.getRelativePathname }} + + + + Delete {{ file.getRelativePathname }} + + +
+ + + + Filename: {{ file.getRelativePathname }} + + + {% if title %} + + + Title: {{ title }} + + {% endif %} + + {% if dimensions %} + + + Dimensions: {{ dimensions }} + + {% endif %} + + + + Published on: {-{ file.publishedAt|localedatetime }} + + + + Last modified on: {-{ file.modifiedAt|localedatetime }} + +
+
+ +
+
+ + {{ file.getSize() }} bytes + {% if dimensions %}
{{ dimensions }}{% endif %} + {{ file.getCTime()|localizeddate('short', 'short', null, 'UTC') }} +
+
+
+ + {% endfor %} +
\ No newline at end of file diff --git a/templates/finder/_files.html.twig b/templates/finder/_files_list.html.twig similarity index 97% rename from templates/finder/_files.html.twig rename to templates/finder/_files_list.html.twig index 4767a1d8..3957ed2f 100644 --- a/templates/finder/_files.html.twig +++ b/templates/finder/_files_list.html.twig @@ -47,7 +47,7 @@ {%- if thumbnail -%} - + {%- else -%} diff --git a/templates/finder/_folders.html.twig b/templates/finder/_folders.html.twig index 9d0109f0..b66b58fb 100644 --- a/templates/finder/_folders.html.twig +++ b/templates/finder/_folders.html.twig @@ -1,41 +1,52 @@ - - - - - - - - - {% if path != '/' %} - - - - - - {% endif %} +
+
+ + {{ 'caption.folders'|trans }} +
+
- {% for directory in finder.directories() %} -
- - - - - {% endfor %} -
{{ 'directoryname'|trans }}{{ 'actions'|trans }}
- - - ../ - - - -
- - {% set dirname = path ~ directory.getRelativePathname() %} - - {{ directory.getRelativePathname }}/ - - - -
\ No newline at end of file + + + + + + + + + + {% if path != '/' %} + + + + + + {% endif %} + + {% for directory in finder.directories() %} + + + + + + {% endfor %} +
{{ 'directoryname'|trans }}{{ 'actions'|trans }}
+ + + ../ + + + +
+ + {% set dirname = path ~ directory.getRelativePathname() %} + + {{ directory.getRelativePathname }}/ + + + +
+ + + diff --git a/templates/finder/finder.html.twig b/templates/finder/finder.html.twig index 9b09c855..542548fd 100644 --- a/templates/finder/finder.html.twig +++ b/templates/finder/finder.html.twig @@ -10,9 +10,11 @@ {% include '@bolt/finder/_quickselect.html.twig' %} - {% include '@bolt/finder/_folders.html.twig' %} - - {% include '@bolt/finder/_files.html.twig' %} + {% if view == 'list' %} + {% include '@bolt/finder/_files_list.html.twig' %} + {% else %} + {% include '@bolt/finder/_files_cards.html.twig' %} + {% endif %} {% endblock %} @@ -21,20 +23,20 @@
{{ 'caption.meta_information'|trans }}
- + View: {{ view|default('none') }} +
+ List + Cards +
+ {% include '@bolt/finder/_folders.html.twig' %} + {% include '@bolt/finder/_uploader.html.twig' %} {% endblock aside %} {% block stylesheets %} {{ parent() }} - - {% endblock %} From 6a055a2347d82079d5e90aee60b3815f0ad73f99 Mon Sep 17 00:00:00 2001 From: Bob den Otter Date: Mon, 29 Jul 2019 16:03:48 +0200 Subject: [PATCH 2/4] Finetuning --- assets/static/images/placeholder.png | Bin 0 -> 2913 bytes .../Backend/FilemanagerController.php | 24 ++++++--- src/Utils/Html.php | 2 +- templates/finder/_files_cards.html.twig | 48 ++++++++++-------- templates/finder/_files_list.html.twig | 5 +- templates/finder/finder.html.twig | 12 +++-- 6 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 assets/static/images/placeholder.png diff --git a/assets/static/images/placeholder.png b/assets/static/images/placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..41ec53ef99a818d36fe400f9b10787576c9a435b GIT binary patch literal 2913 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 literal 0 HcmV?d00001 diff --git a/src/Controller/Backend/FilemanagerController.php b/src/Controller/Backend/FilemanagerController.php index bf85827c..65593496 100644 --- a/src/Controller/Backend/FilemanagerController.php +++ b/src/Controller/Backend/FilemanagerController.php @@ -13,6 +13,8 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\Finder\Finder; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpFoundation\Session\Session; +use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\Routing\Annotation\Route; use Webmozart\PathUtil\Path; @@ -21,20 +23,20 @@ use Webmozart\PathUtil\Path; */ class FilemanagerController extends TwigAwareController implements BackendZone { - /** - * @var FileLocations - */ + /** @var FileLocations */ private $fileLocations; - /** - * @var MediaRepository - */ + /** @var MediaRepository */ private $mediaRepository; - public function __construct(FileLocations $fileLocations, MediaRepository $mediaRepository) + /** @var SessionInterface */ + private $session; + + public function __construct(FileLocations $fileLocations, MediaRepository $mediaRepository, SessionInterface $session) { $this->fileLocations = $fileLocations; $this->mediaRepository = $mediaRepository; + $this->session = $session; } /** @@ -47,7 +49,13 @@ class FilemanagerController extends TwigAwareController implements BackendZone $path .= '/'; } - $view = $request->query->get('view', 'list'); + if ($request->query->get('view')) { + $view = ($request->query->get('view') === 'cards') ? 'cards' : 'list'; + $this->session->set('filemanager_view', $view); + } else { + $view = $this->session->get('filemanager_view', 'list'); + } + $location = $this->fileLocations->get($location); diff --git a/src/Utils/Html.php b/src/Utils/Html.php index f9b01fe7..14dd70b8 100644 --- a/src/Utils/Html.php +++ b/src/Utils/Html.php @@ -16,7 +16,7 @@ class Html * * @return string Trimmed string */ - public static function trimText(string $str, int $desiredLength, bool $hellip = true, int $cutOffCap = 10): string + public static function trimText(string $str, int $desiredLength, bool $hellip = true, int $cutOffCap = 3): string { if ($hellip) { $ellipseStr = ' …'; diff --git a/templates/finder/_files_cards.html.twig b/templates/finder/_files_cards.html.twig index cab56f5a..5f3ea950 100644 --- a/templates/finder/_files_cards.html.twig +++ b/templates/finder/_files_cards.html.twig @@ -1,10 +1,5 @@ - - - {% set imageformats = ['gif', 'jpg', 'jpeg', 'png', 'svg'] %} -
{% for file in finder.files() %} -{# {{ dump(file) }}#} {% set extension = file.extension() %} {% set filename = path ~ file.getRelativePathname() %} @@ -27,18 +22,20 @@ {% endif %} -
+
{%- if thumbnail -%} + {% else %} + {%- endif -%} -
-  {{ file.getRelativePathname|excerpt(12) }} +
+ {{ file.getRelativePathname|excerpt(15) }} -
+
+
+ + + + {% if extension in imageformats %} + Edit image information + {% else %} + Edit file in editor + {% endif %} + + View original - Duplicate {{ file.getRelativePathname }} + Duplicate {{ file.getRelativePathname|excerpt(22) }} - Delete {{ file.getRelativePathname }} + Delete {{ file.getRelativePathname|excerpt(22) }}
@@ -84,23 +93,20 @@ {% endif %} - - Published on: {-{ file.publishedAt|localedatetime }} + + Filesize: {{ file.getSize() }} bytes + - - Last modified on: {-{ file.modifiedAt|localedatetime }} - + + Created on: {{ file.getCTime()|localizeddate('short', 'short', null, 'UTC') }} + +
-
- {{ file.getSize() }} bytes - {% if dimensions %}
{{ dimensions }}{% endif %} - {{ file.getCTime()|localizeddate('short', 'short', null, 'UTC') }} -
diff --git a/templates/finder/_files_list.html.twig b/templates/finder/_files_list.html.twig index 3957ed2f..8503c48c 100644 --- a/templates/finder/_files_list.html.twig +++ b/templates/finder/_files_list.html.twig @@ -10,9 +10,6 @@ {{ 'actions'|trans }} - - {% set imageformats = ['gif', 'jpg', 'jpeg', 'png', 'svg'] %} - {% for file in finder.files() %} {% set extension = file.extension() %} @@ -24,7 +21,7 @@ {% set dimensions = '' %} {% if extension in imageformats %} - {% set thumbnail = filename|thumbnail(width = 100, height = 72, location = location) %} + {% set thumbnail = filename|thumbnail(width = 100, height = 72, location = location, fit = 'crop') %} {% set icon = 'fa-image' %} {% set link = path('bolt_media_new', {'location': location, 'file': filename}) %} diff --git a/templates/finder/finder.html.twig b/templates/finder/finder.html.twig index 542548fd..59c22e5c 100644 --- a/templates/finder/finder.html.twig +++ b/templates/finder/finder.html.twig @@ -6,10 +6,10 @@ {% block main %} -

{{ 'caption.path'|trans }}: {{ location }}{{ path }}

- {% include '@bolt/finder/_quickselect.html.twig' %} + {% set imageformats = ['gif', 'jpg', 'jpeg', 'png', 'svg'] %} + {% if view == 'list' %} {% include '@bolt/finder/_files_list.html.twig' %} {% else %} @@ -23,10 +23,12 @@
{{ 'caption.meta_information'|trans }}
- View: {{ view|default('none') }} +

{{ 'caption.path'|trans }}: {{ location }}{{ path }}

+ + View:
- List - Cards + List + Cards
From fc19b0bb4a62db95e3a2db3f25342e8aaf2044de Mon Sep 17 00:00:00 2001 From: Bob den Otter Date: Mon, 29 Jul 2019 16:35:51 +0200 Subject: [PATCH 3/4] Finetuning --- src/Controller/Backend/FilemanagerController.php | 6 ++---- templates/finder/_files_cards.html.twig | 5 ++++- templates/finder/_files_list.html.twig | 6 ++++++ templates/finder/finder.html.twig | 2 +- tests/e2e/features/filemanager.feature | 2 +- tests/e2e/pages/filemanager.js | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/Controller/Backend/FilemanagerController.php b/src/Controller/Backend/FilemanagerController.php index 65593496..c8fa09a2 100644 --- a/src/Controller/Backend/FilemanagerController.php +++ b/src/Controller/Backend/FilemanagerController.php @@ -13,7 +13,6 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\Finder\Finder; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\Routing\Annotation\Route; use Webmozart\PathUtil\Path; @@ -50,13 +49,12 @@ class FilemanagerController extends TwigAwareController implements BackendZone } if ($request->query->get('view')) { - $view = ($request->query->get('view') === 'cards') ? 'cards' : 'list'; + $view = $request->query->get('view') === 'cards' ? 'cards' : 'list'; $this->session->set('filemanager_view', $view); } else { $view = $this->session->get('filemanager_view', 'list'); } - $location = $this->fileLocations->get($location); $finder = $this->findFiles($location->getBasepath(), $path); @@ -73,7 +71,7 @@ class FilemanagerController extends TwigAwareController implements BackendZone 'parent' => $parent, 'media' => $media, 'allfiles' => $location->isShowAll() ? $this->buildIndex($location->getBasepath()) : false, - 'view' => $view + 'view' => $view, ]); } diff --git a/templates/finder/_files_cards.html.twig b/templates/finder/_files_cards.html.twig index 5f3ea950..b67bedfb 100644 --- a/templates/finder/_files_cards.html.twig +++ b/templates/finder/_files_cards.html.twig @@ -109,6 +109,9 @@
- + {% else %} +
+

No files are present in this folder. Select a folder to navigate to, on the right-hand side.

+
{% endfor %}
\ No newline at end of file diff --git a/templates/finder/_files_list.html.twig b/templates/finder/_files_list.html.twig index 8503c48c..d7810471 100644 --- a/templates/finder/_files_list.html.twig +++ b/templates/finder/_files_list.html.twig @@ -62,5 +62,11 @@   + {% else %} + + +

No files are present in this folder. Select a folder to navigate to, on the right-hand side.

+ + {% endfor %} \ No newline at end of file diff --git a/templates/finder/finder.html.twig b/templates/finder/finder.html.twig index 59c22e5c..1d0f90cb 100644 --- a/templates/finder/finder.html.twig +++ b/templates/finder/finder.html.twig @@ -23,7 +23,7 @@
{{ 'caption.meta_information'|trans }}
-

{{ 'caption.path'|trans }}: {{ location }}{{ path }}

+

{{ 'caption.path'|trans }}: {{ location }}{{ path }}

View:
diff --git a/tests/e2e/features/filemanager.feature b/tests/e2e/features/filemanager.feature index 1464ef09..fd30b2e5 100644 --- a/tests/e2e/features/filemanager.feature +++ b/tests/e2e/features/filemanager.feature @@ -7,7 +7,7 @@ Feature: Filemanager | area | themes | Then there is element "header" with text "Theme files" - And there is element "title" with text "Path: themes/" + And there is element "path" with text "Path: themes/" When I visit the "filemanager" page with parameters: | area | files | diff --git a/tests/e2e/pages/filemanager.js b/tests/e2e/pages/filemanager.js index 53c73592..206655ba 100644 --- a/tests/e2e/pages/filemanager.js +++ b/tests/e2e/pages/filemanager.js @@ -7,7 +7,7 @@ class FilemanagerPage extends BasePage { this.url = '/bolt/filemanager/:area'; this.header = $('.admin__header--title'); - this.title = $('h2'); + this.path = $('p.path'); } } From 4a5e96e0c6e6806666f78843e0db639055ec2154 Mon Sep 17 00:00:00 2001 From: Bob den Otter Date: Mon, 29 Jul 2019 17:02:26 +0200 Subject: [PATCH 4/4] Fixing test. --- tests/e2e/features/filemanager.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/features/filemanager.feature b/tests/e2e/features/filemanager.feature index fd30b2e5..b3675a97 100644 --- a/tests/e2e/features/filemanager.feature +++ b/tests/e2e/features/filemanager.feature @@ -13,7 +13,7 @@ Feature: Filemanager | area | files | Then there is element "header" with text "Content files" - And there is element "title" with text "Path: files/" + And there is element "path" with text "Path: files/" # @todo Add tests for uploading files, and verifying that they're there \ No newline at end of file