summaryrefslogtreecommitdiffabout
path: root/ui-shared.c
Side-by-side diff
Diffstat (limited to 'ui-shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c67
1 files changed, 48 insertions, 19 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 4944dfd..60aa2e3 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -267,16 +267,22 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
html("id2=");
html_attr(old_rev);
}
html("'>");
html_txt(name);
html("</a>");
}
+void cgit_patch_link(char *name, char *title, char *class, char *head,
+ char *rev)
+{
+ reporevlink("patch", name, title, class, head, rev, NULL);
+}
+
void cgit_object_link(struct object *obj)
{
char *page, *arg, *url;
if (obj->type == OBJ_COMMIT) {
cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
cgit_query_head, sha1_to_hex(obj->sha1));
return;
@@ -351,38 +357,40 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
return;
}
htmlf("<span class='age-years'>%.0f years</span>",
secs * 1.0 / TM_YEAR);
}
void cgit_print_docstart(char *title, struct cacheitem *item)
{
- html("Content-Type: text/html; charset=utf-8\n");
+ html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
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");
html(cgit_doctype);
- html("<html>\n");
+ html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
html("<head>\n");
html("<title>");
html_txt(title);
html("</title>\n");
htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
+ if (cgit_robots && *cgit_robots)
+ htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);
html("<link rel='stylesheet' type='text/css' href='");
html_attr(cgit_css);
html("'/>\n");
html("</head>\n");
html("<body>\n");
}
void cgit_print_docend()
{
- html("</td>\n</tr>\n<table>\n</body>\n</html>\n");
+ html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
}
int print_branch_option(const char *refname, const unsigned char *sha1,
int flags, void *cb_data)
{
char *name = (char *)refname;
html_option(name, name, cgit_query_head);
return 0;
@@ -410,17 +418,17 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
return 0;
hashcpy(fileid, tag->tagged->sha1);
} else if (obj->type != OBJ_BLOB) {
return 0;
} else {
hashcpy(fileid, sha1);
}
if (!*header) {
- html("<p><h1>download</h1>");
+ html("<h1>download</h1>\n");
*header = 1;
}
url = cgit_pageurl(cgit_query_repo, "blob",
fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
buf));
html_link_open(url, NULL, "menu");
html_txt(strlpart(buf, 20));
html_link_close();
@@ -453,59 +461,80 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
html_hidden("q", cgit_query_search);
}
}
void cgit_print_pageheader(char *title, int show_search)
{
static const char *default_info = "This is cgit, a fast webinterface for git repositories";
int header = 0;
+ char *url;
- html("<div id='sidebar'>\n");
- html("<a href='");
+ html("<table id='layout' summary=''>\n");
+ html("<tr><td id='sidebar'>\n");
+ html("<table class='sidebar' cellspacing='0' summary=''>\n");
+ html("<tr><td class='sidebar'>\n<a href='");
html_attr(cgit_rooturl());
- htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n",
+ htmlf("'><img src='%s' alt='cgit'/></a>\n",
cgit_logo);
- html("<div class='infobox'>");
+ html("</td></tr>\n<tr><td class='sidebar'>\n");
if (cgit_query_repo) {
- html("<h1>");
+ html("<h1 class='first'>");
html_txt(strrpart(cgit_repo->name, 20));
html("</h1>\n");
html_txt(cgit_repo->desc);
if (cgit_repo->owner) {
- html("<p>\n<h1>owner</h1>\n");
+ html("<h1>owner</h1>\n");
html_txt(cgit_repo->owner);
}
- html("<p>\n<h1>navigate</h1>\n");
+ html("<h1>navigate</h1>\n");
reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
NULL, NULL);
cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,
0, NULL, NULL);
cgit_tree_link("tree", NULL, "menu", cgit_query_head,
cgit_query_sha1, NULL);
cgit_commit_link("commit", NULL, "menu", cgit_query_head,
cgit_query_sha1);
cgit_diff_link("diff", NULL, "menu", cgit_query_head,
cgit_query_sha1, cgit_query_sha2, NULL);
+ cgit_patch_link("patch", NULL, "menu", cgit_query_head,
+ cgit_query_sha1);
for_each_ref(print_archive_ref, &header);
- html("<p>\n<h1>branch</h1>\n");
+ if (cgit_repo->clone_url || cgit_clone_prefix) {
+ html("<h1>clone</h1>\n");
+ if (cgit_repo->clone_url)
+ url = cgit_repo->clone_url;
+ else
+ url = fmt("%s%s", cgit_clone_prefix,
+ cgit_repo->url);
+ html("<a class='menu' href='");
+ html_attr(url);
+ html("' title='");
+ html_attr(url);
+ html("'>\n");
+ html_txt(strrpart(url, 20));
+ html("</a>\n");
+ }
+
+ html("<h1>branch</h1>\n");
html("<form method='get' action=''>\n");
add_hidden_formfields(0, 1, cgit_query_page);
- html("<table class='grid'><tr><td id='branch-dropdown-cell'>");
+// html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
html("<select name='h' onchange='this.form.submit();'>\n");
for_each_branch_ref(print_branch_option, cgit_query_head);
html("</select>\n");
- html("</td><td>");
- html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n");
- html("</td></tr></table>");
+// html("</td><td>");
+ html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
+// html("</td></tr></table>");
html("</form>\n");
- html("<p>\n<h1>search</h1>\n");
+ html("<h1>search</h1>\n");
html("<form method='get' action='");
if (cgit_virtual_root)
html_attr(cgit_fileurl(cgit_query_repo, "log",
cgit_query_path, NULL));
html("'>\n");
add_hidden_formfields(1, 0, "log");
html("<select name='qt'>\n");
html_option("grep", "log msg", cgit_query_grep);
@@ -516,19 +545,19 @@ void cgit_print_pageheader(char *title, int show_search)
html_attr(cgit_query_search);
html("'/>\n");
html("</form>\n");
} else {
if (!cgit_index_info || html_include(cgit_index_info))
html(default_info);
}
- html("</div>\n");
+ html("</td></tr></table></td>\n");
- html("</div>\n<table class='grid'><tr><td id='content'>\n");
+ html("<td id='content'>\n");
}
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);