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

11 files changed, 145 insertions, 53 deletions

diff --git a/cgit.c b/cgit.c
index 11dff76..d9a03c2 100644
--- a/cgit.c
+++ b/cgit.c
@@ -23,19 +23,21 @@ static int cgit_prepare_cache(struct cacheitem *item)
                 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
                 item->ttl = cgit_cache_root_ttl;
                 return 1;
         }
 
         if (!cgit_cmd) {
-                item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
-                           cache_safe_filename(cgit_repo->url)));
+                item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
+                                         cache_safe_filename(cgit_repo->url),
+                                         cache_safe_filename(cgit_querystring)));
                 item->ttl = cgit_cache_repo_ttl;
         } else {
                 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
-                           cache_safe_filename(cgit_repo->url), cgit_query_page,
-                           cache_safe_filename(cgit_querystring)));
+                                         cache_safe_filename(cgit_repo->url),
+                                         cgit_query_page,
+                                         cache_safe_filename(cgit_querystring)));
                 if (cgit_query_has_symref)
                         item->ttl = cgit_cache_dynamic_ttl;
                 else if (cgit_query_has_sha1)
                         item->ttl = cgit_cache_static_ttl;
                 else
                         item->ttl = cgit_cache_repo_ttl;
diff --git a/cgit.css b/cgit.css
index cda437e..112dac1 100644
--- a/cgit.css
+++ b/cgit.css
@@ -92,12 +92,20 @@ td#header {
         font-size: 150%;
         font-weight: bold;
         padding: 0.2em 0.5em;
         vertical-align: text-bottom;
 }
 
+td#header a {
+        color: #666;
+}
+
+td#header a:hoved {
+        text-decoration: underline;
+}
+
 td#logo {
         text-align: right;
         vertical-align: middle;
         padding-right: 0.5em;
 }
 
@@ -113,17 +121,19 @@ td#crumb {
         font-weight: bold;
 }
 
 td#crumb a {
         color: #ccc;
         background-color: #666;
+        padding: 0em 0.5em 0em 0.5em;
 }
 
 td#crumb a:hover {
-        color: #eee;
-        background-color: #666;
+        color: #666;
+        background-color: #ccc;
+        text-decoration: none;
 }
 
 td#search {
         text-align: right;
         vertical-align: middle;
         padding-right: 0.5em;
@@ -358,22 +368,23 @@ table.list td.repogroup {
         font-style: italic;
         color: #888;
 }
 
 a.button {
         font-size: 80%;
-        color: #333;
-        background-color: #ccc;
-        border: solid 1px #999;
+        color: #aaa;
+        background-color: #eee;
+        border: solid 1px #aaa;
         padding: 0em 0.5em;
         margin: 0.1em 0.25em;
 }
 
 a.button:hover {
         text-decoration: none;
-        background-color: #eee;
+        color: #333;
+        background-color: #ccc;
 }
 
 a.primary {
         font-size: 100%;
 }
 
diff --git a/cgit.h b/cgit.h
index 9558362..2ff5340 100644
--- a/cgit.h
+++ b/cgit.h
@@ -115,12 +115,13 @@ extern char *cgit_virtual_root;
 extern char *cgit_script_name;
 extern char *cgit_cache_root;
 extern char *cgit_repo_group;
 
 extern int cgit_nocache;
 extern int cgit_snapshots;
+extern int cgit_enable_index_links;
 extern int cgit_enable_log_filecount;
 extern int cgit_enable_log_linecount;
 extern int cgit_max_lock_attempts;
 extern int cgit_cache_root_ttl;
 extern int cgit_cache_repo_ttl;
 extern int cgit_cache_dynamic_ttl;
@@ -155,12 +156,13 @@ extern void cgit_repo_config_cb(const char *name, const char *value);
 extern void cgit_querystring_cb(const char *name, const char *value);
 
 extern int chk_zero(int result, char *msg);
 extern int chk_positive(int result, char *msg);
 
 extern int hextoint(char c);
+extern char *trim_end(const char *str, char c);
 
 extern void *cgit_free_commitinfo(struct commitinfo *info);
 
 extern int cgit_diff_files(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            linediff_fn fn);
@@ -201,13 +203,13 @@ extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
                           const char *query);
 
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
-                          char *rev, char *path);
+                          char *rev, char *path, int ofs);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                              char *rev);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
                            char *new_rev, char *old_rev, char *path);
 
 extern void cgit_print_error(char *msg);
diff --git a/cgitrc b/cgitrc
index 0f602e4..40877f8 100644
--- a/cgitrc
+++ b/cgitrc
@@ -9,12 +9,16 @@
 
 
 ## Enable/disable snapshots by default. This can be overridden per repo
 #snapshots=0
 
 
