summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2006-12-15 23:33:28 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2006-12-15 23:33:28 (UTC)
commit148fb9622c6a96021e572d1a372e38896506031f (patch) (side-by-side diff)
tree2bfde276f3fed3b3a42afbdd90a64c98d0502ae3
parent9a8f88658d51aeb86a79ac1121de13562ad2601f (diff)
downloadcgit-148fb9622c6a96021e572d1a372e38896506031f.zip
cgit-148fb9622c6a96021e572d1a372e38896506031f.tar.gz
cgit-148fb9622c6a96021e572d1a372e38896506031f.tar.bz2
Move cgit_print_date into ui-shared, reuse in ui-summary
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h1
-rw-r--r--ui-commit.c11
-rw-r--r--ui-shared.c12
-rw-r--r--ui-summary.c20
4 files changed, 24 insertions, 20 deletions
diff --git a/cgit.h b/cgit.h
index a905e47..a54f2b5 100644
--- a/cgit.h
+++ b/cgit.h
@@ -56,44 +56,45 @@ extern int cgit_query_ofs;
extern int htmlfd;
extern void cgit_global_config_cb(const char *name, const char *value);
extern void cgit_repo_config_cb(const char *name, const char *value);
extern void cgit_querystring_cb(const char *name, const char *value);
extern char *fmt(const char *format,...);
extern void html(const char *txt);
extern void htmlf(const char *format,...);
extern void html_txt(char *txt);
extern void html_attr(char *txt);
extern void html_link_open(char *url, char *title, char *class);
extern void html_link_close(void);
extern int cgit_read_config(const char *filename, configfn fn);
extern int cgit_parse_query(char *txt, configfn fn);
extern struct commitinfo *cgit_parse_commit(struct commit *commit);
extern void cache_prepare(struct cacheitem *item);
extern int cache_lock(struct cacheitem *item);
extern int cache_unlock(struct cacheitem *item);
extern int cache_cancel_lock(struct cacheitem *item);
extern int cache_exist(struct cacheitem *item);
extern int cache_expired(struct cacheitem *item);
extern char *cgit_repourl(const char *reponame);
extern char *cgit_pageurl(const char *reponame, const char *pagename,
const char *query);
extern void cgit_print_error(char *msg);
+extern void cgit_print_date(unsigned long secs);
extern void cgit_print_docstart(char *title, struct cacheitem *item);
extern void cgit_print_docend();
extern void cgit_print_pageheader(char *title);
extern void cgit_print_repolist(struct cacheitem *item);
extern void cgit_print_summary();
extern void cgit_print_log(const char *tip, int ofs, int cnt);
extern void cgit_print_view(const char *hex);
extern void cgit_print_tree(const char *hex);
extern void cgit_print_commit(const char *hex);
#endif /* CGIT_H */
diff --git a/ui-commit.c b/ui-commit.c
index 1c0e7e5..2d38f0b 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,45 +1,34 @@
#include "cgit.h"
-void cgit_print_date(unsigned long secs)
-{
- char buf[32];
- struct tm *time;
-
- time = gmtime(&secs);
- strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
- html_txt(buf);
-
-}
-
void cgit_print_commit(const char *hex)
{
struct commit *commit;
struct commitinfo *info;
struct commit_list *p;
unsigned long size;
char type[20];
char *buf;
unsigned char sha1[20];
if (get_sha1(hex, sha1)) {
cgit_print_error(fmt("Bad object id: %s", hex));
return;
}
buf = read_sha1_file(sha1, type, &size);
if (!buf) {
cgit_print_error(fmt("Bad object reference: %s", hex));
return;
}
commit = lookup_commit(sha1);
if (!commit) {
cgit_print_error(fmt("Bad commit reference: %s", hex));
return;
}
commit->buffer = buf;
if (parse_commit_buffer(commit, buf, size)) {
cgit_print_error(fmt("Malformed commit buffer: %s", hex));
return;
diff --git a/ui-shared.c b/ui-shared.c
index cb8a8df..1a6c127 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -31,64 +31,76 @@ static int ttl_seconds(int ttl)
return 60 * 60 * 24 * 365;
else
return ttl * 60;
}
void cgit_print_error(char *msg)
{
html("<div class='error'>");
html_txt(msg);
html("</div>\n");
}
char *cgit_repourl(const char *reponame)
{
if (cgit_virtual_root) {
return fmt("%s/%s/", cgit_virtual_root, reponame);
} else {
return fmt("?r=%s", reponame);
}
}
char *cgit_pageurl(const char *reponame, const char *pagename,
const char *query)
{
if (cgit_virtual_root) {
return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
pagename, query);
} else {
return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
}
}
+
+void cgit_print_date(unsigned long secs)
+{
+ char buf[32];
+ struct tm *time;
+
+ time = gmtime(&secs);
+ strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
+ html_txt(buf);
+
+}
+
void cgit_print_docstart(char *title, struct cacheitem *item)
{
html("Content-Type: text/html; charset=utf-8\n");
htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
htmlf("Expires: %s\n", http_date(item->st.st_mtime +
ttl_seconds(item->ttl)));
html("\n");
html(cgit_doctype);
html("<html>\n");
html("<head>\n");
html("<title>");
html_txt(title);
html("</title>\n");
htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
html("<link rel='stylesheet' type='text/css' href='");
html_attr(cgit_css);
html("'/>\n");
html("</head>\n");
html("<body>\n");
}
void cgit_print_docend()
{
html("</body>\n</html>\n");
}
void cgit_print_pageheader(char *title)
{
html("<div id='header'>");
htmlf("<a href='%s'>", cgit_logo_link);
htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
htmlf("</a>");
diff --git a/ui-summary.c b/ui-summary.c
index 46814dd..8ff3642 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,60 +1,62 @@
/* 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;
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);
strncpy(buf, refname, sizeof(buf));
html_txt(buf);
html_link_close();
html("</td><td>");
- pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
- sizeof(buf), 0, NULL, NULL, 0);
- html_txt(buf);
- html("</td><td><a href='");
- html_attr(cgit_pageurl(cgit_query_repo, "tree",
- fmt("id=%s",
- sha1_to_hex(commit->tree->object.sha1))));
- html("'>tree</a>");
+ cgit_print_date(commit->date);
+ html("</td><td>");
+ url = cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(sha1)));
+ html_link_open(url, NULL, NULL);
+ html_txt(info->subject);
+ html_link_close();
+ html("</td><td>");
+ html_txt(info->author);
html("</td></tr>\n");
} else {
html("<tr><td>");
html_txt(buf);
html("</td><td>");
htmlf("*** bad ref %s", sha1_to_hex(sha1));
html("</td></tr>\n");
}
return 0;
}
static void cgit_print_branches()
{
html("<table class='list'>");
- html("<tr><th>Branch</th><th>Last commit</th><th>Link</th></tr>\n");
+ html("<tr><th class='left'>Branch</th><th class='left'>Updated</th><th class='left'>Commit subject</th><th class='left'>Author</th></tr>\n");
for_each_branch_ref(cgit_print_branch_cb, NULL);
html("</table>");
}
void cgit_print_summary()
{
html("<h2>");
html_txt("Repo summary page");
html("</h2>");
cgit_print_branches();
}