Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge/fix-up pull from staging

  • Loading branch information...
commit 8f746432d829165372bfe89a29e4de5639ae7442 2 parents 1cc1bef + 7cdbc56
@rossbruniges rossbruniges authored
View
13 make_mozilla/base/templates/base.html
@@ -17,6 +17,19 @@
{{ css('make_desktop') }}
<![endif]-->
{{ js('jquery') }}
+ {% if not waffle.switch('no_track') %}
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-35433268-12']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
+ {% endif %}
</head>
<body id="{% block page_id %}generic-page{% endblock %}" class="{% block page_class %}section-{% block section_type %}global{% endblock %}{% endblock %}">
<script>
View
10 make_mozilla/base/templates/splash.html
@@ -5,15 +5,6 @@
{% block content %}
<div class="amuse pager pager-with-tabs pager-auto-rotate pager-no-history" id="home-promo">
<div class="default-page pager-content">
- <div class="pager-page" id="page-promo-festival">
- <a href="http://mozillafestival.org">
- <img src="{{ MEDIA_URL }}img/carousel/mozfest_opt.jpg" alt="" width="1400" height="488" />
- <div class="pager-text">
- <h2 class="pager-title">Join us for the 2012 Mozilla Festival!</h2>
- <p>November 9 – 11, 2012<br />London, UK | Ravensbourne</p>
- </div>
- </a>
- </div>
<div class="pager-page" id="page-promo-search-events">
<a href="{{ url('events.search') }}">
<img src="{{ MEDIA_URL }}img/carousel/july_2012/map.jpg" alt="" width="1400" height="488" />
@@ -51,7 +42,6 @@ <h2 class="pager-title">Join Mozilla</h2>
</a>
</div>
<ul class="pager-tabs">
- <li id="tab-festival"><a href="#" class="selected">● <span>read about Join us for the 2012 Mozilla Festival!</span></a></li>
<li id="tab-search-events"><a href="#">● <span>read about Find an event near you</span></a></li>
<li id="tab-webmaker-kids"><a href="#">● <span>read about Building the next generation of webmakers</span></a></li>
<li id="tab-adlib"><a href="#">● <span>read about Make your own campaign ad</span></a></li>
View
2  make_mozilla/settings/base.py
@@ -71,6 +71,8 @@
'make_mozilla.users',
# Pages
'make_mozilla.pages',
+ # Static pages
+ 'make_mozilla.static_pages',
# extra lib stuff
'south',
'django_browserid', # Load after auth to monkey-patch it.
View
0  make_mozilla/static_pages/__init__.py
No changes.
View
0  make_mozilla/static_pages/models.py
No changes.
View
214 make_mozilla/static_pages/templates/static_pages/itu_advocates.html
@@ -0,0 +1,214 @@
+{% extends "base.html" %}
+
+{% block page_title %}ITU Grantees | ITU | {{ super() }}
+{% endblock %}
+
+{% block page_id %}itu_advocates{% endblock %}
+{% block page_class %}content-page itu{% endblock %}
+
+{% block content %}
+<section>
+ <header>
+ <h2>Grantees</h2>
+ </header>
+ <div class="content columns">
+ <div class="main col">
+ <p><strong>Your Allies In The Fight For The Open Web</strong></p>
+ <p>Mozilla has funded ten open web advocates from around the world to get involved and raise awareness about the ITU. They’re working on a number of different projects that may fit with your message, and many of them will be on the ground in Dubai. They're great allies if you have an idea and are looking for collaborators, or if you're looking to help with a project that is already moving ahead.</p>
+ <p>To make it easy to search through, we've included a description of the projects by region and included the contact information of the people coordinating them below.</p>
+ <p>Get in touch! If you'd like to contact any of the advocates who do not have their e-mails listed, send a message to <a href="mailto:tim@mozillafoundation.org">tim@mozillafoundation.org</a>.</p>
+ </div>
+ <div class="sidebar meta col">
+ <h2 class="announce">Countries</h2>
+ <ul>
+ <li><a href="#africa">Africa</a></li>
+ <li><a href="#asia">Asia</a></li>
+ <li><a href="#europe">Europe</a></li>
+ <li><a href="#south-america">South America</a></li>
+ </ul>
+ </div>
+ </div>
+</section>
+<section id="africa">
+ <header>
+ <h2>Africa</h2>
+ </header>
+ <div class="content">
+ <div class="vcard">
+ <h3><strong class="fn">Romain Abile Houehou</strong> - Engaging African Consumers in Open Internet</h3>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://www.recatic.org/" class="org">African Ict Consumer Network (AICN)</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">Benin</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>Sensitizing consumer organizations of Internet services to push for their governments to support open Internet. The AICN will make available in French version the Baku IGF meeting report titled "Proposed ITR Revisions and Their Implications for Freedom of Expression Online" to sensitize consumers organizations from the 14 francophone countries of West Africa on the positions they may adopt when facing their governments concerning Dubai World Conference on International Telecommunications (WCIT). Following this action that will occur in the lead up to the conference, we will get into contact with African organizations on the ground in Dubai for organizing field actions during the conference.</p>
+ </div>
+ </div>
+ <div class="vcard">
+ <h3><strong class="fn">Jimson Olufuye</strong> - Participation in the Nigerian Delegation to WCIT</h3>
+ <div class="vcard-row">
+ <h4>E-mail:</h4> <a href="mailto:info@aficta.org" class="email">info@aficta.org</a>
+ </div>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://www.aficta.org/" class="org">Africa ICT Alliance (AfICTA)</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">Nigeria</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>Jimson will be traveling as part of the Nigerian delegation to WCIT. He will be attending in support of the AfLCTA position and joining others to push for same or similarly progressive positions.</p>
+ </div>
+ </div>
+ <div class="vcard">
+ <h3><strong class="fn">John Walubengo</strong> - Engage With The Kenya Government on the ITRs</h3>
+ <div class="vcard-row">
+ <h4>E-mail:</h4> <a href="mailto:jwalubengo@mmu.ac.ke" class="email">jwalubengo@mmu.ac.ke</a>
+ </div>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://www.mmu.ac.ke/" class="org">Multimedia University College of Kenya</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">Kenya</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>John will be attending the WCIT as a member of the Kenyan delegation. He will be playing an advisory role in supporting open, multistakeholder approaches.</p>
+ </div>
+ </div>
+ </div>
+</section>
+<section id="asia">
+ <header>
+ <h2>Asia</h2>
+ </header>
+ <div class="content">
+ <div class="vcard">
+ <h3><strong class="fn">Isriya Paireepairit</strong> - "How The Internet is Regulated" Article Series</h3>
+ <div class="vcard-row">
+ <h4>E-mail:</h4> <a href="mailto:markpeak@blognone.com" class="email">markpeak@blognone.com</a>
+ </div>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://www.blognone.com/" class="org">Blognone</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">Thailand</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>Blognone.com is a leading Thai technology news site. Isriya will be producing a series of articles on how the Internet is regulated in Thai to explain the issues around the ITU/WCIT/ITR and their significance to Thai Internet users.</p>
+ </div>
+ </div>
+ <div class="vcard">
+ <h3><strong class="fn">Shyam Ponappa</strong> - Participation in the Indian Delegation to WCIT</h3>
+ <div class="vcard-row">
+ <h4>E-mail:</h4> <a href="mailto:shyamponappa@gmail.com" class="email">shyamponappa@gmail.com</a>
+ </div>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://cis-india.org/" class="org">Centre for Internet and Society</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">India</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>Shyam is a member of the India delegation to WCIT. Mr. Ponappa will be attending to advocate for CIS’ view that the amendments to the ITRs be restricted to telecommunications services and telecommunications transport means. The Centre for Internet and Society (CIS) has a keen interest in participating in this conference in order to ensure a greater representation of civil society and try and prevent any undue expansion of the ITU’s role in internet governance without proper participation by all the stakeholders involved.</p>
+ </div>
+ </div>
+ <div class="vcard">
+ <h3><strong class="fn">Babu Ram Aryal</strong> - Panel Discussion on Nepalese Amendments at WCIT</h3>
+ <div class="vcard-row">
+ <h4>E-mail:</h4> <a href="mailto:babu@isoc.org.np" class="email">babu@isoc.org.np</a>
+ </div>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://www.isoc.net.np/" class="org">ISOC Nepal</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">Nepal</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>Babu will be coordinating a discussion prior to WCIT with government representatives, ISOC members, and representatives in private industry to discuss the Nepalese position on the proposed amendments to be discussed in Dubai.</p>
+ </div>
+ </div>
+ <div class="vcard">
+ <h3><strong class="fn">Ahmed Swapan Mahmud</strong> - Public Dialogue on WCIT in Bangladesh</h3>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://www.voicebd.org/" class="org">VOICE</a> and <a href="http://www.internetsociety.org/" class="org">ISOC</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">Bangladesh</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>Ahmed will be organizing a public meeting on the eve of WCIT. This will be a public meeting with multi-stakeholder approach. They will invite government, law and policy makers, IT business companies, ISPs, mobile operators, human rights and media organizations, journalists, academicians, NGOs and CSOs The purpose is to raise public understanding on the proposed ITR amendments and their implications for freedom of expression online.</p>
+ </div>
+ </div>
+ </div>
+</section>
+<section id="europe">
+ <header>
+ <h2>Europe</h2>
+ </header>
+ <div class="content">
+ <div class="vcard">
+ <h3><strong class="fn">Julia Velkova</strong> - Support Open and Free Internet Positions at the WCIT</h3>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://www.isoc.bg/" class="org">Internet Society Bulgaria</a> and <a href="http://isocbg.wordpress.com/" class="org">Södertörn University Sweden</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">Bulgaria</span> / <span class="country-name">Sweden</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>Julia will be helping to bridge gaps between various delegations as a member of the Swedish delegation. She plans to provide expertise and other advice to delegations from ITU Region B (Europe) and C (Russia/CIS) in supporting open and free Internet positions at WCIT.</p>
+ </div>
+ </div>
+ <div class="vcard">
+ <h3><strong class="fn">Elena Zvarici</strong> - Inform and Engage on Romania's WCIT Position</h3>
+ <div class="vcard-row">
+ <h4>E-mail:</h4> <a href="mailto:elena.zvarici@isoc.ro" class="email">elena.zvarici@isoc.ro</a>
+ </div>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://www.isoc.ro/" class="org">Internet Society Romania</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">Romania</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>Elena will be launching an article and accompanying infographic targeted at Romania's Internet community and decisionmakers to inform them on what the WCIT is, what will be discussed at the upcoming meeting, and how people can be involved in the process. Her aim is to advocate for a future with a more open, multistakeholder, participative process for discussing and contributing to Internet governance related issues.</p>
+ </div>
+ </div>
+ </div>
+</section>
+<section id="south-america">
+ <header>
+ <h2>South America</h2>
+ </header>
+ <div class="content">
+ <div class="vcard">
+ <h3><strong class="fn">Francisco Vera Hott</strong> - ¿Qué pasa en ITU?</h3>
+ <div class="vcard-row">
+ <h4>Organization:</h4> <a href="http://www.derechosdigitales.org/" class="org">ONG Derechos Digitales</a>
+ </div>
+ <div class="vcard-row adr">
+ <h4>Location:</h4> <span class="country-name">Chile</span>
+ </div>
+ <div class="vcard-row project">
+ <h4>Project:</h4>
+ <p>Derechos Digitales is an independent, non-profit and non-governmental organization, founded in 2004, whose mission is to promote the defense and protection of human rights in the digital environment. They will set up a small website that work as a resource center related with ITU issues for Spanish speaking people, governments and organizations. The website will contain key documents and other material related with the ITU, translated and localized in Spanish.</p>
+ </div>
+ </div>
+ </div>
+</section>
+{% endblock %}
+
+{% block footer %}
+{{ super() }}
+{{ js('core_js') }}
+{{ js('video-tools') }}
+{% endblock %}
View
55 make_mozilla/static_pages/templates/static_pages/itu_index.html
@@ -0,0 +1,55 @@
+{% extends "base.html" %}
+
+{% block page_title %}ITU | {{ super() }}
+{% endblock %}
+
+{% block page_id %}itu_index{% endblock %}
+{% block page_class %}content-page itu{% endblock %}
+
+{% block content %}
+<section class="hoc_intro">
+ <header>
+ <h2>ITU</h2>
+ </header>
+ <img class="stretch" title="ITU" src="{{ MEDIA_URL }}img/static_pages/itu.jpg" alt="" />
+ <div class="content columns">
+ <div class="col">
+ <h2 class="announce">Make your voice heard on the ITU</h2>
+ <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="https://mozilla.org/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>
+ <div class="col">
+ <section class="your-say">
+ <h2 class="announce">Have Your Say</h2>
+ <ol>
+ <li>
+ <h3 class="whimper">Learn Why This Matters</h3>
+ <p>Read <a href="https://blog.mozilla.org/blog/2012/11/29/the-itu-and-you/">Mozilla's position on the ITU</a> and explore other <a href="{{ url('itu_kit') }}#the-issues">resources from across the Web</a>.</p>
+ </li>
+ <li>
+ <h3 class="whimper">Create Your Message</h3>
+ <p><a href="{{ url('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="{{ url('itu_kit') }}#custom-message"> share your own ITU message</a>.</p>
+ </li>
+ <li>
+ <h3 class="whimper">Engage in the Conversation</h3>
+ <p>Get the word out! We've collected some channels and allies you can work with to <a href="{{ url('itu_kit') }}#activate">get people engaged</a> on- and offline.</p>
+ </li>
+ </ol>
+ </section>
+ <section class="micro-grants">
+ <h3 class="whimper">Micro-grants for Civil Society</h3>
+ <p>We've provided support to 10 amazing open web advocates from around the world. <a href="{{ url('itu_advocates') }}">Check out their projects and get involved!</a></p>
+ </section>
+ </div>
+ </div>
+</section>
+{% endblock %}
+
+{% block footer %}
+{{ super() }}
+{{ js('core_js') }}
+{{ js('video-tools') }}
+{% endblock %}
View
135 make_mozilla/static_pages/templates/static_pages/itu_kit.html
@@ -0,0 +1,135 @@
+{% extends "base.html" %}
+
+{% block page_title %}ITU Engagement Kit | ITU | {{ super() }}
+{% endblock %}
+
+{% block page_id %}itu_kit{% endblock %}
+{% block page_class %}content-page itu{% endblock %}
+
+{% block content %}
+<section>
+ <header>
+ <h2>ITU Engagement Kit</h2>
+ </header>
+ <div class="content columns">
+ <div class="main col">
+ <p><strong>So you’ve heard about the ITU, and want to get involved in spreading awareness about the meeting in Dubai? You’ve come to the right place!</strong></p>
+ <p>This Engagement Kit provides resources for understanding what’s at stake and the tools to make a difference. It’s all about advocating for the rights of everyday web users to ensure we all have a voice in how the Internet is governed. This page will help you build a Popcorn video you can use to get people involved.</p>
+ </div>
+ <div class="sidebar meta col">
+ <h2 class="announce">How It Works</h2>
+ <ul>
+ <li>Step 1 - <a href="#the-issues">Choose the issue that matters most to you</a></li>
+ <li>Step 2 - <a href="#custom-message">Decide what you want people to do about it</a></li>
+ <li>Step 3 - <a href="#activate">Create and share your message.</a></li>
+ </ul>
+ </div>
+ </div>
+</section>
+<section id="the-issues">
+ <header>
+ <h2>Step 1 – Choose the Issue that Matters Most to You</h2>
+ </header>
+ <div class="content">
+ <img class="stretch" title="ITU" src="{{ MEDIA_URL }}img/static_pages/itu.jpg" alt="" />
+ <p><strong>The upcoming meeting of the ITU is called the World Conference of International Telecommunications (WCIT)</strong>. It's set to run from December 3-14, 2012, in Dubai. There are a lot of issues up for discussion. Use this section to figure out the ones that matter most to you.</p>
+ <p>For a quick summary overview of what the ITU is and why this meeting of the WCIT is important, check out:</p>
+ <ul>
+ <li><strong><a href="https://www.whatistheitu.org/">'What Is The ITU.'</a></strong> A four-minute video rundown from Access Now and Fight for the Future.</li>
+ <li><strong><a href="http://www.internetsociety.org/wcit">The Internet Society</a></strong> has this quick description on why the WCIT meeting is important.</li>
+ </ul>
+ <p><strong>Key Issues</strong></p>
+ <ul>
+ <li><strong>Transparency</strong><ul>
+ <li><a href="https://www.cdt.org/blogs/cynthia-wong/1607itu-gives-nod-towards-transparency-still-long-road-full-civil-society-partici">ITU Gives A Nod Towards Transparency, Still A Long Road To Full Civil Society Participation</a> (Center for Democracy and Technology)</li>
+ <li><a href="http://papers.ssrn.com/sol3/papers.cfm?abstract_id=2110509">ITU and the Internet's Titanic Moment</a> (Stanford Technology Law Review)</li>
+ </ul></li>
+ </ul>
+ <ul>
+ <li><strong>Free Expression</strong><ul>
+ <li><a href="https://s3.amazonaws.com/access.3cdn.net/07bd5aad9c0abb91ee_7am6b9hxs.pdf">Freedom of Expression Online and Revising the International Telecommunications Regulations</a> (Access Now)</li>
+ <li><a href="http://publicknowledge.org/blog/itu-wcit-and-internet-freedom">ITU, WCIT, and Internet Freedom</a> (Public Knowledge)</li>
+ </ul></li>
+ </ul>
+ <ul>
+ <li><strong>Access to the Open Internet</strong><ul>
+ <li><a href="https://www.cdt.org/files/pdfs/CDT_Analysis_ETNO_Proposal.pdf">ETNO Proposal Threatens To Impair Access To Open, Global Internet (PDF)</a> (Center for Democracy and Technology)</li>
+ <li><a href="http://www.nytimes.com/2012/05/25/opinion/keep-the-internet-open.html?_r=0">Keep The Internet Open</a> (Vint Cerf)</li>
+ </ul></li>
+ </ul>
+ <ul>
+ <li><strong>Economic Impact and Global Development</strong><ul>
+ <li><a href="http://lirneasia.net/wp-content/uploads/2012/09/Samarajiva-WCIT-Final_9.12.pdf">A Giant Step Backwards (PDF)</a> (LIRNEAsia)</li>
+ <li><a href="https://www.cdt.org/paper/economic-impact-itrs">Economic Impact of the ITRs</a> (Center for Democracy and Technology)</li>
+ </ul></li>
+ </ul>
+ <p><strong>Dig deeper</strong></p>
+ <p>Useful resources for exploring further:</p>
+ <ul>
+ <li><a href="http://africa-ig.wiki.apc.org/index.php/Main_Page">The Association for Progressive Communications</a></li>
+ <li><a href="http://publicknowledge.org/issues/itu">Public Knowledge</a></li>
+ <li><a href="https://www.cdt.org/issue/ITU">The Center for Democracy and Technology</a></li>
+ <li><a href="https://www.accessnow.org/pages/itu">Access Now</a></li>
+ <li><a href="http://wcitleaks.org/resources/">WCITLeaks</a></li>
+ </ul>
+ </div>
+</section>
+<section id="custom-message">
+ <header>
+ <h2>Step 2 – Decide What You Want People to Do</h2>
+ </header>
+ <div class="content">
+ <img class="stretch" title="ITU" src="{{ MEDIA_URL }}img/static_pages/the-web.jpg" alt="" />
+ <p>Now that you know what's at stake, what do you want people &#8211; your friends, colleagues, or community members &#8211; to do about it? Choose from the options we&#8217;ve pulled together or create you own.</p>
+ <p>You can ask people to&#8230;</p>
+ <p><strong>A) Contact Their ITU Delegation</strong></p>
+ <p><strong>Governments will be represented at the ITU by delegations from each country</strong>. These people will take part in the meetings, so ensuring they hear your voice is a good place to start.</p>
+ <p><a href="http://wcitleaks.org/">WCITLeaks</a> has obtained a full list of the delegates and their contact information as of November 18, so you can find out who is representing your country and get in touch with them. Access it here in <strong><a href="http://files.wcitleaks.org/public/S12-WCIT12-ADM-0004!!PDF-E_18Nov.pdf">PDF format</a>.</strong></p>
+ <p><strong>B) Mobilize on the Web</strong></p>
+ <p>An international coalition of advocates and activists are bringing together as many web users as possible to make a joint declaration to the ITU for greater transparency and participation. Signing and spreading the word about these petitions will send a clear message.</p>
+ <ul class="indent">
+ <li><strong><a href="http://protectinternetfreedom.net/">OpenMedia.ca: &#8220;Protect Internet Freedom.&#8221;</a></strong>Asserts that Internet governance decisions &#8220;should be made in a transparent manner with genuine multi-stakeholder participation from civil society, governments, and the private sector.&#8221;</li>
+ <li><strong><a href="https://www.whatistheitu.org/">Access Now &amp; Fight For The Future: &#8220;What Is The ITU?&#8221;</a></strong> A rallying cry for individuals on the ground to demand that their governments not hand over web governance functions to the ITU.</li>
+ <li><strong><a href="https://www.cdt.org/letter/sign-letter-opposing-itu-authority-over-internet">Center for Democracy and Technology: &#8220;Open Letter.&#8221;</a></strong> Emphasizes the human rights issues surrounding the ITU&#8217;s lack of transparency. Open to organizational sign-ons. Translated into multiple languages.</li>
+ <li><strong><a href="https://www.google.com/takeaction/">Google: &#8220;Take Action.&#8221;</a></strong> “A free and open world depends on a free and open Internet. Governments alone, working behind closed doors, should not direct its future.”</li>
+ <li><strong><a href="http://bestbits.igf-online.net/statement/">Best Bits: &#8220;Statement of Civil Society Groups and Members.&#8221;</a></strong> A coalition of international civil society groups. This letter includes a number of specific policy statements and recommendations to the ITU.</li>
+ </ul>
+ <p><strong>C) Organize a Local Event</strong></p>
+ <p>Mobilizing people on the ground in your community is a great way to engage in the conversation. <a href="{{ url('events') }}">Mozilla&#8217;s Webmaker</a> platform makes it easy for you to schedule your own event and let others know about it. You can also collaborate with:</p>
+ <ul class="indent">
+ <li><strong>Mozilla Representatives (&#8220;ReMo&#8221;).</strong> <a href="https://reps.mozilla.org/">ReMo</a> is a coalition of volunteer Mozillians around the world. They&#8217;re plugged into local communities engaged with these issues, and are a good group to get in touch with if you&#8217;re planning something.</li>
+ <li><strong>Mozilla Micro-Grantees.</strong> We&#8217;ve funded ten open web advocates from around the world to get involved and raise awareness about the ITU. They&#8217;re working on a number of different projects that may fit with your message, and some of them will be on the ground in Dubai. <a href="{{ url('itu_advocates') }}">Get in touch with them here</a>.</li>
+ </ul>
+ </div>
+</section>
+<section id="activate">
+ <header>
+ <h2>Step 3 – Create and Share Your Message</h2>
+ </header>
+ <div class="content">
+ <p>You&#8217;ve chosen the issues you care about and you&#8217;ve decided what you want your friends to do about it.<strong> Now, you can craft and customize your own Popcorn video to get the word out. </strong>Some things to consider when creating your message:</p>
+ <ul class="indent">
+ <li><strong>What do you think about the WCIT and ITU?</strong> What concerns you the most?</li>
+ <li><strong>How do you want the web to be governed?</strong></li>
+ <li><strong>Target Audience:</strong> Who needs to hear about the ITU? Who can you get involved?</li>
+ <li><strong>Local Needs:</strong> What will make the ITU relevant to your local community?</li>
+ <li><strong>Call to Action:</strong> What do you want people to do? How will they do it?</li>
+ <li><strong>Sharing:</strong> How do you make the message sharable? Is there someone that others can do to help you spread the word?</li>
+ <li><strong>Language:</strong> Have you translated the video into your local language?</li>
+ </ul>
+ <p>In collaboration with <a href="https://www.accessnow.org/">Access Now</a> and <ahref="http://www.fightforthefuture.org/">Fight for the Future</a>, we&#8217;ve put together an interactive video about the ITU that you can customize for your own needs and share with others. <strong><a href="https://www.webmaker.org/en-US/projects/roll-your-own-itu-activism-video/">Just click here and you&#8217;ll be editing your own video in minutes.</a></strong></p>
+ <p>If making a Popcorn video isn&#8217;t your think you could write a blog post, share your message on social media, or just start talking to your friends in your local community about what&#8217;s going on.</p>
+ </div>
+</section>
+<section id="and_finally">
+ <header>
+ <h2>Finally: Activate! Get involved and share your message with others.</h2>
+ </header>
+</section>
+{% endblock %}
+
+{% block footer %}
+{{ super() }}
+{{ js('core_js') }}
+{{ js('video-tools') }}
+{% endblock %}
View
29 make_mozilla/static_pages/templates/static_pages/itu_videos.html
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block page_title %}Videos | ITU | {{ super() }}
+{% endblock %}
+
+{% block page_id %}videos{% endblock %}
+{% block page_class %}content-page itu{% endblock %}
+
+{% block content %}
+<section class="hoc_intro">
+ <header>
+ <h2>ITU Video remixes</h2>
+ </header>
+ <div class="content">
+ <p><strong>This page will contain remixes of the Popcorn Project that Mozilla launched to support grassroots mobilization around the ITU.</strong></p>
+ <p>Read <a href="https://www.webmaker.org/en-US/projects/roll-your-own-itu-activism-video/">more about the original video</a> and once you've remixed it we're collecting the best videos to feature here. Submit your remixes to <a href="mailto:tim@mozillafoundation.org">tim@mozillafoundation.org</a>!</p>
+ <article>
+ <h3>The original video</h3>
+ <iframe src="http://popcorn.webmadecontent.org/1gr_" width="820" height="503" frameborder="0" mozallowfullscreen webkitallowfullscreen allowfullscreen></iframe>
+ </article>
+ </div>
+</section>
+{% endblock %}
+
+{% block footer %}
+{{ super() }}
+{{ js('core_js') }}
+{{ js('video-tools') }}
+{% endblock %}
View
10 make_mozilla/static_pages/urls.py
@@ -0,0 +1,10 @@
+from django.conf.urls.defaults import patterns, url
+
+from make_mozilla.static_pages import views
+
+urlpatterns = patterns('',
+ url(r'^ITU/$', views.itu_index, name='itu_index'),
+ url(r'^ITU/kit/$', views.itu_kit, name='itu_kit'),
+ url(r'^ITU/advocates/$', views.itu_advocates, name='itu_advocates'),
+ url(r'^ITU/videos/$', views.itu_videos, name='itu_videos'),
+)
View
17 make_mozilla/static_pages/views.py
@@ -0,0 +1,17 @@
+import jingo
+
+
+def itu_index(request):
+ return jingo.render(request, 'static_pages/itu_index.html', {})
+
+
+def itu_kit(request):
+ return jingo.render(request, 'static_pages/itu_kit.html', {})
+
+
+def itu_advocates(request):
+ return jingo.render(request, 'static_pages/itu_advocates.html', {})
+
+
+def itu_videos(request):
+ return jingo.render(request, 'static_pages/itu_videos.html', {})
View
2  make_mozilla/urls.py
@@ -40,7 +40,7 @@
# Uncomment the next line to enable the admin:
(r'^admin/', include(admin.site.urls)),
-
+ (r'', include('make_mozilla.static_pages.urls')),
(r'', include(make_mozilla.pages.urls)),
)
View
89 media/css/base.less
@@ -156,6 +156,10 @@ h4 {
margin: 0;
padding: 0;
}
+.whimper {
+ font-size: 1em;
+ font-weight: bold;
+}
p {
font-size: 0.929em;
@@ -3720,6 +3724,13 @@ ul.tri-set img {
.columns .meta {
width: 40%;
}
+@media screen and (max-width: 700px) {
+ .columns .col {
+ float: none;
+ width: auto;
+ padding-left: 0;
+ }
+}
#about .join_in {
padding-left: 0;
}
@@ -5099,4 +5110,82 @@ a.mozilla-video-control-overlay {
.mozilla-video-player-content .video-download-links a:link,
.mozilla-video-player-content .video-download-links a:hover {
color: #888;
+}
+/** a bunch of hacks for the ITU page **/
+.itu section .content ul {
+ border-left: none;
+ padding-left: 0;
+}
+.itu section .content ul ul {
+ padding-left: 40px;
+}
+.itu .whimper {
+ margin: 0.5em 0 0.2em 0;
+}
+.itu .content {
+ overflow: hidden;
+}
+.itu .sidebar p {
+ margin-top: 0;
+}
+.itu .stretch {
+ width: 100%;
+ height: auto;
+}
+.itu #and_finally {
+ padding: 0;
+}
+.itu #and_finally header {
+ margin: 0;
+}
+.itu .vcard {
+ border-bottom: 1px solid #E1E2E3;
+ padding-bottom: 1em;
+ margin-bottom: 1em;
+}
+.itu .vcard:last-child {
+ margin-bottom: 0;
+ border-bottom: none;
+ padding-bottom: 0;
+}
+.itu .vcard-row {
+ margin-bottom: 0.2em;
+ overflow: hidden;
+}
+.itu .vcard h4 {
+ display: inline-block;
+ margin-right: 10px;
+}
+#itu_index .col {
+ padding-top: 1em;
+}
+#itu_index .col section {
+ box-shadow: none;
+ padding: 0;
+}
+#itu_index .your-say {
+ border-bottom: 1px solid #E1E2E3;
+}
+#itu_index .your-say li {
+ list-style-position: outside;
+ margin-left: 1.5em;
+}
+#itu_kit .indent {
+ margin-left: 40px;
+}
+#itu_advocates .project h4 {
+ float: left;
+ width: 10%;
+ min-width: 70px;
+}
+#itu_advocates .project p {
+ width: 83%;
+ float: left;
+ margin-top: 0;
+}
+#videos article {
+ margin-top: 1em;
+}
+#videos article iframe {
+ margin-bottom: 1em;
}
View
BIN  media/img/static_pages/itu.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  media/img/static_pages/the-web.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.