+## Enable/disable extra links to summary/log/tree per repo on index page
+#enable-index-links=0
+
+
 ## Enable/disable display of 'number of files changed' in log view
 #enable-log-filecount=0
 
 
 ## Enable/disable display of 'number of lines changed' in log view
 #enable-log-linecount=0
diff --git a/parsing.c b/parsing.c
index 74a2484..2c05c09 100644
--- a/parsing.c
+++ b/parsing.c
@@ -165,13 +165,13 @@ void cgit_parse_url(const char *url)
 
                 cgit_query_repo = cgit_repo->url;
                 p = strchr(cmd + 1, '/');
                 if (p) {
                         p[0] = '\0';
                         if (p[1])
-                                cgit_query_path = xstrdup(p + 1);
+                                cgit_query_path = trim_end(p + 1, '/');
                 }
                 cgit_cmd = cgit_get_cmd_index(cmd + 1);
                 cgit_query_page = xstrdup(cmd + 1);
                 return;
         }
 }
diff --git a/shared.c b/shared.c
index f7f43b2..1a5b866 100644
--- a/shared.c
+++ b/shared.c
@@ -25,12 +25,13 @@ char *cgit_virtual_root = NULL;
 char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_cache_root   = "/var/cache/cgit";
 char *cgit_repo_group   = NULL;
 
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;
+int cgit_enable_index_links    =  0;
 int cgit_enable_log_filecount  =  0;
 int cgit_enable_log_linecount  =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
 int cgit_cache_dynamic_ttl     =  5;
@@ -145,12 +146,14 @@ void cgit_global_config_cb(const char *name, const char *value)
         else if (!strcmp(name, "virtual-root"))
                 cgit_virtual_root = xstrdup(value);
         else if (!strcmp(name, "nocache"))
                 cgit_nocache = atoi(value);
         else if (!strcmp(name, "snapshots"))
                 cgit_snapshots = atoi(value);
+        else if (!strcmp(name, "enable-index-links"))
+                cgit_enable_index_links = atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 cgit_enable_log_filecount = atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 cgit_enable_log_linecount = atoi(value);
         else if (!strcmp(name, "cache-root"))
                 cgit_cache_root = xstrdup(value);
@@ -224,13 +227,13 @@ void cgit_querystring_cb(const char *name, const char *value)
         } else if (!strcmp(name, "id2")) {
                 cgit_query_sha2 = xstrdup(value);
                 cgit_query_has_sha1 = 1;
         } else if (!strcmp(name, "ofs")) {
                 cgit_query_ofs = atoi(value);
         } else if (!strcmp(name, "path")) {
-                cgit_query_path = xstrdup(value);
+                cgit_query_path = trim_end(value, '/');
         } else if (!strcmp(name, "name")) {
                 cgit_query_name = xstrdup(value);
         }
 }
 
 void *cgit_free_commitinfo(struct commitinfo *info)
@@ -253,12 +256,34 @@ int hextoint(char c)
         else if (c >= '0' && c <= '9')
                 return c - '0';
         else
                 return -1;
 }
 
