From db721a9d103550853e2029bc328ee846162d7c3f Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Wed, 14 Mar 2018 13:45:37 +0100 Subject: [PATCH] Closes #198: show hierarchy in tag screen --- README.md | 1 - .../webapp/src/app/docs/controller/tag/Tag.js | 18 ++++--- docs-web/src/main/webapp/src/locale/en.json | 1 - .../webapp/src/partial/docs/document.html | 4 ++ .../src/main/webapp/src/partial/docs/tag.html | 38 +++++++-------- .../webapp/src/partial/docs/usergroup.html | 8 ++++ docs-web/src/main/webapp/src/style/main.less | 47 ++++++++++--------- 7 files changed, 67 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 69e020d5..21985694 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Twitter: @sismicsdocs](https://img.shields.io/badge/contact-@sismicsdocs-blue.svg?style=flat)](https://twitter.com/sismicsdocs) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html) [![Build Status](https://secure.travis-ci.org/sismics/docs.png)](http://travis-ci.org/sismics/docs) -[![Read the Docs](https://img.shields.io/readthedocs/pip.svg)](https://demo.sismicsdocs.com/apidoc/) Docs is an open source, lightweight document management system for individuals and businesses. diff --git a/docs-web/src/main/webapp/src/app/docs/controller/tag/Tag.js b/docs-web/src/main/webapp/src/app/docs/controller/tag/Tag.js index 33572c9f..b652b868 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/tag/Tag.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/tag/Tag.js @@ -7,6 +7,7 @@ angular.module('docs').controller('Tag', function($scope, Restangular, $state) { $scope.tag = { name: '', color: '#3a87ad' }; // Retrieve tags + $scope.tags = []; $scope.loadTags = function() { Restangular.one('tag/list').get().then(function(data) { $scope.tags = data.tags; @@ -14,13 +15,6 @@ angular.module('docs').controller('Tag', function($scope, Restangular, $state) { }; $scope.loadTags(); - /** - * Display a tag. - */ - $scope.viewTag = function(id) { - $state.go('tag.edit', { id: id }); - }; - /** * Add a tag. */ @@ -30,4 +24,14 @@ angular.module('docs').controller('Tag', function($scope, Restangular, $state) { $scope.tag = { name: '', color: '#3a87ad' }; }); }; + + /** + * Find children tags. + * @param parent + */ + $scope.getChildrenTags = function(parent) { + return _.filter($scope.tags, function(tag) { + return tag.parent === parent; + }); + }; }); \ No newline at end of file diff --git a/docs-web/src/main/webapp/src/locale/en.json b/docs-web/src/main/webapp/src/locale/en.json index 4b037c41..7bb5dac1 100644 --- a/docs-web/src/main/webapp/src/locale/en.json +++ b/docs-web/src/main/webapp/src/locale/en.json @@ -199,7 +199,6 @@ "tag": { "new_tag": "New tag", "search": "Search", - "edit_tag": "Edit tag", "default": { "title": "Tags", "message_1": "Tags are labels associated to documents.", diff --git a/docs-web/src/main/webapp/src/partial/docs/document.html b/docs-web/src/main/webapp/src/partial/docs/document.html index 2ad55053..7580c0d9 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.html @@ -265,6 +265,10 @@   + +
+ +
diff --git a/docs-web/src/main/webapp/src/partial/docs/tag.html b/docs-web/src/main/webapp/src/partial/docs/tag.html index dc8ae69e..addc048f 100644 --- a/docs-web/src/main/webapp/src/partial/docs/tag.html +++ b/docs-web/src/main/webapp/src/partial/docs/tag.html @@ -1,3 +1,15 @@ + +
@@ -11,27 +23,13 @@ {{ 'validation.no_space' | translate }} -

- - -

+
    +
  • +
- - - - - - - -
-   - {{ tag.name }} - - - - -
+
+ +
diff --git a/docs-web/src/main/webapp/src/partial/docs/usergroup.html b/docs-web/src/main/webapp/src/partial/docs/usergroup.html index 3e9e0ec8..d3c922db 100644 --- a/docs-web/src/main/webapp/src/partial/docs/usergroup.html +++ b/docs-web/src/main/webapp/src/partial/docs/usergroup.html @@ -16,6 +16,10 @@ + +
+ +
@@ -36,6 +40,10 @@ + +
+ +
diff --git a/docs-web/src/main/webapp/src/style/main.less b/docs-web/src/main/webapp/src/style/main.less index 1b35671d..e552057d 100644 --- a/docs-web/src/main/webapp/src/style/main.less +++ b/docs-web/src/main/webapp/src/style/main.less @@ -23,14 +23,20 @@ } } -// Tags list -.table-tags { - td { - vertical-align: middle !important; - } +// Tag tree +ul.tag-tree { + list-style-type: none; + padding: 0; - .label { - font-size: 100%; + li { + margin-left: 20px; + margin-top: 8px; + margin-bottom: 8px; + white-space: nowrap; + + .active { + font-weight: 500; + } } } @@ -329,20 +335,6 @@ input[readonly].share-link { margin-top: 20px; } -// Tag tree -.tag-tree-dropdown { - padding-left: 0; - - .tag-tree { - li { - margin-left: 20px; - margin-top: 8px; - margin-bottom: 8px; - white-space: nowrap; - } - } -} - // Advanced search .btn-open-search > * { vertical-align: middle; @@ -668,6 +660,7 @@ input[readonly].share-link { box-shadow: 0 7px 14px 0 rgba(50,50,93,.1), 0 3px 6px 0 rgba(0,0,0,.07); background: none; border-radius: 4px; + overflow: hidden; .well-3d-header { font-size: 20px; @@ -681,6 +674,18 @@ input[readonly].share-link { } } +.well-3d-background { + position: absolute; + top: 60px; + right: 60px; + z-index: -1; + opacity: 0.03; + + .fas { + font-size: 15vw; + } +} + // Cards .card { min-width: 0;