author | Lars Hjemli <hjemli@gmail.com> | 2007-06-16 23:23:08 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-16 23:39:05 (UTC) |
commit | 44947bfcdc0d6e8c7d673bea0538cbf2a182f289 (patch) (unidiff) | |
tree | 3f65d6842738a8314ed72d5575a0b523061556b7 /ui-tree.c | |
parent | f91b9696a36008c245a3195800ba0c5fa3e890f9 (diff) | |
download | cgit-44947bfcdc0d6e8c7d673bea0538cbf2a182f289.zip cgit-44947bfcdc0d6e8c7d673bea0538cbf2a182f289.tar.gz cgit-44947bfcdc0d6e8c7d673bea0538cbf2a182f289.tar.bz2 |
Add and use cgit_tree_link()
This creates a new function used to generate links to 'tree' page and uses
the function everywhere a link to the 'tree' page is generated.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-tree.c | 33 |
1 files changed, 18 insertions, 15 deletions
@@ -57,2 +57,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
57 | char *name; | 57 | char *name; |
58 | char *fullpath; | ||
58 | enum object_type type; | 59 | enum object_type type; |
@@ -62,2 +63,5 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
62 | name = xstrdup(pathname); | 63 | name = xstrdup(pathname); |
64 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", | ||
65 | cgit_query_path ? "/" : "", name); | ||
66 | |||
63 | type = sha1_object_info(sha1, &size); | 67 | type = sha1_object_info(sha1, &size); |
@@ -69,6 +73,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
69 | } | 73 | } |
70 | qry = fmt("h=%s&path=%s%s%s", curr_rev, | 74 | |
71 | cgit_query_path ? cgit_query_path : "", | ||
72 | cgit_query_path ? "/" : "", pathname); | ||
73 | url = cgit_pageurl(cgit_query_repo, "tree", qry); | ||
74 | html("<tr><td class='filemode'>"); | 75 | html("<tr><td class='filemode'>"); |
@@ -81,11 +82,15 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
81 | sha1_to_hex(sha1))); | 82 | sha1_to_hex(sha1))); |
83 | html("'>"); | ||
84 | html_txt(name); | ||
85 | html("</a>"); | ||
82 | } else if (S_ISDIR(mode)) { | 86 | } else if (S_ISDIR(mode)) { |
83 | html("class='ls-dir'><a href='"); | 87 | html("class='ls-dir'>"); |
84 | html_attr(url); | 88 | cgit_tree_link(name, NULL, NULL, cgit_query_head, |
89 | curr_rev, fullpath); | ||
85 | } else { | 90 | } else { |
86 | html("class='ls-blob'><a href='"); | 91 | html("class='ls-blob'>"); |
87 | html_attr(url); | 92 | cgit_tree_link(name, NULL, NULL, cgit_query_head, |
93 | curr_rev, fullpath); | ||
88 | } | 94 | } |
89 | htmlf("'>%s</a></td>", name); | 95 | htmlf("</td><td class='filesize'>%li</td>", size); |
90 | htmlf("<td class='filesize'>%li</td>", size); | ||
91 | 96 | ||
@@ -152,7 +157,5 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | |||
152 | fmt("h=%s&path=%s", curr_rev, buffer)); | 157 | fmt("h=%s&path=%s", curr_rev, buffer)); |
153 | htmlf(" / <a href='"); | 158 | html("/"); |
154 | html_attr(url); | 159 | cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head, |
155 | html("'>"); | 160 | curr_rev, buffer); |
156 | html_txt(xstrdup(pathname)); | ||
157 | html("</a>"); | ||
158 | 161 | ||