ui-diff.c: create a control panel for diff options

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 2c13d5041b2a4931358b241b6316db3d96a9a6b5..2c98668ad931489ad54632d3c869c06de294f1cb 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,30 +6,26 @@
  *   (see COPYING for full license text)
  */
 
  *   (see COPYING for full license text)
  */
 

-/* This is needed for strcasestr to be defined by <string.h> */
-#define _GNU_SOURCE 1
-#include <string.h>
-
-#include <time.h>
-

 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 time_t read_agefile(char *path)
 {
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 time_t read_agefile(char *path)
 {

-       FILE *f;
-       static char buf[64], buf2[64];
+       time_t result;
+       size_t size;
+       char *buf;
+       static char buf2[64];

 
 

-       if (!(f = fopen(path, "r")))
-               return -1;
-       if (fgets(buf, sizeof(buf), f) == NULL)
+       if (readfile(path, &buf, &size))

                return -1;
                return -1;

-       fclose(f);
+

        if (parse_date(buf, buf2, sizeof(buf2)))
        if (parse_date(buf, buf2, sizeof(buf2)))

-               return strtoul(buf2, NULL, 10);
+               result = strtoul(buf2, NULL, 10);

        else
        else

-               return 0;
+               result = 0;
+       free(buf);
+       return result;

 }
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 }
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)


@@ -92,7 +88,7 @@ int is_in_url(struct cgit_repo *repo)
 
 void print_sort_header(const char *title, const char *sort)
 {
 
 void print_sort_header(const char *title, const char *sort)
 {

-       htmlf("<th class='left'><a href='./?s=%s", sort);
+       htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);

        if (ctx.qry.search) {
                html("&q=");
                html_url_arg(ctx.qry.search);
        if (ctx.qry.search) {
                html("&q=");
                html_url_arg(ctx.qry.search);


@@ -134,6 +130,18 @@ static int cmp(const char *s1, const char *s2)
        return 0;
 }
 
        return 0;
 }
 

+static int sort_section(const void *a, const void *b)
+{
+       const struct cgit_repo *r1 = a;
+       const struct cgit_repo *r2 = b;
+       int result;
+
+       result = cmp(r1->section, r2->section);
+       if (!result)
+               result = cmp(r1->name, r2->name);
+       return result;
+}
+

 static int sort_name(const void *a, const void *b)
 {
        const struct cgit_repo *r1 = a;
 static int sort_name(const void *a, const void *b)
 {
        const struct cgit_repo *r1 = a;


@@ -176,6 +184,7 @@ struct sortcolumn {
 };
 
 struct sortcolumn sortcolumn[] = {
 };
 
 struct sortcolumn sortcolumn[] = {

+       {"section", sort_section},

        {"name", sort_name},
        {"desc", sort_desc},
        {"owner", sort_owner},
        {"name", sort_name},
        {"desc", sort_desc},
        {"owner", sort_owner},


@@ -201,7 +210,8 @@ int sort_repolist(char *field)
 void cgit_print_repolist()
 {
        int i, columns = 4, hits = 0, header = 0;
 void cgit_print_repolist()
 {
        int i, columns = 4, hits = 0, header = 0;

-       char *last_group = NULL;
+       char *last_section = NULL;
+       char *section;

        int sorted = 0;
 
        if (ctx.cfg.enable_index_links)
        int sorted = 0;
 
        if (ctx.cfg.enable_index_links)


@@ -217,6 +227,8 @@ void cgit_print_repolist()
 
        if(ctx.qry.sort)
                sorted = sort_repolist(ctx.qry.sort);
 
        if(ctx.qry.sort)
                sorted = sort_repolist(ctx.qry.sort);

+       else
+               sort_repolist("section");

 
        html("<table summary='repository list' class='list nowrap'>");
        for (i=0; i<cgit_repolist.count; i++) {
 
        html("<table summary='repository list' class='list nowrap'>");
        for (i=0; i<cgit_repolist.count; i++) {


@@ -230,19 +242,22 @@ void cgit_print_repolist()
                        continue;
                if (!header++)
                        print_header(columns);
                        continue;
                if (!header++)
                        print_header(columns);

+               section = ctx.repo->section;
+               if (section && !strcmp(section, ""))
+                       section = NULL;

                if (!sorted &&
                if (!sorted &&

-                   ((last_group == NULL && ctx.repo->group != NULL) ||
-                   (last_group != NULL && ctx.repo->group == NULL) ||
-                   (last_group != NULL && ctx.repo->group != NULL &&
-                    strcmp(ctx.repo->group, last_group)))) {
-                       htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
+                   ((last_section == NULL && section != NULL) ||
+                   (last_section != NULL && section == NULL) ||
+                   (last_section != NULL && section != NULL &&
+                    strcmp(section, last_section)))) {
+                       htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",

                              columns);
                              columns);

-                       html_txt(ctx.repo->group);
+                       html_txt(section);

                        html("</td></tr>");
                        html("</td></tr>");

-                       last_group = ctx.repo->group;
+                       last_section = section;

                }
                htmlf("<tr><td class='%s'>",
                }
                htmlf("<tr><td class='%s'>",

-                     !sorted && ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
+                     !sorted && section ? "sublevel-repo" : "toplevel-repo");

                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
                html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
                html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);


@@ -273,6 +288,11 @@ void cgit_print_repolist()
 
 void cgit_print_site_readme()
 {
 
 void cgit_print_site_readme()
 {

-       if (ctx.cfg.root_readme)
-               html_include(ctx.cfg.root_readme);
+       if (!ctx.cfg.root_readme)
+               return;
+       if (ctx.cfg.about_filter)
+               cgit_open_filter(ctx.cfg.about_filter);
+       html_include(ctx.cfg.root_readme);
+       if (ctx.cfg.about_filter)
+               cgit_close_filter(ctx.cfg.about_filter);

 }
 }