Merge pull request #269 from kiwix/fix-multiple-column-suggestions

Force one columned suggestions in kiwix-serve

ChangeLog

@@ -1,3 +1,20 @@
+kiwix-lib 6.0.3
+===============
+
+ * force one column suggestion in kiwix-serve suggestions
+ * fix fulltext search link in suggestions
+ * UI fixes in kiwix-serve rendering
+
+kiwix-lib 6.0.2
+===============
+
+ * Correctly set the groupId in the pom file.
+
+kiwix-lib 6.0.1
+===============
+
+ * Generate the pom file for android/maven
+
 kiwix-lib 6.0.0
 ===============
 

README.md

@@ -1,8 +1,9 @@
 Kiwix library
 =============
 
-The Kiwix library provides the Kiwix software core. It contains the
-code shared by all Kiwix ports (Windows, Linux, OSX, Android, ...).
+The Kiwix library provides the [Kiwix](https://kiwix.org) software
+suite core. It contains the code shared by all Kiwix ports (Windows,
+Linux, OSX, Android, ...).
 
 [![Download](https://api.bintray.com/packages/kiwix/kiwix/kiwixlib/images/download.svg)](https://bintray.com/kiwix/kiwix/kiwixlib/_latestVersion)
 [![Build Status](https://travis-ci.org/kiwix/kiwix-lib.svg?branch=master)](https://travis-ci.org/kiwix/kiwix-lib)
@@ -57,9 +58,9 @@ The Kiwix library builds using [Meson](https://mesonbuild.com/) version
 compilation tools.
 
 Install first the few common compilation tools:
-* Meson
-* Ninja
-* Pkg-config
+* [Meson](https://mesonbuild.com/)
+* [Ninja](https://ninja-build.org/)
+* [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/)
 
 These tools should be packaged if you use a cutting edge operating
 system. If not, have a look to the [Troubleshooting](#Troubleshooting)
@@ -70,7 +71,6 @@ Compilation
 
 Once all dependencies are installed, you can compile the Kiwix library
 with:
-
 ```bash
 meson . build
 ninja -C build
@@ -88,32 +88,29 @@ Installation
 
 If you want to install the Kiwix library and the headers you just have
 compiled on your system, here we go:
-
 ```bash
 ninja -C build install
 ```
 
 You might need to run the command as root (or using `sudo`), depending
 where you want to install the libraries. After the installation
-succeeded, you may need to run `ldconfig` (as root).
+succeeded, you may need to run `ldconfig` (as `root`).
 
 Uninstallation
 ------------
 
 If you want to uninstall the Kiwix library:
-
 ```bash
 ninja -C build uninstall
 ```
 
-Like for the installation, you might need to run the command as root
+Like for the installation, you might need to run the command as `root`
 (or using `sudo`).
 
 Troubleshooting
 ---------------
 
 If you need to install Meson "manually":
-
 ```bash
 virtualenv -p python3 ./ # Create virtualenv
 source bin/activate      # Activate the virtualenv
@@ -122,7 +119,6 @@ hash -r                  # Refresh bash paths
 ```
 
 If you need to install Ninja "manually":
-
 ```bash
 git clone git://github.com/ninja-build/ninja.git
 cd ninja
@@ -142,4 +138,5 @@ repository.
 License
 -------
 
-GPLv3 or later, see COPYING for more details.
+[GPLv3](https://www.gnu.org/licenses/gpl-3.0) or later, see
+[COPYING](COPYING) for more details.

android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'maven'
 
 android {
     compileSdkVersion 28
@@ -19,3 +20,45 @@ android {
 dependencies {
     implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
 }
+
+task writePom {
+  pom {
+    project {
+        groupId 'org.kiwix.kiwixlib'
+        artifactId 'kiwixlib'
+        version '6.0.3' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
+        packaging 'aar'
+        name 'kiwixlib'
+        url 'https://github.com/kiwix/kiwix-lib'
+        licenses {
+            license {
+                name 'GPLv3'
+                url 'https://www.gnu.org/licenses/gpl-3.0.en.html'
+            }
+        }
+      developers {
+          developer {
+              id 'kiwix'
+              name 'kiwix'
+              email 'contact@kiwix.org'
+          }
+      }
+      scm {
+          connection 'https://github.com/kiwix/kiwix-lib.git'
+          developerConnection 'https://github.com/kiwix/kiwix-lib.git'
+          url 'https://github.com/kiwix/kiwix-lib'
+      }
+    }
+  }.withXml {
+    def dependenciesNode = asNode().appendNode('dependencies')
+
+    //Iterate over the implementation dependencies, adding a <dependency> node for each
+    configurations.implementation.allDependencies.each {
+      def dependencyNode = dependenciesNode.appendNode('dependency')
+      dependencyNode.appendNode('groupId', it.group)
+      dependencyNode.appendNode('artifactId', it.name)
+      dependencyNode.appendNode('version', it.version)
+    }
+  }.writeTo("$buildDir/pom.xml")
+}
+

meson.build

@@ -1,5 +1,5 @@
 project('kiwix-lib', 'cpp',
-  version : '6.0.0',
+  version : '6.0.3', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
   license : 'GPL',
   default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
 

src/server.cpp

@@ -519,7 +519,7 @@ Response InternalServer::handle_suggest(const RequestContext& request)
   if (reader->hasFulltextIndex()) {
     kainjow::mustache::data result;
     result.set("label", "containing '" + term + "'...");
-    result.set("value", term);
+    result.set("value", term + " ");
     result.set("first", first);
     results.push_back(result);
   }

static/skin/taskbar.css

@@ -132,6 +132,7 @@ body {
 .ui-autocomplete {
     background: white !important;
     border: solid 1px grey !important;
+    column-count: 1 !important;
 }
 
 li.ui-state-focus {

static/templates/index.html

@@ -31,14 +31,14 @@
         .book:hover { background-color: #F9F9F9; box-shadow: none;}
         .book__background { background-repeat: no-repeat; background-size: auto; background-position: top right; }
         .book__title {
-                padding: 0 55px 0 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
-                font-size: 18px; color: #0645ad;
+                padding: 0 55px 0 0;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+                font-size: 18px; color: #0645ad; line-height: 1em;
         }
         .book__description {
                 padding: 5px 55px 5px 0px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
-                font-size: 15px;
+                font-size: 15px; line-height: 1em;
         }
-        .book__info { line-height: 18px; color: #777; font-weight: bold; font-size: 13px; }
+        .book__info { color: #777; font-weight: bold; font-size: 13px; line-height: 1em; }
   </style>
   <script type="text/javascript" src="{{root}}/skin/taskbar.js" async></script>
 </head>
@@ -47,15 +47,13 @@
 <div class="kiwix">
   <div class='book__list'>
     {{#books}}
-    <a href="{{root}}/{{name}}">
-      <div class='book'>
+    <a href="{{root}}/{{name}}"><div class='book'>
         <div class='book__background' style="background-image: url('{{root}}/meta?content={{#urlencoded}}{{{name}}}{{/urlencoded}}&name=favicon');">
           <div class='book__title' title='{{title}}'>{{title}}</div>
           <div class='book__description' title='{{description}}'>{{description}}</div>
           <div class='book__info'>{{articleCount}} articles, {{mediaCount}} medias</div>
         </div>
-      </div>
-    </a>
+    </div></a>
     {{/books}}
   </div>
 </div>

static/templates/taskbar_part.html

@@ -23,4 +23,3 @@
     </div>
   </span>
 </span>
-<div style="display: block; height: 5em;"></div>