prefix all static path to having back the classic UI

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
thanos-io · Apr 20, 2021 · 6682e0e · 6682e0e
1 parent 2669d7b
commit 6682e0e
Show file tree

Hide file tree

Showing 12 changed files with 171 additions and 171 deletions.
diff --git a/pkg/ui/bindata.go b/pkg/ui/bindata.go
diff --git a/pkg/ui/static/js/graph.js b/pkg/ui/static/js/graph.js
@@ -1301,7 +1301,7 @@ function init() {
   });
 
   $.ajax({
-    url: PATH_PREFIX + "/static/js/graph_template.handlebar?v=" + BUILD_VERSION,
+    url: PATH_PREFIX + "/classic/static/js/graph_template.handlebar?v=" + BUILD_VERSION,
     success: function(data) {
 
       graphTemplate = data;

diff --git a/pkg/ui/static/js/graph_template.handlebar b/pkg/ui/static/js/graph_template.handlebar
@@ -6,7 +6,7 @@
               </div>
               <div class="col-lg-2">
                 <div class="eval_stats float-right"></div>
-                <img src="{{ pathPrefix }}/static/img/ajax-loader.gif?v={{ buildVersion }}" class="spinner" alt="ajax_spinner">
+                <img src="{{ pathPrefix }}/classic/static/img/ajax-loader.gif?v={{ buildVersion }}" class="spinner" alt="ajax_spinner">
               </div>
             </div>
             <div class="form-inline">

diff --git a/pkg/ui/templates/_base.html b/pkg/ui/templates/_base.html
@@ -4,14 +4,14 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <meta name="robots" content="noindex,nofollow">
         <title>Thanos long term storage Prometheus solution</title>
-        <link rel="shortcut icon" href="{{ pathPrefix }}/static/img/favicon.ico?v={{ buildVersion }}">
-        <script src="{{ pathPrefix }}/static/vendor/js/jquery-3.5.0.min.js?v={{ buildVersion }}"></script>
-        <script src="{{ pathPrefix }}/static/vendor/js/popper.min.js?v={{ buildVersion }}"></script>
-        <script src="{{ pathPrefix }}/static/vendor/bootstrap-4.1.3/js/bootstrap.min.js?v={{ buildVersion }}"></script>
+        <link rel="shortcut icon" href="{{ pathPrefix }}/classic/static/img/favicon.ico?v={{ buildVersion }}">
+        <script src="{{ pathPrefix }}/classic/static/vendor/js/jquery-3.5.0.min.js?v={{ buildVersion }}"></script>
+        <script src="{{ pathPrefix }}/classic/static/vendor/js/popper.min.js?v={{ buildVersion }}"></script>
+        <script src="{{ pathPrefix }}/classic/static/vendor/bootstrap-4.1.3/js/bootstrap.min.js?v={{ buildVersion }}"></script>
 
-        <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/vendor/bootstrap-4.1.3/css/bootstrap.min.css?v={{ buildVersion }}">
-        <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/css/prometheus.css?v={{ buildVersion }}">
-        <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css?v={{ buildVersion }}">
+        <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/classic/static/vendor/bootstrap-4.1.3/css/bootstrap.min.css?v={{ buildVersion }}">
+        <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/classic/static/css/prometheus.css?v={{ buildVersion }}">
+        <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/classic/static/vendor/bootstrap4-glyphicons/css/bootstrap-glyphicons.min.css?v={{ buildVersion }}">
 
         <script>
             var PATH_PREFIX = "{{ pathPrefix }}";

diff --git a/pkg/ui/templates/alerts.html b/pkg/ui/templates/alerts.html
@@ -1,6 +1,6 @@
 {{define "head"}}
-    <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/css/alerts.css?v={{ buildVersion }}">
-    <script src="{{ pathPrefix }}/static/js/alerts.js?v={{ buildVersion }}"></script>
+    <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/classic/static/css/alerts.css?v={{ buildVersion }}">
+    <script src="{{ pathPrefix }}/classic/static/js/alerts.js?v={{ buildVersion }}"></script>
 {{end}}
 
 {{define "content"}}

diff --git a/pkg/ui/templates/bucket.html b/pkg/ui/templates/bucket.html
@@ -2,8 +2,8 @@
     <meta http-equiv="refresh" content="300"/>
 
     <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
-    <script src="{{ pathPrefix }}/static/js/bucket.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/moment/moment.min.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/js/bucket.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/moment/moment.min.js?v={{ buildVersion }}"></script>
 {{end}}
 
 {{define "content"}}

diff --git a/pkg/ui/templates/bucket_menu.html b/pkg/ui/templates/bucket_menu.html
@@ -4,14 +4,14 @@
         <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#nav-content" aria-expanded="false" aria-controls="nav-content" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
-        <a class="navbar-brand" href="{{ pathPrefix }}/">Thanos Bucket Viewer</a>
+        <a class="navbar-brand" href="{{ pathPrefix }}/classic/">Thanos Bucket Viewer</a>
         <div id="nav-content" class="navbar-collapse collapse">
             <ul class="navbar-nav">
                 <li class="nav-item">
                     <a class="nav-link" href="https://thanos.io/tip/thanos/getting-started.md/" target="_blank">Help</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="{{ pathPrefix }}/new/" target="_blank">New UI</a>
+                    <a class="nav-link" href="{{ pathPrefix }}/" target="_blank">New UI</a>
                 </li>
             </ul>
         </div>

diff --git a/pkg/ui/templates/graph.html b/pkg/ui/templates/graph.html
@@ -1,25 +1,25 @@
 {{define "head"}}
-    <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/vendor/rickshaw/rickshaw.min.css?v={{ buildVersion }}">
-    <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/vendor/eonasdan-bootstrap-datetimepicker/bootstrap-datetimepicker.min.css?v={{ buildVersion }}">
+    <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/classic/static/vendor/rickshaw/rickshaw.min.css?v={{ buildVersion }}">
+    <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/classic/static/vendor/eonasdan-bootstrap-datetimepicker/bootstrap-datetimepicker.min.css?v={{ buildVersion }}">
 
-    <script src="{{ pathPrefix }}/static/vendor/rickshaw/vendor/d3.v3.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/rickshaw/vendor/d3.layout.min.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/rickshaw/rickshaw.min.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/moment/moment.min.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/moment/moment-timezone-with-data.min.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/eonasdan-bootstrap-datetimepicker/bootstrap-datetimepicker.min.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/fuzzy/fuzzy.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/rickshaw/vendor/d3.v3.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/rickshaw/vendor/d3.layout.min.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/rickshaw/rickshaw.min.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/moment/moment.min.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/moment/moment-timezone-with-data.min.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/eonasdan-bootstrap-datetimepicker/bootstrap-datetimepicker.min.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/fuzzy/fuzzy.js?v={{ buildVersion }}"></script>
 
-    <script src="{{ pathPrefix }}/static/vendor/mustache/mustache.min.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/js/jquery.selection.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/mustache/mustache.min.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/vendor/js/jquery.selection.js?v={{ buildVersion }}"></script>
     <!-- <script src="{{ pathPrefix }}/static/vendor/js/jquery.hotkeys.js?v={{ buildVersion }}"></script> -->
 
-    <script src="{{ pathPrefix }}/static/js/graph.js?v={{ buildVersion }}"></script>
+    <script src="{{ pathPrefix }}/classic/static/js/graph.js?v={{ buildVersion }}"></script>
 
     <script id="graph_template" type="text/x-handlebars-template"></script>
 
-    <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/css/graph.css?v={{ buildVersion }}">
+    <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/classic/static/css/graph.css?v={{ buildVersion }}">
 {{end}}
 
 {{define "content"}}

diff --git a/pkg/ui/templates/query_menu.html b/pkg/ui/templates/query_menu.html
@@ -4,22 +4,22 @@
             <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#nav-content" aria-expanded="false" aria-controls="nav-content" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
-            <a class="navbar-brand" href="{{ pathPrefix }}/">Thanos</a>
+            <a class="navbar-brand" href="{{ pathPrefix }}/classic/">Thanos</a>
             <div id="nav-content" class="navbar-collapse collapse">
                 <ul class="navbar-nav">
-                    <li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/graph">Graph</a></li>
-                    <li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/stores">Stores</a></li>
+                    <li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/classic/graph">Graph</a></li>
+                    <li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/classic/stores">Stores</a></li>
                     <li class="nav-item dropdown">
                         <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Status <span class="caret"></span></a>
                         <div class="dropdown-menu">
-                            <a class="dropdown-item" href="{{ pathPrefix }}/status">Runtime &amp; Build Information</a>
+                            <a class="dropdown-item" href="{{ pathPrefix }}/classic/status">Runtime &amp; Build Information</a>
                         </div>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="https://thanos.io/tip/thanos/getting-started.md/" target="_blank">Help</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="{{ pathPrefix }}/new/" target="_blank">New UI</a>
+                        <a class="nav-link" href="{{ pathPrefix }}/" target="_blank">New UI</a>
                     </li>
                 </ul>
             </div>

diff --git a/pkg/ui/templates/rule_menu.html b/pkg/ui/templates/rule_menu.html
@@ -4,16 +4,16 @@
         <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#nav-content" aria-expanded="false" aria-controls="nav-content" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
-        <a class="navbar-brand" href="{{ pathPrefix }}/">Thanos</a>
+        <a class="navbar-brand" href="{{ pathPrefix }}/classic/">Thanos</a>
         <div id="nav-content" class="navbar-collapse collapse">
           <ul class="navbar-nav">
-            <li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/alerts">Alerts</a></li>
-            <li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/rules">Rules</a></li>
+            <li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/classic/alerts">Alerts</a></li>
+            <li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/classic/rules">Rules</a></li>
             <li class="nav-item">
               <a class="nav-link" href="https://thanos.io/tip/thanos/getting-started.md/" target="_blank">Help</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="{{ pathPrefix }}/new/" target="_blank">New UI</a>
+              <a class="nav-link" href="{{ pathPrefix }}/" target="_blank">New UI</a>
             </li>
           </ul>
         </div>

diff --git a/pkg/ui/templates/rules.html b/pkg/ui/templates/rules.html
@@ -1,5 +1,5 @@
 {{define "head"}}
-<link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/css/rules.css?v={{ buildVersion }}">
+<link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/classic/static/css/rules.css?v={{ buildVersion }}">
 {{end}}
 
 {{define "content"}}

diff --git a/pkg/ui/templates/stores.html b/pkg/ui/templates/stores.html
@@ -1,5 +1,5 @@
 {{define "head"}}
-<link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/css/rules.css?v={{ buildVersion }}">
+<link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/classic/static/css/rules.css?v={{ buildVersion }}">
 {{end}}
 
 {{define "content"}}