-rw-r--r-- | ui-shared.c | 67 |
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 | |||
@@ -274,2 +274,8 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
274 | 274 | ||
275 | void cgit_patch_link(char *name, char *title, char *class, char *head, | ||
276 | char *rev) | ||
277 | { | ||
278 | reporevlink("patch", name, title, class, head, rev, NULL); | ||
279 | } | ||
280 | |||
275 | void cgit_object_link(struct object *obj) | 281 | void cgit_object_link(struct object *obj) |
@@ -358,3 +364,3 @@ void cgit_print_docstart(char *title, struct cacheitem *item) | |||
358 | { | 364 | { |
359 | html("Content-Type: text/html; charset=utf-8\n"); | 365 | html("Content-Type: text/html; charset=" PAGE_ENCODING "\n"); |
360 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 366 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
@@ -364,3 +370,3 @@ void cgit_print_docstart(char *title, struct cacheitem *item) | |||
364 | html(cgit_doctype); | 370 | html(cgit_doctype); |
365 | html("<html>\n"); | 371 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
366 | html("<head>\n"); | 372 | html("<head>\n"); |
@@ -370,2 +376,4 @@ void cgit_print_docstart(char *title, struct cacheitem *item) | |||
370 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 376 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
377 | if (cgit_robots && *cgit_robots) | ||
378 | htmlf("<meta name='robots' content='%s'/>\n", cgit_robots); | ||
371 | html("<link rel='stylesheet' type='text/css' href='"); | 379 | html("<link rel='stylesheet' type='text/css' href='"); |
@@ -379,3 +387,3 @@ void cgit_print_docend() | |||
379 | { | 387 | { |
380 | html("</td>\n</tr>\n<table>\n</body>\n</html>\n"); | 388 | html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); |
381 | } | 389 | } |
@@ -417,3 +425,3 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
417 | if (!*header) { | 425 | if (!*header) { |
418 | html("<p><h1>download</h1>"); | 426 | html("<h1>download</h1>\n"); |
419 | *header = 1; | 427 | *header = 1; |
@@ -460,11 +468,14 @@ void cgit_print_pageheader(char *title, int show_search) | |||
460 | int header = 0; | 468 | int header = 0; |
469 | char *url; | ||
461 | 470 | ||
462 | html("<div id='sidebar'>\n"); | 471 | html("<table id='layout' summary=''>\n"); |
463 | html("<a href='"); | 472 | html("<tr><td id='sidebar'>\n"); |
473 | html("<table class='sidebar' cellspacing='0' summary=''>\n"); | ||
474 | html("<tr><td class='sidebar'>\n<a href='"); | ||
464 | html_attr(cgit_rooturl()); | 475 | html_attr(cgit_rooturl()); |
465 | htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n", | 476 | htmlf("'><img src='%s' alt='cgit'/></a>\n", |
466 | cgit_logo); | 477 | cgit_logo); |
467 | html("<div class='infobox'>"); | 478 | html("</td></tr>\n<tr><td class='sidebar'>\n"); |
468 | if (cgit_query_repo) { | 479 | if (cgit_query_repo) { |
469 | html("<h1>"); | 480 | html("<h1 class='first'>"); |
470 | html_txt(strrpart(cgit_repo->name, 20)); | 481 | html_txt(strrpart(cgit_repo->name, 20)); |
@@ -473,6 +484,6 @@ void cgit_print_pageheader(char *title, int show_search) | |||
473 | if (cgit_repo->owner) { | 484 | if (cgit_repo->owner) { |
474 | html("<p>\n<h1>owner</h1>\n"); | 485 | html("<h1>owner</h1>\n"); |
475 | html_txt(cgit_repo->owner); | 486 | html_txt(cgit_repo->owner); |
476 | } | 487 | } |
477 | html("<p>\n<h1>navigate</h1>\n"); | 488 | html("<h1>navigate</h1>\n"); |
478 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, | 489 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, |
@@ -487,2 +498,4 @@ void cgit_print_pageheader(char *title, int show_search) | |||
487 | cgit_query_sha1, cgit_query_sha2, NULL); | 498 | cgit_query_sha1, cgit_query_sha2, NULL); |
499 | cgit_patch_link("patch", NULL, "menu", cgit_query_head, | ||
500 | cgit_query_sha1); | ||
488 | 501 | ||
@@ -490,6 +503,22 @@ void cgit_print_pageheader(char *title, int show_search) | |||
490 | 503 | ||
491 | html("<p>\n<h1>branch</h1>\n"); | 504 | if (cgit_repo->clone_url || cgit_clone_prefix) { |
505 | html("<h1>clone</h1>\n"); | ||
506 | if (cgit_repo->clone_url) | ||
507 | url = cgit_repo->clone_url; | ||
508 | else | ||
509 | url = fmt("%s%s", cgit_clone_prefix, | ||
510 | cgit_repo->url); | ||
511 | html("<a class='menu' href='"); | ||
512 | html_attr(url); | ||
513 | html("' title='"); | ||
514 | html_attr(url); | ||
515 | html("'>\n"); | ||
516 | html_txt(strrpart(url, 20)); | ||
517 | html("</a>\n"); | ||
518 | } | ||
519 | |||
520 | html("<h1>branch</h1>\n"); | ||
492 | html("<form method='get' action=''>\n"); | 521 | html("<form method='get' action=''>\n"); |
493 | add_hidden_formfields(0, 1, cgit_query_page); | 522 | add_hidden_formfields(0, 1, cgit_query_page); |
494 | html("<table class='grid'><tr><td id='branch-dropdown-cell'>"); | 523 | // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); |
495 | html("<select name='h' onchange='this.form.submit();'>\n"); | 524 | html("<select name='h' onchange='this.form.submit();'>\n"); |
@@ -497,8 +526,8 @@ void cgit_print_pageheader(char *title, int show_search) | |||
497 | html("</select>\n"); | 526 | html("</select>\n"); |
498 | html("</td><td>"); | 527 | // html("</td><td>"); |
499 | html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n"); | 528 | html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n"); |
500 | html("</td></tr></table>"); | 529 | // html("</td></tr></table>"); |
501 | html("</form>\n"); | 530 | html("</form>\n"); |
502 | 531 | ||
503 | html("<p>\n<h1>search</h1>\n"); | 532 | html("<h1>search</h1>\n"); |
504 | html("<form method='get' action='"); | 533 | html("<form method='get' action='"); |
@@ -523,5 +552,5 @@ void cgit_print_pageheader(char *title, int show_search) | |||
523 | 552 | ||
524 | html("</div>\n"); | 553 | html("</td></tr></table></td>\n"); |
525 | 554 | ||
526 | html("</div>\n<table class='grid'><tr><td id='content'>\n"); | 555 | html("<td id='content'>\n"); |
527 | } | 556 | } |