Merge pull request flipkart-incubator#76 from flipkart-incubator/dev

UI changes
Anemone95 · Nov 28, 2018 · 6142902 · 6142902
2 parents 18eb251 + c94ffe8
commit 6142902
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 13 deletions.
diff --git a/Dashboard/static/bootstrap-table.min.css b/Dashboard/static/bootstrap-table.min.css
diff --git a/Dashboard/static/bootstrap-table.min.js b/Dashboard/static/bootstrap-table.min.js
diff --git a/Dashboard/static/bootstrap.min.css b/Dashboard/static/bootstrap.min.css
diff --git a/Dashboard/static/bootstrap.min.js b/Dashboard/static/bootstrap.min.js
diff --git a/Dashboard/static/jquery.min.js b/Dashboard/static/jquery.min.js
diff --git a/Dashboard/templates/reports.html b/Dashboard/templates/reports.html
@@ -18,11 +18,11 @@
 		<script type="text/javascript" src="{{ url_for('static', filename='main.js') }}"></script>
 		<script type="text/javascript" src="{{ url_for('static', filename='scan.js') }}"></script>
 
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
-            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.10.1/bootstrap-table.min.css">
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.10.1/bootstrap-table.min.js"></script>
+        <link rel="stylesheet" href="{{ url_for('static', filename='bootstrap.min.css')}}">
+            <link rel="stylesheet" href="{{ url_for('static', filename='bootstrap-table.min.css') }}">
+        <script src="{{ url_for('static', filename='jquery.min.js')}}"></script>
+        <script src="{{ url_for('static', filename='bootstrap.min.js')}}"></script>
+            <script src="{{ url_for('static', filename='bootstrap-table.min.js') }}"></script>
 
 
 

diff --git a/Dashboard/templates/scan.html b/Dashboard/templates/scan.html
@@ -10,18 +10,15 @@
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 		<link rel="stylesheet" href="{{ url_for('static', filename='main.css')}}">
 
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-		<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-  		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+		<link rel="stylesheet" href="{{ url_for('static', filename='bootstrap.min.css')}}">
+		<script src="{{ url_for('static', filename='jquery.min.js')}}"></script>
+  		<script src="{{ url_for('static', filename='bootstrap.min.js')}}"></script>
 
 		<script type="text/javascript" src="{{ url_for('static', filename='main.js') }}"></script>
         <script type="text/javascript" src="{{ url_for('static', filename='scan.js') }}"></script>
 
-            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
-            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.10.1/bootstrap-table.min.css">
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.10.1/bootstrap-table.min.js"></script>
+            <link rel="stylesheet" href="{{ url_for('static', filename='bootstrap-table.min.css') }}">
+            <script src="{{ url_for('static', filename='bootstrap-table.min.js') }}"></script>
 
 	</head>