removed vendor files from hosting and using the ones from dataccenterlight

datacenterlight/templates/datacenterlight/base.html

@@ -14,7 +14,7 @@
 
     <!-- Vendor CSS -->
     <!-- Bootstrap Core CSS -->
-    <link href="{% static 'datacenterlight/css/bootstrap.min.css' %}" rel="stylesheet">
+    <link href="{% static 'datacenterlight/css/bootstrap-3.3.7.min.css' %}" rel="stylesheet">
     <!-- Icon Fonts -->
     <link href="{% static 'datacenterlight/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
     <!-- Custom CSS -->
@@ -52,12 +52,13 @@
     {% include "datacenterlight/includes/_footer.html" %}
 
     <!-- jQuery -->
-    <script src="{% static 'datacenterlight/js/jquery.js' %}"></script>
+    <script src="{% static 'datacenterlight/js/jquery-2.2.4.min.js' %}"></script>
     <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'datacenterlight/js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'datacenterlight/js/bootstrap-3.3.7.min.js' %}"></script>
     <!-- Bootstrap Validator -->
     <script src="//cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
 
+    <!-- Custom JS -->
     <script src="{% static 'datacenterlight/js/main.js' %}"></script>
 
 </body>

datacenterlight/templates/datacenterlight/base_hosting.html

@@ -15,7 +15,7 @@
 
     <!-- Vendor CSS -->
     <!-- Bootstrap Core CSS -->
-    <link href="{% static 'datacenterlight/css/bootstrap.min.css' %}" rel="stylesheet">
+    <link href="{% static 'datacenterlight/css/bootstrap-3.3.7.min.css' %}" rel="stylesheet">
     <!-- Icon Fonts -->
     <link href="{% static 'datacenterlight/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
     <link href="//fonts.googleapis.com/css?family=Lato:300,400,600,700" rel="stylesheet" type="text/css">
@@ -27,7 +27,6 @@
     {% endblock css_extra %}
 
     <!-- External Fonts -->
-    <link href="//fonts.googleapis.com/css?family=Lato:300,400,600,700" rel="stylesheet" type="text/css">
 
     <link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon">
 
@@ -71,20 +70,17 @@
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment-with-locales.js"></script>
     <!-- jQuery -->
-    <script src="{% static 'hosting/js/jquery.js' %}"></script>
+    <script src="{% static 'datacenterlight/js/jquery-2.2.4.min.js' %}"></script>
     <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'hosting/js/bootstrap.min.js' %}"></script>
-
+    <script src="{% static 'datacenterlight/js/bootstrap-3.3.7.min.js' %}"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.16.0/jquery.validate.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
     <!-- Copy Clipboard (not required for dcl, but dependency in virtual_machine_detail.js) -->
     <script src="//cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.5.10/clipboard.min.js"></script>
 
-    <!-- Virtual Machine Detail Javascript -->
+    <!-- Custom JS -->
     <script src="{% static 'hosting/js/virtual_machine_detail.js' %}"></script>
-    <!-- Create Virtual Machine Javascript -->
     <script src="{% static 'hosting/js/createvm.js' %}"></script>
-    <!-- Init JavaScript -->
     <script src="{% static 'hosting/js/initial.js' %}"></script>
     {% block js_extra %}
         {% comment %}

datacenterlight/templates/datacenterlight/beta_access.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-
 <form novalidate id ="beta_access" class="form-beta" method="POST" action="{% url 'datacenterlight:beta_access'%}">
   {% csrf_token %}
   {{ form.non_field_errors }}

datacenterlight/templates/datacenterlight/cms_page.html

@@ -1,35 +1,29 @@
 {% extends "datacenterlight/base.html" %}
 {% load staticfiles cms_tags sekizai_tags %}
-{% block title %}
-{% page_attribute page_title %}
-{% endblock %}
-{% block content %}
-{% addtoblock "css" %}
-<link href="{% static 'datacenterlight/css/cms.css' %}" media="screen" rel="stylesheet" type="text/css"/>
-{% endaddtoblock %}
-<div class="dcl-cms_page-full-width">
-    <div class="dcl-cms_page-header">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 col-md-12">
-                    <div class="single-heading">
-                        <h2>{% page_attribute page_title %}</h2>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 
-<div class="split-section left" id="dcl-cms_page-text">
-    <div class="space">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-12">
-                    {% placeholder 'datacenterlight_cms_page_text' %}
+{% block title %}
+    {% page_attribute page_title %}
+{% endblock %}
+
+{% block content %}
+    {% addtoblock "css" %}
+        <link href="{% static 'datacenterlight/css/cms.css' %}" media="screen" rel="stylesheet" type="text/css"/>
+    {% endaddtoblock %}
+    <div class="dcl-cms_page-full-width">
+        <div class="dcl-cms_page-header">
+            <div class="container">
+                <div class="single-heading">
+                    <h2>{% page_attribute page_title %}</h2>
                 </div>
             </div>
         </div>
     </div>
-</div>
+
+    <div class="split-section left" id="dcl-cms_page-text">
+        <div class="space">
+            <div class="container">
+                {% placeholder 'datacenterlight_cms_page_text' %}
+            </div>
+        </div>
+    </div>
 {% endblock %}