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

Manual merge of ungleich/master into opennebula-integration

Browse source
This commit is contained in:
M.Ravi 2017-04-24 03:01:05 +05:30
commit d537fcb118
227 changed files with 25682 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
hosting/locale/de/LC_MESSAGES/django.mo Normal file
View file

Binary file not shown.

14
hosting/static/hosting/js/payment.js
View file

@ -112,13 +112,13 @@ $( document ).ready(function() {
}
}
$form.find('[type=submit]').prop('disabled', true);
var readyInterval = setInterval(function() {
if (paymentFormReady()) {
$form.find('[type=submit]').prop('disabled', false);
clearInterval(readyInterval);
}
}, 250);
// $form.find('[type=submit]').prop('disabled', true);
// var readyInterval = setInterval(function() {
// if (paymentFormReady()) {
// $form.find('[type=submit]').prop('disabled', false);
// clearInterval(readyInterval);
// }
// }, 250);
});

2
hosting/templates/hosting/beta.html
View file

@ -136,7 +136,7 @@
<a href="{% url 'hosting:index' %}#contact">Contact</a>
</li>
</ul>
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH 2015. All Rights Reserved</p>
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
</div>
</div>
</div>

2
hosting/templates/hosting/login.html
View file

@ -27,7 +27,7 @@
<div class="intro-message">
<h2 class="section-heading">{% trans "Login"%}</h2>
<form action="{% url 'hosting:login' %}" method="post" class="form" novalidate>
<form action="{% url 'hosting:login' %}" method="post" class="form" novalidated>
{% csrf_token %}
{% for field in form %}
{% bootstrap_field field show_label=False type='fields'%}