+char *trim_end(const char *str, char c)
+{
+        int len;
+        char *s, *t;
+
+        if (str == NULL)
+                return NULL;
+        t = (char *)str;
+        len = strlen(t);
+        while(len > 0 && t[len - 1] == c)
+                len--;
+
+        if (len == 0)
+                return NULL;
+
+        c = t[len];
+        t[len] = '\0';
+        s = xstrdup(t);
+        t[len] = c;
+        return s;
+}
+
 void cgit_diff_tree_cb(struct diff_queue_struct *q,
                        struct diff_options *options, void *data)
 {
         int i;
 
         for (i = 0; i < q->nr; i++) {
diff --git a/ui-log.c b/ui-log.c
index 95cb453..d38e40a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -110,21 +110,19 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, i
         }
         html("</table>\n");
 
         if (pager) {
                 html("<div class='pager'>");
                 if (ofs > 0) {
-                        html("&nbsp;<a href='");
-                        html(cgit_pageurl(cgit_query_repo, cgit_query_page,
-                                          fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
-                        html("'>[prev]</a>&nbsp;");
+                        cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
+                                      cgit_query_sha1, cgit_query_path,
+                                      ofs - cnt);
+                        html("&nbsp;");
                 }
-
                 if ((commit = get_revision(&rev)) != NULL) {
-                        html("&nbsp;<a href='");
-                        html(cgit_pageurl(cgit_query_repo, "log",
-                                          fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
-                        html("'>[next]</a>&nbsp;");
+                        cgit_log_link("[next]", NULL, NULL, cgit_query_head,
+                                      cgit_query_sha1, cgit_query_path,
+                                      ofs + cnt);
                 }
                 html("</div>");
         }
 }
diff --git a/ui-repolist.c b/ui-repolist.c
index 2018dab..4c86543 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -41,38 +41,45 @@ static void print_modtime(struct repoinfo *repo)
                 return;
         cgit_print_age(s.st_mtime, -1, NULL);
 }
 
 void cgit_print_repolist(struct cacheitem *item)
 {
-        int i;
+        int i, columns = 4;
         char *last_group = NULL;
 
+        if (cgit_enable_index_links)
+                columns++;
+
         cgit_print_docstart(cgit_root_title, item);
         cgit_print_pageheader(cgit_root_title, 0);
 
         html("<table class='list nowrap'>");
         if (cgit_index_header) {
-                html("<tr class='nohover'><td colspan='5' class='include-block'>");
+                htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
+                      columns);
                 html_include(cgit_index_header);
                 html("</td></tr>");
         }
         html("<tr class='nohover'>"
              "<th class='left'>Name</th>"
              "<th class='left'>Description</th>"
              "<th class='left'>Owner</th>"
-             "<th class='left'>Idle</th>"
-             "<th>Links</th></tr>\n");
+             "<th class='left'>Idle</th>");
+        if (cgit_enable_index_links)
+                html("<th>Links</th>");
+        html("</tr>\n");
 
         for (i=0; i<cgit_repolist.count; i++) {
                 cgit_repo = &cgit_repolist.repos[i];
                 if ((last_group == NULL && cgit_repo->group != NULL) ||
                     (last_group != NULL && cgit_repo->group == NULL) ||
                     (last_group != NULL && cgit_repo->group != NULL &&
                      strcmp(cgit_repo->group, last_group))) {
-                        html("<tr class='nohover'><td colspan='4' class='repogroup'>");
+                        htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
+                              columns);
                         html_txt(cgit_repo->group);
                         html("</td></tr>");
                         last_group = cgit_repo->group;
                 }
                 htmlf("<tr><td class='%s'>",
                       cgit_repo->group ? "sublevel-repo" : "toplevel-repo");
@@ -82,17 +89,21 @@ void cgit_print_repolist(struct cacheitem *item)
                 html("</td><td>");
                 html_ntxt(cgit_max_repodesc_len, cgit_repo->desc);
                 html("</td><td>");
                 html_txt(cgit_repo->owner);
                 html("</td><td>");
                 print_modtime(cgit_repo);
-                html("</td><td>");
-                html_link_open(cgit_repourl(cgit_repo->url),
-                               "Summary", "button");
-                html("S</a>");
-                cgit_log_link("L", "Log", "button", NULL, NULL, NULL);
-                cgit_tree_link("F", "Files", "button", NULL, NULL, NULL);
-                html("</td></tr>\n");
+                html("</td>");
+                if (cgit_enable_index_links) {
+                        html("<td>");
+                        html_link_open(cgit_repourl(cgit_repo->url),
+                                       NULL, "button");
+                        html("summary</a>");
+                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 0);
+                        cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
+                        html("</td>");
+                }
+                html("</tr>\n");
         }
         html("</table>");
         cgit_print_docend();
 }
diff --git a/ui-shared.c b/ui-shared.c
index 110c696..d4376ce 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -108,26 +108,30 @@ static char *repolink(char *title, char *class, char *page, char *head,
                 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);
@@ -156,15 +160,31 @@ 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) {
@@ -276,25 +296,44 @@ void cgit_print_docend()
         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());
diff --git a/ui-summary.c b/ui-summary.c
index 03dd078..b4bc6d8 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -24,13 +24,13 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
         // object is not really parsed at this point, because of some fallout
         // from previous calls to git functions in cgit_print_log()
         commit->object.parsed = 0;
         if (commit && !parse_commit(commit)){
                 info = cgit_parse_commit(commit);
                 html("<tr><td>");
-                cgit_log_link(ref, NULL, NULL, ref, NULL, NULL);
+                cgit_log_link(ref, NULL, NULL, ref, NULL, NULL, 0);
                 html("</td><td>");
                 cgit_print_age(commit->date, -1, NULL);
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td><td>");
                 cgit_commit_link(info->subject, NULL, NULL, ref, NULL);
diff --git a/ui-tree.c b/ui-tree.c
index 1037c82..c5d64ff 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -89,14 +89,14 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                 cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
                                curr_rev, fullpath);
         }
         htmlf("</td><td class='ls-size'>%li</td>", size);
 
         html("<td>");
-        cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev,
-                      fullpath);
+        cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
+                      fullpath, 0);
         html("</td></tr>\n");
         free(name);
         return 0;
 }
 
 static void ls_head()