From: tim.nordell at logicpd.com (Tim Nordell)
Subject: [PATCH v2 4/8] ui-repolist: Move HTML generation into helper functions
Date: Fri, 4 Mar 2016 17:24:52 -0600 [thread overview]
Message-ID: <1457133901-12998-5-git-send-email-tim.nordell@logicpd.com> (raw)
In-Reply-To: <1457133901-12998-1-git-send-email-tim.nordell@logicpd.com>
Move the code that generates the repository and section snippets
of html into their own helper functions. This is for code reuse
in a later patch in this series.
This also moves some dependencies from the context out into
the caller instead of in the section of code moved.
Signed-off-by: Tim Nordell <tim.nordell at logicpd.com>
diff --git a/ui-repolist.c b/ui-repolist.c
index 6b751d2..38a42c7 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -277,6 +277,58 @@ struct repolist_ctx {
const char *last_section;
};
+static void html_section(struct cgit_repo *repo, int columns)
+{
+ htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
+ columns);
+ cgit_open_filter(ctx.cfg.section_filter);
+ html_txt(repo->section);
+ cgit_close_filter(ctx.cfg.section_filter);
+ html("</td></tr>");
+}
+
+static void html_repository(struct cgit_repo *repo, bool sorted)
+{
+ bool is_toplevel;
+
+ is_toplevel = (NULL != repo->section && '\0' != repo->section[0]);
+ htmlf("<tr><td class='%s'>",
+ (!sorted && is_toplevel) ? "sublevel-repo" : "toplevel-repo");
+ cgit_summary_link(repo->name, repo->name, NULL, NULL);
+ html("</td><td>");
+ html_link_open(cgit_repourl(repo->url), NULL, NULL);
+ html_ntxt(ctx.cfg.max_repodesc_len, repo->desc);
+ html_link_close();
+ html("</td><td>");
+ if (ctx.cfg.enable_index_owner) {
+ if (repo->owner_filter) {
+ cgit_open_filter(repo->owner_filter);
+ html_txt(repo->owner);
+ cgit_close_filter(repo->owner_filter);
+ } else {
+ html("<a href='");
+ html_attr(cgit_currenturl());
+ html("?q=");
+ html_url_arg(repo->owner);
+ html("'>");
+ html_txt(repo->owner);
+ html("</a>");
+ }
+ html("</td><td>");
+ }
+ print_modtime(repo);
+ html("</td>");
+ if (ctx.cfg.enable_index_links) {
+ html("<td>");
+ cgit_summary_link("summary", NULL, "button", NULL);
+ cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
+ 0, NULL, NULL, ctx.qry.showmsg, 0);
+ cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
+ html("</td>");
+ }
+ html("</tr>\n");
+}
+
void cgit_print_repolist(void)
{
struct repolist_ctx repolist_ctx;
@@ -330,49 +382,10 @@ void cgit_print_repolist(void)
(repolist_ctx.last_section != NULL && c->section == NULL) ||
(repolist_ctx.last_section != NULL && c->section != NULL &&
strcmp(c->section, c->last_section)))) {
- htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
- c->columns);
- cgit_open_filter(ctx.cfg.section_filter);
- html_txt(c->section);
- cgit_close_filter(ctx.cfg.section_filter);
- html("</td></tr>");
+ html_section(ctx.repo, c->columns);
c->last_section = c->section;
}
- htmlf("<tr><td class='%s'>",
- !c->sorted && c->section ? "sublevel-repo" : "toplevel-repo");
- cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
- html("</td><td>");
- html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
- html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
- html_link_close();
- html("</td><td>");
- if (ctx.cfg.enable_index_owner) {
- if (ctx.repo->owner_filter) {
- cgit_open_filter(ctx.repo->owner_filter);
- html_txt(ctx.repo->owner);
- cgit_close_filter(ctx.repo->owner_filter);
- } else {
- html("<a href='");
- html_attr(cgit_currenturl());
- html("?q=");
- html_url_arg(ctx.repo->owner);
- html("'>");
- html_txt(ctx.repo->owner);
- html("</a>");
- }
- html("</td><td>");
- }
- print_modtime(ctx.repo);
- html("</td>");
- if (ctx.cfg.enable_index_links) {
- html("<td>");
- cgit_summary_link("summary", NULL, "button", NULL);
- cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
- 0, NULL, NULL, ctx.qry.showmsg, 0);
- cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
- html("</td>");
- }
- html("</tr>\n");
+ html_repository(ctx.repo, repolist_ctx.sorted);
}
html("</table>");
if (repolist_ctx.hits > ctx.cfg.max_repo_count)
--
2.4.9
next prev parent reply other threads:[~2016-03-04 23:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 20:58 [PATCH 0/3] ui-repolist: Support additional formatting for sections tim.nordell
2016-02-26 20:58 ` [PATCH 1/3] ui-repolist: Add section filter tim.nordell
2016-02-28 12:51 ` john
2016-02-26 20:58 ` [PATCH 2/3] ui-repolist: Restructure internal logic to be more extensible tim.nordell
2016-02-28 13:02 ` john
2016-02-29 20:51 ` tim.nordell
2016-02-26 20:58 ` [PATCH 3/3] ui-repolist: Support a trimmed view when several sections are present tim.nordell
2016-03-04 23:24 ` [PATCH v2 0/8] ui-repolist: Support additional formatting for sections tim.nordell
2016-03-04 23:24 ` [PATCH v2 1/8] ui-repolist: Add section filter tim.nordell
2016-03-04 23:24 ` [PATCH v2 2/8] ui-repolist: Remove conditional around print_header() tim.nordell
2016-03-04 23:24 ` [PATCH v2 3/8] ui-repolist: Create context structure for cgit_print_repolist() tim.nordell
2016-03-04 23:24 ` tim.nordell [this message]
2016-03-04 23:29 ` [PATCH v2 5/8] ui-repolist: Factor out logic for emitting a new section heading tim.nordell
2016-03-04 23:30 ` [PATCH v2 6/8] ui-repolist: Remove assignment of section to repolist_ctx tim.nordell
2016-03-04 23:30 ` [PATCH v2 7/8] ui-repolist: Restructure internal logic to be more extensible tim.nordell
2016-03-04 23:30 ` [PATCH v2 8/8] ui-repolist: Support a trimmed view when several sections are present tim.nordell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457133901-12998-5-git-send-email-tim.nordell@logicpd.com \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).