[Libreoffice-commits] .: Branch 'opengrok' - patches/remote-attribute.diff patches/toadd

[Thorsten Behrens]

 patches/remote-attribute.diff       |   14 ++++++++++++--
 patches/toadd/libreoffice/style.css |    3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 821f927e6842e8be1d624fad3b21de0f52bb842c
Author: Andrew Higginson <at.higginson at gmail.com>
Date:   Thu Jul 26 14:43:04 2012 +0200

    Fix remote opengrok search, add padding.
    
    This patch fixes a bug where if you click on a different search
    result page, the page doesn't behave remotely (as it doesn't have
    remote=true in the link).
    
    It also adds some padding to the top of the remote page

diff --git a/patches/remote-attribute.diff b/patches/remote-attribute.diff
index b1ae393..beabf46 100644
--- a/patches/remote-attribute.diff
+++ b/patches/remote-attribute.diff
@@ -1,6 +1,6 @@
 --- a/web/search.jsp	2012-04-17 17:18:14.147097100 +0100
 +++ b/web/search.jsp	2012-04-17 17:12:42.679094963 +0100
-@@ -46,11 +46,12 @@
+@@ -48,11 +48,12 @@
  org.apache.lucene.queryParser.*"
  %><%@ page session="false" %><%@ page errorPage="error.jsp" %><%
  Date starttime = new Date();
@@ -18,7 +18,7 @@
  
  %><%@ include file="projects.jspf" %><%
  String sort = null;
-@@ -266,7 +267,7 @@
+@@ -269,7 +270,7 @@
           RuntimeEnvironment environment = RuntimeEnvironment.getInstance();
           environment.register();
  	    %><%@ include file="httpheader.jspf" %>
@@ -27,3 +27,13 @@
  <div id="page">
      <div id="header"><%@ include file="pageheader.jspf" %></div>
  <div id="Masthead"></div>
+@@ -425,7 +426,8 @@
+                             (refs == null ? "" : "&refs=" + Util.URIEncode(refs)) +
+                             (path == null ? "" : "&path=" + Util.URIEncode(path)) +
+                             (hist == null ? "" : "&hist=" + Util.URIEncode(hist)) +
+-                            (sort == null ? "" : "&sort=" + Util.URIEncode(sort));
++                            (sort == null ? "" : "&sort=" + Util.URIEncode(sort)) +
++                            (remote == null ? "" : "&remote=" + Util.URIEncode(remote));
+                     if (hasProjects) {
+                         urlp = urlp + "&project=";
+                         for (Iterator it = project.iterator(); it.hasNext();) {
diff --git a/patches/toadd/libreoffice/style.css b/patches/toadd/libreoffice/style.css
index 712c0ed..a42b7a7 100644
--- a/patches/toadd/libreoffice/style.css
+++ b/patches/toadd/libreoffice/style.css
@@ -224,7 +224,8 @@ body#remote {
 }
 
 body#remote #page {
-    width:100% !important
+    width:100% !important;
+    margin-top:8px
 }
 
 body#remote #header, body#remote #Masthead, body#remote #menu, body#remote #Footer {