Merge branch 'repogroups'

* repogroups:
  Adjust apperance of repogroup headers
  Don't highlight repogroup headings
  Teach cgit how to group repositories by category

4 files changed, 21 insertions, 0 deletions

diff --git a/cgit.css b/cgit.css
index 6c7f9c3..5dd43b0 100644
--- a/cgit.css
+++ b/cgit.css
@@ -355 +355,6 @@ table.diff td div.del {
 }
+
+table.list td.repogroup {
+        padding-top: 1em;
+        border-bottom: solid 1px #777;
+}
diff --git a/cgit.h b/cgit.h
index e0879bd..8927236 100644
--- a/cgit.h
+++ b/cgit.h
@@ -49,2 +49,3 @@ struct repoinfo {
         char *defbranch;
+        char *group;
         char *module_link;
@@ -95,2 +96,3 @@ extern char *cgit_script_name;
 extern char *cgit_cache_root;
+extern char *cgit_repo_group;
 
diff --git a/shared.c b/shared.c
index 45fde7f..65af11a 100644
--- a/shared.c
+++ b/shared.c
@@ -23,2 +23,3 @@ char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_cache_root   = "/var/cache/cgit";
+char *cgit_repo_group   = NULL;
 
@@ -101,2 +102,3 @@ struct repoinfo *add_repo(const char *url)
         ret->owner = NULL;
+        ret->group = cgit_repo_group;
         ret->defbranch = "master";
@@ -162,2 +164,4 @@ void cgit_global_config_cb(const char *name, const char *value)
                 cgit_max_commit_count = atoi(value);
+        else if (!strcmp(name, "repo.group"))
+                cgit_repo_group = xstrdup(value);
         else if (!strcmp(name, "repo.url"))
diff --git a/ui-repolist.c b/ui-repolist.c
index 8e367a2..33e3e7f 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -14,2 +14,3 @@ void cgit_print_repolist(struct cacheitem *item)
         int i;
+        char *last_group = NULL;
 
@@ -32,2 +33,11 @@ void cgit_print_repolist(struct cacheitem *item)
                 repo = &cgit_repolist.repos[i];
+                if ((last_group == NULL && repo->group != NULL) ||
+                    (last_group != NULL && repo->group == NULL) ||
+                    (last_group != NULL && repo->group!= NULL &&
+                     strcmp(repo->group, last_group))) {
+                        html("<tr class='nohover'><td colspan='4' class='repogroup'>");
+                        html_txt(repo->group);
+                        html("</td></tr>");
+                        last_group = repo->group;
+                }
                 html("<tr><td>");