indenting only real subrepositories of the project (#2679)

fixes #2672

Author: tulinkry

opengrok-web/src/main/webapp/repos.jspf

@@ -21,21 +21,21 @@ CDDL HEADER END
 Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 
 --%>
-<%@page import="java.util.TreeSet"%>
+<%@page import="java.io.File"%>
+<%@page import="java.util.Collections"%>
+<%@page import="java.util.Comparator"%>
 <%@page import="java.util.Iterator"%>
+<%@page import="java.util.LinkedList"%>
+<%@page import="java.util.List"%>
 <%@page import="java.util.Set"%>
+<%@page import="java.util.TreeSet"%>
+<%@page import="org.opengrok.indexer.configuration.Group"%>
+<%@page import="org.opengrok.indexer.configuration.Project"%>
+<%@page import="org.opengrok.indexer.history.RepositoryInfo"%>
+<%@page import="org.opengrok.indexer.web.PageConfig"%>
 <%@page import="org.opengrok.indexer.web.Prefix"%>
 <%@page import="org.opengrok.indexer.web.ProjectHelper"%>
-<%@page import="java.util.LinkedList"%>
-<%@page import="java.util.Collections"%>
-<%@page import="java.util.Comparator"%>
-<%@page import="java.io.File"%>
-<%@page import="org.opengrok.indexer.history.RepositoryInfo"%>
 <%@page import="org.opengrok.indexer.web.Util"%>
-<%@page import="org.opengrok.indexer.configuration.Project"%>
-<%@page import="org.opengrok.indexer.configuration.Group"%>
-<%@page import="java.util.List"%>
-<%@page import="org.opengrok.indexer.web.PageConfig"%>
 <%@ page import="static org.opengrok.indexer.web.messages.MessagesUtils.printMessages" %>
 <%@ page import="static org.opengrok.indexer.web.messages.MessagesUtils.messagesToJson" %>
 <%
@@ -156,13 +156,28 @@ Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
                             if (cnt > 0 && ri.getParent() == null)
                                 // discard repositories without a parent url
                                 continue;
-                            if (cnt != 0) {
+
+                            boolean subrepository = !ri.getDirectoryNameRelative().equals(project.getPath());
+                            if (subrepository && cnt == 0) {
+                            %>
+                                <tr>
+                                    <td class="name repository" colspan="3">
+                                        <a href="<%= request.getContextPath() + Prefix.XREF_P + "/" + projDesc %>"
+                                           title="Xref for project <%= Util.htmlize(projDesc) %>">
+                                            <%= Util.htmlize(projDesc) %>
+                                        </a>
+                                    </td>
+                                </tr>
+                            <%
+                            }
+
+                            if (subrepository) {
                                 projDesc = ri.getDirectoryName()
                                              .replace(cfg.getSourceRootPath() + File.separator, "");
                             }
                             %>
                             <tr>
-                                <td class="name <%= cnt > 0 ? "subrepository" : "repository" %>">
+                                <td class="name <%= subrepository ? "subrepository" : "repository" %>">
                     <a href="<%= request.getContextPath() + Prefix.XREF_P + "/" + projDesc%>"
                        title="Xref for project <%= Util.htmlize(projDesc) %>">
                         <%= Util.htmlize(projDesc) %>
@@ -287,12 +302,26 @@ Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
                                 if (cnt > 0 && ri.getParent() == null)
                                     // discard repositories without a parent url
                                     continue;
-                                if (cnt != 0) {
+                                boolean subrepository = !ri.getDirectoryNameRelative().equals(proj.getPath());
+                                if (subrepository && cnt == 0) {
+                                    %>
+                                        <tr>
+                                            <td class="name repository" colspan="3">
+                                                <a href="<%= request.getContextPath() + Prefix.XREF_P + "/" + projDesc %>"
+                                                   title="Xref for project <%= Util.htmlize(projDesc) %>">
+                                                    <%= Util.htmlize(projDesc) %>
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    <%
+                                }
+
+                                if (subrepository) {
                                     projDesc = ri.getDirectoryName()
                                                  .replace(cfg.getSourceRootPath() + File.separator, "");
                                 }
                                 %>
-                                <tr><td class="name <%= cnt > 0 ? "subrepository" : "repository" %>">
+                                <tr><td class="name <%= subrepository ? "subrepository" : "repository" %>">
                     <a href="<%= request.getContextPath() + Prefix.XREF_P + "/" + projDesc %>"
                        title="Xref for project <%= Util.htmlize(projDesc) %>">
                         <%= Util.htmlize(projDesc) %>