ui-repolist + ui-shared: Use cgit_summary_link()

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index c23bc7540b9862bb200afba1bd46b7af7a119896..1fc5c0978bde754ce540285cc9300ca84159d2bf 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -206,36 +206,36 @@ static char *repolink(char *title, char *class, char *page, char *head,
        }
        html(" href='");
        if (ctx.cfg.virtual_root) {
        }
        html(" href='");
        if (ctx.cfg.virtual_root) {

-               html_attr(ctx.cfg.virtual_root);
+               html_url_path(ctx.cfg.virtual_root);

                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");
                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");

-               html_attr(ctx.repo->url);
+               html_url_path(ctx.repo->url);

                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {

-                       html(page);
+                       html_url_path(page);

                        html("/");
                        if (path)
                        html("/");
                        if (path)

-                               html_attr(path);
+                               html_url_path(path);

                }
        } else {
                html(ctx.cfg.script_name);
                html("?url=");
                }
        } else {
                html(ctx.cfg.script_name);
                html("?url=");

-               html_attr(ctx.repo->url);
+               html_url_arg(ctx.repo->url);

                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {

-                       html(page);
+                       html_url_arg(page);

                        html("/");
                        if (path)
                        html("/");
                        if (path)

-                               html_attr(path);
+                               html_url_arg(path);

                }
                delim = "&";
        }
        if (head && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");
                }
                delim = "&";
        }
        if (head && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");

-               html_attr(head);
+               html_url_arg(head);

                delim = "&";
        }
        return fmt("%s", delim);
                delim = "&";
        }
        return fmt("%s", delim);


@@ -250,13 +250,18 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");

-               html_attr(rev);
+               html_url_arg(rev);

        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 

+void cgit_summary_link(char *name, char *title, char *class, char *head)
+{
+       reporevlink(NULL, name, title, class, head, NULL, NULL);
+}
+

 void cgit_tree_link(char *name, char *title, char *class, char *head,
                    char *rev, char *path)
 {
 void cgit_tree_link(char *name, char *title, char *class, char *head,
                    char *rev, char *path)
 {


@@ -278,17 +283,17 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");

-               html_attr(rev);
+               html_url_arg(rev);

                delim = "&";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
                delim = "&";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");

-               html_attr(grep);
+               html_url_arg(grep);

                delim = "&";
                html(delim);
                html("q=");
                delim = "&";
                html(delim);
                html("q=");

-               html_attr(pattern);
+               html_url_arg(pattern);

        }
        if (ofs > 0) {
                html(delim);
        }
        if (ofs > 0) {
                html(delim);


@@ -333,13 +338,13 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        if (new_rev && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");
        if (new_rev && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");

-               html_attr(new_rev);
+               html_url_arg(new_rev);

                delim = "&amp;";
        }
        if (old_rev) {
                html(delim);
                html("id2=");
                delim = "&amp;";
        }
        if (old_rev) {
                html(delim);
                html("id2=");

-               html_attr(old_rev);
+               html_url_arg(old_rev);

        }
        html("'>");
        html_txt(name);
        }
        html("'>");
        html_txt(name);


@@ -598,8 +603,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
        if (ctx->repo) {
                cgit_index_link("index", NULL, NULL, NULL, 0);
                html(" : ");
        if (ctx->repo) {
                cgit_index_link("index", NULL, NULL, NULL, 0);
                html(" : ");

-               reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
-                           ctx->qry.head, NULL, NULL);
+               cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);

                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                add_hidden_formfields(0, 1, ctx->qry.page);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                add_hidden_formfields(0, 1, ctx->qry.page);


@@ -627,8 +631,8 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {

-               reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
-                           ctx->qry.head, NULL, NULL);
+               cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL,
+                       ctx->qry.head);

                cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
                cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,