summaryrefslogtreecommitdiffabout
path: root/ui-shared.c
authorLars Hjemli <hjemli@gmail.com>2008-04-13 08:57:11 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-13 08:57:11 (UTC)
commit931fc6d1e4986a4566647dda16af09bf69a28b89 (patch) (side-by-side diff)
tree733a9b7292e98d60ae0e40b5f249fa250f32b2d6 /ui-shared.c
parent72a69b77e7bf10cc3674e61e1ddd4d81618ee533 (diff)
downloadcgit-931fc6d1e4986a4566647dda16af09bf69a28b89.zip
cgit-931fc6d1e4986a4566647dda16af09bf69a28b89.tar.gz
cgit-931fc6d1e4986a4566647dda16af09bf69a28b89.tar.bz2
More layout fixes
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-shared.c') (more/less context) (show whitespace changes)
-rw-r--r--ui-shared.c65
1 files changed, 50 insertions, 15 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 73e3d4c..782caa7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -376,33 +376,33 @@ void cgit_print_docstart(struct cgit_context *ctx)
html("<head>\n");
html("<title>");
html_txt(ctx->page.title);
html("</title>\n");
htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
if (ctx->cfg.robots && *ctx->cfg.robots)
htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
html("<link rel='stylesheet' type='text/css' href='");
html_attr(ctx->cfg.css);
html("'/>\n");
html("</head>\n");
html("<body>\n");
}
void cgit_print_docend()
{
- html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
+ html("</div>\n</body>\n</html>\n");
}
int print_branch_option(const char *refname, const unsigned char *sha1,
int flags, void *cb_data)
{
char *name = (char *)refname;
html_option(name, name, ctx.qry.head);
return 0;
}
int print_archive_ref(const char *refname, const unsigned char *sha1,
int flags, void *cb_data)
{
struct tag *tag;
struct taginfo *info;
struct object *obj;
@@ -472,72 +472,107 @@ char *hc(struct cgit_cmd *cmd, const char *page)
}
void cgit_print_pageheader(struct cgit_context *ctx)
{
struct cgit_cmd *cmd = cgit_get_cmd(ctx);
html("<table id='header'>\n");
html("<tr>\n");
html("<td class='logo' rowspan='2'><a href='");
if (ctx->cfg.logo_link)
html_attr(ctx->cfg.logo_link);
else
html_attr(cgit_rooturl());
html("'><img src='");
html_attr(ctx->cfg.logo);
html("'/></a></td>\n");
+
html("<td class='main'>");
if (ctx->repo) {
+/*
html("<a href='");
html_attr(cgit_rooturl());
- html("'>index</a> / ");
- html_txt(ctx->repo->name);
+ html("'>index</a> : ");
+*/
+ reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
+ ctx->qry.head, NULL, NULL);
+ html(" : ");
+ html_txt(ctx->qry.page);
+ html("</td><td class='form'>");
+ html("<form method='get' action=''>\n");
+ add_hidden_formfields(0, 1, ctx->qry.page);
+ html("<select name='h' onchange='this.form.submit();'>\n");
+ for_each_branch_ref(print_branch_option, ctx->qry.head);
+ html("</select> ");
+ html("<input type='submit' name='' value='switch'/>");
+ html("</form>");
} else
html_txt(ctx->cfg.root_title);
- html("</td></tr>\n");
- html("<tr><td class='sub'>");
- if (ctx->repo)
+ html("</td>\n");
+
+ html("<tr><td class='sub'");
+ if (ctx->repo) {
+ html(" colspan='2'>");
html_txt(ctx->repo->desc);
- else
- html_txt(ctx->cfg.index_info);
+ }
+/*
+ else if (ctx->cfg.root_subtitle)
+ html_txt(ctx->cfg.root_subtitle);
+*/
+ else {
+ html(">");
+ html_txt("a fast webinterface for the git dscm");
+ }
html("</td></tr>\n");
+
+ html("</tr>\n");
html("</table>\n");
html("<table class='tabs'><tr><td>\n");
if (ctx->repo) {
reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
ctx->qry.head, NULL, NULL);
cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
ctx->qry.sha1, NULL);
cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
NULL, NULL, 0, NULL, NULL);
cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
ctx->qry.sha1, NULL);
cgit_commit_link("commit", NULL, hc(cmd, "commit"),
ctx->qry.head, ctx->qry.sha1);
cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
ctx->qry.sha1, ctx->qry.sha2, NULL);
cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
ctx->qry.sha1);
- html("</td><td class='branch'>");
- html("<form method='get' action=''>\n");
- add_hidden_formfields(0, 1, ctx->qry.page);
- html("<select name='h' onchange='this.form.submit();'>\n");
- for_each_branch_ref(print_branch_option, ctx->qry.head);
- html("</select> ");
- html("<input type='submit' name='' value='switch'/>");
+ html("</td><td class='form'>");
+ html("<form class='right' method='get' action='");
+ if (ctx->cfg.virtual_root)
+ html_attr(cgit_fileurl(ctx->qry.repo, "log",
+ ctx->qry.path, NULL));
+ html("'>\n");
+ add_hidden_formfields(1, 0, "log");
+ html("<select name='qt'>\n");
+ html_option("grep", "log msg", ctx->qry.grep);
+ html_option("author", "author", ctx->qry.grep);
+ html_option("committer", "committer", ctx->qry.grep);
+ html("</select>\n");
+ html("<input class='txt' type='text' size='8' name='q' value='");
+ html_attr(ctx->qry.search);
+ html("'/>\n");
+ html("<input type='submit' value='search'/>\n");
+ html("</form>\n");
} else {
html("<a class='active' href='");
html_attr(cgit_rooturl());
html("'>index</a>\n");
}
html("</td></tr></table>\n");
html("<div class='content'>");
}
void cgit_print_filemode(unsigned short mode)
{
if (S_ISDIR(mode))
html("d");
else if (S_ISLNK(mode))
html("l");
else if (S_ISGITLINK(mode))