From 937a41489f78aa32efb5e65dcc4e60e9bae19431 Mon Sep 17 00:00:00 2001
From: Upayavira <uv@odoko.co.uk>
Date: Thu, 10 Mar 2016 23:48:48 +0000
Subject: [PATCH] SOLR-7858 - update links between new/old UIs for 6.x release

---
 solr/webapp/web/css/angular/common.css | 13 ++-----------
 solr/webapp/web/css/styles/common.css  | 16 +++++++++++++++-
 solr/webapp/web/index.html             |  6 ++----
 solr/webapp/web/old.html               |  5 +++--
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/solr/webapp/web/css/angular/common.css b/solr/webapp/web/css/angular/common.css
index 1a3b087db5b..d9604464d6c 100644
--- a/solr/webapp/web/css/angular/common.css
+++ b/solr/webapp/web/css/angular/common.css
@@ -762,16 +762,7 @@ pre.syntax .tex .formula
   padding-left: 16px;
 }
 
-.new-ui-warning {
-  position: absolute;
-  left: 150px;
-  top: -20px;
-  align: center;
-  color: red;
-  font-weight: bold;
-}
-.new-ui-warning a.ul {
-  color: red;
-  font-weight: bold;
+.other-ui-link a.ul {
   text-decoration: underline;
 }
+
diff --git a/solr/webapp/web/css/styles/common.css b/solr/webapp/web/css/styles/common.css
index f0e0652fa17..6c0a9fbcba3 100644
--- a/solr/webapp/web/css/styles/common.css
+++ b/solr/webapp/web/css/styles/common.css
@@ -714,4 +714,18 @@ pre.syntax .tex .formula
 }
 .other-ui-link a.ul {
   text-decoration: underline;
-}
\ No newline at end of file
+}
+
+.old-ui-warning {
+  position: absolute;
+  right: 0px;
+  top: -20px;
+  align: center;
+  color: red;
+  font-weight: bold;
+}
+.old-ui-warning a.ul {
+  color: red;
+  font-weight: bold;
+  text-decoration: underline;
+}
diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html
index 3c230478ada..6c4df6afe86 100644
--- a/solr/webapp/web/index.html
+++ b/solr/webapp/web/index.html
@@ -121,10 +121,8 @@ limitations under the License.
         <div class="exception">{{exception.msg}}</div>
       </div>
 
-      <div class="new-ui-warning">
-        This is an experimental UI. Report bugs <a class="ul" target="_blank" href="http://issues.apache.org/jira/browse/SOLR">here</a>.
-        For the old UI click <a class="ul" href="/solr/old.html">here</a>
-        <a target="_blank" href="http://wiki.apache.org/solr/AngularUI">&nbsp;<span class="help"></span></a>
+      <div class="other-ui-link">
+        Use <a class="ul" href="/solr/old.html">original UI</a><a target="_blank" href="http://wiki.apache.org/solr/AngularUI">&nbsp;<span class="help"></span></a>
       </div>
 
       <div id="content-wrapper">
diff --git a/solr/webapp/web/old.html b/solr/webapp/web/old.html
index a25504e21ba..d688a0a56e3 100644
--- a/solr/webapp/web/old.html
+++ b/solr/webapp/web/old.html
@@ -79,8 +79,9 @@ limitations under the License.
                 
       </div>
 
-      <div class="other-ui-link">
-        Try <a class="ul" href="/solr/">New UI</a><a target="_blank" href="http://wiki.apache.org/solr/AngularUI">&nbsp;<span class="help"></span></a>
+      <div class="old-ui-warning">
+        THIS USER INTERFACE IS DEPRECATED. Please use the current UI <a class="ul" href="/solr/">here</a>
+        <a target="_blank" href="http://wiki.apache.org/solr/AngularUI">&nbsp;<span class="help"></span></a>
       </div>
 
       <div id="content-wrapper">