Merged upstream master into task/3484/email_refactoring

datacenterlight/locale/de/LC_MESSAGES/django.po

@@ -335,8 +335,8 @@ msgstr "Rechnungsadresse"
 msgid "Payment Method:"
 msgstr "Bezahlmethode"
 
-msgid "ending"
-msgstr "endend"
+msgid "ending in"
+msgstr "endend in"
 
 msgid "Order summary"
 msgstr "Bestellungsübersicht"

datacenterlight/static/datacenterlight/css/landing-page.css

@@ -122,7 +122,7 @@ button, input, optgroup, select, textarea {
 
 .navbar-default {
     background: #fff;
-    border: none;
+    /* border: none; */
     padding: 5px;
 }
 
@@ -143,15 +143,19 @@ button, input, optgroup, select, textarea {
 
 .navbar-default .navbar-nav>li>a {
     cursor: pointer;
-    /*font-family: 'Lato-Light', sans-serif;*/
-    font-weight: 300;
+    font-weight: 400;
 }
 
 .navbar-transparent .navbar-nav>li>a {
     color: #fff;
     cursor: pointer;
-    /*font-family: 'Lato-Light', sans-serif;*/
-    font-weight: 300;
+}
+
+@media (min-width: 768px) {
+    .navbar-default .navbar-nav>li>a,
+    .navbar-transparent .navbar-nav>li>a {
+        font-weight: 300;
+    }
 }
 
 .navbar-transparent .navbar-nav>li>a:hover {
@@ -924,7 +928,7 @@ tech-sub-sec h2 {
     border: 1px solid #fff;
     -webkit-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 14px 20px -5px rgba(77, 77, 77, 0.5);
     display: none;
     text-align: center;
     border-radius: 4px !important;
@@ -976,8 +980,12 @@ tech-sub-sec h2 {
 
 .dropdown-menu>li>a {
     font-size: 13px;
-    font-weight: 300;
-    /*font-family: 'Lato-Light', sans-serif;*/
+}
+
+@media (min-width: 768px) {
+    .dropdown-menu>li>a {
+        font-weight: 300;
+    }
 }
 
 .navbar-default .navbar-nav>.active>a,

datacenterlight/templates/datacenterlight/includes/_navbar.html

@@ -1,10 +1,12 @@
-{% load staticfiles i18n%} {% load custom_tags %} {% get_current_language as LANGUAGE_CODE %}
+{% load staticfiles i18n%}
+{% load custom_tags %}
+{% get_current_language as LANGUAGE_CODE %}
 <nav class="navbar navbar-default navbar-fixed-top topnav">
     <div class="topnav">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
             <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-                <span class="sr-only">Toggle navigation</span>
+                <span class="sr-only">{% trans "Toggle navigation" %}</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
@@ -34,6 +36,15 @@
                     <a class="on-hover-border" href="{% change_lang 'de' %}">Deutsch&nbsp;&nbsp;<i class="fa fa-globe" aria-hidden="true"></i></a> {% else %}
                     <a class="on-hover-border" href="{% change_lang 'en-us' %}">English&nbsp;&nbsp;<i class="fa fa-globe" aria-hidden="true"></i></a> {% endif %}
                 </li>
+                {% if not request.user.is_authenticated %}
+                    <li>
+                        <a href="{% url 'hosting:login' %}">{% trans "Login" %}&nbsp;&nbsp;<span class="fa fa-sign-in"></span></a>
+                    </li>
+                {% else %}
+                    <li>
+                        <a href="{% url 'hosting:dashboard' %}">{% trans "Dashboard" %}</a>
+                    </li>
+                {% endif %}
                 {% comment %}
                 <!-- to be used when more than one option for language -->
                 <li class="nav-language">

datacenterlight/templates/datacenterlight/order_detail.html

@@ -50,7 +50,7 @@
                         <div class="col-xs-6">
                             <address>
                                 <strong>{% trans "Payment Method:"%}</strong><br>
-                                    {{cc_brand}} {% trans "ending" %} **** {{cc_last4}}<br>
+                                    {{cc_brand}} {% trans "ending in" %} **** {{cc_last4}}<br>
                                     {{request.session.user.email}}
                             </address>
                         </div>

datacenterlight/urls.py

@@ -7,9 +7,10 @@ from .views import IndexView, BetaProgramView, LandingProgramView, \
 
 urlpatterns = [
     url(r'^$', IndexView.as_view(), name='index'),
-    url(r'^t$', IndexView.as_view(), name='index_t'),
-    url(r'^g$', IndexView.as_view(), name='index_g'),
-    url(r'^f$', IndexView.as_view(), name='index_f'),
+    url(r'^t/$', IndexView.as_view(), name='index_t'),
+    url(r'^g/$', IndexView.as_view(), name='index_g'),
+    url(r'^f/$', IndexView.as_view(), name='index_f'),
+    url(r'^l/$', IndexView.as_view(), name='index_l'),
     url(r'^whydatacenterlight/?$', WhyDataCenterLightView.as_view(),
         name='whydatacenterlight'),
     url(r'^beta-program/?$', BetaProgramView.as_view(), name='beta'),