Author: koji
Date: Mon Dec 22 17:45:23 2008
New Revision: 728842
URL: http://svn.apache.org/viewvc?rev=728842&view=rev
Log:
SOLR-84: use new Solr logo in admin GUI
Added:
lucene/solr/trunk/client/ruby/flare/public/images/solr_small.png (with
props)
lucene/solr/trunk/src/webapp/web/admin/solr_small.png (with props)
Removed:
lucene/solr/trunk/client/ruby/flare/public/images/solr.png
lucene/solr/trunk/src/webapp/web/admin/solr-head.gif
lucene/solr/trunk/src/webapp/web/admin/solr-head.png
lucene/solr/trunk/src/webapp/web/admin/solr-lowercase.gif
lucene/solr/trunk/src/webapp/web/admin/solr-lowercase.png
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/client/ruby/flare/app/views/layouts/browse.rhtml
lucene/solr/trunk/client/ruby/flare/vendor/plugins/flare/app/views/layouts/browse.rhtml
lucene/solr/trunk/src/test/test-files/htmlStripReaderTest.html
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
lucene/solr/trunk/src/webapp/web/admin/analysis.xsl
lucene/solr/trunk/src/webapp/web/admin/favicon.ico
lucene/solr/trunk/src/webapp/web/admin/header.jsp
lucene/solr/trunk/src/webapp/web/admin/logging.xsl
lucene/solr/trunk/src/webapp/web/admin/ping.xsl
lucene/solr/trunk/src/webapp/web/admin/registry.xsl
lucene/solr/trunk/src/webapp/web/admin/replication/header.jsp
lucene/solr/trunk/src/webapp/web/admin/stats.xsl
lucene/solr/trunk/src/webapp/web/admin/tabular.xsl
lucene/solr/trunk/src/webapp/web/admin/threaddump.xsl
lucene/solr/trunk/src/webapp/web/favicon.ico
lucene/solr/trunk/src/webapp/web/index.jsp
Modified: lucene/solr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Mon Dec 22 17:45:23 2008
@@ -231,6 +231,8 @@
12. SOLR-885: NamedListCodec is renamed to JavaBinCodec and returns Object
instead of NamedList.
(Noble Paul, yonik via shalin)
+13. SOLR-84: Use new Solr logo in admin (Michiel via koji)
+
Build
----------------------
1. SOLR-776: Added in ability to sign artifacts via Ant for releases
(gsingers)
Modified: lucene/solr/trunk/client/ruby/flare/app/views/layouts/browse.rhtml
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/flare/app/views/layouts/browse.rhtml?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/client/ruby/flare/app/views/layouts/browse.rhtml
(original)
+++ lucene/solr/trunk/client/ruby/flare/app/views/layouts/browse.rhtml Mon Dec
22 17:45:23 2008
@@ -7,9 +7,9 @@
<body>
<div>
<div id="header">
- <a href="http://lucene.apache.org/solr";><%=image_tag
"solr.png"%></a><a href="http://wiki.apache.org/solr/Flare";>flare</a>
+ <a href="http://lucene.apache.org/solr";><%=image_tag
"solr_small.png"%></a><a href="http://wiki.apache.org/solr/Flare";>flare</a>
</div>
<%= yield %>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Added: lucene/solr/trunk/client/ruby/flare/public/images/solr_small.png
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/flare/public/images/solr_small.png?rev=728842&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/trunk/client/ruby/flare/public/images/solr_small.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
lucene/solr/trunk/client/ruby/flare/vendor/plugins/flare/app/views/layouts/browse.rhtml
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/flare/vendor/plugins/flare/app/views/layouts/browse.rhtml?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
---
lucene/solr/trunk/client/ruby/flare/vendor/plugins/flare/app/views/layouts/browse.rhtml
(original)
+++
lucene/solr/trunk/client/ruby/flare/vendor/plugins/flare/app/views/layouts/browse.rhtml
Mon Dec 22 17:45:23 2008
@@ -7,9 +7,9 @@
<body>
<div>
<div id="header">
- <a href="http://lucene.apache.org/solr";><%=image_tag
"solr.png"%></a><a href="http://wiki.apache.org/solr/Flare";>flare</a>
+ <a href="http://lucene.apache.org/solr";><%=image_tag
"solr_small.png"%></a><a href="http://wiki.apache.org/solr/Flare";>flare</a>
</div>
<%= yield %>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: lucene/solr/trunk/src/test/test-files/htmlStripReaderTest.html
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/test-files/htmlStripReaderTest.html?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/test-files/htmlStripReaderTest.html (original)
+++ lucene/solr/trunk/src/test/test-files/htmlStripReaderTest.html Mon Dec 22
17:45:23 2008
@@ -39,7 +39,7 @@
|start Project Logo
+-->
<div class="projectlogo">
-<a href="http://lucene.apache.org/solr/";><img class="logoImage" alt="Solr"
src="images/solr.png" title="Solr Description"></a>
+<a href="http://lucene.apache.org/solr/";><img class="logoImage" alt="Solr"
src="images/solr_small.png" title="Solr Description"></a>
</div>
<!--+
|end Project Logo
Modified:
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
---
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
(original)
+++
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
Mon Dec 22 17:45:23 2008
@@ -54,7 +54,7 @@
out.write("<title>Solr Admin: JDK Log Level Selector</title>\n");
out.write("<link rel=\"stylesheet\" type=\"text/css\"
href=\"solr-admin.css\" />");
out.write("</head><body>\n");
- out.write("<a href=\".\"><img border=\"0\" align=\"right\" height=\"61\"
width=\"142\" src=\"solr-head.gif\" alt=\"Solr\"></a>");
+ out.write("<a href=\".\"><img border=\"0\" align=\"right\" height=\"78\"
width=\"142\" src=\"solr_small.png\" alt=\"Solr\"></a>");
out.write("<h1>JDK Log Level Selector</h1>");
out.write("<p>Below is the complete JDK Log hierarchy with " +
Modified: lucene/solr/trunk/src/webapp/web/admin/analysis.xsl
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/analysis.xsl?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/analysis.xsl (original)
+++ lucene/solr/trunk/src/webapp/web/admin/analysis.xsl Mon Dec 22 17:45:23 2008
@@ -40,7 +40,7 @@
</head>
<body>
<a href="">
- <img border="0" align="right" height="61" width="142"
src="solr-head.gif" alt="SOLR"/>
+ <img border="0" align="right" height="78" width="142"
src="solr_small.png" alt="SOLR"/>
</a>
<h1>Solr Admin (<xsl:value-of select="solr/meta/collection" />)</h1>
<div style="margin-top: 1em;">
Modified: lucene/solr/trunk/src/webapp/web/admin/favicon.ico
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/favicon.ico?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/src/webapp/web/admin/header.jsp
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/header.jsp?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/header.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/header.jsp Mon Dec 22 17:45:23 2008
@@ -33,7 +33,7 @@
</head>
<body>
-<a href="."><img border="0" align="right" height="61" width="142"
src="solr-head.gif" alt="Solr"></a>
+<a href="."><img border="0" align="right" height="78" width="142"
src="solr_small.png" alt="Solr"></a>
<h1>Solr Admin (<%= collectionName %>)
<%= enabledStatus==null ? "" : (isEnabled ? " - Enabled" : " - Disabled") %>
</h1>
Modified: lucene/solr/trunk/src/webapp/web/admin/logging.xsl
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/logging.xsl?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/logging.xsl (original)
+++ lucene/solr/trunk/src/webapp/web/admin/logging.xsl Mon Dec 22 17:45:23 2008
@@ -40,7 +40,7 @@
</head>
<body>
<a href="">
- <img border="0" align="right" height="61" width="142"
src="solr-head.gif" alt="SOLR">
+ <img border="0" align="right" height="78" width="142"
src="solr_small.png" alt="SOLR">
</img>
</a>
<h1>Solr Admin (<xsl:value-of select="solr/meta/collection" />)</h1>
Modified: lucene/solr/trunk/src/webapp/web/admin/ping.xsl
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/ping.xsl?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/ping.xsl (original)
+++ lucene/solr/trunk/src/webapp/web/admin/ping.xsl Mon Dec 22 17:45:23 2008
@@ -40,7 +40,7 @@
</head>
<body>
<a href=".">
- <img border="0" align="right" height="61" width="142"
src="solr-head.gif" alt="SOLR">
+ <img border="0" align="right" height="78" width="142"
src="solr_small.png" alt="SOLR">
</img>
</a>
<h1>Solr Admin (<xsl:value-of select="solr/meta/collection" />)</h1>
Modified: lucene/solr/trunk/src/webapp/web/admin/registry.xsl
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/registry.xsl?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/registry.xsl (original)
+++ lucene/solr/trunk/src/webapp/web/admin/registry.xsl Mon Dec 22 17:45:23 2008
@@ -42,7 +42,7 @@
</head>
<body>
<a href=".">
- <img border="0" align="right" height="61" width="142"
src="solr-head.gif" alt="SOLR">
+ <img border="0" align="right" height="78" width="142"
src="solr_small.png" alt="SOLR">
</img>
</a>
<h1>SOLR Info (<xsl:value-of select="solr/schema" />)</h1>
Modified: lucene/solr/trunk/src/webapp/web/admin/replication/header.jsp
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/replication/header.jsp?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/replication/header.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/replication/header.jsp Mon Dec 22
17:45:23 2008
@@ -68,7 +68,7 @@
</head>
<body>
-<a href=".."><img border="0" align="right" height="61" width="142"
src="../solr-head.gif" alt="Solr"></a>
+<a href=".."><img border="0" align="right" height="78" width="142"
src="../solr_small.png" alt="Solr"></a>
<h1>Solr replication (<%= collectionName %>)
<%
if("true".equals((String)detailsMap.get("isMaster")))
Added: lucene/solr/trunk/src/webapp/web/admin/solr_small.png
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/solr_small.png?rev=728842&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/trunk/src/webapp/web/admin/solr_small.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/solr/trunk/src/webapp/web/admin/stats.xsl
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/stats.xsl?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/stats.xsl (original)
+++ lucene/solr/trunk/src/webapp/web/admin/stats.xsl Mon Dec 22 17:45:23 2008
@@ -49,7 +49,7 @@
</head>
<body>
<a href=".">
- <img border="0" align="right" height="61" width="142"
src="solr-head.gif" alt="SOLR">
+ <img border="0" align="right" height="78" width="142"
src="solr_small.png" alt="SOLR">
</img>
</a>
<h1><xsl:value-of select="$title"/></h1>
Modified: lucene/solr/trunk/src/webapp/web/admin/tabular.xsl
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/tabular.xsl?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/tabular.xsl (original)
+++ lucene/solr/trunk/src/webapp/web/admin/tabular.xsl Mon Dec 22 17:45:23 2008
@@ -43,7 +43,7 @@
</head>
<body>
<a href=".">
- <img border="0" align="right" height="61" width="142"
src="solr-head.gif" alt="SOLR">
+ <img border="0" align="right" height="78" width="142"
src="solr_small.png" alt="SOLR">
</img>
</a>
<h1>SOLR Search Results</h1>
Modified: lucene/solr/trunk/src/webapp/web/admin/threaddump.xsl
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/threaddump.xsl?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/threaddump.xsl (original)
+++ lucene/solr/trunk/src/webapp/web/admin/threaddump.xsl Mon Dec 22 17:45:23
2008
@@ -40,7 +40,7 @@
</head>
<body>
<a href=".">
- <img border="0" align="right" height="61" width="142"
src="solr-head.gif" alt="SOLR"/>
+ <img border="0" align="right" height="78" width="142"
src="solr_small.png" alt="SOLR"/>
</a>
<h1>Solr Admin (<xsl:value-of select="solr/meta/collection" />)</h1>
<h2>Thread Dump</h2>
Modified: lucene/solr/trunk/src/webapp/web/favicon.ico
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/favicon.ico?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/solr/trunk/src/webapp/web/index.jsp
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/index.jsp?rev=728842&r1=728841&r2=728842&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/index.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/index.jsp Mon Dec 22 17:45:23 2008
@@ -25,7 +25,7 @@
<body>
<h1>Welcome to Solr!</h1>
-<a href="."><img border="0" align="right" height="61" width="142"
src="admin/solr-head.gif" alt="Solr"/></a>
+<a href="."><img border="0" align="right" height="78" width="142"
src="admin/solr_small.png" alt="Solr"/></a>
<%
org.apache.solr.core.CoreContainer cores =
(org.apache.solr.core.CoreContainer)request.getAttribute("org.apache.solr.CoreContainer");
