Integrate RelaySearch (Fixes: #25392)

This is using commit b6e6c3235806c9d1521dbc2c08cecee626466928 of atlas.git.

 * Removes submodule for RS.
 * Move two license files to basedirectory; these should be merged.
 * Move atlas.css into css folder
 * Fonts in both were identical
 * Changes all findable paths to the new setting
 * js libs were simply copied; these should be sorted out more
 * Merged rs/img and rs/images folder into images

Thanks to iwakeh for the bulk of the work in this commit.

.gitignore

@@ -21,3 +21,8 @@ legacy.config
 # other
 *~
 
+# Ignore git mergetool backup files
+*.orig
+
+# Ignore Vim swap files
+*.swp

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "src/submods/metrics-lib"]
 	path = src/submods/metrics-lib
 	url = https://git.torproject.org/metrics-lib.git
-[submodule "src/main/resources/web/rs"]
-	path = src/main/resources/web/rs
-	url = https://git.torproject.org/atlas.git

LICENCE.flags

@@ -0,0 +1,35 @@
+These flags are built from the sources at:
+
+ https://github.com/gosquared/flags
+
+To update these flags:
+
+ * apt install pngcrush imagemagick icnsutils rename
+ * git clone https://github.com/gosquared/flags
+ * cd flags; make
+ * cp flags/flags-iso/shiny/16/* $RELAYSEARCH/img/cc/
+ * cd $RELAYSEARCH/img/cc/; rename 'y/A-Z/a-z/' *.png; cp _unknown.png xz.png
+
+The flags are made available under the MIT license:
+
+-----------------------------------------------------------------------
+Copyright (c) 2017 Go Squared Ltd. http://www.gosquared.com/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-----------------------------------------------------------------------

LICENSE.relaysearch

@@ -0,0 +1,23 @@
+Copyright (c) 2012, 2013, Arturo Filastò
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

build.xml

@@ -182,7 +182,7 @@
                   includes="logback.xml" />
       <zipfileset dir="${resources}/web"
                   prefix=""
-                  includes="css/* images/* js/* fonts/** rs/**" />
+                  includes="css/* images/** js/** fonts/** templates/**" />
       <zipfileset dir="${resources}/web/jsps"
                   prefix="WEB-INF"
                   includes="*.jsp"/>

src/main/java/org/torproject/metrics/web/RelaySearchServlet.java

@@ -23,7 +23,7 @@ public class RelaySearchServlet extends AnyServlet {
       HttpServletResponse response) throws IOException, ServletException {
 
     /* Forward the request to the JSP that does all the hard work. */
-    String[] additionalStylesheets = {"/rs/css/atlas.css"};
+    String[] additionalStylesheets = {"/css/atlas.css"};
     request.setAttribute("additionalStylesheets", additionalStylesheets);
     request.setAttribute("categories", this.categories);
     request.getRequestDispatcher("WEB-INF/rs.jsp").forward(request,

src/main/resources/web/css/atlas.css

@@ -0,0 +1,103 @@
+.progress {
+    width: 50%;
+    margin: 100px auto;
+    display: none;
+}
+
+.progress-bar {
+    width: 100%;
+}
+
+#secondary-search {
+    display: none;
+}
+
+a.alleged {
+	color: #FE9F30;
+}
+
+.flags {
+    padding: 2px;
+}
+
+span.flags {
+    display: inline-block;
+}
+
+.tooltip-inner {
+    text-align:left;
+}
+
+#outdatedData > div {
+    position:relative;
+    top:60px;
+}
+
+.circle {
+    display: inline-block;
+    vertical-align: middle;
+    background: #999999;
+    width: 10px;
+    height: 10px;
+    -moz-border-radius: 50%;
+    -webkit-border-radius: 50%;
+    border-radius: 50%;
+}
+
+.circle-online {
+    background: #25d918;
+}
+
+.circle-offline {
+    background: #ff1515;
+}
+
+#home-search, #home-aggregate-search, #home-advanced-search, #map-radio-buttons {
+    padding: 0;
+    margin: 0 0 10px 0;
+    width: 100%;
+}
+
+td, th {
+    padding: 2px!important;
+}
+
+.form-control {
+    max-width: none !important;
+}
+
+.flags-cell {
+    width: 150px;
+}
+
+/* Allow displaying long contact info (#23868) */
+dd {
+    -ms-word-break: break-all;
+    word-break: break-all;
+
+    /* Non standard for webkit */
+    word-break: break-word;
+
+    -webkit-hyphens: auto;
+    -moz-hyphens: auto;
+    hyphens: auto;
+}
+
+/* Override style.css from metrics.torproject.org style */
+td a {
+    padding-right: 0 !important;
+}
+
+.day-spinner {
+    width: 120px;
+    display: inline;
+}
+
+label.radio-inline {
+    display: inline !important;
+    width: auto;
+}
+
+#no-svg {
+    display: none;
+}