Merge branch 'stable'

[cgit.git] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index ee3f6fefef3578391e7ba354f007884bf6baec04..224e5f3b2f3da88d89a0ea3034b9182cf7775cd7 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -262,6 +262,12 @@ void cgit_summary_link(char *name, char *title, char *class, char *head)
        reporevlink(NULL, name, title, class, head, NULL, NULL);
 }
 
+void cgit_tag_link(char *name, char *title, char *class, char *head,
+                  char *rev)
+{
+       reporevlink("tag", name, title, class, head, rev, NULL);
+}
+
 void cgit_tree_link(char *name, char *title, char *class, char *head,
                    char *rev, char *path)
 {
@@ -359,29 +365,21 @@ void cgit_patch_link(char *name, char *title, char *class, char *head,
 
 void cgit_object_link(struct object *obj)
 {
-       char *page, *arg, *url;
+       char *page, *rev, *name;
 
        if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
                                 ctx.qry.head, sha1_to_hex(obj->sha1));
                return;
-       } else if (obj->type == OBJ_TREE) {
+       } else if (obj->type == OBJ_TREE)
                page = "tree";
-               arg = "id";
-       } else if (obj->type == OBJ_TAG) {
+       else if (obj->type == OBJ_TAG)
                page = "tag";
-               arg = "id";
-       } else {
+       else
                page = "blob";
-               arg = "id";
-       }
-
-       url = cgit_pageurl(ctx.qry.repo, page,
-                          fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
-       html_link_open(url, NULL, NULL);
-       htmlf("%s %s", typename(obj->type),
-             sha1_to_hex(obj->sha1));
-       html_link_close();
+       rev = sha1_to_hex(obj->sha1);
+       name = fmt("%s %s", typename(obj->type), rev);
+       reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL);
 }
 
 void cgit_print_date(time_t secs, char *format, int local_time)
@@ -496,9 +494,9 @@ void cgit_print_docend()
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
-               html("<div class='footer'>generated ");
+               htmlf("<div class='footer'>generated  by cgit %s at ",
+                       cgit_version);
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
-               htmlf(" by cgit %s", cgit_version);
                html("</div>\n");
        }
        html("</body>\n</html>\n");
@@ -603,8 +601,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
        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);
@@ -632,8 +629,8 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 
        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("summary", NULL, hc(cmd, "summary"),
+                                 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,
@@ -651,8 +648,8 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                if (ctx->cfg.virtual_root)
-                       html_attr(cgit_fileurl(ctx->qry.repo, "log",
-                                              ctx->qry.path, NULL));
+                       html_url_path(cgit_fileurl(ctx->qry.repo, "log",
+                                                  ctx->qry.path, NULL));
                html("'>\n");
                add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");