diff --git a/public_html/css/tag-list.css b/public_html/css/tag-list.css index df5e7613..8543befa 100644 --- a/public_html/css/tag-list.css +++ b/public_html/css/tag-list.css @@ -25,3 +25,21 @@ text-align: left; margin: 1em auto; } + +#tag-list th, +#tag-list td { + padding-right: 1.5em; +} + +#tag-list th { + font-weight: normal; +} + +#tag-list .fa-check { + opacity: .2; +} + +#tag-list .banned, +#tag-list .usages { + text-align: center; +} diff --git a/public_html/js/Presenters/TagListPresenter.js b/public_html/js/Presenters/TagListPresenter.js index f7e928e9..8f8ffbcc 100644 --- a/public_html/js/Presenters/TagListPresenter.js +++ b/public_html/js/Presenters/TagListPresenter.js @@ -72,7 +72,7 @@ App.Presenters.TagListPresenter = function( } function renderTags(tags, clear) { - var $target = $el.find('.tags'); + var $target = $el.find('tbody'); if (clear) { $target.empty(); diff --git a/public_html/templates/tag-list-item.tpl b/public_html/templates/tag-list-item.tpl index 079dcc17..82de4ead 100644 --- a/public_html/templates/tag-list-item.tpl +++ b/public_html/templates/tag-list-item.tpl @@ -1,8 +1,21 @@ - + <%= tag.name %> - + + <%= _.pluck(tag.implications, 'name').join(' ') || '-' %> + + + <%= _.pluck(tag.suggestions, 'name').join(' ') || '-' %> + + <%= tag.usages %> + + <% if (tag.banned) { %> + + <% } else { %> + + <% } %> + diff --git a/public_html/templates/tag-list.tpl b/public_html/templates/tag-list.tpl index 6fac8002..2a866d3a 100644 --- a/public_html/templates/tag-list.tpl +++ b/public_html/templates/tag-list.tpl @@ -13,6 +13,15 @@
+ + + + + + + + +
Tag nameImplicationsSuggestionsUsagesUsable?
diff --git a/src/Controllers/TagController.php b/src/Controllers/TagController.php index 624d7a9e..606b726f 100644 --- a/src/Controllers/TagController.php +++ b/src/Controllers/TagController.php @@ -55,7 +55,7 @@ final class TagController extends AbstractController $filter->setPageSize(50); $result = $this->tagService->getFiltered($filter); - $entities = $this->tagViewProxy->fromArray($result->getEntities()); + $entities = $this->tagViewProxy->fromArray($result->getEntities(), $this->getFullFetchConfig()); return [ 'data' => $entities, 'pageSize' => $result->getPageSize(),