aboutsummaryrefslogtreecommitdiff
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cgit.css147
-rw-r--r--cgit.pngbin1840 -> 5406 bytes
-rw-r--r--ui-shared.c125
3 files changed, 175 insertions, 97 deletions
diff --git a/cgit.css b/cgit.css
index 67cf48e..17c2712 100644
--- a/cgit.css
+++ b/cgit.css
@@ -11,67 +11,41 @@ body {
padding: 4px;
}
-a {
- color: blue;
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
table {
border-collapse: collapse;
}
-table#header {
- width: 100%;
- margin-bottom: 1em;
-}
-
-table#header td.logo {
- width: 96px;
-}
-
-table#header td.main {
- font-size: 200%;
-}
-
-table#header td.sub {
- color: #777;
- border-top: solid 1px #ccc;
-}
-
-table.tabs {
- border-bottom: solid 2px #ccc;
- border-collapse: collapse;
- margin-top: 2em;
- margin-bottom: 1em;
- width: 100%;
+h2 {
+ font-size: 120%;
+ font-weight: bold;
+ margin-top: 0em;
+ margin-bottom: 0.25em;
}
-table.tabs td {
- padding: 0px 0.5em;
+h3 {
+ margin-top: 0em;
+ font-size: 100%;
+ font-weight: normal;
}
-table.tabs td a {
- padding: 2px 1em;
- color: #007;
+h4 {
+ margin-top: 1.5em;
+ margin-bottom: 0.1em;
+ font-size: 100%;
+ font-weight: bold;
}
-table.tabs td a.active {
- color: #000;
- background-color: #ccc;
+a {
+ color: #600;
+ text-decoration: none;
}
-div.content {
- margin: 0px;
- padding: 1em;
+a:hover {
+ background-color: #ddd;
+ text-decoration: none;
}
-
table.list {
- width: 100%;
border: none;
border-collapse: collapse;
}
@@ -81,7 +55,7 @@ table.list tr {
}
table.list tr:hover {
- background: #eee;
+ background: #f8f8f8;
}
table.list tr.nohover:hover {
@@ -89,8 +63,8 @@ table.list tr.nohover:hover {
}
table.list th {
- font-weight: normal;
- border-bottom: solid 1px #ccc;
+ font-weight: bold;
+ border-bottom: solid 1px #777;
padding: 0.1em 0.5em 0.1em 0.5em;
vertical-align: baseline;
}
@@ -100,12 +74,79 @@ table.list td {
padding: 0.1em 0.5em 0.1em 0.5em;
}
-table.list td a {
- color: black;
+img {
+ border: none;
}
-img {
+table#layout {
+ border-collapse: collapse;
border: none;
+ margin: 0px;
+}
+
+td#sidebar {
+ vertical-align: top;
+ width: 162px;
+ padding: 0px 0px 0px 0px;
+ margin: 0px;
+}
+
+td#sidebar table {
+ border-collapse: separate;
+ border-spacing: 0px;
+ margin: 0px;
+ padding: 0px;
+ background-color: #ccc;
+}
+
+td#sidebar table.sidebar td.sidebar {
+ padding: 4px;
+ border-top: solid 1px #eee;
+ border-left: solid 1px #eee;
+ border-right: solid 1px #aaa;
+ border-bottom: solid 1px #aaa;
+}
+
+div#logo {
+ margin: 0px;
+ padding: 4px 0px 4px 0px;
+ text-align: center;
+ background-color: #ccc;
+ border-top: solid 1px #eee;
+ border-left: solid 1px #eee;
+ border-right: solid 1px #aaa;
+ border-bottom: solid 1px #aaa;
+}
+
+td#sidebar h1 {
+ font-size: 10pt;
+ font-weight: bold;
+ margin: 8px 0px 0px 0px;
+}
+
+td#sidebar h1.first {
+ margin-top: 0px;
+}
+
+td#sidebar a.menu {
+ display: block;
+ background-color: #ccc;
+ padding: 0.1em 0.5em;
+ text-decoration: none;
+}
+
+td#sidebar a.menu:hover {
+ background-color: #bbb;
+ text-decoration: none;
+}
+
+td#sidebar select {
+ width: 100%;
+ margin: 2px 0px 0px 0px;
+}
+
+td#sidebar form {
+ text-align: right;
}
input#switch-btn {
@@ -316,7 +357,7 @@ table.diff td {
table.diff td div.head {
font-weight: bold;
margin-top: 1em;
- color: black;
+ background-color: #eee;
}
table.diff td div.hunk {
diff --git a/cgit.png b/cgit.png
index d7f70bc..22f7e95 100644
--- a/cgit.png
+++ b/cgit.png
Binary files differ
diff --git a/ui-shared.c b/ui-shared.c
index 7287956..aa65988 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,7 +7,6 @@
*/
#include "cgit.h"
-#include "cmd.h"
#include "html.h"
const char cgit_doctype[] =
@@ -466,59 +465,97 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
}
}
-char *hc(struct cgit_cmd *cmd, const char *page)
-{
- return (strcmp(cmd->name, page) ? NULL : "active");
-}
-
void cgit_print_pageheader(struct cgit_context *ctx)
{
- struct cgit_cmd *cmd = cgit_get_cmd(ctx);
+ static const char *default_info = "This is cgit, a fast webinterface for git repositories";
+ int header = 0;
+ char *url;
- html("<table id='header'>\n");
- html("<tr>\n");
- html("<td class='logo' rowspan='2'><a href='");
+ html("<table id='layout' summary=''>\n");
+ html("<tr><td id='sidebar'>\n");
+ html("<table class='sidebar' cellspacing='0' summary=''>\n");
+ html("<tr><td class='sidebar'>\n<a href='");
html_attr(cgit_rooturl());
- html("'><img src='");
- html_attr(ctx->cfg.logo);
- html("'/></a></td>\n");
- html("<td class='main'>");
- if (ctx->repo)
- html_txt(ctx->repo->name);
- else
- html_txt(ctx->cfg.root_title);
- html("</td></tr>\n");
- html("<tr><td class='sub'>");
- if (ctx->repo)
- html_txt(ctx->repo->desc);
- else
- html_txt(ctx->cfg.index_info);
- html("</td></tr>\n");
- html("</table>\n");
-
- html("<table class='tabs'><tr><td>\n");
+ htmlf("'><img src='%s' alt='cgit'/></a>\n",
+ ctx->cfg.logo);
+ html("</td></tr>\n<tr><td class='sidebar'>\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,
+ html("<h1 class='first'>");
+ html_txt(strrpart(ctx->repo->name, 20));
+ html("</h1>\n");
+ html_txt(ctx->repo->desc);
+ if (ctx->repo->owner) {
+ html("<h1>owner</h1>\n");
+ html_txt(ctx->repo->owner);
+ }
+ html("<h1>navigate</h1>\n");
+ reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,
+ NULL, NULL);
+ cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,
+ 0, NULL, NULL);
+ cgit_tree_link("tree", NULL, "menu", 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,
+ cgit_commit_link("commit", NULL, "menu", ctx->qry.head,
+ ctx->qry.sha1);
+ cgit_diff_link("diff", NULL, "menu", ctx->qry.head,
ctx->qry.sha1, ctx->qry.sha2, NULL);
- cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
+ cgit_patch_link("patch", NULL, "menu", ctx->qry.head,
ctx->qry.sha1);
+
+ for_each_ref(print_archive_ref, &header);
+
+ if (ctx->repo->clone_url || ctx->cfg.clone_prefix) {
+ html("<h1>clone</h1>\n");
+ if (ctx->repo->clone_url)
+ url = ctx->repo->clone_url;
+ else
+ url = fmt("%s%s", ctx->cfg.clone_prefix,
+ ctx->repo->url);
+ html("<a class='menu' href='");
+ html_attr(url);
+ html("' title='");
+ html_attr(url);
+ html("'>\n");
+ html_txt(strrpart(url, 20));
+ html("</a>\n");
+ }
+
+ html("<h1>branch</h1>\n");
+ html("<form method='get' action=''>\n");
+ add_hidden_formfields(0, 1, ctx->qry.page);
+// html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
+ html("<select name='h' onchange='this.form.submit();'>\n");
+ for_each_branch_ref(print_branch_option, ctx->qry.head);
+ html("</select>\n");
+// html("</td><td>");
+ html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
+// html("</td></tr></table>");
+ html("</form>\n");
+
+ html("<h1>search</h1>\n");
+ html("<form 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' name='q' value='");
+ html_attr(ctx->qry.search);
+ html("'/>\n");
+ html("</form>\n");
} else {
- html("<a class='active' href='");
- html_attr(cgit_rooturl());
- html("'>index</a>\n");
+ if (!ctx->cfg.index_info || html_include(ctx->cfg.index_info))
+ html(default_info);
}
- html("</td></tr></table>\n");
- html("<div class='content'>");
+
+ html("</td></tr></table></td>\n");
+
+ html("<td id='content'>\n");
}
void cgit_print_filemode(unsigned short mode)
generated by cgitext v1.3.1+17 (git 2.54.0) at 2026-09-12 09:43:36 +0000