summaryrefslogtreecommitdiffabout
authorLars Hjemli <larsh@slaptop.hjemli.net>2007-01-27 23:39:26 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-01-27 23:52:41 (UTC)
commit777faf7e509e1de2b795b2a326ff00c9bd799104 (patch) (side-by-side diff)
treeccb440445caf46cbfa3d4bd21d743697f37a9876
parent447025f62ccbbb6e038d42009368e28f3e162460 (diff)
downloadcgit-777faf7e509e1de2b795b2a326ff00c9bd799104.zip
cgit-777faf7e509e1de2b795b2a326ff00c9bd799104.tar.gz
cgit-777faf7e509e1de2b795b2a326ff00c9bd799104.tar.bz2
Cleanup table listings
Make the output for <table class='list'> a bit nicer Signed-off-by: Lars Hjemli <larsh@slaptop.hjemli.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.css10
-rw-r--r--ui-log.c2
-rw-r--r--ui-repolist.c2
-rw-r--r--ui-summary.c4
-rw-r--r--ui-tree.c2
-rw-r--r--ui-view.c2
6 files changed, 9 insertions, 13 deletions
diff --git a/cgit.css b/cgit.css
index d94b1b7..d2c0d0b 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,200 +1,196 @@
body {
font-family: arial;
font-size: normal;
background: white;
padding: 0em;
margin: 0.5em 1em;
}
h2 {
font-size: 120%;
font-weight: bold;
margin-bottom: 0.5em;
}
a {
color: blue;
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
table.list {
- border: solid 1px black;
+ border: none;
border-collapse: collapse;
- border: solid 1px #aaa;
}
table.list tr {
background: white;
}
table.list tr:hover {
- background: #eeb;
+ background: #eee;
}
table.list tr.nohover:hover {
background: white;
}
table.list th {
font-weight: normal;
- background: #ddd;
- border-top: solid 1px #aaa;
- border-bottom: solid 1px #aaa;
+ border-bottom: solid 1px #777;
padding: 0.1em 0.5em 0.1em 0.5em;
vertical-align: baseline;
}
table.list td {
border: none;
padding: 0.1em 0.5em 0.1em 0.5em;
}
img {
border: none;
}
-
div#header {
background-color: #ddd;
padding: 0.25em 0.25em 0.25em 0.5em;
font-size: 150%;
font-weight: bold;
border: solid 1px #aaa;
vertical-align: middle;
margin-bottom: 2em;
}
div#header img#logo {
float: right;
}
div#header input {
float: right;
margin: 0.25em 1em;
}
div#header a {
color: black;
}
div#content {
margin: 0.5em 0.5em;
}
div#blob {
border: solid 1px black;
}
div.error {
color: red;
font-weight: bold;
margin: 1em 2em;
}
div.ls-blob, div.ls-dir {
font-family: monospace;
}
div.ls-dir a {
font-weight: bold;
}
th.filesize, td.filesize {
text-align: right;
}
td.filesize {
font-family: monospace;
}
td.filemode {
font-family: monospace;
}
td.blob {
white-space: pre;
font-family: monospace;
background-color: white;
}
table.nowrap td {
white-space: nowrap;
}
table.commit-info {
border-collapse: collapse;
margin-top: 1.5em;
}
table.commit-info th {
text-align: left;
font-weight: normal;
padding: 0.1em 1em 0.1em 0.1em;
}
table.commit-info td {
font-weight: normal;
padding: 0.1em 1em 0.1em 0.1em;
}
div.commit-subject {
font-weight: bold;
font-size: 125%;
margin: 1.5em 0em 0.5em 0em;
padding: 0em;
}
div.commit-msg {
white-space: pre;
font-family: monospace;
}
table.diffstat {
border-collapse: collapse;
margin-top: 1.5em;
}
table.diffstat th {
font-weight: normal;
text-align: left;
text-decoration: underline;
padding: 0.1em 1em 0.1em 0.1em;
font-size: 100%;
}
table.diffstat td {
padding: 0.1em 1em 0.1em 0.1em;
font-size: 100%;
}
table.diffstat td span.modechange {
padding-left: 1em;
color: red;
}
table.diffstat td.add a {
color: green;
}
table.diffstat td.del a {
color: red;
}
table.diffstat td.upd a {
color: blue;
}
table.diffstat td.summary {
/* border-top: solid 1px black; */
color: #888;
padding-top: 0.5em;
}
table.diff td {
border: solid 1px black;
font-family: monospace;
white-space: pre;
}
table.diff td div.hunk {
background: #ccc;
}
table.diff td div.add {
color: green;
}
table.diff td div.del {
color: red;
}
.sha1 {
font-family: courier;
font-size: 90%;
}
.left {
text-align: left;
}
.right {
text-align: right;
}
diff --git a/ui-log.c b/ui-log.c
index c353b2a..725f49b 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,98 +1,98 @@
/* ui-log.c: functions for log output
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
void print_commit(struct commit *commit)
{
char buf[32];
struct commitinfo *info;
struct tm *time;
info = cgit_parse_commit(commit);
time = gmtime(&commit->date);
html("<tr><td>");
strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
html_txt(buf);
html("</td><td>");
char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
html_link_open(url, NULL, NULL);
html_ntxt(80, info->subject);
html_link_close();
html("</td><td>");
html_txt(info->author);
html("</td></tr>\n");
cgit_free_commitinfo(info);
}
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep)
{
struct rev_info rev;
struct commit *commit;
const char *argv[3] = {NULL, tip, NULL};
int argc = 2;
int i;
if (grep)
argv[argc++] = fmt("--grep=%s", grep);
init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV;
rev.commit_format = CMIT_FMT_DEFAULT;
rev.verbose_header = 1;
rev.show_root_diff = 0;
setup_revisions(argc, argv, &rev, NULL);
if (rev.grep_filter) {
rev.grep_filter->regflags |= REG_ICASE;
compile_grep_patterns(rev.grep_filter);
}
prepare_revision_walk(&rev);
html("<h2>Log</h2>");
html("<table class='list nowrap'>");
- html("<tr><th class='left'>Date</th>"
+ html("<tr class='nohover'><th class='left'>Date</th>"
"<th class='left'>Message</th>"
"<th class='left'>Author</th></tr>\n");
if (ofs<0)
ofs = 0;
for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
free(commit->buffer);
commit->buffer = NULL;
free_commit_list(commit->parents);
commit->parents = NULL;
}
for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
print_commit(commit);
free(commit->buffer);
commit->buffer = NULL;
free_commit_list(commit->parents);
commit->parents = NULL;
}
html("</table>\n");
html("<div class='pager'>");
if (ofs > 0) {
html("&nbsp;<a href='");
html(cgit_pageurl(cgit_query_repo, cgit_query_page,
fmt("h=%s&ofs=%d", tip, ofs-cnt)));
html("'>[prev]</a>&nbsp;");
}
if ((commit = get_revision(&rev)) != NULL) {
html("&nbsp;<a href='");
html(cgit_pageurl(cgit_query_repo, "log",
fmt("h=%s&ofs=%d", tip, ofs+cnt)));
html("'>[next]</a>&nbsp;");
}
html("</div>");
}
diff --git a/ui-repolist.c b/ui-repolist.c
index 9f12b18..bd4af59 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,63 +1,63 @@
/* ui-repolist.c: functions for generating the repolist page
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
void cgit_print_repolist(struct cacheitem *item)
{
DIR *d;
struct dirent *de;
struct stat st;
char *name;
chdir(cgit_root);
cgit_print_docstart(cgit_root_title, item);
cgit_print_pageheader(cgit_root_title, 0);
if (!(d = opendir("."))) {
cgit_print_error(fmt("Unable to scan repository directory: %s",
strerror(errno)));
cgit_print_docend();
return;
}
html("<h2>Repositories</h2>\n");
html("<table class='list nowrap'>");
- html("<tr>"
+ html("<tr class='nohover'>"
"<th class='left'>Name</th>"
"<th class='left'>Description</th>"
"<th class='left'>Owner</th></tr>\n");
while ((de = readdir(d)) != NULL) {
if (de->d_name[0] == '.')
continue;
if (stat(de->d_name, &st) < 0)
continue;
if (!S_ISDIR(st.st_mode))
continue;
cgit_repo_name = cgit_repo_desc = cgit_repo_owner = NULL;
name = fmt("%s/info/cgit", de->d_name);
if (cgit_read_config(name, cgit_repo_config_cb))
continue;
html("<tr><td>");
html_link_open(cgit_repourl(de->d_name), NULL, NULL);
html_txt(cgit_repo_name);
html_link_close();
html("</td><td>");
html_txt(cgit_repo_desc);
html("</td><td>");
html_txt(cgit_repo_owner);
html("</td></tr>\n");
}
closedir(d);
html("</table>");
cgit_print_docend();
}
diff --git a/ui-summary.c b/ui-summary.c
index 1591632..04d4912 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,125 +1,125 @@
/* ui-summary.c: functions for generating repo summary page
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
int flags, void *cb_data)
{
struct commit *commit;
struct commitinfo *info;
char buf[256], *url;
strncpy(buf, refname, sizeof(buf));
commit = lookup_commit(sha1);
if (commit && !parse_commit(commit)){
info = cgit_parse_commit(commit);
html("<tr><td>");
url = cgit_pageurl(cgit_query_repo, "log",
fmt("h=%s", refname));
html_link_open(url, NULL, NULL);
html_txt(buf);
html_link_close();
html("</td><td>");
cgit_print_date(commit->date);
html("</td><td>");
html_txt(info->author);
html("</td><td>");
url = cgit_pageurl(cgit_query_repo, "commit",
fmt("id=%s", sha1_to_hex(sha1)));
html_link_open(url, NULL, NULL);
html_ntxt(80, info->subject);
html_link_close();
html("</td></tr>\n");
cgit_free_commitinfo(info);
} else {
html("<tr><td>");
html_txt(buf);
html("</td><td colspan='3'>");
htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
html("</td></tr>\n");
}
return 0;
}
static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
int flags, void *cb_data)
{
struct tag *tag;
struct taginfo *info;
char buf[256], *page, *url;
strncpy(buf, refname, sizeof(buf));
tag = lookup_tag(sha1);
if (tag && !parse_tag(tag) && (info = cgit_parse_tag(tag))){
html("<tr><td>");
url = cgit_pageurl(cgit_query_repo, "view",
fmt("id=%s", sha1_to_hex(sha1)));
html_link_open(url, NULL, NULL);
html_txt(buf);
html_link_close();
html("</td><td>");
if (info->tagger_date > 0)
cgit_print_date(info->tagger_date);
html("</td><td>");
if (info->tagger)
html(info->tagger);
html("</td><td>");
if (tag->tagged->type == OBJ_COMMIT)
page = "commit";
else if (tag->tagged->type == OBJ_TREE)
page = "tree";
else
page = "view";
url = cgit_pageurl(cgit_query_repo, page,
fmt("id=%s", sha1_to_hex(tag->tagged->sha1)));
html_link_open(url, NULL, NULL);
htmlf("%s %s", type_names[tag->tagged->type],
sha1_to_hex(tag->tagged->sha1));
html_link_close();
html("</td></tr>\n");
} else {
html("<tr><td>");
html_txt(buf);
html("</td><td colspan='3'>");
htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
html("</td></tr>\n");
}
return 0;
}
static void cgit_print_branches()
{
- html("<tr><th class='left'>Branch</th>"
+ html("<tr class='nohover'><th class='left'>Branch</th>"
"<th class='left'>Updated</th>"
"<th class='left'>Author</th>"
"<th class='left'>Head commit</th></tr>\n");
for_each_branch_ref(cgit_print_branch_cb, NULL);
}
static void cgit_print_tags()
{
- html("<tr><th class='left'>Tag</th>"
+ html("<tr class='nohover'><th class='left'>Tag</th>"
"<th class='left'>Created</th>"
"<th class='left'>Author</th>"
"<th class='left'>Reference</th></tr>\n");
for_each_tag_ref(cgit_print_tag_cb, NULL);
}
void cgit_print_summary()
{
html("<h2>");
html_txt("Repo summary page");
html("</h2>");
html("<table class='list nowrap'>");
cgit_print_branches();
html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
cgit_print_tags();
html("</table>");
}
diff --git a/ui-tree.c b/ui-tree.c
index ed9f05e..1d07e70 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -1,79 +1,79 @@
/* ui-tree.c: functions for tree output
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
static int print_entry(const unsigned char *sha1, const char *base,
int baselen, const char *pathname, unsigned int mode,
int stage)
{
char *name;
char type[20];
unsigned long size;
if (sha1_object_info(sha1, type, &size)) {
cgit_print_error(fmt("Bad object name: %s",
sha1_to_hex(sha1)));
return 0;
}
name = xstrdup(pathname);
html("<tr><td class='filemode'>");
html_filemode(mode);
html("</td><td>");
if (S_ISDIR(mode)) {
html("<div class='ls-dir'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "tree",
fmt("id=%s&path=%s%s/",
sha1_to_hex(sha1),
cgit_query_path ? cgit_query_path : "",
pathname)));
} else {
html("<div class='ls-blob'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "view",
fmt("id=%s&path=%s%s", sha1_to_hex(sha1),
cgit_query_path ? cgit_query_path : "",
pathname)));
}
html("'>");
html_txt(name);
if (S_ISDIR(mode))
html("/");
html("</a></div></td>");
htmlf("<td class='filesize'>%li</td>", size);
html("</tr>\n");
free(name);
return 0;
}
void cgit_print_tree(const char *hex, char *path)
{
struct tree *tree;
unsigned char sha1[20];
if (get_sha1_hex(hex, sha1)) {
cgit_print_error(fmt("Invalid object id: %s", hex));
return;
}
tree = parse_tree_indirect(sha1);
if (!tree) {
cgit_print_error(fmt("Not a tree object: %s", hex));
return;
}
html("<h2>Tree content</h2>\n");
html_txt(path);
html("<table class='list'>\n");
- html("<tr>");
+ html("<tr class='nohover'>");
html("<th class='left'>Mode</th>");
html("<th class='left'>Name</th>");
html("<th class='right'>Size</th>");
html("</tr>\n");
read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
html("</table>\n");
}
diff --git a/ui-view.c b/ui-view.c
index b75ce9a..07cd8be 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -1,42 +1,42 @@
/* ui-view.c: functions to output _any_ object, given it's sha1
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
void cgit_print_view(const char *hex)
{
unsigned char sha1[20];
char type[20];
unsigned char *buf;
unsigned long size;
if (get_sha1_hex(hex, sha1)){
cgit_print_error(fmt("Bad hex value: %s", hex));
return;
}
if (sha1_object_info(sha1, type, &size)){
cgit_print_error("Bad object name");
return;
}
buf = read_sha1_file(sha1, type, &size);
if (!buf) {
cgit_print_error("Error reading object");
return;
}
buf[size] = '\0';
html("<h2>Object content</h2>\n");
html("<table class='list'>\n");
- htmlf("<tr><th>%s %s, %li bytes</th></tr>\n", type, hex, size);
+ htmlf("<tr class='nohover'><th class='left'>%s %s, %li bytes</th></tr>\n", type, hex, size);
html("<tr><td class='blob'>\n");
html_txt(buf);
html("\n</td></tr>\n");
html("</table>\n");
}