summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-16 08:45:45 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-16 08:46:59 (UTC)
commitc1ad6cb77889880ad0189a689840fbfa6e5cbc80 (patch) (unidiff)
tree352c32898316a388b582385a5fb3c6c534eaa30a
parentf4f1339fe62fb1a28c147567195a86dd99485e25 (diff)
downloadcgit-c1ad6cb77889880ad0189a689840fbfa6e5cbc80.zip
cgit-c1ad6cb77889880ad0189a689840fbfa6e5cbc80.tar.gz
cgit-c1ad6cb77889880ad0189a689840fbfa6e5cbc80.tar.bz2
Restrict length of repo description on repolist page
If any repo has a very long description, all repos suffer since the repo-links in the right-most column gets pushed out of sight. Fix it by introducing max-repodesc-length parameter in cgitrc, and default to 60 chars. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h1
-rw-r--r--cgitrc4
-rw-r--r--shared.c3
-rw-r--r--ui-repolist.c2
4 files changed, 9 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 764225d..290401f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -88,8 +88,9 @@ extern int cgit_cache_dynamic_ttl;
88extern int cgit_cache_static_ttl; 88extern int cgit_cache_static_ttl;
89extern int cgit_cache_max_create_time; 89extern int cgit_cache_max_create_time;
90 90
91extern int cgit_max_msg_len; 91extern int cgit_max_msg_len;
92extern int cgit_max_repodesc_len;
92extern int cgit_max_commit_count; 93extern int cgit_max_commit_count;
93 94
94extern char *cgit_repo_name; 95extern char *cgit_repo_name;
95extern char *cgit_repo_desc; 96extern char *cgit_repo_desc;
diff --git a/cgitrc b/cgitrc
index e7e731c..f923cc4 100644
--- a/cgitrc
+++ b/cgitrc
@@ -50,8 +50,12 @@
50## Url loaded when clicking a submodule link 50## Url loaded when clicking a submodule link
51#module-link=./?repo=%s&page=commit&id=%s 51#module-link=./?repo=%s&page=commit&id=%s
52 52
53 53
54## Number of chars shown of repo description (in repolist view)
55#max-repodesc-length=60
56
57
54## Number of chars shown of commit subject message (in log view) 58## Number of chars shown of commit subject message (in log view)
55#max-message-length=60 59#max-message-length=60
56 60
57 61
diff --git a/shared.c b/shared.c
index a1e1acd..752ceac 100644
--- a/shared.c
+++ b/shared.c
@@ -29,8 +29,9 @@ int cgit_cache_dynamic_ttl = 5;
29int cgit_cache_static_ttl = -1; 29int cgit_cache_static_ttl = -1;
30int cgit_cache_max_create_time = 5; 30int cgit_cache_max_create_time = 5;
31 31
32int cgit_max_msg_len = 60; 32int cgit_max_msg_len = 60;
33int cgit_max_repodesc_len = 60;
33int cgit_max_commit_count = 50; 34int cgit_max_commit_count = 50;
34 35
35int cgit_query_has_symref = 0; 36int cgit_query_has_symref = 0;
36int cgit_query_has_sha1 = 0; 37int cgit_query_has_sha1 = 0;
@@ -117,8 +118,10 @@ void cgit_global_config_cb(const char *name, const char *value)
117 else if (!strcmp(name, "cache-dynamic-ttl")) 118 else if (!strcmp(name, "cache-dynamic-ttl"))
118 cgit_cache_dynamic_ttl = atoi(value); 119 cgit_cache_dynamic_ttl = atoi(value);
119 else if (!strcmp(name, "max-message-length")) 120 else if (!strcmp(name, "max-message-length"))
120 cgit_max_msg_len = atoi(value); 121 cgit_max_msg_len = atoi(value);
122 else if (!strcmp(name, "max-repodesc-length"))
123 cgit_max_repodesc_len = atoi(value);
121 else if (!strcmp(name, "max-commit-count")) 124 else if (!strcmp(name, "max-commit-count"))
122 cgit_max_commit_count = atoi(value); 125 cgit_max_commit_count = atoi(value);
123 else if (!strcmp(name, "repo.url")) 126 else if (!strcmp(name, "repo.url"))
124 cgit_repo = add_repo(value); 127 cgit_repo = add_repo(value);
diff --git a/ui-repolist.c b/ui-repolist.c
index d341193..d7311e4 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -29,9 +29,9 @@ void cgit_print_repolist(struct cacheitem *item)
29 html_link_open(cgit_repourl(repo->url), NULL, NULL); 29 html_link_open(cgit_repourl(repo->url), NULL, NULL);
30 html_txt(repo->name); 30 html_txt(repo->name);
31 html_link_close(); 31 html_link_close();
32 html("</td><td>"); 32 html("</td><td>");
33 html_txt(repo->desc); 33 html_ntxt(cgit_max_repodesc_len, repo->desc);
34 html("</td><td>"); 34 html("</td><td>");
35 html_txt(repo->owner); 35 html_txt(repo->owner);
36 html("</td><td>"); 36 html("</td><td>");
37 html_link_open(cgit_pageurl(repo->name, "commit", NULL), 37 html_link_open(cgit_pageurl(repo->name, "commit", NULL),