From b71d0359d4d665188624579907209bdaea2a02d8 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 5 May 2017 12:25:58 +0300
Subject: juick-www: fix sape

---
 juick-www/src/main/java/com/juick/www/controllers/Home.java | 2 +-
 juick-www/src/main/webapp/WEB-INF/views/partial/footer.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/juick-www/src/main/java/com/juick/www/controllers/Home.java b/juick-www/src/main/java/com/juick/www/controllers/Home.java
index 22cf4b90..6aa18526 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Home.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Home.java
@@ -192,7 +192,7 @@ public class Home {
         }
         UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
         String queryString = builder.getQuery();
-        String requestURI = builder.toUri().toString();
+        String requestURI = builder.toUri().getPath();
         if (sape != null && visitor.getUid() == 0 && queryString == null) {
             String links = sape.getPageLinks(requestURI, sapeCookie).render();
             model.addAttribute("links", links);
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
index 61267396..c9ccb26d 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
@@ -12,7 +12,7 @@
     </div>
     <div id="footer-left">juick.com &copy; 2008-2017
         {% if links | default ('')  is not empty %}
-        <br/>{{ i18n("messages","label.sponsors") }}: {{ links }}
+        <br/>{{ i18n("messages","label.sponsors") }}: {{ links | raw }}
         {% endif %}
     </div>
 </div>
@@ -24,7 +24,7 @@
         ga('create','UA-385578-4','juick.com');
         ga('require','displayfeatures');
         ga('send','pageview');
-        {% if (sapeon | default(false)) %}
+        {% if (showAdv | default(false)) %}
             var _acic={dataProvider:10};
             (function(){
             var e=document.createElement('script');e.type='text/javascript';e.async=true;e.src='//www2.aci'+'nt.net/aci.js';
-- 
cgit v1.2.3