author | Diego Ongaro <ongardie@gmail.com> | 2009-06-10 23:18:34 (UTC) |
---|---|---|
committer | Diego Ongaro <ongardie@gmail.com> | 2009-06-11 05:01:32 (UTC) |
commit | 694dd43886f23723f415aed3afb62131cdbcaa51 (patch) (unidiff) | |
tree | 891ce59bcac2673e9ca294cfa83e69eec23ccbd5 | |
parent | 87a89aed41136d388537b146000c4af6c1135a8c (diff) | |
download | cgit-694dd43886f23723f415aed3afb62131cdbcaa51.zip cgit-694dd43886f23723f415aed3afb62131cdbcaa51.tar.gz cgit-694dd43886f23723f415aed3afb62131cdbcaa51.tar.bz2 |
use cgit_httpscheme() for atom feed
-rw-r--r-- | ui-atom.c | 6 | ||||
-rw-r--r-- | ui-shared.c | 3 |
2 files changed, 6 insertions, 3 deletions
@@ -49,13 +49,14 @@ void add_entry(struct commit *commit, char *host) | |||
49 | } | 49 | } |
50 | html("</author>\n"); | 50 | html("</author>\n"); |
51 | html("<published>"); | 51 | html("<published>"); |
52 | cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time); | 52 | cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time); |
53 | html("</published>\n"); | 53 | html("</published>\n"); |
54 | if (host) { | 54 | if (host) { |
55 | html("<link rel='alternate' type='text/html' href='http://"); | 55 | html("<link rel='alternate' type='text/html' href='"); |
56 | html(cgit_httpscheme()); | ||
56 | html_attr(host); | 57 | html_attr(host); |
57 | html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL)); | 58 | html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL)); |
58 | if (ctx.cfg.virtual_root) | 59 | if (ctx.cfg.virtual_root) |
59 | delim = '?'; | 60 | delim = '?'; |
60 | htmlf("%cid=%s", delim, hex); | 61 | htmlf("%cid=%s", delim, hex); |
61 | html("'/>\n"); | 62 | html("'/>\n"); |
@@ -110,13 +111,14 @@ void cgit_print_atom(char *tip, char *path, int max_count) | |||
110 | html_txt(ctx.repo->name); | 111 | html_txt(ctx.repo->name); |
111 | html("</title>\n"); | 112 | html("</title>\n"); |
112 | html("<subtitle>"); | 113 | html("<subtitle>"); |
113 | html_txt(ctx.repo->desc); | 114 | html_txt(ctx.repo->desc); |
114 | html("</subtitle>\n"); | 115 | html("</subtitle>\n"); |
115 | if (host) { | 116 | if (host) { |
116 | html("<link rel='alternate' type='text/html' href='http://"); | 117 | html("<link rel='alternate' type='text/html' href='"); |
118 | html(cgit_httpscheme()); | ||
117 | html_attr(host); | 119 | html_attr(host); |
118 | html_attr(cgit_repourl(ctx.repo->url)); | 120 | html_attr(cgit_repourl(ctx.repo->url)); |
119 | html("'/>\n"); | 121 | html("'/>\n"); |
120 | } | 122 | } |
121 | while ((commit = get_revision(&rev)) != NULL) { | 123 | while ((commit = get_revision(&rev)) != NULL) { |
122 | add_entry(commit, host); | 124 | add_entry(commit, host); |
diff --git a/ui-shared.c b/ui-shared.c index 749ea35..5ce2bc5 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -500,13 +500,14 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
500 | if (ctx->cfg.favicon) { | 500 | if (ctx->cfg.favicon) { |
501 | html("<link rel='shortcut icon' href='"); | 501 | html("<link rel='shortcut icon' href='"); |
502 | html_attr(ctx->cfg.favicon); | 502 | html_attr(ctx->cfg.favicon); |
503 | html("'/>\n"); | 503 | html("'/>\n"); |
504 | } | 504 | } |
505 | if (host && ctx->repo) { | 505 | if (host && ctx->repo) { |
506 | html("<link rel='alternate' title='Atom feed' href='http://"); | 506 | html("<link rel='alternate' title='Atom feed' href='"); |
507 | html(cgit_httpscheme()); | ||
507 | html_attr(cgit_hosturl()); | 508 | html_attr(cgit_hosturl()); |
508 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 509 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
509 | fmt("h=%s", ctx->qry.head))); | 510 | fmt("h=%s", ctx->qry.head))); |
510 | html("' type='application/atom+xml'/>"); | 511 | html("' type='application/atom+xml'/>"); |
511 | } | 512 | } |
512 | html("</head>\n"); | 513 | html("</head>\n"); |