merge from master

1 files changed, 27 insertions, 0 deletions

diff --git a/solr-8.1.1/server/solr-webapp/webapp/partials/java-properties.html b/solr-8.1.1/server/solr-webapp/webapp/partials/java-properties.html
new file mode 100644
index 000000000..047de48d5
--- /dev/null
+++ b/solr-8.1.1/server/solr-webapp/webapp/partials/java-properties.html
@@ -0,0 +1,27 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+    <div id="java-properties">
+      <ul>
+        <li ng-class="{odd:$odd}" ng-repeat="prop in props | orderObjectBy:'name'">
+          <dl class="clearfix">
+            <dt ng-bind-html="prop.name | unsafe"></dt>
+            <dd ng-class="{odd:$odd, multi:props.length&gt;1}" ng-repeat="value in prop.values">{{value.value}}</dd>
+          </dl>
+        </li>
+      </ul>
+    </div>
+