ui-tree: link to plain view instead of blob view

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

index 8a00099fdf10bc9871742c6eb561ab450c83a2b6..a2e0dd2b77c97efa2dbd43df4aed7ef2eae6e2a7 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -243,6 +243,12 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
         reporevlink("tree", name, title, class, head, rev, path);
  }
  
+void cgit_plain_link(char *name, char *title, char *class, char *head,
+                    char *rev, char *path)
+{
+       reporevlink("plain", name, title, class, head, rev, path);
+}
+
  void cgit_log_link(char *name, char *title, char *class, char *head,
                    char *rev, char *path, int ofs, char *grep, char *pattern)
  {
@@ -353,14 +359,17 @@ void cgit_object_link(struct object *obj)
         html_link_close();
  }
  
-void cgit_print_date(time_t secs, char *format)
+void cgit_print_date(time_t secs, char *format, int local_time)
  {
         char buf[64];
         struct tm *time;
  
         if (!secs)
                 return;
-       time = gmtime(&secs);
+       if(local_time)
+               time = localtime(&secs);
+       else
+               time = gmtime(&secs);
         strftime(buf, sizeof(buf)-1, format, time);
         html_txt(buf);
  }
@@ -375,7 +384,7 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
         secs = now - t;
  
         if (secs > max_relative && max_relative >= 0) {
-               cgit_print_date(t, format);
+               cgit_print_date(t, format, ctx.cfg.local_time);
                 return;
         }
  
@@ -415,6 +424,8 @@ void cgit_print_http_headers(struct cgit_context *ctx)
                       ctx->page.charset);
         else if (ctx->page.mimetype)
                 htmlf("Content-Type: %s\n", ctx->page.mimetype);
+       if (ctx->page.size)
+               htmlf("Content-Length: %ld\n", ctx->page.size);
         if (ctx->page.filename)
                 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                       ctx->page.filename);
@@ -437,6 +448,11 @@ void cgit_print_docstart(struct cgit_context *ctx)
         html("<link rel='stylesheet' type='text/css' href='");
         html_attr(ctx->cfg.css);
         html("'/>\n");
+       if (ctx->cfg.favicon) {
+               html("<link rel='shortcut icon' href='");
+               html_attr(ctx->cfg.favicon);
+               html("'/>\n");
+       }
         html("</head>\n");
         html("<body>\n");
  }
@@ -448,7 +464,7 @@ void cgit_print_docend()
                 html_include(ctx.cfg.footer);
         else {
                 html("<div class='footer'>generated ");
-               cgit_print_date(time(NULL), FMT_LONGDATE);
+               cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                 htmlf(" by cgit %s", cgit_version);
                 html("</div>\n");
         }
@@ -513,7 +529,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                 html_hidden("url", url);
         }
  
-       if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
+       if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
+           strcmp(ctx.qry.head, ctx.repo->defbranch))
                 html_hidden("h", ctx.qry.head);
  
         if (ctx.qry.sha1)
@@ -567,12 +584,12 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 html_txt(ctx->cfg.root_title);
         html("</td></tr>\n");
  
-       html("<tr><td class='sub'");
+       html("<tr><td class='sub'>");
         if (ctx->repo) {
-               html(" colspan='2'>");
                 html_txt(ctx->repo->desc);
+               html("</td><td class='sub right'>");
+               html_txt(ctx->repo->owner);
         } else {
-               html(">");
                 if (ctx->cfg.root_desc)
                         html_txt(ctx->cfg.root_desc);
                 else if (ctx->cfg.index_info)