diff --git a/make_mozilla/settings/base.py b/make_mozilla/settings/base.py index 58cbe0e..780e8e9 100644 --- a/make_mozilla/settings/base.py +++ b/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. diff --git a/make_mozilla/static_pages/__init__.py b/make_mozilla/static_pages/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/make_mozilla/static_pages/models.py b/make_mozilla/static_pages/models.py new file mode 100644 index 0000000..e69de29 diff --git a/make_mozilla/static_pages/templates/static_pages/itu_advocates.html b/make_mozilla/static_pages/templates/static_pages/itu_advocates.html new file mode 100644 index 0000000..dd1ca3f --- /dev/null +++ b/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 %} +
+
+

Grantees

+
+
+
+

Your Allies In The Fight For The Open Web

+

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.

+

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.

+

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 tim@mozillafoundation.org.

+
+
+

Countries

+ +
+
+
+
+
+

Africa

+
+
+
+

Romain Abile Houehou - Engaging African Consumers in Open Internet

+
+

Organization:

African Ict Consumer Network (AICN) +
+
+

Location:

Benin +
+
+

Project:

+

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.

+
+
+
+

Jimson Olufuye - Participation in the Nigerian Delegation to WCIT

+
+

E-mail:

+
+
+

Organization:

Africa ICT Alliance (AfICTA) +
+
+

Location:

Nigeria +
+
+

Project:

+

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.

+
+
+
+

John Walubengo - Engage With The Kenya Government on the ITRs

+
+

E-mail:

+
+
+

Organization:

Multimedia University College of Kenya +
+
+

Location:

Kenya +
+
+

Project:

+

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.

+
+
+
+
+
+
+

Asia

+
+
+
+

Isriya Paireepairit - "How The Internet is Regulated" Article Series

+
+

E-mail:

+
+
+

Organization:

Blognone +
+
+

Location:

Thailand +
+
+

Project:

+

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.

+
+
+
+

Shyam Ponappa - Participation in the Indian Delegation to WCIT

+
+

E-mail:

+
+
+

Organization:

Centre for Internet and Society +
+
+

Location:

India +
+
+

Project:

+

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.

+
+
+
+

Babu Ram Aryal - Panel Discussion on Nepalese Amendments at WCIT

+
+

E-mail:

+
+
+

Organization:

ISOC Nepal +
+
+

Location:

Nepal +
+
+

Project:

+

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.

+
+
+
+

Ahmed Swapan Mahmud - Public Dialogue on WCIT in Bangladesh

+
+

Organization:

VOICE and ISOC +
+
+

Location:

Bangladesh +
+
+

Project:

+

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.

+
+
+
+
+
+
+

Europe

+
+
+
+

Julia Velkova - Support Open and Free Internet Positions at the WCIT

+
+

Organization:

Internet Society Bulgaria and Södertörn University Sweden +
+
+

Location:

Bulgaria / Sweden +
+
+

Project:

+

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.

+
+
+
+

Elena Zvarici - Inform and Engage on Romania's WCIT Position

+
+

E-mail:

+
+
+

Organization:

Internet Society Romania +
+
+

Location:

Romania +
+
+

Project:

+

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.

+
+
+
+
+
+
+

South America

+
+
+
+

Francisco Vera Hott - ¿Qué pasa en ITU?

+
+

Organization:

ONG Derechos Digitales +
+
+

Location:

Chile +
+
+

Project:

+

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.

+
+
+
+
+{% endblock %} + +{% block footer %} +{{ super() }} +{{ js('core_js') }} +{{ js('video-tools') }} +{% endblock %} \ No newline at end of file diff --git a/make_mozilla/static_pages/templates/static_pages/itu_index.html b/make_mozilla/static_pages/templates/static_pages/itu_index.html new file mode 100644 index 0000000..04d11e6 --- /dev/null +++ b/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 %} +
+
+

ITU

+
+ +
+
+

Make your voice heard on the ITU

+

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.

+

Mozilla has made it our mission to keep the power of the web in people's hands. But all this could change on December 3.

+

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.

+

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.

+

We believe everyone should have a voice. And this site is to help you be heard in Dubai.

+
+
+
+

Have Your Say

+
    +
  1. +

    Learn Why This Matters

    +

    Read Mozilla's position on the ITU and explore other resources from across the Web.

    +
    2. +
  2. +

    Create Your Message

    +

    See what other people are saying and make your own interactive video to share your own ITU message.

    +
    3. +
  3. +

    Engage in the Conversation

    +

    Get the word out! We've collected some channels and allies you can work with to get people engaged on- and offline.

    +
    4. +
