Add link to index page from repo header, remove page name

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 73e3d4cc81f2216bc2c9edaa495057ab8b0e6034..cd9838732be5f5f34e2c3fba3c4ac900486333dc 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -114,6 +114,60 @@ char *cgit_currurl()
                return fmt("%s/", ctx.cfg.virtual_root);
 }
 
+static void site_url(char *page, char *search, int ofs)
+{
+       char *delim = "?";
+
+       if (ctx.cfg.virtual_root) {
+               html_attr(ctx.cfg.virtual_root);
+               if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
+                       html("/");
+       } else
+               html(ctx.cfg.script_name);
+
+       if (page) {
+               htmlf("?p=%s", page);
+               delim = "&";
+       }
+       if (search) {
+               html(delim);
+               html("q=");
+               html_attr(search);
+               delim = "&";
+       }
+       if (ofs) {
+               html(delim);
+               htmlf("ofs=%d", ofs);
+       }
+}
+
+static void site_link(char *page, char *name, char *title, char *class,
+                     char *search, int ofs)
+{
+       html("<a");
+       if (title) {
+               html(" title='");
+               html_attr(title);
+               html("'");
+       }
+       if (class) {
+               html(" class='");
+               html_attr(class);
+               html("'");
+       }
+       html(" href='");
+       site_url(page, search, ofs);
+       html("'>");
+       html_txt(name);
+       html("</a>");
+}
+
+void cgit_index_link(char *name, char *title, char *class, char *pattern,
+                    int ofs)
+{
+       site_link(NULL, name, title, class, pattern, ofs);
+}
+
 static char *repolink(char *title, char *class, char *page, char *head,
                      char *path)
 {
@@ -389,7 +443,10 @@ void cgit_print_docstart(struct cgit_context *ctx)
 
 void cgit_print_docend()
 {
-       html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
+       html("</div><div class='footer'>generated ");
+       cgit_print_date(time(NULL), FMT_LONGDATE);
+       htmlf(" by cgit %s", cgit_version);
+       html("</div>\n</body>\n</html>\n");
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
@@ -484,23 +541,38 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html_attr(cgit_rooturl());
        html("'><img src='");
        html_attr(ctx->cfg.logo);
-       html("'/></a></td>\n");
+       html("' alt='cgit logo'/></a></td>\n");
+
        html("<td class='main'>");
        if (ctx->repo) {
-               html("<a href='");
-               html_attr(cgit_rooturl());
-               html("'>index</a> / ");
-               html_txt(ctx->repo->name);
+               cgit_index_link("index", NULL, NULL, NULL, 0);
+               html(" : ");
+               reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
+                           ctx->qry.head, NULL, NULL);
+               html("</td><td class='form'>");
+               html("<form method='get' action=''>\n");
+               add_hidden_formfields(0, 1, ctx->qry.page);
+               html("<select name='h' onchange='this.form.submit();'>\n");
+               for_each_branch_ref(print_branch_option, ctx->qry.head);
+               html("</select> ");
+               html("<input type='submit' name='' value='switch'/>");
+               html("</form>");
        } else
                html_txt(ctx->cfg.root_title);
        html("</td></tr>\n");
-       html("<tr><td class='sub'>");
-       if (ctx->repo)
+
+       html("<tr><td class='sub'");
+       if (ctx->repo) {
+               html(" colspan='2'>");
                html_txt(ctx->repo->desc);
-       else
-               html_txt(ctx->cfg.index_info);
-       html("</td></tr>\n");
-       html("</table>\n");
+       } else {
+               html(">");
+               if (ctx->cfg.root_desc)
+                       html_txt(ctx->cfg.root_desc);
+               else if (ctx->cfg.index_info)
+                       html_include(ctx->cfg.index_info);
+       }
+       html("</td></tr></table>\n");
 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
@@ -516,19 +588,41 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                                 ctx->qry.head, ctx->qry.sha1);
                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
                               ctx->qry.sha1, ctx->qry.sha2, NULL);
-               cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
-                               ctx->qry.sha1);
-               html("</td><td class='branch'>");
-               html("<form method='get' action=''>\n");
-               add_hidden_formfields(0, 1, ctx->qry.page);
-               html("<select name='h' onchange='this.form.submit();'>\n");
-               for_each_branch_ref(print_branch_option, ctx->qry.head);
-               html("</select> ");
-               html("<input type='submit' name='' value='switch'/>");
+               if (ctx->repo->readme)
+                       reporevlink("about", "about", NULL,
+                                   hc(cmd, "about"), ctx->qry.head, NULL,
+                                   NULL);
+               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("'>\n");
+               add_hidden_formfields(1, 0, "log");
+               html("<select name='qt'>\n");
+               html_option("grep", "log msg", ctx->qry.grep);
+               html_option("author", "author", ctx->qry.grep);
+               html_option("committer", "committer", ctx->qry.grep);
+               html("</select>\n");
+               html("<input class='txt' type='text' size='10' name='q' value='");
+               html_attr(ctx->qry.search);
+               html("'/>\n");
+               html("<input type='submit' value='search'/>\n");
+               html("</form>\n");
        } else {
-               html("<a class='active' href='");
+               site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
+               if (ctx->cfg.root_readme)
+                       site_link("about", "about", NULL, hc(cmd, "about"),
+                                 NULL, 0);
+               html("</td><td class='form'>");
+               html("<form method='get' action='");
                html_attr(cgit_rooturl());
-               html("'>index</a>\n");
+               html("'>\n");
+               html("<input type='text' name='q' size='10' value='");
+               html_attr(ctx->qry.search);
+               html("'/>\n");
+               html("<input type='submit' value='search'/>\n");
+               html("</form>");
        }
        html("</td></tr></table>\n");
        html("<div class='content'>");