cgit.css: try to make diffs look a little bit nicer

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index bebd3e01b9ad7af2748788cf3a0f919bc4c5e73b..bca50aa311dafc6a24c5069a7c551f31118325cd 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -40,6 +40,14 @@ void cgit_print_error(char *msg)
        html("</div>\n");
 }
 
+char *cgit_rooturl()
+{
+       if (cgit_virtual_root)
+               return fmt("%s/", cgit_virtual_root);
+       else
+               return "./cgit.cgi";
+}
+
 char *cgit_repourl(const char *reponame)
 {
        if (cgit_virtual_root) {
@@ -107,19 +115,39 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
 
 void cgit_print_docend()
 {
+       html("</td></tr></table>");
        html("</body>\n</html>\n");
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
-       html("<div id='header'>");
-       htmlf("<a href='%s'>", cgit_logo_link);
-       htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
-       htmlf("</a>");
+       html("<table id='layout'>");
+       html("<tr><td id='header'>");
+       html(cgit_root_title);
+       html("</td><td id='logo'>");
+       html("<a href='");
+       html_attr(cgit_logo_link);
+       htmlf("'><img src='%s'/></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("</td>");
+       html("<td id='search'>");
        if (show_search) {
                html("<form method='get' href='");
                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)
@@ -130,10 +158,17 @@ void cgit_print_pageheader(char *title, int show_search)
                html_attr(cgit_query_search);
                html("'/></form>");
        }
-       if (cgit_query_repo)
-               htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));
-       html_txt(title);
-       if (cgit_query_repo)
-               html("</a>");
-       html("</div>");
+       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);
+       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");
 }