#33 Display Images - Folders tree - show count of pictures in folder

Gorbush · Jul 28, 2018 · 52cb5e8 · 52cb5e8
1 parent b7e14c1
commit 52cb5e8
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 21 deletions.
diff --git a/ui/web/src/main/resources/static/css/common.css b/ui/web/src/main/resources/static/css/common.css
@@ -156,4 +156,20 @@ div#pageCenterButtons {
     height: 50px;
     margin-left: -25%;
     float: right;
-}
+}
+/** Tree table nodes */
+.jstree-node div.node_postblock {
+    float:right;
+    /*border:1px solid red;*/
+    width: auto;
+}
+.jstree-node div.node_postblock div.status {
+    float: left;
+    width: 100px;
+    text-align: left;
+}
+.jstree-node div.node_postblock div.counts {
+    float: left;
+    width: 65px;
+    text-align: right;
+}
diff --git a/ui/web/src/main/resources/static/css/importRequest.css b/ui/web/src/main/resources/static/css/importRequest.css
@@ -93,21 +93,6 @@ div#pageContentScroller {
     /*font-size: x-small;*/
     height: 20px;
 }
-div.node_postblock {
-    float:right;
-    /*border:1px solid red;*/
-    width: auto;
-}
-div.node_postblock div.status {
-    float: left;
-    width: 100px;
-    text-align: left;
-}
-div.node_postblock div.counts {
-    float: left;
-    width: 65px;
-    text-align: right;
-}
 li.jstree-node i.NODE_STATUS_FOUND {
     background-image: url(../images/loading-16.gif);
     background-position: 1px 4px;

diff --git a/ui/web/src/main/resources/static/css/main.css b/ui/web/src/main/resources/static/css/main.css
@@ -4,4 +4,13 @@
 }
 .paginatorContainer .pagination {
     margin: 9px;
+}
+
+#folderTree .jstree-anchor {
+    right: 0px;
+    width: 100%;
+    padding-right: 25px;
+}
+#folderTree div[name='filesCount'] {
+    color: grey;
 }
diff --git a/ui/web/src/main/resources/static/js/cmp/TreePath.js b/ui/web/src/main/resources/static/js/cmp/TreePath.js
@@ -3,15 +3,20 @@
  */
 var TreePath = {
 
+    init: function(){
+        TreePath.treePathColumnsTemplate = $("#TreePathRowTemplate");
+    },
+
     create: function (element, clickJSTreeNode, prepareCriteria) {
+        TreePath.init();
+
         function preprocessFoldersAsNodes(nodesList, nodeParent) {
             var nodes = [];
             for(nodexIndex in nodesList.content) {
                 var data = nodesList.content[nodexIndex];
                 var path = data.name;
                 var node = {
-                    // id: (nodesList.root ? nodesList.root : "") + path,
-                    text: (path === "")? "Gallery Root" : path,
+                    text: path,
                     icon: "glyphicon glyphicon-folder-open",
                     children: data.foldersCount > 0,
                     state: {
@@ -62,10 +67,13 @@ var TreePath = {
                             },
                             "postprocessor": function (node, data, par2) {
                                 return preprocessFoldersAsNodes(data.list, node);
+                            },
+                            "renderer" : function (node, obj, settings, jstree, document) {
+                                populateTemplate(TreePath.treePathColumnsTemplate, obj.original.content, node.childNodes[1]);
                             }
                         }
                     },
-                    "plugins": ["contextmenu", "dnd"],
+                    "plugins": ["contextmenu", "dnd", "wholerow"],
                     "contextmenu": {
                         "items": function ($node) {
                             return {

diff --git a/ui/web/src/main/resources/static/js/common.js b/ui/web/src/main/resources/static/js/common.js
@@ -132,11 +132,14 @@ function moveChildren(source, target) {
         target = target[0];
     }
     var sourceNodes = source.childNodes;
+    var children = [];
+    if (sourceNodes == null || sourceNodes.length === 0) {
+        return children;
+    }
     var nodesList = [];
     sourceNodes.forEach(function(child) {
         nodesList.push(child);
     });
-    var children = [];
     nodesList.forEach(function(child) {
         target.appendChild(child);
         children.push(child);

diff --git a/ui/web/src/main/resources/templates/main/importProgress.html b/ui/web/src/main/resources/templates/main/importProgress.html
@@ -95,7 +95,7 @@
                 <div id="indexRequestTreeHeaderRightColumns"></div>
             </div>
             <div class="indexRequestsTreeHeader" >
-                <div id="indexRequestTreeHeaderTotalColumns"></div>
+                <div id="indexRequestTreeHeaderTotalColumns" class="jstree-node"></div>
             </div>
             <div id="importDetailsBrowsingArea" class="bottomMatch">
                 <div id="indexRequestsTreeScroller" class="heightHalf">

diff --git a/ui/web/src/main/resources/templates/main/main.html b/ui/web/src/main/resources/templates/main/main.html
@@ -109,6 +109,12 @@
     <section layout:fragment="dialogs" class="container">
         <div id="templates">
             <div th:replace="support/sourceBlock" ></div>
+            <div id="TreePathRowTemplate">
+                <span name="name"></span>
+                <div class="node_postblock">
+                    <div name="filesCount" class="counts">Photoes</div>
+                </div>
+            </div>
         </div>
         <div id="contextMenuFolderAction" class="dropdown clearfix contextmenu">
             <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display:block;position:static;margin-bottom:5px;">