Merge branch 'lh/menu'

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 383b8acb353124c85ec2f920971df469013c5a08..d4376cef5823f403ccd30707abc985ef76c2e6fb 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -163,9 +163,25 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-                  char *rev, char *path)
+                  char *rev, char *path, int ofs)
 {
-       reporevlink("log", name, title, class, head, rev, path);
+       char *delim;
+
+       delim = repolink(title, class, "log", head, path);
+       if (rev && strcmp(rev, cgit_query_head)) {
+               html(delim);
+               html("id=");
+               html_attr(rev);
+               delim = "&";
+       }
+       if (ofs > 0) {
+               html(delim);
+               html("ofs=");
+               htmlf("%d", ofs);
+       }
+       html("'>");
+       html_txt(name);
+       html("</a>");
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
@@ -266,7 +282,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
        html("<title>");
        html_txt(title);
        html("</title>\n");
-       htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
+       htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(cgit_css);
        html("'/>\n");
@@ -302,10 +318,10 @@ void cgit_print_pageheader(char *title, int show_search)
                            NULL, NULL);
                html(" ");
                cgit_log_link("log", NULL, NULL, cgit_query_head,
-                             cgit_query_sha1, cgit_query_path);
+                             cgit_query_sha1, cgit_query_path, 0);
                html(" ");
-               cgit_tree_link("files", NULL, NULL, cgit_query_head,
-                              cgit_query_sha1, cgit_query_path);
+               cgit_tree_link("tree", NULL, NULL, cgit_query_head,
+                              cgit_query_sha1, NULL);
                html(" ");
                cgit_commit_link("commit", NULL, NULL, cgit_query_head,
                              cgit_query_sha1);