From 148492a63567f623be6f6bf1ef16d79ef7b94841 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 22 Nov 2018 17:22:32 +0000 Subject: [PATCH] Put all nested items on page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So that the live search can filter things, they need to be on the page when it loads. We want to make search work across folders, so all the things in subfolders need to be in the page. They also need the full path appending to them, so that you can tell which ones are in which folders. This won’t show items that are in a folder above the one you’re currently in – my reckon is that when you’re narrowing down by clicking into a folder that you only want to search for things in that folder. --- .../stylesheets/components/message.scss | 12 ++++++-- .../views/templates/_template_list.html | 23 +++++++++------ tests/app/main/views/test_template_folders.py | 28 +++++++++---------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss index ec44dd8a7..47ee96790 100644 --- a/app/assets/stylesheets/components/message.scss +++ b/app/assets/stylesheets/components/message.scss @@ -5,11 +5,19 @@ margin: 0; a { - display: block; + display: inline-block; margin-bottom: -$gutter; padding-bottom: $gutter; } + &-separator { + display: inline-block; + vertical-align: top; + color: $secondary-text-colour; + padding: 0 4px 0 5px; + font-weight: normal; + } + } &-type { @@ -44,7 +52,7 @@ &-folder { - a { + a:first-child { text-indent: 40px; background-image: file-url('folder-blue-bold.svg'); background-repeat: no-repeat; diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html index 53439904a..e4fe60476 100644 --- a/app/templates/views/templates/_template_list.html +++ b/app/templates/views/templates/_template_list.html @@ -12,7 +12,7 @@ {% else %}