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

Merge branch 'master' into task/3553

Browse source
This commit is contained in:
ARvind Tiwari 2017-07-31 18:17:30 +05:30
commit bb061c67d0
4 changed files with 98 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog
View file

@ -1,4 +1,4 @@
1.0.22: 2017-07-28 1.0.22: 2017-07-30
* #3593: [datacenterlight] Removed underbars between social icons in index * #3593: [datacenterlight] Removed underbars between social icons in index
* #3509: [datacenterlight, hosting] Made navbar transparent and removed mobile navbar bug in login/signup/reset-password * #3509: [datacenterlight, hosting] Made navbar transparent and removed mobile navbar bug in login/signup/reset-password
* #3592: [datacenterlight] Changed “Order Now” button text to “Continue/weiter” * #3592: [datacenterlight] Changed “Order Now” button text to “Continue/weiter”
@ -8,6 +8,8 @@
* #3604: [datacenterlight, hosting] Font colour change for better visibility in signup/login/password request footer links * #3604: [datacenterlight, hosting] Font colour change for better visibility in signup/login/password request footer links
[all] Introduced ENABLE_DEBUG_LOGGING [all] Introduced ENABLE_DEBUG_LOGGING
* #3542: [datacenterlight, hosting] Fixed warning messages and deprecated url * #3542: [datacenterlight, hosting] Fixed warning messages and deprecated url
* #3603: [datacenterlight] Removed navbar language option dropdown
* #3629: [datacenterlight] Fixed navbar language switching bug
1.0.21: 2017-07-21 1.0.21: 2017-07-21
* #3591: [datacenterlight, payment] Fixed card holder name to appear on Confirm Order page * #3591: [datacenterlight, payment] Fixed card holder name to appear on Confirm Order page
* #3558: [datacenterlight] Changed font family and background color for header * #3558: [datacenterlight] Changed font family and background color for header

63
datacenterlight/static/datacenterlight/css/landing-page.css
View file

@ -156,6 +156,14 @@ h6 {
background-color: transparent; background-color: transparent;
} }
.navbar-transparent .navbar-nav>li>.on-hover-border {
transition: all 0.3s linear;
box-shadow: none;
}
.navbar-transparent .navbar-nav>li>.on-hover-border:hover {
box-shadow: 0 0 0 1px #eee;
border-radius: 5px;
}
.navbar-default .btn-link { .navbar-default .btn-link {
box-shadow: none; box-shadow: none;
} }
@ -196,44 +204,61 @@ h6 {
margin-right: 5px; margin-right: 5px;
font-family: 'Lato', sans-serif; font-family: 'Lato', sans-serif;
} }
.nav-language .drop-language{
.nav-language .drop-language { /*position: absolute;*/
position: absolute;
top: 45px; top: 45px;
left: -8px; left: auto !important;
background: #fff; /* background: #fff; */
width: 100px; width: 100px;
min-width: 100px;
height: 40px; height: 40px;
padding: 9px 10px; padding: 9px 10px;
-webkit-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); -webkit-box-shadow: -8px 13px 31px -8px rgba(77,77,77,1);
-moz-box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); -moz-box-shadow: -8px 13px 31px -8px rgba(77,77,77,1);
box-shadow: -8px 13px 31px -8px rgba(77, 77, 77, 1); box-shadow: -8px 13px 31px -8px rgba(77,77,77,1);
display: none; /*display: none;*/
z-index: 100; z-index: 100;
/* margin-left: 10px; */ /* margin-left: 10px; */
text-align: center; text-align: center;
border-radius: 4px; border-radius: 4px;
} }
.nav-language .drop-language a { .nav-language .open .drop-language{
cursor: pointer; width: 100px;
font-family: 'Lato', sans-serif; min-width: 100px;
} }
.navbar-transparent .nav-language .drop-language { .nav-language .drop-language a{
cursor: pointer;
padding: 5px 10px !important;
font-family: 'Lato-Light', sans-serif;
}
/* Show the dropdown menu on hover */
@media (min-width: 769px) {
.nav-language .dropdown:hover .dropdown-menu {
display: block;
}
}
@media (max-width: 767px){
.nav-language .open .dropdown-menu>li>a {
line-height: 1.42857143;
}
}
.navbar-transparent .nav-language .drop-language{
background: transparent; background: transparent;
border: 1px solid #fff; border: 1px solid #fff;
} }
.navbar-transparent .nav-language .drop-language a { .navbar-transparent .nav-language .drop-language a {
color: #fff; color: #fff;
padding: 5px 10px !important;
font-family: 'Lato-Light', sans-serif; font-family: 'Lato-Light', sans-serif;
} }
/* .nav-language:hover .drop-language{
.nav-language:hover .drop-language {
display: block; display: block;
} } */
.intro-header { .intro-header {
height: 100vh; height: 100vh;
text-align: center; text-align: center;
@ -1192,8 +1217,8 @@ tech-sub-sec h2 {
font-size: 14px; font-size: 14px;
color: #777; color: #777;
} }
.nav-language:hover { .nav-language:hover{
height: 80px; /*height: 80px;*/
} }
.navbar-transparent .nav-language .select-language { .navbar-transparent .nav-language .select-language {
color: #777; color: #777;

8
datacenterlight/static/datacenterlight/js/main.js
View file

@ -91,16 +91,12 @@
var href = $(this).attr('data-url'); var href = $(this).attr('data-url');
$('.navbar-collapse').removeClass('in'); $('.navbar-collapse').removeClass('in');
$('.navbar-collapse').addClass('collapsing'); $('.navbar-collapse').addClass('collapsing');
var url = window.location.pathname; if ($(href).length) {
var urlSplit = url.split('/');
if (urlSplit.length === 3 && urlSplit[2] === 'datacenterlight') {
$('html, body').animate({ $('html, body').animate({
scrollTop: $(href).offset().top scrollTop: $(href).offset().top
}, 1000); }, 1000);
} else { } else {
var allUrl = window.location.href; window.location.href = '/datacenterlight' + href;
var redirect = allUrl.split('whydatacenterlight')
window.location.href = '/en-us/datacenterlight' + href;
} }
}); });
} }

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

