-rw-r--r-- | cgit.css | 8 | ||||
-rw-r--r-- | ui-shared.c | 6 |
2 files changed, 14 insertions, 0 deletions
@@ -9,192 +9,200 @@ body { | |||
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: 250%; | 37 | font-size: 250%; |
38 | padding-left: 10px; | 38 | padding-left: 10px; |
39 | white-space: nowrap; | 39 | white-space: nowrap; |
40 | } | 40 | } |
41 | 41 | ||
42 | table#header td.main a { | 42 | table#header td.main a { |
43 | color: #000; | 43 | color: #000; |
44 | } | 44 | } |
45 | 45 | ||
46 | table#header td.form { | 46 | table#header td.form { |
47 | text-align: right; | 47 | text-align: right; |
48 | vertical-align: bottom; | 48 | vertical-align: bottom; |
49 | padding-right: 1em; | 49 | padding-right: 1em; |
50 | padding-bottom: 2px; | 50 | padding-bottom: 2px; |
51 | white-space: nowrap; | 51 | white-space: nowrap; |
52 | } | 52 | } |
53 | 53 | ||
54 | table#header td.form form, | 54 | table#header td.form form, |
55 | table#header td.form input, | 55 | table#header td.form input, |
56 | table#header td.form select { | 56 | table#header td.form select { |
57 | font-size: 90%; | 57 | font-size: 90%; |
58 | } | 58 | } |
59 | 59 | ||
60 | table#header td.sub { | 60 | table#header td.sub { |
61 | color: #777; | 61 | color: #777; |
62 | border-top: solid 1px #ccc; | 62 | border-top: solid 1px #ccc; |
63 | padding-left: 10px; | 63 | padding-left: 10px; |
64 | } | 64 | } |
65 | 65 | ||
66 | table.tabs { | 66 | table.tabs { |
67 | /* border-bottom: solid 2px #ccc; */ | 67 | /* border-bottom: solid 2px #ccc; */ |
68 | border-collapse: collapse; | 68 | border-collapse: collapse; |
69 | margin-top: 2em; | 69 | margin-top: 2em; |
70 | margin-bottom: 0px; | 70 | margin-bottom: 0px; |
71 | width: 100%; | 71 | width: 100%; |
72 | } | 72 | } |
73 | 73 | ||
74 | table.tabs td { | 74 | table.tabs td { |
75 | padding: 0px 1em; | 75 | padding: 0px 1em; |
76 | vertical-align: bottom; | 76 | vertical-align: bottom; |
77 | } | 77 | } |
78 | 78 | ||
79 | table.tabs td a { | 79 | table.tabs td a { |
80 | padding: 2px 0.75em; | 80 | padding: 2px 0.75em; |
81 | color: #777; | 81 | color: #777; |
82 | font-size: 110%; | 82 | font-size: 110%; |
83 | } | 83 | } |
84 | 84 | ||
85 | table.tabs td a.active { | 85 | table.tabs td a.active { |
86 | color: #000; | 86 | color: #000; |
87 | background-color: #ccc; | 87 | background-color: #ccc; |
88 | } | 88 | } |
89 | 89 | ||
90 | table.tabs td.form { | 90 | table.tabs td.form { |
91 | text-align: right; | 91 | text-align: right; |
92 | } | 92 | } |
93 | 93 | ||
94 | table.tabs td.form form { | 94 | table.tabs td.form form { |
95 | padding-bottom: 2px; | 95 | padding-bottom: 2px; |
96 | font-size: 90%; | 96 | font-size: 90%; |
97 | white-space: nowrap; | 97 | white-space: nowrap; |
98 | } | 98 | } |
99 | 99 | ||
100 | table.tabs td.form input, | 100 | table.tabs td.form input, |
101 | table.tabs td.form select { | 101 | table.tabs td.form select { |
102 | font-size: 90%; | 102 | font-size: 90%; |
103 | } | 103 | } |
104 | 104 | ||
105 | div.path { | ||
106 | margin: 0px; | ||
107 | padding: 5px 2em 2px 2em; | ||
108 | color: #000; | ||
109 | background-color: #ccc; | ||
110 | font-weight: bold; | ||
111 | } | ||
112 | |||
105 | div.content { | 113 | div.content { |
106 | margin: 0px; | 114 | margin: 0px; |
107 | padding: 2em; | 115 | padding: 2em; |
108 | border-top: solid 3px #ccc; | 116 | border-top: solid 3px #ccc; |
109 | border-bottom: solid 3px #ccc; | 117 | border-bottom: solid 3px #ccc; |
110 | } | 118 | } |
111 | 119 | ||
112 | 120 | ||
113 | table.list { | 121 | table.list { |
114 | width: 100%; | 122 | width: 100%; |
115 | border: none; | 123 | border: none; |
116 | border-collapse: collapse; | 124 | border-collapse: collapse; |
117 | } | 125 | } |
118 | 126 | ||
119 | table.list tr { | 127 | table.list tr { |
120 | background: white; | 128 | background: white; |
121 | } | 129 | } |
122 | 130 | ||
123 | table.list tr.logheader { | 131 | table.list tr.logheader { |
124 | background: #eee; | 132 | background: #eee; |
125 | } | 133 | } |
126 | 134 | ||
127 | table.list tr:hover { | 135 | table.list tr:hover { |
128 | background: #eee; | 136 | background: #eee; |
129 | } | 137 | } |
130 | 138 | ||
131 | table.list tr.nohover:hover { | 139 | table.list tr.nohover:hover { |
132 | background: white; | 140 | background: white; |
133 | } | 141 | } |
134 | 142 | ||
135 | table.list th { | 143 | table.list th { |
136 | font-weight: bold; | 144 | font-weight: bold; |
137 | /* color: #888; | 145 | /* color: #888; |
138 | border-top: dashed 1px #888; | 146 | border-top: dashed 1px #888; |
139 | border-bottom: dashed 1px #888; | 147 | border-bottom: dashed 1px #888; |
140 | */ | 148 | */ |
141 | padding: 0.1em 0.5em 0.05em 0.5em; | 149 | padding: 0.1em 0.5em 0.05em 0.5em; |
142 | vertical-align: baseline; | 150 | vertical-align: baseline; |
143 | } | 151 | } |
144 | 152 | ||
145 | table.list td { | 153 | table.list td { |
146 | border: none; | 154 | border: none; |
147 | padding: 0.1em 0.5em 0.1em 0.5em; | 155 | padding: 0.1em 0.5em 0.1em 0.5em; |
148 | } | 156 | } |
149 | 157 | ||
150 | table.list td.logsubject { | 158 | table.list td.logsubject { |
151 | font-family: monospace; | 159 | font-family: monospace; |
152 | font-weight: bold; | 160 | font-weight: bold; |
153 | } | 161 | } |
154 | 162 | ||
155 | table.list td.logmsg { | 163 | table.list td.logmsg { |
156 | font-family: monospace; | 164 | font-family: monospace; |
157 | white-space: pre; | 165 | white-space: pre; |
158 | padding: 1em 0.5em 2em 0.5em; | 166 | padding: 1em 0.5em 2em 0.5em; |
159 | } | 167 | } |
160 | 168 | ||
161 | table.list td a { | 169 | table.list td a { |
162 | color: black; | 170 | color: black; |
163 | } | 171 | } |
164 | 172 | ||
165 | table.list td a.ls-dir { | 173 | table.list td a.ls-dir { |
166 | font-weight: bold; | 174 | font-weight: bold; |
167 | color: #00f; | 175 | color: #00f; |
168 | } | 176 | } |
169 | 177 | ||
170 | table.list td a:hover { | 178 | table.list td a:hover { |
171 | color: #00f; | 179 | color: #00f; |
172 | } | 180 | } |
173 | 181 | ||
174 | img { | 182 | img { |
175 | border: none; | 183 | border: none; |
176 | } | 184 | } |
177 | 185 | ||
178 | input#switch-btn { | 186 | input#switch-btn { |
179 | margin: 2px 0px 0px 0px; | 187 | margin: 2px 0px 0px 0px; |
180 | } | 188 | } |
181 | 189 | ||
182 | td#sidebar input.txt { | 190 | td#sidebar input.txt { |
183 | width: 100%; | 191 | width: 100%; |
184 | margin: 2px 0px 0px 0px; | 192 | margin: 2px 0px 0px 0px; |
185 | } | 193 | } |
186 | 194 | ||
187 | table#grid { | 195 | table#grid { |
188 | margin: 0px; | 196 | margin: 0px; |
189 | } | 197 | } |
190 | 198 | ||
191 | td#content { | 199 | td#content { |
192 | vertical-align: top; | 200 | vertical-align: top; |
193 | padding: 1em 2em 1em 1em; | 201 | padding: 1em 2em 1em 1em; |
194 | border: none; | 202 | border: none; |
195 | } | 203 | } |
196 | 204 | ||
197 | div#summary { | 205 | div#summary { |
198 | vertical-align: top; | 206 | vertical-align: top; |
199 | margin-bottom: 1em; | 207 | margin-bottom: 1em; |
200 | } | 208 | } |
diff --git a/ui-shared.c b/ui-shared.c index 3d5030b..bc14e70 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -664,134 +664,140 @@ static void print_header(struct cgit_context *ctx) | |||
664 | html("'><img src='"); | 664 | html("'><img src='"); |
665 | html_attr(ctx->cfg.logo); | 665 | html_attr(ctx->cfg.logo); |
666 | html("' alt='cgit logo'/></a></td>\n"); | 666 | html("' alt='cgit logo'/></a></td>\n"); |
667 | } | 667 | } |
668 | 668 | ||
669 | html("<td class='main'>"); | 669 | html("<td class='main'>"); |
670 | if (ctx->repo) { | 670 | if (ctx->repo) { |
671 | cgit_index_link("index", NULL, NULL, NULL, 0); | 671 | cgit_index_link("index", NULL, NULL, NULL, 0); |
672 | html(" : "); | 672 | html(" : "); |
673 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 673 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
674 | html("</td><td class='form'>"); | 674 | html("</td><td class='form'>"); |
675 | html("<form method='get' action=''>\n"); | 675 | html("<form method='get' action=''>\n"); |
676 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); | 676 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
677 | html("<select name='h' onchange='this.form.submit();'>\n"); | 677 | html("<select name='h' onchange='this.form.submit();'>\n"); |
678 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 678 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
679 | html("</select> "); | 679 | html("</select> "); |
680 | html("<input type='submit' name='' value='switch'/>"); | 680 | html("<input type='submit' name='' value='switch'/>"); |
681 | html("</form>"); | 681 | html("</form>"); |
682 | } else | 682 | } else |
683 | html_txt(ctx->cfg.root_title); | 683 | html_txt(ctx->cfg.root_title); |
684 | html("</td></tr>\n"); | 684 | html("</td></tr>\n"); |
685 | 685 | ||
686 | html("<tr><td class='sub'>"); | 686 | html("<tr><td class='sub'>"); |
687 | if (ctx->repo) { | 687 | if (ctx->repo) { |
688 | html_txt(ctx->repo->desc); | 688 | html_txt(ctx->repo->desc); |
689 | html("</td><td class='sub right'>"); | 689 | html("</td><td class='sub right'>"); |
690 | html_txt(ctx->repo->owner); | 690 | html_txt(ctx->repo->owner); |
691 | } else { | 691 | } else { |
692 | if (ctx->cfg.root_desc) | 692 | if (ctx->cfg.root_desc) |
693 | html_txt(ctx->cfg.root_desc); | 693 | html_txt(ctx->cfg.root_desc); |
694 | else if (ctx->cfg.index_info) | 694 | else if (ctx->cfg.index_info) |
695 | html_include(ctx->cfg.index_info); | 695 | html_include(ctx->cfg.index_info); |
696 | } | 696 | } |
697 | html("</td></tr></table>\n"); | 697 | html("</td></tr></table>\n"); |
698 | } | 698 | } |
699 | 699 | ||
700 | void cgit_print_pageheader(struct cgit_context *ctx) | 700 | void cgit_print_pageheader(struct cgit_context *ctx) |
701 | { | 701 | { |
702 | html("<div id='cgit'>"); | 702 | html("<div id='cgit'>"); |
703 | if (!ctx->cfg.noheader) | 703 | if (!ctx->cfg.noheader) |
704 | print_header(ctx); | 704 | print_header(ctx); |
705 | 705 | ||
706 | html("<table class='tabs'><tr><td>\n"); | 706 | html("<table class='tabs'><tr><td>\n"); |
707 | if (ctx->repo) { | 707 | if (ctx->repo) { |
708 | cgit_summary_link("summary", NULL, hc(ctx, "summary"), | 708 | cgit_summary_link("summary", NULL, hc(ctx, "summary"), |
709 | ctx->qry.head); | 709 | ctx->qry.head); |
710 | cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head, | 710 | cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head, |
711 | ctx->qry.sha1, NULL); | 711 | ctx->qry.sha1, NULL); |
712 | cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head, | 712 | cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head, |
713 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 713 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
714 | cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head, | 714 | cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head, |
715 | ctx->qry.sha1, NULL); | 715 | ctx->qry.sha1, NULL); |
716 | cgit_commit_link("commit", NULL, hc(ctx, "commit"), | 716 | cgit_commit_link("commit", NULL, hc(ctx, "commit"), |
717 | ctx->qry.head, ctx->qry.sha1, 0); | 717 | ctx->qry.head, ctx->qry.sha1, 0); |
718 | cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head, | 718 | cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head, |
719 | ctx->qry.sha1, ctx->qry.sha2, NULL, 0); | 719 | ctx->qry.sha1, ctx->qry.sha2, NULL, 0); |
720 | if (ctx->repo->max_stats) | 720 | if (ctx->repo->max_stats) |
721 | cgit_stats_link("stats", NULL, hc(ctx, "stats"), | 721 | cgit_stats_link("stats", NULL, hc(ctx, "stats"), |
722 | ctx->qry.head, NULL); | 722 | ctx->qry.head, NULL); |
723 | if (ctx->repo->readme) | 723 | if (ctx->repo->readme) |
724 | reporevlink("about", "about", NULL, | 724 | reporevlink("about", "about", NULL, |
725 | hc(ctx, "about"), ctx->qry.head, NULL, | 725 | hc(ctx, "about"), ctx->qry.head, NULL, |
726 | NULL); | 726 | NULL); |
727 | html("</td><td class='form'>"); | 727 | html("</td><td class='form'>"); |
728 | html("<form class='right' method='get' action='"); | 728 | html("<form class='right' method='get' action='"); |
729 | if (ctx->cfg.virtual_root) | 729 | if (ctx->cfg.virtual_root) |
730 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 730 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
731 | ctx->qry.vpath, NULL)); | 731 | ctx->qry.vpath, NULL)); |
732 | html("'>\n"); | 732 | html("'>\n"); |
733 | cgit_add_hidden_formfields(1, 0, "log"); | 733 | cgit_add_hidden_formfields(1, 0, "log"); |
734 | html("<select name='qt'>\n"); | 734 | html("<select name='qt'>\n"); |
735 | html_option("grep", "log msg", ctx->qry.grep); | 735 | html_option("grep", "log msg", ctx->qry.grep); |
736 | html_option("author", "author", ctx->qry.grep); | 736 | html_option("author", "author", ctx->qry.grep); |
737 | html_option("committer", "committer", ctx->qry.grep); | 737 | html_option("committer", "committer", ctx->qry.grep); |
738 | html("</select>\n"); | 738 | html("</select>\n"); |
739 | html("<input class='txt' type='text' size='10' name='q' value='"); | 739 | html("<input class='txt' type='text' size='10' name='q' value='"); |
740 | html_attr(ctx->qry.search); | 740 | html_attr(ctx->qry.search); |
741 | html("'/>\n"); | 741 | html("'/>\n"); |
742 | html("<input type='submit' value='search'/>\n"); | 742 | html("<input type='submit' value='search'/>\n"); |
743 | html("</form>\n"); | 743 | html("</form>\n"); |
744 | } else { | 744 | } else { |
745 | site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0); | 745 | site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0); |
746 | if (ctx->cfg.root_readme) | 746 | if (ctx->cfg.root_readme) |
747 | site_link("about", "about", NULL, hc(ctx, "about"), | 747 | site_link("about", "about", NULL, hc(ctx, "about"), |
748 | NULL, 0); | 748 | NULL, 0); |
749 | html("</td><td class='form'>"); | 749 | html("</td><td class='form'>"); |
750 | html("<form method='get' action='"); | 750 | html("<form method='get' action='"); |
751 | html_attr(cgit_rooturl()); | 751 | html_attr(cgit_rooturl()); |
752 | html("'>\n"); | 752 | html("'>\n"); |
753 | html("<input type='text' name='q' size='10' value='"); | 753 | html("<input type='text' name='q' size='10' value='"); |
754 | html_attr(ctx->qry.search); | 754 | html_attr(ctx->qry.search); |
755 | html("'/>\n"); | 755 | html("'/>\n"); |
756 | html("<input type='submit' value='search'/>\n"); | 756 | html("<input type='submit' value='search'/>\n"); |
757 | html("</form>"); | 757 | html("</form>"); |
758 | } | 758 | } |
759 | html("</td></tr></table>\n"); | 759 | html("</td></tr></table>\n"); |
760 | if (ctx->qry.vpath) { | ||
761 | html("<div class='path'>"); | ||
762 | html("path: "); | ||
763 | html_txt(ctx->qry.vpath); | ||
764 | html("</div>"); | ||
765 | } | ||
760 | html("<div class='content'>"); | 766 | html("<div class='content'>"); |
761 | } | 767 | } |
762 | 768 | ||
763 | void cgit_print_filemode(unsigned short mode) | 769 | void cgit_print_filemode(unsigned short mode) |
764 | { | 770 | { |
765 | if (S_ISDIR(mode)) | 771 | if (S_ISDIR(mode)) |
766 | html("d"); | 772 | html("d"); |
767 | else if (S_ISLNK(mode)) | 773 | else if (S_ISLNK(mode)) |
768 | html("l"); | 774 | html("l"); |
769 | else if (S_ISGITLINK(mode)) | 775 | else if (S_ISGITLINK(mode)) |
770 | html("m"); | 776 | html("m"); |
771 | else | 777 | else |
772 | html("-"); | 778 | html("-"); |
773 | html_fileperm(mode >> 6); | 779 | html_fileperm(mode >> 6); |
774 | html_fileperm(mode >> 3); | 780 | html_fileperm(mode >> 3); |
775 | html_fileperm(mode); | 781 | html_fileperm(mode); |
776 | } | 782 | } |
777 | 783 | ||
778 | void cgit_print_snapshot_links(const char *repo, const char *head, | 784 | void cgit_print_snapshot_links(const char *repo, const char *head, |
779 | const char *hex, int snapshots) | 785 | const char *hex, int snapshots) |
780 | { | 786 | { |
781 | const struct cgit_snapshot_format* f; | 787 | const struct cgit_snapshot_format* f; |
782 | char *prefix; | 788 | char *prefix; |
783 | char *filename; | 789 | char *filename; |
784 | unsigned char sha1[20]; | 790 | unsigned char sha1[20]; |
785 | 791 | ||
786 | if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && | 792 | if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && |
787 | (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) | 793 | (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) |
788 | hex++; | 794 | hex++; |
789 | prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); | 795 | prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); |
790 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 796 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
791 | if (!(snapshots & f->bit)) | 797 | if (!(snapshots & f->bit)) |
792 | continue; | 798 | continue; |
793 | filename = fmt("%s%s", prefix, f->suffix); | 799 | filename = fmt("%s%s", prefix, f->suffix); |
794 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); | 800 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
795 | html("<br/>"); | 801 | html("<br/>"); |
796 | } | 802 | } |
797 | } | 803 | } |