You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/12/19 02:49:37 UTC

svn commit: r1646609 - in /lucene/dev/trunk/solr: example/example-DIH/solr/db/conf/velocity/ example/example-DIH/solr/db/conf/xslt/ example/example-DIH/solr/mail/conf/velocity/ example/example-DIH/solr/mail/conf/xslt/ example/example-DIH/solr/rss/conf/...

Author: sarowe
Date: Fri Dec 19 01:49:37 2014
New Revision: 1646609

URL: http://svn.apache.org/r1646609
Log:
SOLR-6058: Include the new Solr logo and favicon in Solritas (/browse UI) as well as in generated per-release Solr documentation; switch all favicon links' Content-Type: 'image/ico'->'image/x-icon'

Added:
    lucene/dev/trunk/solr/site/html/solr.svg   (with props)
Removed:
    lucene/dev/trunk/solr/site/html/solr.png
Modified:
    lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/head.vm
    lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/header.vm
    lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/main.css
    lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl
    lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/head.vm
    lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/header.vm
    lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/main.css
    lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl
    lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/head.vm
    lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/header.vm
    lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/main.css
    lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl
    lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/head.vm
    lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/header.vm
    lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/main.css
    lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl
    lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
    lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
    lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css
    lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl
    lucene/dev/trunk/solr/site/xsl/index.xsl
    lucene/dev/trunk/solr/webapp/web/admin.html

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/head.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/head.vm (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/head.vm Fri Dec 19 01:49:37 2014
@@ -9,6 +9,8 @@
   <script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
   <link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
   <link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+  <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+  <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
   <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
 
 

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/header.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/header.vm (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/header.vm Fri Dec 19 01:49:37 2014
@@ -3,5 +3,5 @@
  *#
 
 <div id="head">
-  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
 </div>

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/main.css?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/main.css (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/velocity/main.css Fri Dec 19 01:49:37 2014
@@ -160,7 +160,8 @@ a {
 }
 
 #logo {
-  margin: 10px;
+  width: 115px;
+  margin: 0px 0px 20px 12px;
   border-style: none;
 }
 

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl Fri Dec 19 01:49:37 2014
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/ico"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/head.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/head.vm (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/head.vm Fri Dec 19 01:49:37 2014
@@ -9,6 +9,8 @@
   <script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
   <link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
   <link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+  <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+  <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
   <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
 
 

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/header.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/header.vm (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/header.vm Fri Dec 19 01:49:37 2014
@@ -3,5 +3,5 @@
  *#
 
 <div id="head">
-  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
 </div>

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/main.css?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/main.css (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/velocity/main.css Fri Dec 19 01:49:37 2014
@@ -160,7 +160,8 @@ a {
 }
 
 #logo {
-  margin: 10px;
+  width: 115px;
+  margin: 0px 0px 20px 12px;
   border-style: none;
 }
 

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl Fri Dec 19 01:49:37 2014
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/ico"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/head.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/head.vm (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/head.vm Fri Dec 19 01:49:37 2014
@@ -9,6 +9,8 @@
   <script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
   <link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
   <link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+  <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+  <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
   <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
 
 

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/header.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/header.vm (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/header.vm Fri Dec 19 01:49:37 2014
@@ -3,5 +3,5 @@
  *#
 
 <div id="head">
-  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
 </div>

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/main.css?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/main.css (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/velocity/main.css Fri Dec 19 01:49:37 2014
@@ -160,7 +160,8 @@ a {
 }
 
 #logo {
-  margin: 10px;
+  width: 115px;
+  margin: 0px 0px 20px 12px;
   border-style: none;
 }
 

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl Fri Dec 19 01:49:37 2014
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/ico"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/head.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/head.vm (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/head.vm Fri Dec 19 01:49:37 2014
@@ -9,6 +9,8 @@
   <script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
   <link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
   <link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+  <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+  <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
   <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
 
 

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/header.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/header.vm (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/header.vm Fri Dec 19 01:49:37 2014
@@ -3,5 +3,5 @@
  *#
 
 <div id="head">
-  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
 </div>

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/main.css?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/main.css (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/velocity/main.css Fri Dec 19 01:49:37 2014
@@ -160,7 +160,8 @@ a {
 }
 
 #logo {
-  margin: 10px;
+  width: 115px;
+  margin: 0px 0px 20px 12px;
   border-style: none;
 }
 

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl Fri Dec 19 01:49:37 2014
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/ico"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>

Modified: lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm (original)
+++ lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm Fri Dec 19 01:49:37 2014
@@ -9,6 +9,8 @@
   <script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
   <link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
   <link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
+  <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+  <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
   <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
 
 

Modified: lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm (original)
+++ lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm Fri Dec 19 01:49:37 2014
@@ -3,5 +3,5 @@
  *#
 
 <div id="head">
-  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.png" id="logo"/></a></span>
+  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
 </div>

Modified: lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css (original)
+++ lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/main.css Fri Dec 19 01:49:37 2014
@@ -160,7 +160,8 @@ a {
 }
 
 #logo {
-  margin: 10px;
+  width: 115px;
+  margin: 0px 0px 20px 12px;
   border-style: none;
 }
 

Modified: lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl (original)
+++ lucene/dev/trunk/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl Fri Dec 19 01:49:37 2014
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/ico"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/ico"/>
+                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>

Added: lucene/dev/trunk/solr/site/html/solr.svg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/html/solr.svg?rev=1646609&view=auto
==============================================================================
--- lucene/dev/trunk/solr/site/html/solr.svg (added)
+++ lucene/dev/trunk/solr/site/html/solr.svg Fri Dec 19 01:49:37 2014
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="203.005pt" height="102.654pt" viewBox="0 0 203.005 102.654" version="1.1">
+<defs>
+<clipPath id="clip1">
+  <path d="M 0 36 L 49 36 L 49 102.652344 L 0 102.652344 Z "/>
+</clipPath>
+<clipPath id="clip2">
+  <path d="M 53 53 L 100 53 L 100 102.652344 L 53 102.652344 Z "/>
+</clipPath>
+<clipPath id="clip3">
+  <path d="M 106 35 L 123 35 L 123 102.652344 L 106 102.652344 Z "/>
+</clipPath>
+<clipPath id="clip4">
+  <path d="M 163 29 L 203.003906 29 L 203.003906 52 L 163 52 Z "/>
+</clipPath>
+</defs>
+<g id="surface1">
+<g clip-path="url(#clip1)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.048767%,12.319946%,16.685486%);fill-opacity:1;" d="M 40.761719 70.890625 C 38.414062 69.644531 35.765625 68.765625 32.886719 68.277344 C 30.054688 67.800781 27.179688 67.5625 24.332031 67.5625 C 22.003906 67.5625 19.652344 67.359375 17.332031 66.964844 C 15.078125 66.578125 13.035156 65.871094 11.257812 64.859375 C 9.527344 63.875 8.097656 62.5 7.003906 60.765625 C 5.925781 59.058594 5.382812 56.796875 5.382812 54.066406 C 5.433594 51.65625 5.992188 49.597656 7.046875 47.9375 C 8.117188 46.253906 9.511719 44.886719 11.195312 43.871094 C 12.921875 42.832031 14.914062 42.066406 17.117188 41.597656 C 20.867188 40.800781 24.828125 40.652344 28.863281 41.214844 C 30.441406 41.4375 31.996094 41.832031 33.496094 42.382812 C 34.964844 42.929688 36.347656 43.675781 37.601562 44.601562 C 38.835938 45.515625 39.929688 46.664062 40.847656 48.011719 L 41.359375 48.765625 L 45.148438 47.171875 L 44.34375 46.039062 C 43.3125 44.582031 42.1718
 75 43.269531 40.949219 42.140625 C 39.703125 40.988281 38.238281 40.007812 36.59375 39.234375 C 34.96875 38.46875 33.113281 37.878906 31.070312 37.480469 C 29.050781 37.089844 26.695312 36.890625 24.070312 36.890625 C 21.550781 36.890625 18.949219 37.179688 16.339844 37.75 C 13.691406 38.328125 11.234375 39.289062 9.039062 40.597656 C 6.796875 41.9375 4.949219 43.722656 3.542969 45.90625 C 2.121094 48.125 1.394531 50.863281 1.394531 54.042969 C 1.394531 57.382812 2.066406 60.226562 3.386719 62.492188 C 4.703125 64.746094 6.464844 66.570312 8.625 67.914062 C 10.742188 69.234375 13.210938 70.183594 15.964844 70.734375 C 18.652344 71.273438 21.46875 71.546875 24.332031 71.546875 C 26.609375 71.546875 29.019531 71.71875 31.496094 72.0625 C 33.90625 72.394531 36.152344 73.066406 38.164062 74.058594 C 40.125 75.027344 41.761719 76.375 43.023438 78.0625 C 44.242188 79.699219 44.859375 81.90625 44.859375 84.625 C 44.859375 87.066406 44.261719 89.148438 43.089844 90.820312 C 41.878906 92.542
 969 40.304688 93.964844 38.410156 95.046875 C 36.476562 96.152344 34.289062 96.96875 31.902344 97.464844 C 29.476562 97.972656 27.078125 98.230469 24.769531 98.230469 C 20.898438 98.230469 17.070312 97.492188 13.394531 96.03125 C 9.738281 94.578125 6.492188 92.398438 3.753906 89.550781 L 3.019531 88.785156 L 0 91.402344 L 0.847656 92.25 C 3.550781 94.953125 6.90625 97.308594 10.824219 99.25 C 14.785156 101.21875 19.480469 102.214844 24.769531 102.214844 C 27.285156 102.214844 29.957031 101.929688 32.707031 101.359375 C 35.496094 100.785156 38.117188 99.800781 40.488281 98.429688 C 42.898438 97.039062 44.902344 95.222656 46.449219 93.023438 C 48.039062 90.765625 48.84375 87.941406 48.84375 84.625 C 48.84375 81.265625 48.089844 78.417969 46.597656 76.167969 C 45.128906 73.945312 43.164062 72.171875 40.761719 70.890625 "/>
+</g>
+<g clip-path="url(#clip2)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.048767%,12.319946%,16.685486%);fill-opacity:1;" d="M 76.390625 98.667969 C 73.65625 98.667969 71.160156 98.105469 68.964844 96.992188 C 66.738281 95.867188 64.773438 94.335938 63.125 92.4375 C 61.464844 90.53125 60.148438 88.300781 59.207031 85.808594 C 58.261719 83.304688 57.722656 80.679688 57.613281 78.054688 C 57.613281 75.625 58.066406 73.144531 58.949219 70.675781 C 59.835938 68.214844 61.125 65.972656 62.785156 64.007812 C 64.4375 62.050781 66.449219 60.433594 68.769531 59.191406 C 71.046875 57.96875 73.609375 57.351562 76.390625 57.351562 C 79.003906 57.351562 81.472656 57.929688 83.726562 59.070312 C 86.015625 60.226562 88.023438 61.777344 89.707031 63.675781 C 91.390625 65.585938 92.738281 67.816406 93.707031 70.308594 C 94.675781 72.796875 95.164062 75.40625 95.164062 78.054688 C 95.164062 80.480469 94.714844 82.960938 93.828125 85.429688 C 92.941406 87.894531 91.652344 90.136719 89.996094 92.097656 C 88.34375 94.050
 781 86.335938 95.65625 84.019531 96.867188 C 81.742188 98.0625 79.175781 98.667969 76.390625 98.667969 M 92.96875 61.292969 C 90.984375 58.976562 88.574219 57.058594 85.804688 55.597656 C 82.996094 54.117188 79.828125 53.367188 76.390625 53.367188 C 73.257812 53.367188 70.265625 54.035156 67.496094 55.359375 C 64.746094 56.671875 62.316406 58.484375 60.273438 60.742188 C 58.234375 62.992188 56.601562 65.640625 55.417969 68.617188 C 54.230469 71.59375 53.628906 74.769531 53.628906 78.054688 C 53.628906 81.15625 54.183594 84.195312 55.28125 87.082031 C 56.371094 89.964844 57.929688 92.582031 59.90625 94.863281 C 61.890625 97.15625 64.304688 99.027344 67.078125 100.429688 C 69.875 101.84375 73.003906 102.59375 76.371094 102.652344 L 76.410156 102.652344 C 79.597656 102.59375 82.613281 101.875 85.378906 100.527344 C 88.121094 99.1875 90.550781 97.359375 92.597656 95.101562 C 94.632812 92.851562 96.25 90.230469 97.40625 87.316406 C 98.5625 84.390625 99.148438 81.273438 99.148438 78.05468
 8 C 99.148438 75.136719 98.609375 72.164062 97.550781 69.21875 C 96.488281 66.273438 94.945312 63.605469 92.96875 61.292969 "/>
+</g>
+<g clip-path="url(#clip3)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.048767%,12.319946%,16.685486%);fill-opacity:1;" d="M 119.78125 97.5625 C 119.113281 97.730469 118.523438 97.855469 118.03125 97.9375 C 117.511719 98.027344 116.953125 98.113281 116.347656 98.199219 C 115.789062 98.277344 115.238281 98.320312 114.707031 98.320312 C 113.371094 98.320312 112.386719 97.875 111.699219 96.964844 C 110.9375 95.960938 110.566406 94.960938 110.566406 93.914062 L 110.566406 35.578125 L 106.582031 35.578125 L 106.582031 93.914062 C 106.582031 96.101562 107.273438 98.039062 108.636719 99.667969 C 110.050781 101.359375 112.0625 102.214844 114.621094 102.214844 C 115.421875 102.214844 116.21875 102.167969 116.988281 102.078125 C 117.730469 101.988281 118.394531 101.898438 118.992188 101.808594 C 119.601562 101.71875 120.308594 101.578125 121.09375 101.398438 L 122.445312 101.085938 L 120.671875 97.339844 Z "/>
+</g>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.048767%,12.319946%,16.685486%);fill-opacity:1;" d="M 136.976562 57.378906 C 134.90625 58.835938 133.074219 60.6875 131.507812 62.902344 L 131.507812 54.066406 L 127.523438 54.066406 L 127.523438 101.777344 L 131.507812 101.777344 L 131.507812 72.074219 C 132.058594 70.128906 132.820312 68.300781 133.769531 66.648438 C 134.726562 64.980469 135.914062 63.511719 137.304688 62.285156 C 138.695312 61.058594 140.3125 60.066406 142.117188 59.328125 C 143.914062 58.589844 145.945312 58.160156 148.148438 58.050781 L 149.207031 57.996094 L 149.207031 54.066406 L 148.09375 54.066406 C 143.84375 54.066406 140.105469 55.179688 136.976562 57.378906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85.639954%,20.640564%,13.365173%);fill-opacity:1;" d="M 193.910156 10.613281 L 160.910156 46.289062 L 202.382812 27.15625 C 201.15625 20.824219 198.152344 15.132812 193.910156 10.613281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85.639954%,20.640564%,13.365173%);fill-opacity:1;" d="M 169.425781 0 C 164.855469 0 160.5 0.917969 156.527344 2.574219 L 152.097656 39.886719 L 174.226562 0.347656 C 172.65625 0.121094 171.058594 0 169.425781 0 "/>
+<g clip-path="url(#clip4)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85.639954%,20.640564%,13.365173%);fill-opacity:1;" d="M 202.714844 29.210938 L 163.414062 51.203125 L 200.285156 46.828125 C 202.035156 42.761719 203.003906 38.285156 203.003906 33.578125 C 203.003906 32.097656 202.898438 30.640625 202.714844 29.210938 "/>
+</g>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85.639954%,20.640564%,13.365173%);fill-opacity:1;" d="M 188.226562 61.40625 C 192.617188 58.433594 196.261719 54.449219 198.835938 49.789062 L 164.277344 56.648438 Z "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85.639954%,20.640564%,13.365173%);fill-opacity:1;" d="M 176.25 0.695312 L 157.011719 42.390625 L 192.695312 9.382812 C 188.222656 5.078125 182.5625 2 176.25 0.695312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85.639954%,20.640564%,13.365173%);fill-opacity:1;" d="M 172.234375 67.03125 C 175.953125 66.722656 179.496094 65.816406 182.773438 64.394531 L 163.414062 62.097656 Z "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85.639954%,20.640564%,13.365173%);fill-opacity:1;" d="M 138.820312 19.773438 C 137.308594 23.117188 136.328125 26.75 135.988281 30.566406 L 141.203125 39.886719 Z "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85.639954%,20.640564%,13.365173%);fill-opacity:1;" d="M 153.617188 3.953125 C 148.878906 6.488281 144.824219 10.121094 141.785156 14.519531 L 146.652344 39.023438 Z "/>
+</g>
+</svg>

