snapshot: strip bit from struct cgit_snapshot_format

[cgit.git] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c

index 07c78a517579650e0aa27c22228ebb46d54f6293..e8c0723c75fc84958c230b1eee3824382ca69f66 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -10,6 +10,7 @@
  #include "ui-shared.h"
  #include "cmd.h"
  #include "html.h"
+#include "version.h"
  
  static const char cgit_doctype[] =
  "<!DOCTYPE html>\n";
@@ -151,6 +152,14 @@ const char *cgit_repobasename(const char *reponame)
         return rvbuf;
  }
  
+const char *cgit_snapshot_prefix(const struct cgit_repo *repo)
+{
+       if (repo->snapshot_prefix)
+               return repo->snapshot_prefix;
+
+       return cgit_repobasename(repo->url);
+}
+
  static void site_url(const char *page, const char *search, const char *sort, int ofs, int always_root)
  {
         char *delim = "?";
@@ -545,7 +554,7 @@ void cgit_object_link(struct object *obj)
                 page = "tag";
         else
                 page = "blob";
-       name = fmt("%s %s...", typename(obj->type), shortrev);
+       name = fmt("%s %s...", type_name(obj->type), shortrev);
         reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
  }
  
@@ -785,8 +794,8 @@ void cgit_print_docend(void)
         if (ctx.cfg.footer)
                 html_include(ctx.cfg.footer);
         else {
-               htmlf("<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit %s</a> at ",
-                       cgit_version);
+               htmlf("<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit %s</a> "
+                       "(<a href='https://git-scm.com/'>git %s</a>) at ", cgit_version, git_version_string);
                 html_txt(show_date(time(NULL), 0, cgit_date_mode(DATE_ISO8601)));
                 html("</div>\n");
         }
@@ -1027,7 +1036,7 @@ void cgit_print_pageheader(void)
                 html_option("committer", "committer", ctx.qry.grep);
                 html_option("range", "range", ctx.qry.grep);
                 html("</select>\n");
-               html("<input class='txt' type='text' size='10' name='q' value='");
+               html("<input class='txt' type='search' size='10' name='q' value='");
                 html_attr(ctx.qry.search);
                 html("'/>\n");
                 html("<input type='submit' value='search'/>\n");
@@ -1042,7 +1051,7 @@ void cgit_print_pageheader(void)
                 html("<form method='get' action='");
                 html_attr(currenturl);
                 html("'>\n");
-               html("<input type='text' name='q' size='10' value='");
+               html("<input type='search' name='q' size='10' value='");
                 html_attr(ctx.qry.search);
                 html("'/>\n");
                 html("<input type='submit' value='search'/>\n");
@@ -1102,23 +1111,36 @@ void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base,
         strbuf_addf(filename, "%s-%s", base, ref);
  }
  
-void cgit_print_snapshot_links(const char *repo, const char *head,
-                              const char *hex, int snapshots)
+void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref,
+                              const char *separator)
  {
         const struct cgit_snapshot_format* f;
         struct strbuf filename = STRBUF_INIT;
+       const char *basename;
         size_t prefixlen;
  
-       cgit_compose_snapshot_prefix(&filename, cgit_repobasename(repo), hex);
+       basename = cgit_snapshot_prefix(repo);
+       if (starts_with(ref, basename))
+               strbuf_addstr(&filename, ref);
+       else
+               cgit_compose_snapshot_prefix(&filename, basename, ref);
+
         prefixlen = filename.len;
         for (f = cgit_snapshot_formats; f->suffix; f++) {
-               if (!(snapshots & f->bit))
+               if (!(repo->snapshots & cgit_snapshot_format_bit(f)))
                         continue;
                 strbuf_setlen(&filename, prefixlen);
                 strbuf_addstr(&filename, f->suffix);
                 cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL,
                                    filename.buf);
-               html("<br/>");
+               if (cgit_snapshot_get_sig(ref, f)) {
+                       strbuf_addstr(&filename, ".asc");
+                       html(" (");
+                       cgit_snapshot_link("sig", NULL, NULL, NULL, NULL,
+                                          filename.buf);
+                       html(")");
+               }
+               html(separator);
         }
         strbuf_release(&filename);
  }