@ -1,8 +1,6 @@
{% load staticfiles i18n%} {% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} {% load custom_tags %}
{% get_current_language as LANGUAGE_CODE %}
{% load custom_tags %}
<nav class="navbar navbar-default navbar-fixed-top topnav"> <nav class="navbar navbar-default navbar-fixed-top topnav">
<div class="topnav"> <div class="topnav">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@ -22,44 +20,55 @@
</div> </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"><!-- Start Navbar collapse--> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"><!-- Start Navbar collapse-->
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
{% if request.resolver_match.url_name == "index" or request.resolver_match.url_name == "whydatacenterlight" %} {% if request.resolver_match.url_name == "index" or request.resolver_match.url_name == "whydatacenterlight" %}
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle visible-mobile" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% trans "Highlights" %}<span class="caret"></span></a> <a class="dropdown-toggle visible-mobile" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% trans "Highlights" %}<span class="caret"></span></a>
<a class="dropdown-toggle url disabled visible-desktop menu-url" data-url="#how" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% trans "Highlights" %}<span class="caret"></span></a> <a class="dropdown-toggle url disabled visible-desktop menu-url" data-url="#how" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% trans "Highlights" %}<span class="caret"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a class="url menu-url" data-url="#your" href="#your">{% trans "Scale out" %}</a></li> <li><a class="url menu-url" data-url="#your" href="#your">{% trans "Scale out" %}</a></li>
<li><a class="url menu-url" data-url="#our" href="#our">{% trans "Reliable and light" %}</a></li> <li><a class="url menu-url" data-url="#our" href="#our">{% trans "Reliable and light" %}</a></li>
<li> <a class="url menu-url" data-url="#price" href="#price">{% trans "Order VM" %}</a></li> <li> <a class="url menu-url" data-url="#price" href="#price">{% trans "Order VM" %}</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<a href="{% url 'datacenterlight:index' %}/whydatacenterlight" >{% trans "Why Data Center Light?" %}</a> <a href="{% url 'datacenterlight:whydatacenterlight' %}" >{% trans "Why Data Center Light?" %}</a>
</li> </li>
<li> <li>
<a class="url" href="{% url 'datacenterlight:index' %}#contact" data-url="#contact" >{% trans "Contact" %}</a> <a class="url" href="{% url 'datacenterlight:index' %}#contact" data-url="#contact" >{% trans "Contact" %}</a>
</li> </li>
{% endif %} {% endif %}
<li class="nav-language">
<div class="select-language">
{% if LANGUAGE_CODE == 'en-us'%}
<span>English</span>
{% else %}
<span>Deutsch</span>
{% endif %}
<i class="fa fa-globe" aria-hidden="true"></i>
</div>
<div class="drop-language"> <li>
{% if LANGUAGE_CODE == 'en-us'%} {% if LANGUAGE_CODE == 'en-us'%}
<a href="{% change_lang 'de' %}">Deutsch</a> <a class="on-hover-border" href="{% change_lang 'de' %}">Deutsch&nbsp;&nbsp;<i class="fa fa-globe" aria-hidden="true"></i></a>
{% else %} {% else %}
<a href="{% change_lang 'en-us' %}" >English</a> <a class="on-hover-border" href="{% change_lang 'en-us' %}">English&nbsp;&nbsp;<i class="fa fa-globe" aria-hidden="true"></i></a>
{% endif %} {% endif %}
</div> </li>
{% comment %}
</li> <!-- to be used when more than one option for language -->
</ul> <li class="nav-language">
</div><!-- /.navbar-collapse --> <div class="dropdown">
</div> <div class="dropdown-toggle select-language" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{% if LANGUAGE_CODE == 'en-us'%}
<span>English</span>
{% else %}
<span>Deutsch</span>
{% endif %}
<i class="fa fa-globe" aria-hidden="true"></i>
</div>
<ul class="dropdown-menu drop-language dropdown-menu-right">
{% if LANGUAGE_CODE == 'en-us'%}
<li><a class="url" href="{% change_lang 'de' %}">Deutsch</a></li>
{% else %}
<li><a class="url" href="{% change_lang 'en-us' %}">English</a></li>
{% endif %}
</ul>
</div>
</li>
{% endcomment %}
</ul>
</div>
<!-- /.navbar-collapse -->
</div> </div>
</nav> </nav>