This is an automated email from the ASF dual-hosted git repository.
pankajkumar pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new b5cf273fc7d HBASE-29156 Sort options missing in the Table Regions
section on server deployments with security mods (#6858)
b5cf273fc7d is described below
commit b5cf273fc7d2caa078cba20632864f7e7e884d33
Author: Chandra Sekhar K <[email protected]>
AuthorDate: Sat Apr 12 01:26:03 2025 +0530
HBASE-29156 Sort options missing in the Table Regions section on server
deployments with security mods (#6858)
Signed-off-by: Pankaj Kumar<[email protected]>
(cherry picked from commit fa04f394db896b77f9ff8fe97beffc83bc3a42d5)
---
.../src/main/resources/hbase-webapps/master/footer.jsp | 10 +---------
.../resources/hbase-webapps/master/{footer.jsp => scripts.jsp} | 2 --
hbase-server/src/main/resources/hbase-webapps/master/table.jsp | 4 +++-
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp
b/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp
index 6a0ac444e3b..fcded1ed1d0 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp
@@ -17,14 +17,6 @@
* limitations under the License.
*/
--%>
- <script src="/static/js/jquery.min.js" type="text/javascript"></script>
- <script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
- <script src="/static/js/tab.js" type="text/javascript"></script>
- <script type="text/javascript">
- $(document).ready(function() {
- $('nav.navbar li.active').removeClass('active');
- $('a[href="' + location.pathname + '"]').addClass('active');
- });
- </script>
+<jsp:include page="scripts.jsp" />
</body>
</html>
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp
b/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp
similarity index 98%
copy from hbase-server/src/main/resources/hbase-webapps/master/footer.jsp
copy to hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp
index 6a0ac444e3b..1e9031f77eb 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/scripts.jsp
@@ -26,5 +26,3 @@
$('a[href="' + location.pathname + '"]').addClass('active');
});
</script>
- </body>
-</html>
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
index bd73393fd00..024f474fcbe 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -1290,7 +1290,7 @@ for (ColumnFamilyDescriptor family: families) {
</div><!--/.row -->
</div> <!--/.container-fluid -->
-<jsp:include page="footer.jsp" />
+<jsp:include page="scripts.jsp" />
<script src="/static/js/jquery.tablesorter.min.js"
type="text/javascript"></script>
<script>
@@ -1373,3 +1373,5 @@ $(document).ready(function()
}
);
</script>
+</body>
+</html>
