author | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 23:13:08 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 23:13:08 (UTC) |
commit | 905dbaef5aa33ea11d385b82de0188fee73dd655 (patch) (unidiff) | |
tree | 34712da2eef917be04b2acc5585612b65c1e49cc /ui-shared.c | |
parent | d188ed4f2905e6d10abd26c45572a0d48eb53969 (diff) | |
parent | 71adba1f1678914063fc109cf3805afde2c68f75 (diff) | |
download | cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.zip cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.gz cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.bz2 |
Merge branch 'lh/about'
* lh/about:
Add 'about site' and 'about repo' pages
Prepare for 'about site' page / add 'root-readme' option to cgitrc
Make it possible for a single cmd to work both with and without a repo
Re-enable 'index-info' and add support for 'root-desc' in cgitrc
Move included header-file out of repolist table
Prepare for 'about repo' page
-rw-r--r-- | ui-shared.c | 58 |
1 files changed, 54 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c index 8a804c2..d08ede9 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -114,6 +114,49 @@ char *cgit_currurl() | |||
114 | return fmt("%s/", ctx.cfg.virtual_root); | 114 | return fmt("%s/", ctx.cfg.virtual_root); |
115 | } | 115 | } |
116 | 116 | ||
117 | static void site_url(char *page, char *search) | ||
118 | { | ||
119 | char *delim = "?"; | ||
120 | |||
121 | if (ctx.cfg.virtual_root) { | ||
122 | html_attr(ctx.cfg.virtual_root); | ||
123 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') | ||
124 | html("/"); | ||
125 | } else | ||
126 | html(ctx.cfg.script_name); | ||
127 | |||
128 | if (page) { | ||
129 | htmlf("?p=%s", page); | ||
130 | delim = "&"; | ||
131 | } | ||
132 | if (search) { | ||
133 | html(delim); | ||
134 | html("q="); | ||
135 | html_attr(search); | ||
136 | } | ||
137 | } | ||
138 | |||
139 | static void site_link(char *page, char *name, char *title, char *class, | ||
140 | char *search) | ||
141 | { | ||
142 | html("<a"); | ||
143 | if (title) { | ||
144 | html(" title='"); | ||
145 | html_attr(title); | ||
146 | html("'"); | ||
147 | } | ||
148 | if (class) { | ||
149 | html(" class='"); | ||
150 | html_attr(class); | ||
151 | html("'"); | ||
152 | } | ||
153 | html(" href='"); | ||
154 | site_url(page, search); | ||
155 | html("'>"); | ||
156 | html_txt(name); | ||
157 | html("</a>"); | ||
158 | } | ||
159 | |||
117 | static char *repolink(char *title, char *class, char *page, char *head, | 160 | static char *repolink(char *title, char *class, char *page, char *head, |
118 | char *path) | 161 | char *path) |
119 | { | 162 | { |
@@ -510,7 +553,10 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
510 | html_txt(ctx->repo->desc); | 553 | html_txt(ctx->repo->desc); |
511 | } else { | 554 | } else { |
512 | html(">"); | 555 | html(">"); |
513 | html_txt("a fast webinterface for the git dscm"); | 556 | if (ctx->cfg.root_desc) |
557 | html_txt(ctx->cfg.root_desc); | ||
558 | else if (ctx->cfg.index_info) | ||
559 | html_include(ctx->cfg.index_info); | ||
514 | } | 560 | } |
515 | html("</td></tr></table>\n"); | 561 | html("</td></tr></table>\n"); |
516 | 562 | ||
@@ -528,6 +574,10 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
528 | ctx->qry.head, ctx->qry.sha1); | 574 | ctx->qry.head, ctx->qry.sha1); |
529 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 575 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
530 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 576 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
577 | if (ctx->repo->readme) | ||
578 | reporevlink("about", "about", NULL, | ||
579 | hc(cmd, "about"), ctx->qry.head, NULL, | ||
580 | NULL); | ||
531 | html("</td><td class='form'>"); | 581 | html("</td><td class='form'>"); |
532 | html("<form class='right' method='get' action='"); | 582 | html("<form class='right' method='get' action='"); |
533 | if (ctx->cfg.virtual_root) | 583 | if (ctx->cfg.virtual_root) |
@@ -546,9 +596,9 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
546 | html("<input type='submit' value='search'/>\n"); | 596 | html("<input type='submit' value='search'/>\n"); |
547 | html("</form>\n"); | 597 | html("</form>\n"); |
548 | } else { | 598 | } else { |
549 | html("<a class='active' href='"); | 599 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL); |
550 | html_attr(cgit_rooturl()); | 600 | if (ctx->cfg.root_readme) |
551 | html("'>index</a>\n"); | 601 | site_link("about", "about", NULL, hc(cmd, "about"), NULL); |
552 | html("</td><td class='form'>"); | 602 | html("</td><td class='form'>"); |
553 | html("<form method='get' action='"); | 603 | html("<form method='get' action='"); |
554 | html_attr(cgit_rooturl()); | 604 | html_attr(cgit_rooturl()); |