summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-12-07 12:34:16 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-07 12:34:16 (UTC)
commiteaf2d25c162534efe7566119cf4b1cbeab217b51 (patch) (unidiff)
treefd1c43be26c2e6fdcc85fc851b85b52492ddb271
parentfb2f3f6c29bad733723152893c5246a756e4cada (diff)
downloadcgit-eaf2d25c162534efe7566119cf4b1cbeab217b51.zip
cgit-eaf2d25c162534efe7566119cf4b1cbeab217b51.tar.gz
cgit-eaf2d25c162534efe7566119cf4b1cbeab217b51.tar.bz2
ui-shared: add and use cgit_stats_link()
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c10
-rw-r--r--ui-shared.h2
2 files changed, 10 insertions, 2 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 97b9d46..a5eb25f 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -302,128 +302,134 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
302 html_url_arg(pattern); 302 html_url_arg(pattern);
303 } 303 }
304 if (ofs > 0) { 304 if (ofs > 0) {
305 html(delim); 305 html(delim);
306 html("ofs="); 306 html("ofs=");
307 htmlf("%d", ofs); 307 htmlf("%d", ofs);
308 } 308 }
309 html("'>"); 309 html("'>");
310 html_txt(name); 310 html_txt(name);
311 html("</a>"); 311 html("</a>");
312} 312}
313 313
314void cgit_commit_link(char *name, char *title, char *class, char *head, 314void cgit_commit_link(char *name, char *title, char *class, char *head,
315 char *rev) 315 char *rev)
316{ 316{
317 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { 317 if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
318 name[ctx.cfg.max_msg_len] = '\0'; 318 name[ctx.cfg.max_msg_len] = '\0';
319 name[ctx.cfg.max_msg_len - 1] = '.'; 319 name[ctx.cfg.max_msg_len - 1] = '.';
320 name[ctx.cfg.max_msg_len - 2] = '.'; 320 name[ctx.cfg.max_msg_len - 2] = '.';
321 name[ctx.cfg.max_msg_len - 3] = '.'; 321 name[ctx.cfg.max_msg_len - 3] = '.';
322 } 322 }
323 reporevlink("commit", name, title, class, head, rev, NULL); 323 reporevlink("commit", name, title, class, head, rev, NULL);
324} 324}
325 325
326void cgit_refs_link(char *name, char *title, char *class, char *head, 326void cgit_refs_link(char *name, char *title, char *class, char *head,
327 char *rev, char *path) 327 char *rev, char *path)
328{ 328{
329 reporevlink("refs", name, title, class, head, rev, path); 329 reporevlink("refs", name, title, class, head, rev, path);
330} 330}
331 331
332void cgit_snapshot_link(char *name, char *title, char *class, char *head, 332void cgit_snapshot_link(char *name, char *title, char *class, char *head,
333 char *rev, char *archivename) 333 char *rev, char *archivename)
334{ 334{
335 reporevlink("snapshot", name, title, class, head, rev, archivename); 335 reporevlink("snapshot", name, title, class, head, rev, archivename);
336} 336}
337 337
338void cgit_diff_link(char *name, char *title, char *class, char *head, 338void cgit_diff_link(char *name, char *title, char *class, char *head,
339 char *new_rev, char *old_rev, char *path) 339 char *new_rev, char *old_rev, char *path)
340{ 340{
341 char *delim; 341 char *delim;
342 342
343 delim = repolink(title, class, "diff", head, path); 343 delim = repolink(title, class, "diff", head, path);
344 if (new_rev && strcmp(new_rev, ctx.qry.head)) { 344 if (new_rev && strcmp(new_rev, ctx.qry.head)) {
345 html(delim); 345 html(delim);
346 html("id="); 346 html("id=");
347 html_url_arg(new_rev); 347 html_url_arg(new_rev);
348 delim = "&amp;"; 348 delim = "&amp;";
349 } 349 }
350 if (old_rev) { 350 if (old_rev) {
351 html(delim); 351 html(delim);
352 html("id2="); 352 html("id2=");
353 html_url_arg(old_rev); 353 html_url_arg(old_rev);
354 } 354 }
355 html("'>"); 355 html("'>");
356 html_txt(name); 356 html_txt(name);
357 html("</a>"); 357 html("</a>");
358} 358}
359 359
360void cgit_patch_link(char *name, char *title, char *class, char *head, 360void cgit_patch_link(char *name, char *title, char *class, char *head,
361 char *rev) 361 char *rev)
362{ 362{
363 reporevlink("patch", name, title, class, head, rev, NULL); 363 reporevlink("patch", name, title, class, head, rev, NULL);
364} 364}
365 365
366void cgit_stats_link(char *name, char *title, char *class, char *head,
367 char *path)
368{
369 reporevlink("stats", name, title, class, head, NULL, path);
370}
371
366void cgit_object_link(struct object *obj) 372void cgit_object_link(struct object *obj)
367{ 373{
368 char *page, *rev, *name; 374 char *page, *rev, *name;
369 375
370 if (obj->type == OBJ_COMMIT) { 376 if (obj->type == OBJ_COMMIT) {
371 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, 377 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
372 ctx.qry.head, sha1_to_hex(obj->sha1)); 378 ctx.qry.head, sha1_to_hex(obj->sha1));
373 return; 379 return;
374 } else if (obj->type == OBJ_TREE) 380 } else if (obj->type == OBJ_TREE)
375 page = "tree"; 381 page = "tree";
376 else if (obj->type == OBJ_TAG) 382 else if (obj->type == OBJ_TAG)
377 page = "tag"; 383 page = "tag";
378 else 384 else
379 page = "blob"; 385 page = "blob";
380 rev = sha1_to_hex(obj->sha1); 386 rev = sha1_to_hex(obj->sha1);
381 name = fmt("%s %s", typename(obj->type), rev); 387 name = fmt("%s %s", typename(obj->type), rev);
382 reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL); 388 reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL);
383} 389}
384 390
385void cgit_print_date(time_t secs, char *format, int local_time) 391void cgit_print_date(time_t secs, char *format, int local_time)
386{ 392{
387 char buf[64]; 393 char buf[64];
388 struct tm *time; 394 struct tm *time;
389 395
390 if (!secs) 396 if (!secs)
391 return; 397 return;
392 if(local_time) 398 if(local_time)
393 time = localtime(&secs); 399 time = localtime(&secs);
394 else 400 else
395 time = gmtime(&secs); 401 time = gmtime(&secs);
396 strftime(buf, sizeof(buf)-1, format, time); 402 strftime(buf, sizeof(buf)-1, format, time);
397 html_txt(buf); 403 html_txt(buf);
398} 404}
399 405
400void cgit_print_age(time_t t, time_t max_relative, char *format) 406void cgit_print_age(time_t t, time_t max_relative, char *format)
401{ 407{
402 time_t now, secs; 408 time_t now, secs;
403 409
404 if (!t) 410 if (!t)
405 return; 411 return;
406 time(&now); 412 time(&now);
407 secs = now - t; 413 secs = now - t;
408 414
409 if (secs > max_relative && max_relative >= 0) { 415 if (secs > max_relative && max_relative >= 0) {
410 cgit_print_date(t, format, ctx.cfg.local_time); 416 cgit_print_date(t, format, ctx.cfg.local_time);
411 return; 417 return;
412 } 418 }
413 419
414 if (secs < TM_HOUR * 2) { 420 if (secs < TM_HOUR * 2) {
415 htmlf("<span class='age-mins'>%.0f min.</span>", 421 htmlf("<span class='age-mins'>%.0f min.</span>",
416 secs * 1.0 / TM_MIN); 422 secs * 1.0 / TM_MIN);
417 return; 423 return;
418 } 424 }
419 if (secs < TM_DAY * 2) { 425 if (secs < TM_DAY * 2) {
420 htmlf("<span class='age-hours'>%.0f hours</span>", 426 htmlf("<span class='age-hours'>%.0f hours</span>",
421 secs * 1.0 / TM_HOUR); 427 secs * 1.0 / TM_HOUR);
422 return; 428 return;
423 } 429 }
424 if (secs < TM_WEEK * 2) { 430 if (secs < TM_WEEK * 2) {
425 htmlf("<span class='age-days'>%.0f days</span>", 431 htmlf("<span class='age-days'>%.0f days</span>",
426 secs * 1.0 / TM_DAY); 432 secs * 1.0 / TM_DAY);
427 return; 433 return;
428 } 434 }
429 if (secs < TM_MONTH * 2) { 435 if (secs < TM_MONTH * 2) {
@@ -581,130 +587,130 @@ char *hc(struct cgit_cmd *cmd, const char *page)
581{ 587{
582 return (strcmp(cmd->name, page) ? NULL : "active"); 588 return (strcmp(cmd->name, page) ? NULL : "active");
583} 589}
584 590
585void cgit_print_pageheader(struct cgit_context *ctx) 591void cgit_print_pageheader(struct cgit_context *ctx)
586{ 592{
587 struct cgit_cmd *cmd = cgit_get_cmd(ctx); 593 struct cgit_cmd *cmd = cgit_get_cmd(ctx);
588 594
589 html("<table id='header'>\n"); 595 html("<table id='header'>\n");
590 html("<tr>\n"); 596 html("<tr>\n");
591 html("<td class='logo' rowspan='2'><a href='"); 597 html("<td class='logo' rowspan='2'><a href='");
592 if (ctx->cfg.logo_link) 598 if (ctx->cfg.logo_link)
593 html_attr(ctx->cfg.logo_link); 599 html_attr(ctx->cfg.logo_link);
594 else 600 else
595 html_attr(cgit_rooturl()); 601 html_attr(cgit_rooturl());
596 html("'><img src='"); 602 html("'><img src='");
597 html_attr(ctx->cfg.logo); 603 html_attr(ctx->cfg.logo);
598 html("' alt='cgit logo'/></a></td>\n"); 604 html("' alt='cgit logo'/></a></td>\n");
599 605
600 html("<td class='main'>"); 606 html("<td class='main'>");
601 if (ctx->repo) { 607 if (ctx->repo) {
602 cgit_index_link("index", NULL, NULL, NULL, 0); 608 cgit_index_link("index", NULL, NULL, NULL, 0);
603 html(" : "); 609 html(" : ");
604 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); 610 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
605 html("</td><td class='form'>"); 611 html("</td><td class='form'>");
606 html("<form method='get' action=''>\n"); 612 html("<form method='get' action=''>\n");
607 add_hidden_formfields(0, 1, ctx->qry.page); 613 add_hidden_formfields(0, 1, ctx->qry.page);
608 html("<select name='h' onchange='this.form.submit();'>\n"); 614 html("<select name='h' onchange='this.form.submit();'>\n");
609 for_each_branch_ref(print_branch_option, ctx->qry.head); 615 for_each_branch_ref(print_branch_option, ctx->qry.head);
610 html("</select> "); 616 html("</select> ");
611 html("<input type='submit' name='' value='switch'/>"); 617 html("<input type='submit' name='' value='switch'/>");
612 html("</form>"); 618 html("</form>");
613 } else 619 } else
614 html_txt(ctx->cfg.root_title); 620 html_txt(ctx->cfg.root_title);
615 html("</td></tr>\n"); 621 html("</td></tr>\n");
616 622
617 html("<tr><td class='sub'>"); 623 html("<tr><td class='sub'>");
618 if (ctx->repo) { 624 if (ctx->repo) {
619 html_txt(ctx->repo->desc); 625 html_txt(ctx->repo->desc);
620 html("</td><td class='sub right'>"); 626 html("</td><td class='sub right'>");
621 html_txt(ctx->repo->owner); 627 html_txt(ctx->repo->owner);
622 } else { 628 } else {
623 if (ctx->cfg.root_desc) 629 if (ctx->cfg.root_desc)
624 html_txt(ctx->cfg.root_desc); 630 html_txt(ctx->cfg.root_desc);
625 else if (ctx->cfg.index_info) 631 else if (ctx->cfg.index_info)
626 html_include(ctx->cfg.index_info); 632 html_include(ctx->cfg.index_info);
627 } 633 }
628 html("</td></tr></table>\n"); 634 html("</td></tr></table>\n");
629 635
630 html("<table class='tabs'><tr><td>\n"); 636 html("<table class='tabs'><tr><td>\n");
631 if (ctx->repo) { 637 if (ctx->repo) {
632 cgit_summary_link("summary", NULL, hc(cmd, "summary"), 638 cgit_summary_link("summary", NULL, hc(cmd, "summary"),
633 ctx->qry.head); 639 ctx->qry.head);
634 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, 640 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
635 ctx->qry.sha1, NULL); 641 ctx->qry.sha1, NULL);
636 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, 642 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
637 NULL, NULL, 0, NULL, NULL); 643 NULL, NULL, 0, NULL, NULL);
638 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, 644 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
639 ctx->qry.sha1, NULL); 645 ctx->qry.sha1, NULL);
640 cgit_commit_link("commit", NULL, hc(cmd, "commit"), 646 cgit_commit_link("commit", NULL, hc(cmd, "commit"),
641 ctx->qry.head, ctx->qry.sha1); 647 ctx->qry.head, ctx->qry.sha1);
642 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, 648 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
643 ctx->qry.sha1, ctx->qry.sha2, NULL); 649 ctx->qry.sha1, ctx->qry.sha2, NULL);
644 if (ctx->repo->max_stats) 650 if (ctx->repo->max_stats)
645 reporevlink("stats", "stats", NULL, hc(cmd, "stats"), 651 cgit_stats_link("stats", NULL, hc(cmd, "stats"),
646 ctx->qry.head, NULL, NULL); 652 ctx->qry.head, NULL);
647 if (ctx->repo->readme) 653 if (ctx->repo->readme)
648 reporevlink("about", "about", NULL, 654 reporevlink("about", "about", NULL,
649 hc(cmd, "about"), ctx->qry.head, NULL, 655 hc(cmd, "about"), ctx->qry.head, NULL,
650 NULL); 656 NULL);
651 html("</td><td class='form'>"); 657 html("</td><td class='form'>");
652 html("<form class='right' method='get' action='"); 658 html("<form class='right' method='get' action='");
653 if (ctx->cfg.virtual_root) 659 if (ctx->cfg.virtual_root)
654 html_url_path(cgit_fileurl(ctx->qry.repo, "log", 660 html_url_path(cgit_fileurl(ctx->qry.repo, "log",
655 ctx->qry.path, NULL)); 661 ctx->qry.path, NULL));
656 html("'>\n"); 662 html("'>\n");
657 add_hidden_formfields(1, 0, "log"); 663 add_hidden_formfields(1, 0, "log");
658 html("<select name='qt'>\n"); 664 html("<select name='qt'>\n");
659 html_option("grep", "log msg", ctx->qry.grep); 665 html_option("grep", "log msg", ctx->qry.grep);
660 html_option("author", "author", ctx->qry.grep); 666 html_option("author", "author", ctx->qry.grep);
661 html_option("committer", "committer", ctx->qry.grep); 667 html_option("committer", "committer", ctx->qry.grep);
662 html("</select>\n"); 668 html("</select>\n");
663 html("<input class='txt' type='text' size='10' name='q' value='"); 669 html("<input class='txt' type='text' size='10' name='q' value='");
664 html_attr(ctx->qry.search); 670 html_attr(ctx->qry.search);
665 html("'/>\n"); 671 html("'/>\n");
666 html("<input type='submit' value='search'/>\n"); 672 html("<input type='submit' value='search'/>\n");
667 html("</form>\n"); 673 html("</form>\n");
668 } else { 674 } else {
669 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); 675 site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
670 if (ctx->cfg.root_readme) 676 if (ctx->cfg.root_readme)
671 site_link("about", "about", NULL, hc(cmd, "about"), 677 site_link("about", "about", NULL, hc(cmd, "about"),
672 NULL, 0); 678 NULL, 0);
673 html("</td><td class='form'>"); 679 html("</td><td class='form'>");
674 html("<form method='get' action='"); 680 html("<form method='get' action='");
675 html_attr(cgit_rooturl()); 681 html_attr(cgit_rooturl());
676 html("'>\n"); 682 html("'>\n");
677 html("<input type='text' name='q' size='10' value='"); 683 html("<input type='text' name='q' size='10' value='");
678 html_attr(ctx->qry.search); 684 html_attr(ctx->qry.search);
679 html("'/>\n"); 685 html("'/>\n");
680 html("<input type='submit' value='search'/>\n"); 686 html("<input type='submit' value='search'/>\n");
681 html("</form>"); 687 html("</form>");
682 } 688 }
683 html("</td></tr></table>\n"); 689 html("</td></tr></table>\n");
684 html("<div class='content'>"); 690 html("<div class='content'>");
685} 691}
686 692
687void cgit_print_filemode(unsigned short mode) 693void cgit_print_filemode(unsigned short mode)
688{ 694{
689 if (S_ISDIR(mode)) 695 if (S_ISDIR(mode))
690 html("d"); 696 html("d");
691 else if (S_ISLNK(mode)) 697 else if (S_ISLNK(mode))
692 html("l"); 698 html("l");
693 else if (S_ISGITLINK(mode)) 699 else if (S_ISGITLINK(mode))
694 html("m"); 700 html("m");
695 else 701 else
696 html("-"); 702 html("-");
697 html_fileperm(mode >> 6); 703 html_fileperm(mode >> 6);
698 html_fileperm(mode >> 3); 704 html_fileperm(mode >> 3);
699 html_fileperm(mode); 705 html_fileperm(mode);
700} 706}
701 707
702void cgit_print_snapshot_links(const char *repo, const char *head, 708void cgit_print_snapshot_links(const char *repo, const char *head,
703 const char *hex, int snapshots) 709 const char *hex, int snapshots)
704{ 710{
705 const struct cgit_snapshot_format* f; 711 const struct cgit_snapshot_format* f;
706 char *filename; 712 char *filename;
707 713
708 for (f = cgit_snapshot_formats; f->suffix; f++) { 714 for (f = cgit_snapshot_formats; f->suffix; f++) {
709 if (!(snapshots & f->bit)) 715 if (!(snapshots & f->bit))
710 continue; 716 continue;
diff --git a/ui-shared.h b/ui-shared.h
index 3c8a6d0..e3fae64 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,46 +1,48 @@
1#ifndef UI_SHARED_H 1#ifndef UI_SHARED_H
2#define UI_SHARED_H 2#define UI_SHARED_H
3 3
4extern char *cgit_hosturl(); 4extern char *cgit_hosturl();
5extern char *cgit_repourl(const char *reponame); 5extern char *cgit_repourl(const char *reponame);
6extern char *cgit_fileurl(const char *reponame, const char *pagename, 6extern char *cgit_fileurl(const char *reponame, const char *pagename,
7 const char *filename, const char *query); 7 const char *filename, const char *query);
8extern char *cgit_pageurl(const char *reponame, const char *pagename, 8extern char *cgit_pageurl(const char *reponame, const char *pagename,
9 const char *query); 9 const char *query);
10 10
11extern void cgit_index_link(char *name, char *title, char *class, 11extern void cgit_index_link(char *name, char *title, char *class,
12 char *pattern, int ofs); 12 char *pattern, int ofs);
13extern void cgit_summary_link(char *name, char *title, char *class, char *head); 13extern void cgit_summary_link(char *name, char *title, char *class, char *head);
14extern void cgit_tag_link(char *name, char *title, char *class, char *head, 14extern void cgit_tag_link(char *name, char *title, char *class, char *head,
15 char *rev); 15 char *rev);
16extern void cgit_tree_link(char *name, char *title, char *class, char *head, 16extern void cgit_tree_link(char *name, char *title, char *class, char *head,
17 char *rev, char *path); 17 char *rev, char *path);
18extern void cgit_plain_link(char *name, char *title, char *class, char *head, 18extern void cgit_plain_link(char *name, char *title, char *class, char *head,
19 char *rev, char *path); 19 char *rev, char *path);
20extern void cgit_log_link(char *name, char *title, char *class, char *head, 20extern void cgit_log_link(char *name, char *title, char *class, char *head,
21 char *rev, char *path, int ofs, char *grep, 21 char *rev, char *path, int ofs, char *grep,
22 char *pattern); 22 char *pattern);
23extern void cgit_commit_link(char *name, char *title, char *class, char *head, 23extern void cgit_commit_link(char *name, char *title, char *class, char *head,
24 char *rev); 24 char *rev);
25extern void cgit_patch_link(char *name, char *title, char *class, char *head, 25extern void cgit_patch_link(char *name, char *title, char *class, char *head,
26 char *rev); 26 char *rev);
27extern void cgit_refs_link(char *name, char *title, char *class, char *head, 27extern void cgit_refs_link(char *name, char *title, char *class, char *head,
28 char *rev, char *path); 28 char *rev, char *path);
29extern void cgit_snapshot_link(char *name, char *title, char *class, 29extern void cgit_snapshot_link(char *name, char *title, char *class,
30 char *head, char *rev, char *archivename); 30 char *head, char *rev, char *archivename);
31extern void cgit_diff_link(char *name, char *title, char *class, char *head, 31extern void cgit_diff_link(char *name, char *title, char *class, char *head,
32 char *new_rev, char *old_rev, char *path); 32 char *new_rev, char *old_rev, char *path);
33extern void cgit_stats_link(char *name, char *title, char *class, char *head,
34 char *path);
33extern void cgit_object_link(struct object *obj); 35extern void cgit_object_link(struct object *obj);
34 36
35extern void cgit_print_error(char *msg); 37extern void cgit_print_error(char *msg);
36extern void cgit_print_date(time_t secs, char *format, int local_time); 38extern void cgit_print_date(time_t secs, char *format, int local_time);
37extern void cgit_print_age(time_t t, time_t max_relative, char *format); 39extern void cgit_print_age(time_t t, time_t max_relative, char *format);
38extern void cgit_print_http_headers(struct cgit_context *ctx); 40extern void cgit_print_http_headers(struct cgit_context *ctx);
39extern void cgit_print_docstart(struct cgit_context *ctx); 41extern void cgit_print_docstart(struct cgit_context *ctx);
40extern void cgit_print_docend(); 42extern void cgit_print_docend();
41extern void cgit_print_pageheader(struct cgit_context *ctx); 43extern void cgit_print_pageheader(struct cgit_context *ctx);
42extern void cgit_print_filemode(unsigned short mode); 44extern void cgit_print_filemode(unsigned short mode);
43extern void cgit_print_snapshot_links(const char *repo, const char *head, 45extern void cgit_print_snapshot_links(const char *repo, const char *head,
44 const char *hex, int snapshots); 46 const char *hex, int snapshots);
45 47
46#endif /* UI_SHARED_H */ 48#endif /* UI_SHARED_H */