+
+
+

Micro-grants for Civil Society

+

We've provided support to 10 amazing open web advocates from around the world. Check out their projects and get involved!

+
+
+
+
+{% endblock %} + +{% block footer %} +{{ super() }} +{{ js('core_js') }} +{{ js('video-tools') }} +{% endblock %} \ No newline at end of file diff --git a/make_mozilla/static_pages/templates/static_pages/itu_kit.html b/make_mozilla/static_pages/templates/static_pages/itu_kit.html new file mode 100644 index 0000000..bcc6835 --- /dev/null +++ b/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 %} +
+
+

ITU Engagement Kit

+
+
+
+

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!

+

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.

+
+
+

How It Works

+ +
+
+
+
+
+

Step 1 – Choose the Issue that Matters Most to You

+
+
+ +

The upcoming meeting of the ITU is called the World Conference of International Telecommunications (WCIT). 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.

+

For a quick summary overview of what the ITU is and why this meeting of the WCIT is important, check out:

+ +

Key Issues

+ + + + +

Dig deeper

+

Useful resources for exploring further:

+ +
+
+
+
+

Step 2 – Decide What You Want People to Do

+
+
+ +

Now that you know what's at stake, what do you want people – your friends, colleagues, or community members – to do about it? Choose from the options we’ve pulled together or create you own.

+

You can ask people to…

+

A) Contact Their ITU Delegation

+

Governments will be represented at the ITU by delegations from each country. These people will take part in the meetings, so ensuring they hear your voice is a good place to start.

+

WCITLeaks 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 PDF format.

+

B) Mobilize on the Web

+

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.

+ +

C) Organize a Local Event

+

Mobilizing people on the ground in your community is a great way to engage in the conversation. Mozilla’s Webmaker platform makes it easy for you to schedule your own event and let others know about it. You can also collaborate with:

+ +
+
+
+
+

Step 3 – Create and Share Your Message

+
+
+

You’ve chosen the issues you care about and you’ve decided what you want your friends to do about it. Now, you can craft and customize your own Popcorn video to get the word out. Some things to consider when creating your message:

+ +

In collaboration with Access Now and Fight for the Future, we’ve put together an interactive video about the ITU that you can customize for your own needs and share with others. Just click here and you’ll be editing your own video in minutes.

+

If making a Popcorn video isn’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’s going on.

+
+
+
+
+

Finally: Activate! Get involved and share your message with others.

+
+
+{% endblock %} + +{% block footer %} +{{ super() }} +{{ js('core_js') }} +{{ js('video-tools') }} +{% endblock %} \ No newline at end of file diff --git a/make_mozilla/static_pages/templates/static_pages/itu_videos.html b/make_mozilla/static_pages/templates/static_pages/itu_videos.html new file mode 100644 index 0000000..9c0de84 --- /dev/null +++ b/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 %} +
+
+

ITU Video remixes

+
+
+

This page will contain remixes of the Popcorn Project that Mozilla launched to support grassroots mobilization around the ITU.

+

Read more about the original video and once you've remixed it we're collecting the best videos to feature here. Submit your remixes to tim@mozillafoundation.org!

+
+

The original video

+ +
+
+
+{% endblock %} + +{% block footer %} +{{ super() }} +{{ js('core_js') }} +{{ js('video-tools') }} +{% endblock %} \ No newline at end of file diff --git a/make_mozilla/static_pages/urls.py b/make_mozilla/static_pages/urls.py new file mode 100644 index 0000000..b5d8be6 --- /dev/null +++ b/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'), +) diff --git a/make_mozilla/static_pages/views.py b/make_mozilla/static_pages/views.py new file mode 100644 index 0000000..222b30e --- /dev/null +++ b/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', {}) diff --git a/make_mozilla/urls.py b/make_mozilla/urls.py index 2dd086a..1cafead 100644 --- a/make_mozilla/urls.py +++ b/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)), ) diff --git a/media/css/base.less b/media/css/base.less index 922f84a..481bc53 100644 --- a/media/css/base.less +++ b/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; } @@ -5100,4 +5111,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; } \ No newline at end of file diff --git a/media/img/static_pages/itu.jpg b/media/img/static_pages/itu.jpg new file mode 100644 index 0000000..2263941 Binary files /dev/null and b/media/img/static_pages/itu.jpg differ diff --git a/media/img/static_pages/the-web.jpg b/media/img/static_pages/the-web.jpg new file mode 100644 index 0000000..365b8fa Binary files /dev/null and b/media/img/static_pages/the-web.jpg differ