Skip to content

Commit

Permalink
[fix bug 1399585] Update Internet Health hub content
Browse files Browse the repository at this point in the history
  • Loading branch information
craigcook committed Sep 29, 2017
1 parent b65b284 commit b59745c
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 220 deletions.

This file was deleted.

81 changes: 54 additions & 27 deletions bedrock/mozorg/templates/mozorg/internet-health/index.html
Expand Up @@ -45,35 +45,62 @@ <h1><span>{{ _('Internet Health') }}</span></h1>
</div>
</header>

{% if LANG.startswith('en') %}
{% include 'mozorg/internet-health/includes/june-campaign.html' %}
{% else %}
<section class="net-neutrality">
<div class="content">
<div class="card-image-large">
<h2 class="section-title"><span>{{ _('Net Neutrality') }}</span></h2>
{% if l10n_has_tag('health_hub_common_voice') %}
<section class="common-voice">
<div class="content">
<div class="card-image-large">
<h2 class="section-title"><span>{{ _('Common Voice') }}</span></h2>

<div class="card-content-wrapper">
<div class="card-content">
<a href="https://advocacy.mozilla.org/net-neutrality/?utm_source=www.mozilla.org&amp;utm_medium=referral&amp;utm_campaign=ih-content-hub" data-link-name="Get involved now" data-link-type="link" data-link-position="net-neutrality">
<h3 class="card-heading">{{ _('Net Neutrality is under threat…again.') }}</h3>
</a>

<p>
{% trans %}
Time’s running out. Help protect an open Internet for everyone.
{% endtrans %}
</p>
<div class="card-content-wrapper">
<div class="card-content">
<a href="https://voice.mozilla.org/?utm_source=www.mozilla.org&amp;utm_medium=referral&amp;utm_campaign=ih-content-hub" data-link-name="Record in Common Voice" data-link-type="link" data-link-position="common-voice">
<h3 class="card-heading">{{ _('Let your voice be heard… literally') }}</h3>
</a>

<a href="https://advocacy.mozilla.org/net-neutrality/?utm_source=www.mozilla.org&amp;utm_medium=referral&amp;utm_campaign=ih-content-hub" class="cta-link" data-link-name="Get involved now" data-link-type="link" data-link-position="net-neutrality">
{{ _('Get involved now') }}
</a>
</div>
</div> {#--/.card-content-wrapper--#}
</div>
</div> {#--/.content--#}
</section> {#--/.net-neutrality--#}
{% endif %}
<p>
{% trans %}
Contribute to the world’s first crowdsourced voice library. An open, free resource,
it will help innovators create technology that benefits — <em>and understands</em> — us all.
{% endtrans %}
</p>

<a href="https://voice.mozilla.org/?utm_source=www.mozilla.org&amp;utm_medium=referral&amp;utm_campaign=ih-content-hub" class="cta-link" data-link-name="Record in Common Voice" data-link-type="link" data-link-position="common-voice">
{{ _('Record in Common Voice') }}
</a>
</div>
</div> {#--/.card-content-wrapper--#}
</div>
</div> {#--/.content--#}
</section> {#--/.common-voice--#}

{% else %}

<section class="net-neutrality">
<div class="content">
<div class="card-image-large">
<h2 class="section-title"><span>{{ _('Net Neutrality') }}</span></h2>

<div class="card-content-wrapper">
<div class="card-content">
<a href="https://advocacy.mozilla.org/net-neutrality/?utm_source=www.mozilla.org&amp;utm_medium=referral&amp;utm_campaign=ih-content-hub" data-link-name="Get involved now" data-link-type="link" data-link-position="net-neutrality">
<h3 class="card-heading">{{ _('Net Neutrality is under threat…again.') }}</h3>
</a>

<p>
{% trans %}
Time’s running out. Help protect an open Internet for everyone.
{% endtrans %}
</p>

<a href="https://advocacy.mozilla.org/net-neutrality/?utm_source=www.mozilla.org&amp;utm_medium=referral&amp;utm_campaign=ih-content-hub" class="cta-link" data-link-name="Get involved now" data-link-type="link" data-link-position="net-neutrality">
{{ _('Get involved now') }}
</a>
</div>
</div> {#--/.card-content-wrapper--#}
</div>
</div> {#--/.content--#}
</section> {#--/.net-neutrality--#}
{% endif %}

{% include 'mozorg/internet-health/includes/podcast.html' %}

Expand Down
133 changes: 0 additions & 133 deletions media/css/mozorg/internet-health/hub/_campaign.scss

This file was deleted.

7 changes: 6 additions & 1 deletion media/css/mozorg/internet-health/index.scss
Expand Up @@ -14,7 +14,6 @@
@import '../../hubs/card-image-large';
@import '../../hubs/common';
@import '../../hubs/news-feed';
@import 'hub/campaign';
@import 'hub/newsletter';

main .content {
Expand All @@ -36,6 +35,12 @@ main .content {
}
}

.common-voice {
.card-content-wrapper {
@include at2x('/media/img/mozorg/internet-health/hub/common-voice.png', 100%, auto);
}
}

.podcast {
.card-content-wrapper {
background-image: url('/media/img/mozorg/internet-health/hub/podcast.jpg');
Expand Down
2 changes: 1 addition & 1 deletion media/img/hubs/cta-arrow-black.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion media/img/hubs/cta-arrow.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified media/img/mozorg/internet-health/hub/common-voice-high-res.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified media/img/mozorg/internet-health/hub/common-voice.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file removed media/img/mozorg/internet-health/hub/hero-image.jpg
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit b59745c

Please sign in to comment.