Add setting to enable/disable extra links on index page

The summary/log/tree links displayed for each repository on the index
page lost some of their purpose when the header menu was added, so this
commit introduces the parameter 'enable-index-links' which must be set
to 1 to enable these links.

Suggested-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cgit.h b/cgit.h
index bd2dd0d652a9e881cee0227818d46fe928fccba7..81c819d95ee6fa269b09d9e8148cb066a156ded4 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -118,6 +118,7 @@ extern char *cgit_repo_group;
 
 extern int cgit_nocache;
 extern int cgit_snapshots;
 
 extern int cgit_nocache;
 extern int cgit_snapshots;

+extern int cgit_enable_index_links;

 extern int cgit_enable_log_filecount;
 extern int cgit_enable_log_linecount;
 extern int cgit_max_lock_attempts;
 extern int cgit_enable_log_filecount;
 extern int cgit_enable_log_linecount;
 extern int cgit_max_lock_attempts;

diff --git a/cgitrc b/cgitrc
index 0f602e471a73e177d2a15643fd539f5204ad773a..40877f840bad2d6079fa415eb9b40611ca20064a 100644 (file)
--- a/cgitrc
+++ b/cgitrc
@@ -12,6 +12,10 @@
 #snapshots=0
 
 
 #snapshots=0
 
 

+## Enable/disable extra links to summary/log/tree per repo on index page
+#enable-index-links=0
+
+

 ## Enable/disable display of 'number of files changed' in log view
 #enable-log-filecount=0
 
 ## Enable/disable display of 'number of files changed' in log view
 #enable-log-filecount=0
 

diff --git a/shared.c b/shared.c
index f20fb5cc423f5ab184a730a2f5e2c1bb5b4b066a..ab00bc93c36fec302ef9de8f00ac976dcd14298d 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -26,6 +26,7 @@ char *cgit_repo_group   = NULL;
 
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;
 
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;

+int cgit_enable_index_links    =  0;

 int cgit_enable_log_filecount  =  0;
 int cgit_enable_log_linecount  =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_enable_log_filecount  =  0;
 int cgit_enable_log_linecount  =  0;
 int cgit_max_lock_attempts     =  5;


@@ -146,6 +147,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_nocache = atoi(value);
        else if (!strcmp(name, "snapshots"))
                cgit_snapshots = atoi(value);
                cgit_nocache = atoi(value);
        else if (!strcmp(name, "snapshots"))
                cgit_snapshots = atoi(value);

+       else if (!strcmp(name, "enable-index-links"))
+               cgit_enable_index_links = atoi(value);

        else if (!strcmp(name, "enable-log-filecount"))
                cgit_enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))
        else if (!strcmp(name, "enable-log-filecount"))
                cgit_enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))

diff --git a/ui-repolist.c b/ui-repolist.c
index 4f820a87f3e0075ae10aac3e0c07bc0e2f4bdfd6..c735368d78108725e9177cb87de691306060cda5 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -44,15 +44,19 @@ static void print_modtime(struct repoinfo *repo)
 
 void cgit_print_repolist(struct cacheitem *item)
 {
 
 void cgit_print_repolist(struct cacheitem *item)
 {

-       int i;
+       int i, columns = 4;

        char *last_group = NULL;
 
        char *last_group = NULL;
 

+       if (cgit_enable_index_links)
+               columns++;
+

        cgit_print_docstart(cgit_root_title, item);
        cgit_print_pageheader(cgit_root_title, 0);
 
        html("<table class='list nowrap'>");
        if (cgit_index_header) {
        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'>");
+               htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
+                     columns);

                html_include(cgit_index_header);
                html("</td></tr>");
        }
                html_include(cgit_index_header);
                html("</td></tr>");
        }


@@ -60,8 +64,10 @@ void cgit_print_repolist(struct cacheitem *item)
             "<th class='left'>Name</th>"
             "<th class='left'>Description</th>"
             "<th class='left'>Owner</th>"
             "<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");
+            "<th class='left'>Idle</th>");
+       if (cgit_enable_index_links)
+               html("<th>Links</th>");
+       html("</tr>\n");

 
        for (i=0; i<cgit_repolist.count; i++) {
                cgit_repo = &cgit_repolist.repos[i];
 
        for (i=0; i<cgit_repolist.count; i++) {
                cgit_repo = &cgit_repolist.repos[i];


@@ -69,7 +75,8 @@ void cgit_print_repolist(struct cacheitem *item)
                    (last_group != NULL && cgit_repo->group == NULL) ||
                    (last_group != NULL && cgit_repo->group != NULL &&
                     strcmp(cgit_repo->group, last_group))) {
                    (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'>");
+                       htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
+                             columns);

                        html_txt(cgit_repo->group);
                        html("</td></tr>");
                        last_group = cgit_repo->group;
                        html_txt(cgit_repo->group);
                        html("</td></tr>");
                        last_group = cgit_repo->group;


@@ -85,13 +92,17 @@ void cgit_print_repolist(struct cacheitem *item)
                html_txt(cgit_repo->owner);
                html("</td><td>");
                print_modtime(cgit_repo);
                html_txt(cgit_repo->owner);
                html("</td><td>");
                print_modtime(cgit_repo);

-               html("</td><td>");
-               html_link_open(cgit_repourl(cgit_repo->url),
-                              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("</td>");
+               if (cgit_enable_index_links) {
+                       html("<td>");
+                       html_link_open(cgit_repourl(cgit_repo->url),
+                                      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>");
+               }
+               html("</tr>\n");

        }
        html("</table>");
        cgit_print_docend();
        }
        html("</table>");
        cgit_print_docend();