diff options
author | Lars Hjemli | 2007-05-16 10:45:45 +0200 |
---|---|---|
committer | Lars Hjemli | 2007-05-16 10:46:59 +0200 |
commit | c1ad6cb77889880ad0189a689840fbfa6e5cbc80 (patch) | |
tree | 352c32898316a388b582385a5fb3c6c534eaa30a | |
parent | Don't die when diffing trees with subprojects (diff) | |
download | cgit-c1ad6cb77889880ad0189a689840fbfa6e5cbc80.tar.gz cgit-c1ad6cb77889880ad0189a689840fbfa6e5cbc80.zip |
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>
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cgitrc | 4 | ||||
-rw-r--r-- | shared.c | 3 | ||||
-rw-r--r-- | ui-repolist.c | 2 |
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 | |||
@@ -89,6 +89,7 @@ extern int cgit_cache_static_ttl; | |||
89 | extern int cgit_cache_max_create_time; | 89 | extern int cgit_cache_max_create_time; |
90 | 90 | ||
91 | extern int cgit_max_msg_len; | 91 | extern int cgit_max_msg_len; |
92 | extern int cgit_max_repodesc_len; | ||
92 | extern int cgit_max_commit_count; | 93 | extern int cgit_max_commit_count; |
93 | 94 | ||
94 | extern char *cgit_repo_name; | 95 | extern char *cgit_repo_name; |
diff --git a/cgitrc b/cgitrc index e7e731c..f923cc4 100644 --- a/cgitrc +++ b/cgitrc | |||
@@ -51,6 +51,10 @@ | |||
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 | ||
diff --git a/shared.c b/shared.c index a1e1acd..752ceac 100644 --- a/shared.c +++ b/shared.c | |||
@@ -30,6 +30,7 @@ int cgit_cache_static_ttl = -1; | |||
30 | int cgit_cache_max_create_time = 5; | 30 | int cgit_cache_max_create_time = 5; |
31 | 31 | ||
32 | int cgit_max_msg_len = 60; | 32 | int cgit_max_msg_len = 60; |
33 | int cgit_max_repodesc_len = 60; | ||
33 | int cgit_max_commit_count = 50; | 34 | int cgit_max_commit_count = 50; |
34 | 35 | ||
35 | int cgit_query_has_symref = 0; | 36 | int cgit_query_has_symref = 0; |
@@ -118,6 +119,8 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
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")) |
diff --git a/ui-repolist.c b/ui-repolist.c index d341193..d7311e4 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -30,7 +30,7 @@ void cgit_print_repolist(struct cacheitem *item) | |||
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>"); |