Skip to content

Commit

Permalink
Fix bug 815731 - adding a page at /itu/
Browse files Browse the repository at this point in the history
  • Loading branch information
rossbruniges committed Nov 29, 2012
1 parent dc6e5a6 commit 84f504e
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 0 deletions.
55 changes: 55 additions & 0 deletions apps/mozorg/templates/mozorg/itu.html
@@ -0,0 +1,55 @@
{% extends "base-resp.html" %}

{% block page_title %}ITU{% endblock %}

{% block body_id %}itu{% endblock %}
{% block body_class %}sand{% endblock %}

{% block extrahead %}
{{ css('itu') }}
{% endblock %}

{% block content %}
<hgroup class="container">
<h1 class="large">ITU</h1>
<h2>Make your voice heard on the ITU</h2>
</hgroup>
<div id="main-content">
<article class="row">
<div class="main-column">
<p>The Web lets us speak out, share, and connect around the things that matter. It creates new opportunities, holds governments to account, breaks through barriers, and makes cats famous. This isn't a coincidence. It's because the Web belongs to all of us: We all get a say in how it's built.</p>
<p>Mozilla has made it <a href="{{ url('mozorg.mission') }}">our mission</a> to keep the power of the web in people's hands. But all this could change on December 3.</p>
<p>Our governments are going to meet in Dubai to decide whether an old treaty, the International Telecommunication Union, can be expanded to regulate - to control - the Internet.</p>
<p>The issue isn't whether our governments, the UN, or even the ITU should play a role in shaping the Web. The problem is that they are trying to do it behind closed doors, in secret, without us.</p>
<p>We believe everyone should have a voice. And this site is to help you be heard in Dubai.</p>
</div>
<aside class="sidebar">
{% block sidebar %}
<section class="your-say">
<h2>Have Your Say</h2>
<ol>
<li>
<h3>Learn Why This Matters</h3>
<p>Read <a href="https://blog.mozilla.org/blog/2012/11/30/the-itu-and-you/">Mozilla's position on the ITU</a> and explore other <a href="https://webmaker.org/ITU/kit/#the-issues">resources from across the Web</a>.</p>
</li>
<li>
<h3>Create Your Message</h3>
<p><a href="https://webmaker.org/ITU/videos/">See what other people are saying</a> and <a href="https://www.webmaker.org/en-US/projects/roll-your-own-itu-activism-video/">make your own interactive video</a> to <a href="https://webmaker.org/ITU/kit/#custom-message"> share your own ITU message</a>.</p>
</li>
<li>
<h3>Engage in the Conversation</h3>
<p>Get the word out! We've collected some channels and allies you can work with to <a href="https://webmaker.org/ITU/kit/#activate">get people engaged</a> on- and offline.</p>
</li>
</ol>
</section>
<section class="micro-grants">
<h2>Micro-grants for Civil Society</h2>
<p>We've provided support to 10 amazing open web advocates from around the world. <a href="https://webmaker.org/ITU/advocates/">Check out their projects and get involved!</a></p>
</section>
{% endblock %}
</aside>
</article>
</div>
{% endblock %}

{% block email_form %}{% endblock %}
1 change: 1 addition & 0 deletions apps/mozorg/urls.py
Expand Up @@ -16,6 +16,7 @@
page('sandstone', 'mozorg/sandstone.html'),
page('mission', 'mozorg/mission.html'),
page('mobile', 'mozorg/mobile.html'),
page('ITU', 'mozorg/itu.html'),

url('^contribute/$', views.contribute, name='mozorg.contribute',
kwargs={'template': 'mozorg/contribute.html',
Expand Down
63 changes: 63 additions & 0 deletions media/css/itu.less
@@ -0,0 +1,63 @@
@import "sandstone/lib.less";

@background: #f5f1e8;

hgroup {
text-align: center;
padding-bottom: @baseLine * 2;
img {
width: 100%;
height: auto;
padding-top: @baseLine * 2;
}
}

#itu {
.main-column {
.span(6);
}
.sidebar {
.span(6);
img {
margin-bottom: @gridGutterWidth;
}
ol {
font-size: 24px;
p {
font-size: 14px;
}
}
h3 {
letter-spacing: -0.25px;
line-height: 100%;
}
}
.your-say {
border-bottom: 1px solid @borderColor;
margin-bottom: @gridGutterWidth;
}
}
@media only screen and (min-width: @breakTablet) and (max-width: @breakDesktop) {
#itu {
.main-column {
.span_narrow(6);
}
.sidebar {
.span_narrow(6);
}
}
}
@media only screen and (max-width: @breakTablet) {
#itu {
.main-column {
width: auto;
margin: 0;
}
.sidebar {
width: auto;
margin: @gridGutterWidth 0 0 0;
border-top: 1px solid @borderColor;
padding-top: @gridGutterWidth;
}
}
}
3 changes: 3 additions & 0 deletions settings/base.py
Expand Up @@ -82,6 +82,9 @@ def JINJA_CONFIG():
'collusion': (
'css/collusion.less',
),
'itu': (
'css/itu.less',
),
'common': (
'css/sandstone/sandstone.less',
),
Expand Down

0 comments on commit 84f504e

Please sign in to comment.