Merge branch 'lh/menu'

* lh/menu:
  Add ofs argument to cgit_log_link and use it in ui-log.c
  Add trim_end() and use it to remove trailing slashes from repo paths
  Do not include current path in the "tree" menu link
  Add setting to enable/disable extra links on index page
  Change S/L/T to summary/log/tree
  Change "files" to "tree"
  Include querystring as part of cached filename for repo summary page
  Add more menuitems on repo pages

1 files changed, 55 insertions, 16 deletions

diff --git a/ui-shared.c b/ui-shared.c
index 110c696..d4376ce 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -82,115 +82,135 @@ char *cgit_currurl()
         else if (cgit_query_page)
                 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
         else if (cgit_query_repo)
                 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
         else
                 return fmt("%s/", cgit_virtual_root);
 }
 
 static char *repolink(char *title, char *class, char *page, char *head,
                       char *path)
 {
         char *delim = "?";
 
         html("<a");
         if (title) {
                 html(" title='");
                 html_attr(title);
                 html("'");
         }
         if (class) {
                 html(" class='");
                 html_attr(class);
                 html("'");
         }
         html(" href='");
         if (cgit_virtual_root) {
                 html_attr(cgit_virtual_root);
                 if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/')
                         html("/");
                 html_attr(cgit_repo->url);
                 if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
                         html("/");
-                html(page);
-                html("/");
-                if (path)
-                        html_attr(path);
+                if (page) {
+                        html(page);
+                        html("/");
+                        if (path)
+                                html_attr(path);
+                }
         } else {
                 html(cgit_script_name);
                 html("?url=");
                 html_attr(cgit_repo->url);
                 if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
                         html("/");
-                html(page);
-                html("/");
-                if (path)
-                        html_attr(path);
+                if (page) {
+                        html(page);
+                        html("/");
+                        if (path)
+                                html_attr(path);
+                }
                 delim = "&amp;";
         }
         if (head && strcmp(head, cgit_repo->defbranch)) {
                 html(delim);
                 html("h=");
                 html_attr(head);
                 delim = "&amp;";
         }
         return fmt("%s", delim);
 }
 
 static void reporevlink(char *page, char *name, char *title, char *class,
                         char *head, char *rev, char *path)
 {
         char *delim;
 
         delim = repolink(title, class, page, head, path);
         if (rev && strcmp(rev, cgit_query_head)) {
                 html(delim);
                 html("id=");
                 html_attr(rev);
         }
         html("'>");
         html_txt(name);
         html("</a>");
 }
 
 void cgit_tree_link(char *name, char *title, char *class, char *head,
                     char *rev, char *path)
 {
         reporevlink("tree", name, title, class, head, rev, path);
 }
 
 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,
                       char *rev)
 {
         if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
                 name[cgit_max_msg_len] = '\0';
                 name[cgit_max_msg_len - 1] = '.';
                 name[cgit_max_msg_len - 2] = '.';
                 name[cgit_max_msg_len - 3] = '.';
         }
         reporevlink("commit", name, title, class, head, rev, NULL);
 }
 
 void cgit_diff_link(char *name, char *title, char *class, char *head,
                     char *new_rev, char *old_rev, char *path)
 {
         char *delim;
 
         delim = repolink(title, class, "diff", head, path);
         if (new_rev && strcmp(new_rev, cgit_query_head)) {
                 html(delim);
                 html("id=");
                 html_attr(new_rev);
                 delim = "&amp;";
         }
         if (old_rev) {
                 html(delim);
                 html("id2=");
                 html_attr(old_rev);
         }
         html("'>");
@@ -250,77 +270,96 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 }
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
         html("Content-Type: text/html; charset=utf-8\n");
         htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
         htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                          ttl_seconds(item->ttl)));
         html("\n");
         html(cgit_doctype);
         html("<html>\n");
         html("<head>\n");
         html("<title>");
         html_txt(title);
         html("</title>\n");
         htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
         html("<link rel='stylesheet' type='text/css' href='");
         html_attr(cgit_css);
         html("'/>\n");
         html("</head>\n");
         html("<body>\n");
 }
 
 void cgit_print_docend()
 {
         html("</td></tr></table>");
         html("</body>\n</html>\n");
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
         html("<table id='layout'>");
-        html("<tr><td id='header'>");
-        html(cgit_root_title);
-        html("</td><td id='logo'>");
+        html("<tr><td id='header'><a href='");
+        html_attr(cgit_rooturl());
+        html("'>");
+        html_txt(cgit_root_title);
+        html("</a></td><td id='logo'>");
         html("<a href='");
         html_attr(cgit_logo_link);
         htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
         html("</td></tr>");
         html("<tr><td id='crumb'>");
-        htmlf("<a href='%s'>root</a>", cgit_rooturl());
         if (cgit_query_repo) {
-                htmlf(" : <a href='%s'>", cgit_repourl(cgit_repo->url));
                 html_txt(cgit_repo->name);
-                htmlf("</a> : %s", title);
+                html(" (");
+                html_txt(cgit_query_head);
+                html(") : &nbsp;");
+                reporevlink(NULL, "summary", NULL, NULL, cgit_query_head,
+                            NULL, NULL);
+                html(" ");
+                cgit_log_link("log", NULL, NULL, cgit_query_head,
+                              cgit_query_sha1, cgit_query_path, 0);
+                html(" ");
+                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);
+                html(" ");
+                cgit_diff_link("diff", NULL, NULL, cgit_query_head,
+                               cgit_query_sha1, cgit_query_sha2,
+                               cgit_query_path);
+        } else {
+                html_txt("Index of repositories");
         }
         html("</td>");
         html("<td id='search'>");
         if (show_search) {
                 html("<form method='get' action='");
                 html_attr(cgit_currurl());
                 html("'>");
                 if (!cgit_virtual_root) {
                         if (cgit_query_repo)
                                 html_hidden("r", cgit_query_repo);
                         if (cgit_query_page)
                                 html_hidden("p", cgit_query_page);
                 }
                 if (cgit_query_head)
                         html_hidden("h", cgit_query_head);
                 if (cgit_query_sha1)
                         html_hidden("id", cgit_query_sha1);
                 if (cgit_query_sha2)
                         html_hidden("id2", cgit_query_sha2);
                 html("<input type='text' name='q' value='");
                 html_attr(cgit_query_search);
                 html("'/></form>");
         }
         html("</td></tr>");
         html("<tr><td id='content' colspan='2'>");
 }
 
 void cgit_print_snapshot_start(const char *mimetype, const char *filename,
                                struct cacheitem *item)
 {
         htmlf("Content-Type: %s\n", mimetype);
         htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);