You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by up...@apache.org on 2016/03/11 00:50:42 UTC
[1/2] lucene-solr git commit: SOLR-7858 - update links between
new/old UIs for 6.x release
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_0 c34272da2 -> c18d3521a
refs/heads/branch_6x 7927a3101 -> 77d233bc0
SOLR-7858 - update links between new/old UIs for 6.x release
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/77d233bc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/77d233bc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/77d233bc
Branch: refs/heads/branch_6x
Commit: 77d233bc01894c33f02178898dd3368b51902a11
Parents: 7927a31
Author: Upayavira <uv...@odoko.co.uk>
Authored: Thu Mar 10 23:48:48 2016 +0000
Committer: Upayavira <uv...@odoko.co.uk>
Committed: Thu Mar 10 23:49:43 2016 +0000
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77d233bc/solr/webapp/web/css/angular/common.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/angular/common.css b/solr/webapp/web/css/angular/common.css
index 1a3b087..d960446 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;
}
+
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77d233bc/solr/webapp/web/css/styles/common.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/styles/common.css b/solr/webapp/web/css/styles/common.css
index f0e0652..6c0a9fb 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;
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77d233bc/solr/webapp/web/index.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html
index 3c23047..6c4df6a 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"> <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"> <span class="help"></span></a>
</div>
<div id="content-wrapper">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77d233bc/solr/webapp/web/old.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/old.html b/solr/webapp/web/old.html
index a25504e..d688a0a 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"> <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"> <span class="help"></span></a>
</div>
<div id="content-wrapper">
[2/2] lucene-solr git commit: SOLR-7858 - update links between
new/old UIs for 6.x release
Posted by up...@apache.org.
SOLR-7858 - update links between new/old UIs for 6.x release
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c18d3521
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c18d3521
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c18d3521
Branch: refs/heads/branch_6_0
Commit: c18d3521a47727f2c0a4a4455db3cbaf1c6570bd
Parents: c34272d
Author: Upayavira <uv...@odoko.co.uk>
Authored: Thu Mar 10 23:48:48 2016 +0000
Committer: Upayavira <uv...@odoko.co.uk>
Committed: Thu Mar 10 23:50:26 2016 +0000
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c18d3521/solr/webapp/web/css/angular/common.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/angular/common.css b/solr/webapp/web/css/angular/common.css
index 1a3b087..d960446 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;
}
+
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c18d3521/solr/webapp/web/css/styles/common.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/styles/common.css b/solr/webapp/web/css/styles/common.css
index f0e0652..6c0a9fb 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;
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c18d3521/solr/webapp/web/index.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html
index 3c23047..6c4df6a 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"> <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"> <span class="help"></span></a>
</div>
<div id="content-wrapper">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c18d3521/solr/webapp/web/old.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/old.html b/solr/webapp/web/old.html
index a25504e..d688a0a 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"> <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"> <span class="help"></span></a>
</div>
<div id="content-wrapper">