Modified: lucene/dev/trunk/solr/site/xsl/index.xsl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/xsl/index.xsl?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/xsl/index.xsl (original)
+++ lucene/dev/trunk/solr/site/xsl/index.xsl Fri Dec 19 01:49:37 2014
@@ -34,13 +34,15 @@
     <html>
       <head>
         <title><xsl:text>Apache Solr </xsl:text><xsl:value-of select="$version"/><xsl:text> Documentation</xsl:text></title>
+        <link rel="icon" type="image/x-icon" href="/solr/assets/images/favicon.ico"/>
+        <link rel="shortcut icon" type="image/x-icon" href="/solr/assets/images/favicon.ico"/>
       </head>
       <body>
         <div>
           <a href="http://lucene.apache.org/solr/">
-            <img src="solr.png" title="Apache Solr Logo" alt="Solr" border="0"/>
+            <img src="solr.svg" style="width:210px; margin:22px 0px 7px 20px; border:none;" title="Apache Solr Logo" alt="Solr" />
           </a>
-          <div style="z-index:100;position:absolute;top:25px;left:252px">
+          <div style="z-index:100;position:absolute;top:25px;left:226px">
             <span style="font-size: x-small">TM</span>
           </div>
         </div>

Modified: lucene/dev/trunk/solr/webapp/web/admin.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/admin.html?rev=1646609&r1=1646608&r2=1646609&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/admin.html (original)
+++ lucene/dev/trunk/solr/webapp/web/admin.html Fri Dec 19 01:49:37 2014
@@ -22,7 +22,8 @@ limitations under the License.
     
   <title>Solr Admin</title>
     
-  <link rel="icon" type="image/ico" href="img/favicon.ico?_=${version}">
+  <link rel="icon" type="image/x-icon" href="img/favicon.ico?_=${version}">
+  <link rel="shortcut icon" type="image/x-icon" href="img/favicon.ico?_=${version}">
 
   <link rel="stylesheet" type="text/css" href="css/styles/common.css?_=${version}">
   <link rel="stylesheet" type="text/css" href="css/styles/analysis.css?_=${version}">