Merge pull request #16762 from jcsp/wip-dashboard-trim

mgr: remove unused static files from dashboard module Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Sep 18, 2017 · 5f9bfc5 · 5f9bfc5
2 parents 28c8e89 + 85a87da
commit 5f9bfc5
Show file tree

Hide file tree

Showing 1,012 changed files with 616 additions and 266,376 deletions.
diff --git a/src/pybind/mgr/dashboard/base.html b/src/pybind/mgr/dashboard/base.html
@@ -11,30 +11,26 @@
     <link rel="stylesheet"
           href="{{ url_prefix }}/static/AdminLTE-2.3.7/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
-    <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
+          href="{{ url_prefix }}/static/libs/font-awesome/4.7.0/css/font-awesome.min.css">
     <link rel="stylesheet"
           href="{{ url_prefix }}/static/AdminLTE-2.3.7/dist/css/AdminLTE.min.css">
     <link rel="stylesheet"
           href="{{ url_prefix }}/static/AdminLTE-2.3.7/dist/css/skins/skin-blue.min.css">
     <link rel="stylesheet"
-          href="{{ url_prefix }}/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.css">
+          href="{{ url_prefix }}/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.min.css">
 
     <script src="{{ url_prefix }}/static/AdminLTE-2.3.7/plugins/jQuery/jquery-2.2.3.min.js"></script>
     <script src="{{ url_prefix }}/static/AdminLTE-2.3.7/plugins/sparkline/jquery.sparkline.min.js"></script>
 
-    <script src="{{ url_prefix }}/static/rivets.bundled.min.js"></script>
-    <script src="{{ url_prefix }}/static/underscore-min.js"></script>
+    <script src="{{ url_prefix }}/static/libs/rivets/0.9.6/rivets.bundled.min.js"></script>
+    <script src="{{ url_prefix }}/static/libs/underscore.js/1.8.3/underscore-min.js"></script>
 
     <script src="{{ url_prefix }}/static/AdminLTE-2.3.7/bootstrap/js/bootstrap.min.js"></script>
     <script src="{{ url_prefix }}/static/AdminLTE-2.3.7/dist/js/app.min.js"></script>
     <script src="{{ url_prefix }}/static/AdminLTE-2.3.7/plugins/datatables/jquery.dataTables.min.js"></script>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.min.js"></script>
-
-
+    <script src="{{ url_prefix }}/static/libs/moment.js/2.17.1/moment.min.js"></script>
+    <script src="{{ url_prefix }}/static/libs/Chart.js/2.4.0/Chart.min.js"></script>
 
       <script>
         $(document).ready(function(){

diff --git a/src/pybind/mgr/dashboard/static/AdminLTE-2.3.7/Gruntfile.js b/src/pybind/mgr/dashboard/static/AdminLTE-2.3.7/Gruntfile.js