summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-06-18 20:12:09 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-06-18 20:14:17 (UTC)
commita215bf4620113fcefb8dd3442bf3501bd648c463 (patch) (side-by-side diff)
tree22e156c5b67605d7174c73efcd132696b335e8a0
parent1f34fb9d4f0bf82706ed8912c37a4b320a14813b (diff)
downloadcgit-a215bf4620113fcefb8dd3442bf3501bd648c463.zip
cgit-a215bf4620113fcefb8dd3442bf3501bd648c463.tar.gz
cgit-a215bf4620113fcefb8dd3442bf3501bd648c463.tar.bz2
Change S/L/T to summary/log/tree
In yet another attempt at better usability, the cryptic S/L/T links are changed to show their full name. Suggested-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.css9
-rw-r--r--ui-repolist.c8
-rw-r--r--ui-tree.c2
3 files changed, 10 insertions, 9 deletions
diff --git a/cgit.css b/cgit.css
index 9c79c32..112dac1 100644
--- a/cgit.css
+++ b/cgit.css
@@ -326,100 +326,101 @@ table.diffstat td.graph td.rem {
div.diffstat-summary {
color: #888;
padding-top: 0.5em;
}
table.diff td {
font-family: monospace;
white-space: pre;
}
table.diff td div.head {
font-weight: bold;
padding-top: 1em;
}
table.diff td div.hunk {
color: #009;
}
table.diff td div.add {
color: green;
}
table.diff td div.del {
color: red;
}
.sha1 {
font-family: monospace;
font-size: 90%;
}
.left {
text-align: left;
}
.right {
text-align: right;
}
table.list td.repogroup {
font-style: italic;
color: #888;
}
a.button {
font-size: 80%;
- color: #333;
- background-color: #ccc;
- border: solid 1px #999;
+ color: #aaa;
+ background-color: #eee;
+ border: solid 1px #aaa;
padding: 0em 0.5em;
margin: 0.1em 0.25em;
}
a.button:hover {
text-decoration: none;
- background-color: #eee;
+ color: #333;
+ background-color: #ccc;
}
a.primary {
font-size: 100%;
}
a.secondary {
font-size: 90%;
}
td.toplevel-repo {
}
table.list td.sublevel-repo {
padding-left: 1.5em;
}
span.age-mins {
font-weight: bold;
color: #080;
}
span.age-hours {
color: #080;
}
span.age-days {
color: #040;
}
span.age-weeks {
color: #444;
}
span.age-months {
color: #888;
}
span.age-years {
color: #bbb;
}
diff --git a/ui-repolist.c b/ui-repolist.c
index d5c77ea..4f820a8 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -42,57 +42,57 @@ static void print_modtime(struct repoinfo *repo)
cgit_print_age(s.st_mtime, -1, NULL);
}
void cgit_print_repolist(struct cacheitem *item)
{
int i;
char *last_group = NULL;
cgit_print_docstart(cgit_root_title, item);
cgit_print_pageheader(cgit_root_title, 0);
html("<table class='list nowrap'>");
if (cgit_index_header) {
html("<tr class='nohover'><td colspan='5' class='include-block'>");
html_include(cgit_index_header);
html("</td></tr>");
}
html("<tr class='nohover'>"
"<th class='left'>Name</th>"
"<th class='left'>Description</th>"
"<th class='left'>Owner</th>"
"<th class='left'>Idle</th>"
"<th>Links</th></tr>\n");
for (i=0; i<cgit_repolist.count; i++) {
cgit_repo = &cgit_repolist.repos[i];
if ((last_group == NULL && cgit_repo->group != NULL) ||
(last_group != NULL && cgit_repo->group == NULL) ||
(last_group != NULL && cgit_repo->group != NULL &&
strcmp(cgit_repo->group, last_group))) {
html("<tr class='nohover'><td colspan='4' class='repogroup'>");
html_txt(cgit_repo->group);
html("</td></tr>");
last_group = cgit_repo->group;
}
htmlf("<tr><td class='%s'>",
cgit_repo->group ? "sublevel-repo" : "toplevel-repo");
html_link_open(cgit_repourl(cgit_repo->url), NULL, NULL);
html_txt(cgit_repo->name);
html_link_close();
html("</td><td>");
html_ntxt(cgit_max_repodesc_len, cgit_repo->desc);
html("</td><td>");
html_txt(cgit_repo->owner);
html("</td><td>");
print_modtime(cgit_repo);
html("</td><td>");
html_link_open(cgit_repourl(cgit_repo->url),
- "Summary", "button");
- html("S</a>");
- cgit_log_link("L", "Log", "button", NULL, NULL, NULL);
- cgit_tree_link("T", "Tree", "button", NULL, NULL, NULL);
+ NULL, "button");
+ html("summary</a>");
+ cgit_log_link("log", NULL, "button", NULL, NULL, NULL);
+ cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
html("</td></tr>\n");
}
html("</table>");
cgit_print_docend();
}
diff --git a/ui-tree.c b/ui-tree.c
index 1037c82..b6cb813 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -47,97 +47,97 @@ static void print_object(const unsigned char *sha1, char *path)
}
idx++;
}
html("</table>\n");
}
static int ls_item(const unsigned char *sha1, const char *base, int baselen,
const char *pathname, unsigned int mode, int stage)
{
char *name;
char *fullpath;
enum object_type type;
unsigned long size = 0;
name = xstrdup(pathname);
fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
cgit_query_path ? "/" : "", name);
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
name,
sha1_to_hex(sha1));
return 0;
}
html("<tr><td class='ls-mode'>");
html_filemode(mode);
html("</td><td>");
if (S_ISDIRLNK(mode)) {
htmlf("<a class='ls-mod' href='");
html_attr(fmt(cgit_repo->module_link,
name,
sha1_to_hex(sha1)));
html("'>");
html_txt(name);
html("</a>");
} else if (S_ISDIR(mode)) {
cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
curr_rev, fullpath);
} else {
cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
curr_rev, fullpath);
}
htmlf("</td><td class='ls-size'>%li</td>", size);
html("<td>");
- cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev,
+ cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
fullpath);
html("</td></tr>\n");
free(name);
return 0;
}
static void ls_head()
{
html("<table class='list'>\n");
html("<tr class='nohover'>");
html("<th class='left'>Mode</th>");
html("<th class='left'>Name</th>");
html("<th class='right'>Size</th>");
html("<th/>");
html("</tr>\n");
header = 1;
}
static void ls_tail()
{
if (!header)
return;
html("</table>\n");
header = 0;
}
static void ls_tree(const unsigned char *sha1, char *path)
{
struct tree *tree;
tree = parse_tree_indirect(sha1);
if (!tree) {
cgit_print_error(fmt("Not a tree object: %s",
sha1_to_hex(sha1)));
return;
}
ls_head();
read_tree_recursive(tree, "", 0, 1, NULL, ls_item);
ls_tail();
}
static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
const char *pathname, unsigned mode, int stage)
{
static int state;
static char buffer[PATH_MAX];