-rw-r--r-- | cgit.css | 10 | ||||
-rw-r--r-- | ui-shared.c | 7 |
2 files changed, 17 insertions, 0 deletions
@@ -1,130 +1,140 @@ | |||
1 | body, table { | 1 | body, table { |
2 | padding: 0em; | 2 | padding: 0em; |
3 | margin: 0em; | 3 | margin: 0em; |
4 | } | 4 | } |
5 | 5 | ||
6 | body { | 6 | body { |
7 | font-family: sans; | 7 | font-family: sans; |
8 | font-size: 10pt; | 8 | font-size: 10pt; |
9 | color: #333; | 9 | color: #333; |
10 | background: white; | 10 | background: white; |
11 | padding: 4px; | 11 | padding: 4px; |
12 | } | 12 | } |
13 | 13 | ||
14 | a { | 14 | a { |
15 | color: blue; | 15 | color: blue; |
16 | text-decoration: none; | 16 | text-decoration: none; |
17 | } | 17 | } |
18 | 18 | ||
19 | a:hover { | 19 | a:hover { |
20 | text-decoration: underline; | 20 | text-decoration: underline; |
21 | } | 21 | } |
22 | 22 | ||
23 | table { | 23 | table { |
24 | border-collapse: collapse; | 24 | border-collapse: collapse; |
25 | } | 25 | } |
26 | 26 | ||
27 | table#header { | 27 | table#header { |
28 | width: 100%; | 28 | width: 100%; |
29 | margin-bottom: 1em; | 29 | margin-bottom: 1em; |
30 | } | 30 | } |
31 | 31 | ||
32 | table#header td.logo { | 32 | table#header td.logo { |
33 | width: 96px; | 33 | width: 96px; |
34 | } | 34 | } |
35 | 35 | ||
36 | table#header td.main { | 36 | table#header td.main { |
37 | font-size: 200%; | 37 | font-size: 200%; |
38 | } | 38 | } |
39 | 39 | ||
40 | table#header td.sub { | 40 | table#header td.sub { |
41 | color: #777; | 41 | color: #777; |
42 | border-top: solid 1px #ccc; | 42 | border-top: solid 1px #ccc; |
43 | } | 43 | } |
44 | 44 | ||
45 | table.tabs { | 45 | table.tabs { |
46 | border-bottom: solid 2px #ccc; | 46 | border-bottom: solid 2px #ccc; |
47 | border-collapse: collapse; | 47 | border-collapse: collapse; |
48 | margin-top: 2em; | 48 | margin-top: 2em; |
49 | margin-bottom: 1em; | 49 | margin-bottom: 1em; |
50 | width: 100%; | 50 | width: 100%; |
51 | } | 51 | } |
52 | 52 | ||
53 | table.tabs td { | 53 | table.tabs td { |
54 | padding: 0px 0.5em; | 54 | padding: 0px 0.5em; |
55 | vertical-align: bottom; | ||
55 | } | 56 | } |
56 | 57 | ||
57 | table.tabs td a { | 58 | table.tabs td a { |
58 | padding: 2px 1em; | 59 | padding: 2px 1em; |
59 | color: #007; | 60 | color: #007; |
60 | } | 61 | } |
61 | 62 | ||
62 | table.tabs td a.active { | 63 | table.tabs td a.active { |
63 | color: #000; | 64 | color: #000; |
64 | background-color: #ccc; | 65 | background-color: #ccc; |
65 | } | 66 | } |
66 | 67 | ||
68 | table.tabs td.branch { | ||
69 | text-align: right; | ||
70 | } | ||
71 | |||
72 | table.tabs td.branch form { | ||
73 | padding-bottom: 2px; | ||
74 | font-size: 90%; | ||
75 | } | ||
76 | |||
67 | div.content { | 77 | div.content { |
68 | margin: 0px; | 78 | margin: 0px; |
69 | padding: 1em; | 79 | padding: 1em; |
70 | } | 80 | } |
71 | 81 | ||
72 | 82 | ||
73 | table.list { | 83 | table.list { |
74 | width: 100%; | 84 | width: 100%; |
75 | border: none; | 85 | border: none; |
76 | border-collapse: collapse; | 86 | border-collapse: collapse; |
77 | } | 87 | } |
78 | 88 | ||
79 | table.list tr { | 89 | table.list tr { |
80 | background: white; | 90 | background: white; |
81 | } | 91 | } |
82 | 92 | ||
83 | table.list tr:hover { | 93 | table.list tr:hover { |
84 | background: #eee; | 94 | background: #eee; |
85 | } | 95 | } |
86 | 96 | ||
87 | table.list tr.nohover:hover { | 97 | table.list tr.nohover:hover { |
88 | background: white; | 98 | background: white; |
89 | } | 99 | } |
90 | 100 | ||
91 | table.list th { | 101 | table.list th { |
92 | font-weight: normal; | 102 | font-weight: normal; |
93 | border-bottom: solid 1px #ccc; | 103 | border-bottom: solid 1px #ccc; |
94 | padding: 0.1em 0.5em 0.1em 0.5em; | 104 | padding: 0.1em 0.5em 0.1em 0.5em; |
95 | vertical-align: baseline; | 105 | vertical-align: baseline; |
96 | } | 106 | } |
97 | 107 | ||
98 | table.list td { | 108 | table.list td { |
99 | border: none; | 109 | border: none; |
100 | padding: 0.1em 0.5em 0.1em 0.5em; | 110 | padding: 0.1em 0.5em 0.1em 0.5em; |
101 | } | 111 | } |
102 | 112 | ||
103 | table.list td a { | 113 | table.list td a { |
104 | color: black; | 114 | color: black; |
105 | } | 115 | } |
106 | 116 | ||
107 | img { | 117 | img { |
108 | border: none; | 118 | border: none; |
109 | } | 119 | } |
110 | 120 | ||
111 | input#switch-btn { | 121 | input#switch-btn { |
112 | margin: 2px 0px 0px 0px; | 122 | margin: 2px 0px 0px 0px; |
113 | } | 123 | } |
114 | 124 | ||
115 | td#sidebar input.txt { | 125 | td#sidebar input.txt { |
116 | width: 100%; | 126 | width: 100%; |
117 | margin: 2px 0px 0px 0px; | 127 | margin: 2px 0px 0px 0px; |
118 | } | 128 | } |
119 | 129 | ||
120 | table#grid { | 130 | table#grid { |
121 | margin: 0px; | 131 | margin: 0px; |
122 | } | 132 | } |
123 | 133 | ||
124 | td#content { | 134 | td#content { |
125 | vertical-align: top; | 135 | vertical-align: top; |
126 | padding: 1em 2em 1em 1em; | 136 | padding: 1em 2em 1em 1em; |
127 | border: none; | 137 | border: none; |
128 | } | 138 | } |
129 | 139 | ||
130 | div#summary { | 140 | div#summary { |
diff --git a/ui-shared.c b/ui-shared.c index 03d147f..73e3d4c 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -457,104 +457,111 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
457 | html_hidden("id", ctx.qry.sha1); | 457 | html_hidden("id", ctx.qry.sha1); |
458 | if (ctx.qry.sha2) | 458 | if (ctx.qry.sha2) |
459 | html_hidden("id2", ctx.qry.sha2); | 459 | html_hidden("id2", ctx.qry.sha2); |
460 | 460 | ||
461 | if (incl_search) { | 461 | if (incl_search) { |
462 | if (ctx.qry.grep) | 462 | if (ctx.qry.grep) |
463 | html_hidden("qt", ctx.qry.grep); | 463 | html_hidden("qt", ctx.qry.grep); |
464 | if (ctx.qry.search) | 464 | if (ctx.qry.search) |
465 | html_hidden("q", ctx.qry.search); | 465 | html_hidden("q", ctx.qry.search); |
466 | } | 466 | } |
467 | } | 467 | } |
468 | 468 | ||
469 | char *hc(struct cgit_cmd *cmd, const char *page) | 469 | char *hc(struct cgit_cmd *cmd, const char *page) |
470 | { | 470 | { |
471 | return (strcmp(cmd->name, page) ? NULL : "active"); | 471 | return (strcmp(cmd->name, page) ? NULL : "active"); |
472 | } | 472 | } |
473 | 473 | ||
474 | void cgit_print_pageheader(struct cgit_context *ctx) | 474 | void cgit_print_pageheader(struct cgit_context *ctx) |
475 | { | 475 | { |
476 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 476 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
477 | 477 | ||
478 | html("<table id='header'>\n"); | 478 | html("<table id='header'>\n"); |
479 | html("<tr>\n"); | 479 | html("<tr>\n"); |
480 | html("<td class='logo' rowspan='2'><a href='"); | 480 | html("<td class='logo' rowspan='2'><a href='"); |
481 | if (ctx->cfg.logo_link) | 481 | if (ctx->cfg.logo_link) |
482 | html_attr(ctx->cfg.logo_link); | 482 | html_attr(ctx->cfg.logo_link); |
483 | else | 483 | else |
484 | html_attr(cgit_rooturl()); | 484 | html_attr(cgit_rooturl()); |
485 | html("'><img src='"); | 485 | html("'><img src='"); |
486 | html_attr(ctx->cfg.logo); | 486 | html_attr(ctx->cfg.logo); |
487 | html("'/></a></td>\n"); | 487 | html("'/></a></td>\n"); |
488 | html("<td class='main'>"); | 488 | html("<td class='main'>"); |
489 | if (ctx->repo) { | 489 | if (ctx->repo) { |
490 | html("<a href='"); | 490 | html("<a href='"); |
491 | html_attr(cgit_rooturl()); | 491 | html_attr(cgit_rooturl()); |
492 | html("'>index</a> / "); | 492 | html("'>index</a> / "); |
493 | html_txt(ctx->repo->name); | 493 | html_txt(ctx->repo->name); |
494 | } else | 494 | } else |
495 | html_txt(ctx->cfg.root_title); | 495 | html_txt(ctx->cfg.root_title); |
496 | html("</td></tr>\n"); | 496 | html("</td></tr>\n"); |
497 | html("<tr><td class='sub'>"); | 497 | html("<tr><td class='sub'>"); |
498 | if (ctx->repo) | 498 | if (ctx->repo) |
499 | html_txt(ctx->repo->desc); | 499 | html_txt(ctx->repo->desc); |
500 | else | 500 | else |
501 | html_txt(ctx->cfg.index_info); | 501 | html_txt(ctx->cfg.index_info); |
502 | html("</td></tr>\n"); | 502 | html("</td></tr>\n"); |
503 | html("</table>\n"); | 503 | html("</table>\n"); |
504 | 504 | ||
505 | html("<table class='tabs'><tr><td>\n"); | 505 | html("<table class='tabs'><tr><td>\n"); |
506 | if (ctx->repo) { | 506 | if (ctx->repo) { |
507 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), | 507 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), |
508 | ctx->qry.head, NULL, NULL); | 508 | ctx->qry.head, NULL, NULL); |
509 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 509 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
510 | ctx->qry.sha1, NULL); | 510 | ctx->qry.sha1, NULL); |
511 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 511 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
512 | NULL, NULL, 0, NULL, NULL); | 512 | NULL, NULL, 0, NULL, NULL); |
513 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 513 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
514 | ctx->qry.sha1, NULL); | 514 | ctx->qry.sha1, NULL); |
515 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 515 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
516 | ctx->qry.head, ctx->qry.sha1); | 516 | ctx->qry.head, ctx->qry.sha1); |
517 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 517 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
518 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 518 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
519 | cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head, | 519 | cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head, |
520 | ctx->qry.sha1); | 520 | ctx->qry.sha1); |
521 | html("</td><td class='branch'>"); | ||
522 | html("<form method='get' action=''>\n"); | ||
523 | add_hidden_formfields(0, 1, ctx->qry.page); | ||
524 | html("<select name='h' onchange='this.form.submit();'>\n"); | ||
525 | for_each_branch_ref(print_branch_option, ctx->qry.head); | ||
526 | html("</select> "); | ||
527 | html("<input type='submit' name='' value='switch'/>"); | ||
521 | } else { | 528 | } else { |
522 | html("<a class='active' href='"); | 529 | html("<a class='active' href='"); |
523 | html_attr(cgit_rooturl()); | 530 | html_attr(cgit_rooturl()); |
524 | html("'>index</a>\n"); | 531 | html("'>index</a>\n"); |
525 | } | 532 | } |
526 | html("</td></tr></table>\n"); | 533 | html("</td></tr></table>\n"); |
527 | html("<div class='content'>"); | 534 | html("<div class='content'>"); |
528 | } | 535 | } |
529 | 536 | ||
530 | void cgit_print_filemode(unsigned short mode) | 537 | void cgit_print_filemode(unsigned short mode) |
531 | { | 538 | { |
532 | if (S_ISDIR(mode)) | 539 | if (S_ISDIR(mode)) |
533 | html("d"); | 540 | html("d"); |
534 | else if (S_ISLNK(mode)) | 541 | else if (S_ISLNK(mode)) |
535 | html("l"); | 542 | html("l"); |
536 | else if (S_ISGITLINK(mode)) | 543 | else if (S_ISGITLINK(mode)) |
537 | html("m"); | 544 | html("m"); |
538 | else | 545 | else |
539 | html("-"); | 546 | html("-"); |
540 | html_fileperm(mode >> 6); | 547 | html_fileperm(mode >> 6); |
541 | html_fileperm(mode >> 3); | 548 | html_fileperm(mode >> 3); |
542 | html_fileperm(mode); | 549 | html_fileperm(mode); |
543 | } | 550 | } |
544 | 551 | ||
545 | void cgit_print_snapshot_links(const char *repo, const char *head, | 552 | void cgit_print_snapshot_links(const char *repo, const char *head, |
546 | const char *hex, int snapshots) | 553 | const char *hex, int snapshots) |
547 | { | 554 | { |
548 | const struct cgit_snapshot_format* f; | 555 | const struct cgit_snapshot_format* f; |
549 | char *filename; | 556 | char *filename; |
550 | 557 | ||
551 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 558 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
552 | if (!(snapshots & f->bit)) | 559 | if (!(snapshots & f->bit)) |
553 | continue; | 560 | continue; |
554 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 561 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
555 | f->suffix); | 562 | f->suffix); |
556 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | 563 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, |
557 | (char *)hex, filename); | 564 | (char *)hex, filename); |
558 | html("<br/>"); | 565 | html("<br/>"); |
559 | } | 566 | } |
560 | } | 567 | } |