* [PATCH 1/3] Extract clone URL printing to ui-shared.c
@ 2014-08-01 21:14 john
2014-08-01 21:14 ` [PATCH 2/3] ui-summary: add "rel='vcs-git'" to clone URL links john
2014-08-01 21:14 ` [PATCH 3/3] ui-shared: add rel-vcs microformat links to HTML header john
0 siblings, 2 replies; 4+ messages in thread
From: john @ 2014-08-01 21:14 UTC (permalink / raw)
This will allow us to reuse the same logic to add clone URL <link/>
elements to the header of all repo-specific pages in order to support
the rel-vcs microformat.
Signed-off-by: John Keeping <john at keeping.me.uk>
---
ui-shared.c | 37 +++++++++++++++++++++++++++++++++++++
ui-shared.h | 2 ++
ui-summary.c | 58 ++++++++++++----------------------------------------------
3 files changed, 51 insertions(+), 46 deletions(-)
diff --git a/ui-shared.c b/ui-shared.c
index 9dde0a3..5bae02d 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -728,6 +728,43 @@ void cgit_print_docend()
html("</body>\n</html>\n");
}
+static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
+{
+ struct strbuf buf = STRBUF_INIT;
+ char *h = txt, *t, c;
+
+ while (h && *h) {
+ while (h && *h == ' ')
+ h++;
+ if (!*h)
+ break;
+ t = h;
+ while (t && *t && *t != ' ')
+ t++;
+ c = *t;
+ *t = 0;
+
+ if (suffix && *suffix) {
+ strbuf_reset(&buf);
+ strbuf_addf(&buf, "%s/%s", h, suffix);
+ h = buf.buf;
+ }
+ fn(h);
+ *t = c;
+ h = t;
+ }
+
+ strbuf_release(&buf);
+}
+
+void cgit_add_clone_urls(void (*fn)(const char *))
+{
+ if (ctx.repo->clone_url)
+ add_clone_urls(fn, expand_macros(ctx.repo->clone_url), NULL);
+ else if (ctx.cfg.clone_prefix)
+ add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
+}
+
static int print_branch_option(const char *refname, const unsigned char *sha1,
int flags, void *cb_data)
{
diff --git a/ui-shared.h b/ui-shared.h
index 3e7a91b..79662f7 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -11,6 +11,8 @@ extern char *cgit_fileurl(const char *reponame, const char *pagename,
extern char *cgit_pageurl(const char *reponame, const char *pagename,
const char *query);
+extern void cgit_add_clone_urls(void (*fn)(const char *));
+
extern void cgit_index_link(const char *name, const char *title,
const char *class, const char *pattern, const char *sort, int ofs);
extern void cgit_summary_link(const char *name, const char *title,
diff --git a/ui-summary.c b/ui-summary.c
index 3728c3e..70ea908 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -12,62 +12,30 @@
#include "ui-log.h"
#include "ui-refs.h"
#include "ui-blob.h"
+#include "ui-shared.h"
#include <libgen.h>
-static void print_url(char *base, char *suffix)
+static int urls;
+
+static void print_url(const char *url)
{
int columns = 3;
- struct strbuf basebuf = STRBUF_INIT;
if (ctx.repo->enable_log_filecount)
columns++;
if (ctx.repo->enable_log_linecount)
columns++;
- if (!base || !*base)
- return;
- if (suffix && *suffix) {
- strbuf_addf(&basebuf, "%s/%s", base, suffix);
- base = basebuf.buf;
+ if (urls++ == 0) {
+ htmlf("<tr class='nohover'><td colspan='%d'> </td></tr>", columns);
+ htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
}
+
htmlf("<tr><td colspan='%d'><a href='", columns);
- html_url_path(base);
+ html_url_path(url);
html("'>");
- html_txt(base);
+ html_txt(url);
html("</a></td></tr>\n");
- strbuf_release(&basebuf);
-}
-
-static void print_urls(char *txt, char *suffix)
-{
- char *h = txt, *t, c;
- int urls = 0;
- int columns = 3;
-
- if (ctx.repo->enable_log_filecount)
- columns++;
- if (ctx.repo->enable_log_linecount)
- columns++;
-
-
- while (h && *h) {
- while (h && *h == ' ')
- h++;
- if (!*h)
- break;
- t = h;
- while (t && *t && *t != ' ')
- t++;
- c = *t;
- *t = 0;
- if (urls++ == 0) {
- htmlf("<tr class='nohover'><td colspan='%d'> </td></tr>", columns);
- htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
- }
- print_url(h, suffix);
- *t = c;
- h = t;
- }
}
void cgit_print_summary()
@@ -88,10 +56,8 @@ void cgit_print_summary()
cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
NULL, NULL, 0, 0, 0);
}
- if (ctx.repo->clone_url)
- print_urls(expand_macros(ctx.repo->clone_url), NULL);
- else if (ctx.cfg.clone_prefix)
- print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
+ urls = 0;
+ cgit_add_clone_urls(print_url);
html("</table>");
}
--
2.0.3.890.g700db9e
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/3] ui-summary: add "rel='vcs-git'" to clone URL links
2014-08-01 21:14 [PATCH 1/3] Extract clone URL printing to ui-shared.c john
@ 2014-08-01 21:14 ` john
2014-08-01 21:14 ` [PATCH 3/3] ui-shared: add rel-vcs microformat links to HTML header john
1 sibling, 0 replies; 4+ messages in thread
From: john @ 2014-08-01 21:14 UTC (permalink / raw)
This is described in the rel-vcs microformat[1].
[1] https://joeyh.name/rfc/rel-vcs/
Signed-off-by: John Keeping <john at keeping.me.uk>
---
ui-summary.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui-summary.c b/ui-summary.c
index 70ea908..46ca713 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -31,9 +31,11 @@ static void print_url(const char *url)
htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
}
- htmlf("<tr><td colspan='%d'><a href='", columns);
+ htmlf("<tr><td colspan='%d'><a rel='vcs-git' href='", columns);
html_url_path(url);
- html("'>");
+ html("' title='");
+ html_attr(ctx.repo->name);
+ html(" Git repository'>");
html_txt(url);
html("</a></td></tr>\n");
}
--
2.0.3.890.g700db9e
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] ui-shared: add rel-vcs microformat links to HTML header
2014-08-01 21:14 [PATCH 1/3] Extract clone URL printing to ui-shared.c john
2014-08-01 21:14 ` [PATCH 2/3] ui-summary: add "rel='vcs-git'" to clone URL links john
@ 2014-08-01 21:14 ` john
2014-12-24 2:05 ` Jason
1 sibling, 1 reply; 4+ messages in thread
From: john @ 2014-08-01 21:14 UTC (permalink / raw)
As described at https://joeyh.name/rfc/rel-vcs/.
Signed-off-by: John Keeping <john at keeping.me.uk>
---
ui-shared.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/ui-shared.c b/ui-shared.c
index 5bae02d..9ac65ab 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -661,6 +661,15 @@ void cgit_print_http_headers(void)
exit(0);
}
+static void print_rel_vcs_link(const char *url)
+{
+ html("<link rel='vcs-git' href='");
+ html_attr(url);
+ html("' title='");
+ html_attr(ctx.repo->name);
+ html(" Git repository'/>\n");
+}
+
void cgit_print_docstart(void)
{
if (ctx.cfg.embedded) {
@@ -699,6 +708,8 @@ void cgit_print_docstart(void)
html("' type='application/atom+xml'/>\n");
strbuf_release(&sb);
}
+ if (ctx.repo)
+ cgit_add_clone_urls(print_rel_vcs_link);
if (ctx.cfg.head_include)
html_include(ctx.cfg.head_include);
html("</head>\n");
--
2.0.3.890.g700db9e
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] ui-shared: add rel-vcs microformat links to HTML header
2014-08-01 21:14 ` [PATCH 3/3] ui-shared: add rel-vcs microformat links to HTML header john
@ 2014-12-24 2:05 ` Jason
0 siblings, 0 replies; 4+ messages in thread
From: Jason @ 2014-12-24 2:05 UTC (permalink / raw)
Merged this entire series. Cool to implement rel-vcs. Thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20141223/df2f2303/attachment.html>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-24 2:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-01 21:14 [PATCH 1/3] Extract clone URL printing to ui-shared.c john
2014-08-01 21:14 ` [PATCH 2/3] ui-summary: add "rel='vcs-git'" to clone URL links john
2014-08-01 21:14 ` [PATCH 3/3] ui-shared: add rel-vcs microformat links to HTML header john
2014-12-24 2:05 ` Jason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).