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

Fix conflicts in url footer and fix navbar language

Browse source
This commit is contained in:
Henry Bravo 2017-06-09 16:47:39 -05:00
commit d2e9096cc2
4 changed files with 56 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
datacenterlight/templates/datacenterlight/includes/_footer.html
View file

@ -4,30 +4,48 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
{% if request.resolver_match.url_name == "index" %}
<ul class="list-inline"> <ul class="list-inline">
{% if request.resolver_match.url_name == "index" %}
<li> <li>
<a href="#">{% trans "Home" %}</a> <a class="url" href="javascript:void(0)" data-url="#how" >{% trans "What is it" %}</a>
</li>
<li>
<a class="url" href="javascript:void(0)" data-url="#your" >{% trans "Scale out" %}</a>
</li>
<li>
<a class="url" href="javascript:void(0)" data-url="#our">{% trans "Reliable and light" %}</a>
</li>
<li>
<a class="url" href="javascript:void(0)" data-url="#price" >{% trans "Order VM" %}</a>
</li>
<li>
<a class="url" href="javascript:void(0)" data-url="#contact" >{% trans "Contact" %}</a>
</li>
{% else %}
<li>
<a href="{% url 'datacenterlight:index' %}">{% trans "Home" %}</a>
</li> </li>
<li class="footer-menu-divider">&sdot;</li> <li class="footer-menu-divider">&sdot;</li>
<li> <li>
<a href="#about">{% trans "What is it" %}</a></li> <a href="{% url 'datacenterlight:index' %}#how">{% trans "What is it" %}</a></li>
<li class="footer-menu-divider">&sdot;</li> <li class="footer-menu-divider">&sdot;</li>
<li> <li>
<a href="#about">{% trans "Scale out" %}</a></li> <a href="{% url 'datacenterlight:index' %}#your">{% trans "Scale out" %}</a></li>
<li>&sdot;</li> <li>&sdot;</li>
<li> <li>
<a href="#about">{% trans "Reliable and light" %}</a></li> <a href="{% url 'datacenterlight:index' %}#our">{% trans "Reliable and light" %}</a></li>
<li class="footer-menu-divider">&sdot;</li> <li class="footer-menu-divider">&sdot;</li>
<li> <li>
<a href="#services">{% trans "Pricing" %}</a> <a href="{% url 'datacenterlight:index' %}#price">{% trans "Pricing" %}</a>
</li> </li>
<li class="footer-menu-divider">&sdot;</li> <li class="footer-menu-divider">&sdot;</li>
<li> <li>
<a href="#contact">{% trans "Contact" %}</a> <a href="{% url 'datacenterlight:index' %}#contact">{% trans "Contact" %}</a>
</li> </li>
</ul>
{% endif %} {% endif %}
</ul>
<p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p> <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
</div> </div>
</div> </div>

17
datacenterlight/templates/datacenterlight/includes/_navbar.html
View file

@ -49,10 +49,27 @@
</div> </div>
<div class="drop-language"> <div class="drop-language">
{% if LANGUAGE_CODE == 'en-us'%} {% if LANGUAGE_CODE == 'en-us'%}
{% if request.resolver_match.url_name == "index" %}
<a class="url" href="{{base_url}}/de/datacenterlight" >Deutsch</a> <a class="url" href="{{base_url}}/de/datacenterlight" >Deutsch</a>
{% endif %}
{% if request.resolver_match.url_name == "order" %}
<a class="url" href="{{base_url}}/de/datacenterlight/order" >Deutsch</a>
{% endif %}
{% if request.resolver_match.url_name == "pricing" %}
<a class="url" href="{{base_url}}/de/datacenterlight/pricing" >Deutsch</a>
{% endif %}
{% else %} {% else %}
{% if request.resolver_match.url_name == "index" %}
<a class="url" href="{{base_url}}/en-us/datacenterlight" >English</a> <a class="url" href="{{base_url}}/en-us/datacenterlight" >English</a>
{% endif %} {% endif %}
{% if request.resolver_match.url_name == "order" %}
<a class="url" href="{{base_url}}/en-us/datacenterlight/order" >Deutsch</a>
{% endif %}
{% if request.resolver_match.url_name == "pricing" %}
<a class="url" href="{{base_url}}/en-us/datacenterlight/pricing" >Deutsch</a>
{% endif %}
<a class="url" href="{{base_url}}/en-us/datacenterlight" ></a>
{% endif %}
</div> </div>
</li> </li>

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

@ -90,14 +90,6 @@
</div> </div>
<!-- jQuery -->
<script src="{% static 'datacenterlight/js/jquery.js' %}"></script>
<!-- Bootstrap Core JavaScript -->
<script src="{% static 'datacenterlight/js/bootstrap.min.js' %}"></script>
<script src="{% static 'datacenterlight/js/main.js' %}"></script>
{% endblock %} {% endblock %}
</html> </html>