From ee7bc3873d4c0783d4bb2c582540e857dc6a3e8f Mon Sep 17 00:00:00 2001
From: Luedeke Andreas <andreas.luedeke@psi.ch>
Date: Thu, 27 Sep 2018 13:53:34 +0200
Subject: [PATCH] removed "Subscription columns" from config and source and
 replaced by automatic column spread.

---
 doc/config.html | 7 -------
 src/elogd.c     | 8 +++-----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/doc/config.html b/doc/config.html
index d6fc803c..516c86f0 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -232,13 +232,6 @@ Welcome title = &lt;img src="welcome.jpg"&gt;&lt;p&gt;&lt;font size=5 color=whit
       <code><b>elogd</b></code> can be used.
    </li>
    <li>
-      <b><code>Subscription columns = &lt;number&gt;</code></b><br>
-      The config page shows a list of all logbooks one can subscribe to.
-      When the list is very long it might be recommended to organize it in
-      columns. This option allows to specify the numbers of columns to use
-      (default is 1 column: a simple list).
-   </li>
-<li>
       <b><code>Guest Selection page = &lt;file&gt;</code></b><br>
       The same for installations which have a global password file. This
       means that the logbook selection page is also password protected. It
diff --git a/src/elogd.c b/src/elogd.c
index c3636632..4daab163 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -13973,11 +13973,9 @@ void show_config_page(LOGBOOK * lbs)
    }
 
    if (n > 0) {
-      if (getcfg(lbs->name, "Subscription columns", str, sizeof(str)))
-         cols = atoi(str);
-      else
-         cols = 1;
-
+      for (i = 0; lb_list[i].name[0]; i++) {}
+      j = (int) (i / 16) + 1;
+      cols =  ((j>5)?5:j);
       rsprintf("<tr><td width=\"15%%\">%s:\n", loc("Subscribe to logbooks"));
 
       rsprintf("<br><span class=\"selcomment\"><b>(%s)</b></span>\n",