Add TEF logo to intro. Bug 1119435.

- Organize hello files

Author: jpetto

…ock/firefox/templates/firefox/hello.html …refox/templates/firefox/hello/index.htmlbedrock/firefox/templates/firefox/hello.html renamed to bedrock/firefox/templates/firefox/hello/index.html bedrock/firefox/templates/firefox/hello.html renamed to bedrock/firefox/templates/firefox/hello/index.html

@@ -4,6 +4,8 @@
 
 {% extends "firefox/base-resp.html" %}
 
+{% set_lang_files "firefox/hello" %}
+
 {% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{ _('Firefox Hello — Free, easy video conversations') }}{% endblock %}
 {% block page_desc %}{{ _('Learn all about Firefox Hello and see for yourself how easy it is to have a free video conversation with anyone, anywhere, right from your browser') }}{% endblock %}
@@ -117,6 +119,10 @@ <h2 class="heading-tertiary">
 
       <button class="try-hello" id="try-hello-intro">{{ _('Try Firefox Hello') }}</button>
 
+      <aside id="powered-by">
+        {{ _('Powered by %s')|format(high_res_img('/img/firefox/hello/tef-logo.png', {'alt': 'Telefonica', 'width': '106', 'height': '29'})) }}
+      </aside>
+
       {#
       Share widget pulled from 35, will be back for 36:
       https://bugzilla.mozilla.org/show_bug.cgi?id=1113917#c4

bedrock/firefox/views.py

@@ -512,7 +512,7 @@ def hello(request):
         'zh-TW': 'https://videos.cdn.mozilla.net/uploads/FirefoxHello/firefoxhello_intro_chinese'
     }
 
-    return l10n_utils.render(request, 'firefox/hello.html', {'video_url': videos.get(request.locale, '')})
+    return l10n_utils.render(request, 'firefox/hello/index.html', {'video_url': videos.get(request.locale, '')})
 
 
 class HelloStartView(LatestFxView):

bedrock/settings/base.py

@@ -310,6 +310,12 @@ def JINJA_CONFIG():
             'css/sandstone/sandstone-resp.less',
             'css/firefox/hello/start.less',
         ),
+        'firefox_hello': (
+            'css/sandstone/sandstone-resp.less',
+            'css/firefox/menu-resp.less',
+            'css/base/mozilla-modal.less',
+            'css/firefox/hello/index.less',
+        ),
         'firefox_new': (
             'css/sandstone/sandstone-resp.less',
             'css/firefox/template-resp.less',
@@ -424,12 +430,6 @@ def JINJA_CONFIG():
         'firefox_sync_anim': (
             'css/firefox/sync-animation.less',
         ),
-        'firefox_hello': (
-            'css/sandstone/sandstone-resp.less',
-            'css/firefox/menu-resp.less',
-            'css/base/mozilla-modal.less',
-            'css/firefox/hello.less',
-        ),
         'firefox_independent': (
             'css/sandstone/sandstone-resp.less',
             'css/base/mozilla-share-cta.less',
@@ -751,10 +751,6 @@ def JINJA_CONFIG():
             'js/base/mozilla-modal.js',
             'js/firefox/dev-firstrun.js',
         ),
-        'firefox_hello_start': (
-            'js/firefox/australis/australis-uitour.js',
-            'js/firefox/hello/start.js',
-        ),
         'firefox_new': (
             'js/libs/jquery-1.11.0.min.js',
             'js/libs/spin.min.js',
@@ -818,11 +814,15 @@ def JINJA_CONFIG():
             'js/firefox/sync-animation.js',
             'js/firefox/sync-old.js',
         ),
+        'firefox_hello_start': (
+            'js/firefox/australis/australis-uitour.js',
+            'js/firefox/hello/start.js',
+        ),
         'firefox_hello': (
             'js/firefox/australis/australis-uitour.js',
             'js/libs/modernizr.custom.cssanimations.js',
             'js/base/mozilla-modal.js',
-            'js/firefox/hello.js',
+            'js/firefox/hello/index.js',
         ),
         'firefox_hello_ie9': (
             'js/libs/matchMedia.js',

media/css/firefox/hello.less media/css/firefox/hello/index.lessmedia/css/firefox/hello.less renamed to media/css/firefox/hello/index.less

@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-@import "../sandstone/lib.less";
+@import "../../sandstone/lib.less";
 
 .grainy-sky() {
     background: #cae1f4;
@@ -178,7 +178,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1113917#c4
         border: 2px solid #a9bcca;
         background: transparent;
         color: #00a0db;
-        margin: 34px auto 0;
+        margin: (@baseLine * 1.5) auto 0;
 
         &:hover {
             background: #fff;
@@ -200,6 +200,21 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1113917#c4
     background: url(/media/img/firefox/hello/hello-intro.png) center center no-repeat;
 }
 
+#powered-by {
+    .font-size(@smallFontSize);
+    text-align: center;
+    margin-top: @baseLine * 1.5;
+
+    img {
+        vertical-align: middle;
+    }
+}
+
+html[lang^="en"] #powered-by {
+    text-transform: uppercase;
+    .font-size(10px);
+}
+
 // Animation
 
 #animation-stage {