aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6 from ungleich/master

Browse source 
Pulling Master Changes
This commit is contained in:
Polycarp Okock 2017-07-08 23:00:28 +03:00 • committed by GitHub
commit 73bda16b6d
6 changed files with 242 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

7
datacenterlight/templates/datacenterlight/base.html
View file

@ -3,7 +3,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{LANGUAGE_CODE}}"> <html lang="{{LANGUAGE_CODE}}">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -36,9 +36,9 @@
<!-- Google analytics --> <!-- Google analytics -->
{% include "google_analytics.html" %} {% include "google_analytics.html" %}
<!-- End Google Analytics --> <!-- End Google Analytics -->
</head> </head>
<body> <body>
<!-- Navigation --> <!-- Navigation -->
{% include "datacenterlight/includes/_navbar.html" %} {% include "datacenterlight/includes/_navbar.html" %}
@ -64,4 +64,5 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.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/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> <script src="//cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
</body>
</html> </html>

2
datacenterlight/templates/datacenterlight/index.html
View file

@ -278,4 +278,4 @@
</div> </div>
<!-- /.banner --> <!-- /.banner -->
{% endblock %} {% endblock %}

8
datacenterlight/templates/datacenterlight/order_detail.html
View file

@ -4,7 +4,7 @@
{% load custom_tags %} {% load custom_tags %}
{% block content %} {% block content %}
<div class="order-detail-container"> <div class="order-detail-container">
{% if messages %} {% if messages %}
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-8 col-md-offset-2"> <div class="col-xs-12 col-md-8 col-md-offset-2">
@ -81,10 +81,10 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
window.onload = function () { window.onload = function () {
var locale_date = moment.utc(document.getElementById("order-created_at").textContent,'YYYY-MM-DD HH:mm').toDate(); var locale_date = moment.utc(document.getElementById("order-created_at").textContent,'YYYY-MM-DD HH:mm').toDate();
@ -93,5 +93,5 @@
}; };
</script> </script>
{%endblock%} {%endblock%}

12
datacenterlight/templates/datacenterlight/success.html
View file

@ -12,9 +12,8 @@
</div> </div>
</div> </div>
<script src="{% static 'datacenterlight/js/jquery.js' %}"></script>
<script type="text/javascript"> <script type="text/javascript">
window.onload=function(){ window.onload=function(){
$('.selectpicker').selectpicker({ $('.selectpicker').selectpicker({
style: 'btn-link', style: 'btn-link',
@ -28,13 +27,6 @@
} }
}; };
</script> </script>
<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
<!-- Bootstrap Core JavaScript -->
<script src="{% static 'datacenterlight/js/bootstrap.min.js' %}"></script>
<script src="{% static 'datacenterlight/js/main.js' %}"></script>
{% endblock %} {% endblock %}

2
datacenterlight/templates/datacenterlight/whydatacenterlight.html
View file

@ -251,4 +251,4 @@
<!-- End Why Data Center Light? --> <!-- End Why Data Center Light? -->
{% endblock %} {% endblock %}