Merged upstream master into task/3730/refactor_price_parameter

datacenterlight/locale/de/LC_MESSAGES/django.po

@@ -188,13 +188,13 @@ msgid "All Rights Reserved"
 msgstr "Alle Rechte vorbehalten"
 
 msgid "Toggle navigation"
-msgstr "Konfiguration"
+msgstr "Umschalten"
 
 msgid "Why Data Center Light?"
 msgstr "Warum Data Center Light?"
 
 msgid "Login"
-msgstr ""
+msgstr "Anmelden"
 
 msgid "Dashboard"
 msgstr ""

datacenterlight/static/datacenterlight/js/main.js

@@ -147,7 +147,6 @@
 
     function _fetchPricing() {
         Object.keys(cardPricing).map(function(element) {
-            //$('#'+cardPricing[element].id).val(cardPricing[element].value);
             $('input[name=' + element + ']').val(cardPricing[element].value);
         });
         _calcPricing();

datacenterlight/templates/datacenterlight/calculator_form.html

@@ -26,9 +26,9 @@
             <div class="help-block with-errors">
                 {% for message in messages %}
                     {% if 'cores' in message.tags %}
-                     <ul class="list-unstyled"><li>
-                        {{ message|safe }}
-                    </li></ul>
+                        <ul class="list-unstyled">
+                            <li>{{ message|safe }}</li>
+                        </ul>
                     {% endif %}
                 {% endfor %}
             </div>