]> source.dussan.org Git - gitblit.git/commitdiff
projects / gitblit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0bace7e)
Remove "folding outlines" and sort repositories before subfolders.
authorFlorian Zschocke <florian.zschocke@devolo.de>
Sat, 15 Jun 2019 19:09:36 +0000 (21:09 +0200)
committerFlorian Zschocke <florian.zschocke@devolo.de>
Sat, 15 Jun 2019 19:09:36 +0000 (21:09 +0200)
Remove guard rails at the left to get a cleaner look.
To make it easier to determine which repositories belong to which
folder, display the repositories first, then the subfolder.

Decreased indentation a little.

src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.html patch | blob | history
src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.java patch | blob | history
src/main/resources/gitblit.css patch | blob | history

diff --git a/src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.html b/src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.html
index 5f2aba2160c6d91fde872cabc67340211167a13c..5dfd27afd34529c9958c6479077a0b14eaa69158 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.html
@@ -6,14 +6,11 @@
 <body>
        <wicket:panel>
                <tr style="background-color: #bbb" wicket:id="nodeHeader" data-row-type="folder"></tr>
-               <tr wicket:id="subFolders">
-                       <span wicket:id="rowContent"></span>
-               </tr>
                <wicket:container wicket:id="repositories">
                <tr  wicket:id="rowContent" data-row-type="repo">
                        <td wicket:id="firstColumn" class="left"
                                style="padding-left: 3px;">
-                               <div style="border-left: 1px solid black; margin-left:6px; width: 19px;display: inline-block;float: left;"
+                               <div style="margin-left: 7px; width: 8px;display: inline-block;float: left;"
                                        wicket:id="depth">&nbsp;</div>
                                        <span wicket:id="repoIcon"></span><span
                                style="padding-left: 3px;" wicket:id="repositoryName">[repository
@@ -36,6 +33,9 @@
                                        size]</span></td>
                </tr>
                </wicket:container>
+               <tr wicket:id="subFolders">
+                       <span wicket:id="rowContent"></span>
+               </tr>
 
                <wicket:fragment wicket:id="emptyFragment">
                </wicket:fragment>
@@ -91,7 +91,7 @@
 
                <wicket:fragment wicket:id="groupRepositoryRow">
                        <td wicket:id="firstColumn" style="" colspan="1">
-                       <div style="border-left: 1px solid black; margin-left:6px; width: 19px; display: inline-block;float: left;"
+                       <div style="margin-left:6px; width: 10px; display: inline-block;float: left;"
                                        wicket:id="depth">&nbsp;</div>
                        <span
                                wicket:id="groupCollapsible"></span><span wicket:id="groupName">[group
diff --git a/src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.java b/src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.java
index fbe1991d37b5ccacb1d0256c1fb5b5a67c3bfcfa..cc5df1a13c50e8f68f30bb5054e70dedb489de68 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/NestedRepositoryTreePanel.java
@@ -68,20 +68,6 @@ public class NestedRepositoryTreePanel extends BasePanel {
                }
                WicketUtils.addCssClass(nodeHeader, "group collapsible tree");
 
-               add(new ListView<TreeNodeModel>("subFolders", node.getSubFolders()) {
-                       private static final long serialVersionUID = 1L;
-
-                       @Override
-                       protected void populateItem(ListItem<TreeNodeModel> item) {
-                               item.add(new NestedRepositoryTreePanel("rowContent", item.getModel(), accessRestrictionTranslations, linksActive));
-                       }
-
-                       @Override
-                       public boolean isVisible() {
-                               return super.isVisible() && !node.getSubFolders().isEmpty();
-                       }
-               });
-
                add(new ListView<RepositoryModel>("repositories", node.getRepositories()) {
                        private static final long serialVersionUID = 1L;
 
@@ -220,6 +206,22 @@ public class NestedRepositoryTreePanel extends BasePanel {
                        }
                });
 
+               add(new ListView<TreeNodeModel>("subFolders", node.getSubFolders()) {
+                       private static final long serialVersionUID = 1L;
+
+                       @Override
+                       protected void populateItem(ListItem<TreeNodeModel> item) {
+                               item.add(new NestedRepositoryTreePanel("rowContent", item.getModel(), accessRestrictionTranslations, linksActive));
+                       }
+
+                       @Override
+                       public boolean isVisible() {
+                               return super.isVisible() && !node.getSubFolders().isEmpty();
+                       }
+               });
+
+
+
        }
 
        private void addChildOfNodeIdCssClassesToRow(Component row, TreeNodeModel parentNode) {
diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css
index 5dabbec2434a6c8392d90895640c6c8b7bc25e38..f7271788ea0bfbea742a237e5b04d591b7d0b139 100644 (file)
--- a/src/main/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
@@ -45,6 +45,7 @@ a.bugtraq {
 .octicon-centered {\r
     text-align: center;\r
     width: 16px;\r
+    padding-left: 17px;\r
 }\r
 \r
 tr:hover .octicon-centered {\r
Pure java git solution: https://github.com/gitblit-org/gitblit