1 files changed, 37 insertions, 7 deletions

@@ -894,6 +894,15 @@ void cgit_add_clone_urls(void (*fn)(const char *))
                 add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
 }
 
+static int print_this_commit_option(void)
+{
+        struct object_id oid;
+        if (!ctx.qry.head || get_oid(ctx.qry.head, &oid))
+                return 1;
+        html_option(oid_to_hex(&oid), "this commit", ctx.qry.head);
+        return 0;
+}
+
 static int print_branch_option(const char *refname, const struct object_id *oid,
                                int flags, void *cb_data)
 {
@@ -995,15 +1004,18 @@ static void print_header(void)
         if (ctx.repo) {
                 cgit_index_link("index", NULL, NULL, NULL, NULL, 0, 1);
                 html(" : ");
-                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
+                cgit_summary_link(ctx.repo->name, NULL, NULL, NULL);
                 if (ctx.env.authenticated) {
                         html("</td><td class='form'>");
                         html("<form method='get'>\n");
                         cgit_add_hidden_formfields(0, 1, ctx.qry.page);
                         html("<select name='h' onchange='this.form.submit();'>\n");
+                        print_this_commit_option();
+                        html("<optgroup label='branches'>");
                         for_each_branch_ref(print_branch_option, ctx.qry.head);
                         if (ctx.repo->enable_remote_branches)
                                 for_each_remote_ref(print_branch_option, ctx.qry.head);
+                        html("</optgroup>");
                         html("</select> ");
                         html("<input type='submit' value='switch'/>");
                         html("</form>");
@@ -1016,7 +1028,13 @@ static void print_header(void)
         if (ctx.repo) {
                 html_txt(ctx.repo->desc);
                 html("</td><td class='sub right'>");
-                html_txt(ctx.repo->owner);
+                if (ctx.repo->owner_filter) {
+                        cgit_open_filter(ctx.repo->owner_filter);
+                        html_txt(ctx.repo->owner);
+                        cgit_close_filter(ctx.repo->owner_filter);
+                } else {
+                        html_txt(ctx.repo->owner);
+                }
         } else {
                 if (ctx.cfg.root_desc)
                         html_txt(ctx.cfg.root_desc);
@@ -1032,32 +1050,41 @@ void cgit_print_pageheader(void)
 
         html("<table class='tabs'><tr><td>\n");
         if (ctx.env.authenticated && ctx.repo) {
-                if (ctx.repo->readme.nr)
+                if (ctx.repo->readme.nr) {
                         reporevlink("about", "about", NULL,
                                     hc("about"), ctx.qry.head, NULL,
                                     NULL);
+                        html(" ");
+                }
                 cgit_summary_link("summary", NULL, hc("summary"),
                                   ctx.qry.head);
+                html(" ");
                 cgit_refs_link("refs", NULL, hc("refs"), ctx.qry.head,
                                ctx.qry.oid, NULL);
+                html(" ");
                 cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
                               NULL, ctx.qry.vpath, 0, NULL, NULL,
                               ctx.qry.showmsg, ctx.qry.follow);
+                html(" ");
                 if (ctx.qry.page && !strcmp(ctx.qry.page, "blame"))
                         cgit_blame_link("blame", NULL, hc("blame"), ctx.qry.head,
                                         ctx.qry.oid, ctx.qry.vpath);
                 else
                         cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
-                                       ctx.qry.oid, ctx.qry.vpath);
+                                        ctx.qry.oid, ctx.qry.vpath);
+                html(" ");
                 cgit_commit_link("commit", NULL, hc("commit"),
                                  ctx.qry.head, ctx.qry.oid, ctx.qry.vpath);
+                html(" ");
                 cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
                                ctx.qry.oid, ctx.qry.oid2, ctx.qry.vpath);
-                if (ctx.repo->max_stats)
+                if (ctx.repo->max_stats) {
+                        html(" ");
                         cgit_stats_link("stats", NULL, hc("stats"),
                                         ctx.qry.head, ctx.qry.vpath);
+                }
                 if (ctx.repo->homepage) {
-                        html("<a href='");
+                        html(" <a href='");
                         html_attr(ctx.repo->homepage);
                         html("'>homepage</a>");
                 }
@@ -1201,9 +1228,12 @@ void cgit_set_title_from_path(const char *path)
         if (!path)
                 return;
 
-        for (last_slash = path + strlen(path); (slash = memrchr(path, '/', last_slash - path)) != NULL; last_slash = slash) {
+        last_slash = path + strlen(path);
+        for (slash = last_slash; slash > path; --slash) {
+                if (*slash != '/') continue;
                 strbuf_add(&sb, slash + 1, last_slash - slash - 1);
                 strbuf_addstr(&sb, " \xc2\xab ");
+                last_slash = slash;
         }
         strbuf_add(&sb, path, last_slash - path);
         strbuf_addf(&sb, " - %s", ctx.page.title);