author | Lars Hjemli <hjemli@gmail.com> | 2007-12-03 00:49:38 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-12-03 00:49:38 (UTC) |
commit | afcdd083dab81afef744e261d81a452698188c30 (patch) (unidiff) | |
tree | 0ca43a6b87567af70c802a25124702c7c7891c9a /ui-shared.c | |
parent | dabb34af760eff2a6ab8e14927fd173cafb77547 (diff) | |
download | cgit-afcdd083dab81afef744e261d81a452698188c30.zip cgit-afcdd083dab81afef744e261d81a452698188c30.tar.gz cgit-afcdd083dab81afef744e261d81a452698188c30.tar.bz2 |
Add support for automatic and custom clone urls
This adds support for two new parameters to cgitrc: clone-prefix and
repo.clone-url.
If clone-prefix is specified, all repos will get a clone url printed in the
sidebar; the url is generated by clone-prefix + repo.url.
Additionally, each repo can specify repo.clone-url which will override any
such auto-generated url.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index 3e13c86..ece041c 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -415,128 +415,145 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
415 | return 0; | 415 | return 0; |
416 | } else { | 416 | } else { |
417 | hashcpy(fileid, sha1); | 417 | hashcpy(fileid, sha1); |
418 | } | 418 | } |
419 | if (!*header) { | 419 | if (!*header) { |
420 | html("<h1>download</h1>\n"); | 420 | html("<h1>download</h1>\n"); |
421 | *header = 1; | 421 | *header = 1; |
422 | } | 422 | } |
423 | url = cgit_pageurl(cgit_query_repo, "blob", | 423 | url = cgit_pageurl(cgit_query_repo, "blob", |
424 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 424 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
425 | buf)); | 425 | buf)); |
426 | html_link_open(url, NULL, "menu"); | 426 | html_link_open(url, NULL, "menu"); |
427 | html_txt(strlpart(buf, 20)); | 427 | html_txt(strlpart(buf, 20)); |
428 | html_link_close(); | 428 | html_link_close(); |
429 | return 0; | 429 | return 0; |
430 | } | 430 | } |
431 | 431 | ||
432 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 432 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
433 | { | 433 | { |
434 | char *url; | 434 | char *url; |
435 | 435 | ||
436 | if (!cgit_virtual_root) { | 436 | if (!cgit_virtual_root) { |
437 | url = fmt("%s/%s", cgit_query_repo, page); | 437 | url = fmt("%s/%s", cgit_query_repo, page); |
438 | if (cgit_query_path) | 438 | if (cgit_query_path) |
439 | url = fmt("%s/%s", url, cgit_query_path); | 439 | url = fmt("%s/%s", url, cgit_query_path); |
440 | html_hidden("url", url); | 440 | html_hidden("url", url); |
441 | } | 441 | } |
442 | 442 | ||
443 | if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch)) | 443 | if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch)) |
444 | html_hidden("h", cgit_query_head); | 444 | html_hidden("h", cgit_query_head); |
445 | 445 | ||
446 | if (cgit_query_sha1) | 446 | if (cgit_query_sha1) |
447 | html_hidden("id", cgit_query_sha1); | 447 | html_hidden("id", cgit_query_sha1); |
448 | if (cgit_query_sha2) | 448 | if (cgit_query_sha2) |
449 | html_hidden("id2", cgit_query_sha2); | 449 | html_hidden("id2", cgit_query_sha2); |
450 | 450 | ||
451 | if (incl_search) { | 451 | if (incl_search) { |
452 | if (cgit_query_grep) | 452 | if (cgit_query_grep) |
453 | html_hidden("qt", cgit_query_grep); | 453 | html_hidden("qt", cgit_query_grep); |
454 | if (cgit_query_search) | 454 | if (cgit_query_search) |
455 | html_hidden("q", cgit_query_search); | 455 | html_hidden("q", cgit_query_search); |
456 | } | 456 | } |
457 | } | 457 | } |
458 | 458 | ||
459 | void cgit_print_pageheader(char *title, int show_search) | 459 | void cgit_print_pageheader(char *title, int show_search) |
460 | { | 460 | { |
461 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; | 461 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; |
462 | int header = 0; | 462 | int header = 0; |
463 | char *url; | ||
463 | 464 | ||
464 | html("<table id='layout' summary=''>\n"); | 465 | html("<table id='layout' summary=''>\n"); |
465 | html("<tr><td id='sidebar'>\n"); | 466 | html("<tr><td id='sidebar'>\n"); |
466 | html("<table class='sidebar' cellspacing='0' summary=''>\n"); | 467 | html("<table class='sidebar' cellspacing='0' summary=''>\n"); |
467 | html("<tr><td class='sidebar'>\n<a href='"); | 468 | html("<tr><td class='sidebar'>\n<a href='"); |
468 | html_attr(cgit_rooturl()); | 469 | html_attr(cgit_rooturl()); |
469 | htmlf("'><img src='%s' alt='cgit'/></a>\n", | 470 | htmlf("'><img src='%s' alt='cgit'/></a>\n", |
470 | cgit_logo); | 471 | cgit_logo); |
471 | html("</td></tr>\n<tr><td class='sidebar'>\n"); | 472 | html("</td></tr>\n<tr><td class='sidebar'>\n"); |
472 | if (cgit_query_repo) { | 473 | if (cgit_query_repo) { |
473 | html("<h1 class='first'>"); | 474 | html("<h1 class='first'>"); |
474 | html_txt(strrpart(cgit_repo->name, 20)); | 475 | html_txt(strrpart(cgit_repo->name, 20)); |
475 | html("</h1>\n"); | 476 | html("</h1>\n"); |
476 | html_txt(cgit_repo->desc); | 477 | html_txt(cgit_repo->desc); |
477 | if (cgit_repo->owner) { | 478 | if (cgit_repo->owner) { |
478 | html("<h1>owner</h1>\n"); | 479 | html("<h1>owner</h1>\n"); |
479 | html_txt(cgit_repo->owner); | 480 | html_txt(cgit_repo->owner); |
480 | } | 481 | } |
481 | html("<h1>navigate</h1>\n"); | 482 | html("<h1>navigate</h1>\n"); |
482 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, | 483 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, |
483 | NULL, NULL); | 484 | NULL, NULL); |
484 | cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, | 485 | cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, |
485 | 0, NULL, NULL); | 486 | 0, NULL, NULL); |
486 | cgit_tree_link("tree", NULL, "menu", cgit_query_head, | 487 | cgit_tree_link("tree", NULL, "menu", cgit_query_head, |
487 | cgit_query_sha1, NULL); | 488 | cgit_query_sha1, NULL); |
488 | cgit_commit_link("commit", NULL, "menu", cgit_query_head, | 489 | cgit_commit_link("commit", NULL, "menu", cgit_query_head, |
489 | cgit_query_sha1); | 490 | cgit_query_sha1); |
490 | cgit_diff_link("diff", NULL, "menu", cgit_query_head, | 491 | cgit_diff_link("diff", NULL, "menu", cgit_query_head, |
491 | cgit_query_sha1, cgit_query_sha2, NULL); | 492 | cgit_query_sha1, cgit_query_sha2, NULL); |
492 | 493 | ||
493 | for_each_ref(print_archive_ref, &header); | 494 | for_each_ref(print_archive_ref, &header); |
494 | 495 | ||
496 | if (cgit_repo->clone_url || cgit_clone_prefix) { | ||
497 | html("<h1>clone</h1>\n"); | ||
498 | if (cgit_repo->clone_url) | ||
499 | url = cgit_repo->clone_url; | ||
500 | else | ||
501 | url = fmt("%s%s", cgit_clone_prefix, | ||
502 | cgit_repo->url); | ||
503 | html("<a class='menu' href='"); | ||
504 | html_attr(url); | ||
505 | html("' title='"); | ||
506 | html_attr(url); | ||
507 | html("'>\n"); | ||
508 | html_txt(strrpart(url, 20)); | ||
509 | html("</a>\n"); | ||
510 | } | ||
511 | |||
495 | html("<h1>branch</h1>\n"); | 512 | html("<h1>branch</h1>\n"); |
496 | html("<form method='get' action=''>\n"); | 513 | html("<form method='get' action=''>\n"); |
497 | add_hidden_formfields(0, 1, cgit_query_page); | 514 | add_hidden_formfields(0, 1, cgit_query_page); |
498 | // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); | 515 | // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); |
499 | html("<select name='h' onchange='this.form.submit();'>\n"); | 516 | html("<select name='h' onchange='this.form.submit();'>\n"); |
500 | for_each_branch_ref(print_branch_option, cgit_query_head); | 517 | for_each_branch_ref(print_branch_option, cgit_query_head); |
501 | html("</select>\n"); | 518 | html("</select>\n"); |
502 | // html("</td><td>"); | 519 | // html("</td><td>"); |
503 | html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n"); | 520 | html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n"); |
504 | // html("</td></tr></table>"); | 521 | // html("</td></tr></table>"); |
505 | html("</form>\n"); | 522 | html("</form>\n"); |
506 | 523 | ||
507 | html("<h1>search</h1>\n"); | 524 | html("<h1>search</h1>\n"); |
508 | html("<form method='get' action='"); | 525 | html("<form method='get' action='"); |
509 | if (cgit_virtual_root) | 526 | if (cgit_virtual_root) |
510 | html_attr(cgit_fileurl(cgit_query_repo, "log", | 527 | html_attr(cgit_fileurl(cgit_query_repo, "log", |
511 | cgit_query_path, NULL)); | 528 | cgit_query_path, NULL)); |
512 | html("'>\n"); | 529 | html("'>\n"); |
513 | add_hidden_formfields(1, 0, "log"); | 530 | add_hidden_formfields(1, 0, "log"); |
514 | html("<select name='qt'>\n"); | 531 | html("<select name='qt'>\n"); |
515 | html_option("grep", "log msg", cgit_query_grep); | 532 | html_option("grep", "log msg", cgit_query_grep); |
516 | html_option("author", "author", cgit_query_grep); | 533 | html_option("author", "author", cgit_query_grep); |
517 | html_option("committer", "committer", cgit_query_grep); | 534 | html_option("committer", "committer", cgit_query_grep); |
518 | html("</select>\n"); | 535 | html("</select>\n"); |
519 | html("<input class='txt' type='text' name='q' value='"); | 536 | html("<input class='txt' type='text' name='q' value='"); |
520 | html_attr(cgit_query_search); | 537 | html_attr(cgit_query_search); |
521 | html("'/>\n"); | 538 | html("'/>\n"); |
522 | html("</form>\n"); | 539 | html("</form>\n"); |
523 | } else { | 540 | } else { |
524 | if (!cgit_index_info || html_include(cgit_index_info)) | 541 | if (!cgit_index_info || html_include(cgit_index_info)) |
525 | html(default_info); | 542 | html(default_info); |
526 | } | 543 | } |
527 | 544 | ||
528 | html("</td></tr></table></td>\n"); | 545 | html("</td></tr></table></td>\n"); |
529 | 546 | ||
530 | html("<td id='content'>\n"); | 547 | html("<td id='content'>\n"); |
531 | } | 548 | } |
532 | 549 | ||
533 | 550 | ||
534 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, | 551 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, |
535 | struct cacheitem *item) | 552 | struct cacheitem *item) |
536 | { | 553 | { |
537 | htmlf("Content-Type: %s\n", mimetype); | 554 | htmlf("Content-Type: %s\n", mimetype); |
538 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); | 555 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); |
539 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 556 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
540 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 557 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
541 | ttl_seconds(item->ttl))); | 558 | ttl_seconds(item->ttl))); |
542 | html("\n"); | 559 | html("\n"); |