Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Commits on Jul 10, 2012
Shortening long month names
[#94308-54 state:pending]
Commits on Jul 11, 2012
Copy changes on about page
[#95184-93 state:pending]
Commits on Jul 12, 2012
Commits on Jul 25, 2012
Commits on Jul 26, 2012
Commits on Sep 28, 2012
Fixing template for when request doesn't exist
Seems to be crapping out particularly in 500 error scenarios.
Commits on Nov 02, 2012
Commits on Nov 28, 2012
Commits on Nov 29, 2012
Commits on Dec 13, 2012
Commits on Dec 20, 2012
Commits on Jan 16, 2013
Commits on Jan 17, 2013
Commits on Jan 24, 2013
Commits on Jan 25, 2013
Commits on Jan 28, 2013
Merge pull request #67 from rossbruniges/remove-newrelic
fixes #66 - removing new-relic from the local repo
Commits on Feb 12, 2013
Merge pull request #71 from rossbruniges/finesse-pages
Tweaking the templates slightly to allow for better formating of the page content in the pages-app
Commits on Feb 14, 2013
Commits on Feb 19, 2013
Showing with 795 additions and 56 deletions.
  1. +1 −1 fabfile.py
  2. +15 −2 make_mozilla/base/templates/base.html
  3. +29 −38 make_mozilla/base/templates/splash.html
  4. +1 −1 make_mozilla/events/templates/events/_event-list-item.html
  5. +6 −1 make_mozilla/pages/admin.py
  6. +3 −3 make_mozilla/pages/fixtures/initial_data.json
  7. +75 −0 ...a/pages/migrations/0002_auto__add_field_page_show_subnav__add_field_page_subnav_title__add_fie.py
  8. +12 −0 make_mozilla/pages/models.py
  9. +11 −2 make_mozilla/pages/templates/pages/page.html
  10. +2 −0 make_mozilla/settings/base.py
  11. 0 make_mozilla/static_pages/__init__.py
  12. 0 make_mozilla/static_pages/models.py
  13. +214 −0 make_mozilla/static_pages/templates/static_pages/itu_advocates.html
  14. +55 −0 make_mozilla/static_pages/templates/static_pages/itu_index.html
  15. +135 −0 make_mozilla/static_pages/templates/static_pages/itu_kit.html
  16. +48 −0 make_mozilla/static_pages/templates/static_pages/itu_videos.html
  17. +10 −0 make_mozilla/static_pages/urls.py
  18. +17 −0 make_mozilla/static_pages/views.py
  19. +1 −1 make_mozilla/urls.py
  20. +159 −6 media/css/base.less
  21. BIN media/img/carousel/december_2012/donate.jpg
  22. BIN media/img/carousel/december_2012/guides.jpg
  23. BIN media/img/carousel/december_2012/meet.jpg
  24. BIN media/img/carousel/december_2012/popcorn.jpg
  25. BIN media/img/carousel/feb_2013/valentines.jpg
  26. BIN media/img/partners/doe.png
  27. BIN media/img/partners/moore.png
  28. BIN media/img/partners/nominet.png
  29. BIN media/img/partners/otf.png
  30. BIN media/img/partners/rsca.png
  31. BIN media/img/static_pages/itu.jpg
  32. BIN media/img/static_pages/the-web.jpg
  33. +1 −1 wsgi/playdoh.wsgi
View
@@ -12,7 +12,7 @@
import puppet
env.releases_path = '/var/webapps/make.mozilla.org'
-env.repo_url = 'git://github.com/rossbruniges/make.mozilla.org.git'
+env.repo_url = 'git://github.com/mozilla/make.mozilla.org.git'
env.forward_agent = True
env.puppet_user = os.getenv('AS', env.user)
env.user = 'make_mozilla'
@@ -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>
@@ -42,15 +55,15 @@
<h2><img src="{{ MEDIA_URL }}img/footer_logo.png" alt="Mozilla Webmaker" width="129" height="39" /></h2>
<h3>Admin</h3>
<ul>
- {% if not (request.user and request.user.is_authenticated()) %}
+ {% if not (request and request.user and request.user.is_authenticated()) %}
<li><a href="{{ login_url() }}">Log in</a></li>
{% endif %}
{% block admin_menu_items %}
{% if user.is_authenticated() %}
<li><a href="{{ url('events.mine') }}">My events</a></li>
{% endif %}
{% endblock %}
- {% if request.user and request.user.is_authenticated() %}
+ {% if request and request.user and request.user.is_authenticated() %}
<li><a href="{{ url('logout') }}">Log out</a></li>
{% endif %}
</ul>
@@ -5,58 +5,48 @@
{% 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-code-party">
- <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" />
+ <div class="pager-page" id="page-promo-popcorn">
+ <a href="https://popcorn.webmaker.org/">
+ <img src="{{ MEDIA_URL }}img/carousel/december_2012/popcorn.jpg" alt="" width="1400" height="488" />
<div class="pager-text">
- <h2 class="pager-title">Find an event near you</h2>
- <p>Or get together around your own kitchen table.</p>
+ <!-- <h2 class="pager-title">Try Popcorn Maker</h2> -->
+ <p>NEW! Make your videos pop with links, interactivity and the magic of the web.</p>
</div>
</a>
</div>
- <div class="pager-page" id="page-promo-webmaker-kids">
- <a href="{{ url('video_page') }}">
- <img src="{{ MEDIA_URL }}img/carousel/july_2012/webmaker-kids.jpg" alt="" width="1400" height="488" />
+ <div class="pager-page" id="page-promo-donate">
+ <a href="https://donate.mozilla.org/page/contribute/the-mozilla-story?source=20121217_moz2012_a">
+ <img src="{{ MEDIA_URL }}img/carousel/december_2012/donate.jpg" alt="" width="1400" height="488" />
<div class="pager-text">
- <h2 class="pager-title">Building the next generation of webmakers</h2>
- <p>Meet the digital creators of tomorrow in this new video.</p>
+ <!-- <h2 class="pager-title">Make a donation</h2> -->
+ <p>Help make the Web &ndash; and the world &ndash; a better place in 2013.</p>
</div>
</a>
</div>
- <div class="pager-page" id="page-promo-popcorn">
- <a href="https://webmaker.org/en-US/projects/pbs-newshour-ad-libs-2012/">
- <img src="{{ MEDIA_URL }}img/carousel/Adlib_opt.jpg" alt="" width="1400" height="488" />
+ <div class="pager-page" id="page-promo-guides">
+ <a href="{{ url('guides_all') }}">
+ <img src="{{ MEDIA_URL }}img/carousel/december_2012/guides.jpg" alt="" width="1400" height="488" />
<div class="pager-text">
- <h2 class="pager-title">Make your own campaign ad</h2>
- <p>Learn how political campaign ads work by making one of your own—powered by Popcorn.js!</p>
+ <!-- <h2 class="pager-title">Host your own Webmaker event</h2> -->
+ <p>Our handy Event Kits make it easy.</p>
</div>
</a>
</div>
- <div class="pager-page" id="page-promo-join">
- <a href="https://donate.mozilla.org/page/contribute/join-mozilla?source=webmaker_home">
- <img src="{{ MEDIA_URL }}img/carousel/july_2012/join.jpg" alt="" width="1400" height="488" />
+ <div class="pager-page" id="page-promo-videos">
+ <a href="{{ url('video_page') }}">
+ <img src="{{ MEDIA_URL }}img/carousel/december_2012/meet.jpg" alt="" width="1400" height="488" />
<div class="pager-text">
- <h2 class="pager-title">Join Mozilla</h2>
- <p>Make a donation to support Mozilla's non-profit mission. Help build a new generation of webmakers.</p>
+ <!-- <h2 class="pager-title">Meet the Webmakers</h2> -->
+ <p>Together we're building a more web literate planet. Meet the people making it happen.</p>
</div>
</a>
</div>
- <ul class="pager-tabs">
- <li id="tab-code-party"><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-popcorn"><a href="#">● <span>read about Make your own campaign ad</span></a></li>
- <li id="tab-join"><a href="#">● <span>read about Join Mozilla</span></a></li>
- </ul>
+ <ul class="pager-tabs">
+ <li id="tab-search-events"><a href="#">● <span>read about Try Popcorn Maker</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>
+ <li id="tab-join"><a href="#">● <span>read about Join Mozilla</span></a></li>
+ </ul>
</div>
</div>
<div class="veg">
@@ -220,22 +210,23 @@ <h2>Mozilla Webmaker is <a href="{{ url('page', 'partners') }}">generously suppo
<ul>
<li><a href="http://www.citf.org/"><img src="/media/img/logos/funding/citf.png" alt="Chicago Instructional Technology Foundation"></a></li>
<li><a href="http://cpb.org/"><img src="/media/img/logos/funding/cpb.png" alt="Corporation for Public Broadcasting"></a></li>
+ <li><a href="http://energy.gov/"><img src="/media/img/partners/doe.png" alt="Department of Energy"></a></li>
<li><a href="http://www.fordfoundation.org/"><img src="/media/img/logos/funding/ford-foundation.png" alt="Ford Foundation"></a></li>
<li><a href="http://www.knightfoundation.org/"><img src="/media/img/logos/funding/Knight.png" alt="Knight Foundation"></a></li>
</ul>
</li>
<li class="item">
<ul>
<li><a href="http://www.macfound.org/"><img src="/media/img/logos/funding/Macarthur.png" alt="MacArthur Foundation"></a></li>
- <li><a href="http://www.moore.org/"><img src="/media/img/logos/funding/moore.png" alt="Moore Foundation"></a></li>
<li><a href="http://www.nesta.org.uk/"><img src="/media/img/logos/funding/nesta.png" alt="NESTA"></a></li>
+ <li><a href="http://www.nominettrust.org.uk/"><img src="/media/img/partners/nominet.png" alt="Nominet Trust"></a></li>
<li><a href="http://www.nea.gov/"><img src="/media/img/logos/funding/nea.png" alt="National Endowment for the Arts"></a></li>
+ <li><a href="http://www.otf.ca/"><img src="/media/img/partners/otf.png" alt="Ontario Trillium Foundation"></a></li>
</ul>
</li>
<li class="item">
<ul>
<li><a href="http://www.nsf.gov/"><img src="/media/img/logos/funding/NSF.png" alt="National Science Foundation"></a></li>
- <li><a href="http://www.rescorp.org/"><img src="/media/img/logos/funding/rsca.png" alt="Research Corporation for Science Advancement"></a></li>
<li><a href="http://www.sloan.org/"><img src="/media/img/logos/funding/Sloan.png" alt="Sloan Foundation"></a></li>
<li><a href="http://www.zerodivide.org/"><img src="/media/img/logos/funding/zerodivide.png" alt="ZeroDivide"></a></li>
</ul>
@@ -31,7 +31,7 @@ <h4><a class="p-name summary u-url url" href="{% if event.bsd_hosted() %}{{ even
{% if event.start %}
<div class="date">
<span class="day">{{ event.start.strftime('%A') }}</span>
- <span class="month">{{ event.start.strftime('%B') }}</span>
+ <span class="month">{% if event.start.strftime('%B')|length > 6 %}{{ event.start.strftime('%b.') }}{% else %}{{ event.start.strftime('%B') }}{% endif %}</span>
<span class="date">{{ event.start.strftime('%-d') }}</span>
{# <span class="year">{{ event.start.strftime('%Y') }}</span> #}
</div>
@@ -8,13 +8,14 @@ class PageSectionInline(admin.StackedInline):
extra = 1
fieldsets = (
(None, {
- 'fields': ('title', 'poster', 'content',),
+ 'fields': ('title', 'subnav_title', 'poster', 'content',),
}),
('Sidebar', {
'classes': ('collapse',),
'fields': ('quotes', 'sidebar',),
}),
)
+ prepopulated_fields = {"subnav_title": ("title",)}
filter_horizontal = ('quotes',)
@@ -26,6 +27,10 @@ class PageAdmin(admin.ModelAdmin):
(None, {
'fields': ('title', 'path',),
}),
+ ('Sub-navigation', {
+ 'classes': ('collapse',),
+ 'fields': ('show_subnav', 'subnav_title',),
+ }),
('Advanced', {
'classes': ('collapse',),
'fields': ('additional_content',),
@@ -62,7 +62,7 @@
"fields": {
"title": "Why is Mozilla doing this?",
"poster": "/media/img/about/3.jpg",
- "content": "<p><strong>The web is becoming the world\u2019s second language, and a vital 21st century skill</strong>. Digital literacy today is as important as reading, writing and arithmetic. Mozilla believes its crucial that we give people the skills they need to understand, shape and actively participate in that world, instead of just passively consuming it.</p>",
+ "content": "<p><strong>The web is becoming the world\u2019s second language, and a vital 21st century skill</strong>. Digital literacy today is as important as reading, writing and arithmetic. Mozilla believes it\u2019s crucial that we give people the skills they need to understand, shape and actively participate in that world, instead of just passively consuming it.</p>",
"quotes": [
6
],
@@ -76,7 +76,7 @@
"fields": {
"title": "What\u2019s a &ldquo;webmaker&rdquo;?",
"poster": "/media/img/about/4.jpg",
- "content": "<p><strong>Anyone who makes something using the open building blocks of the web.</strong> If you\u2019re uploading photos or videos, posting to a blog, or using social media, you\u2019re already on the path. We want to help you level up your skills and go further.</p>\r\n\r\n<p><strong>You don\u2019t have to be a professional coder or wizard to be a webmaker.</strong> In the same way that you don\u2019t have to be a professional baker to make bread, or a professional auto mechanic to change a tire or poke under the hood, <strong>you shouldn\u2019t have be be a professional web developer to understand how the web works \u2014 or make your own stuff</strong>. We want to help you go \u201cbeyond upload\u201d to unlock new opportunities for creativity and innovation in your life and work.</p>",
+ "content": "<p><strong>Anyone who makes something using the open building blocks of the web.</strong> If you\u2019re uploading photos or videos, posting to a blog, or using social media, you\u2019re already on the path. We want to help you level up your skills and go further.</p>\r\n\r\n<p><strong>You don\u2019t have to be a professional coder or wizard to be a webmaker.</strong> In the same way that you don\u2019t have to be a professional baker to make bread, or a professional auto mechanic to change a tire or poke under the hood, <strong>you shouldn\u2019t have to be a professional web developer to understand how the web works \u2014 or make your own stuff</strong>. We want to help you go \u201cbeyond upload\u201d to unlock new opportunities for creativity and innovation in your life and work.</p>",
"quotes": [
7
],
@@ -187,7 +187,7 @@
"model": "pages.quote",
"fields": {
"url": "",
- "quote": "Popcorn Maker could be the next big thing in internet video.",
+ "quote": "<strong>Popcorn</strong> could be the next big thing in internet video.",
"show_source_image": false,
"source": 4
}
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding field 'Page.show_subnav'
+ db.add_column('pages_page', 'show_subnav',
+ self.gf('django.db.models.fields.BooleanField')(default=False),
+ keep_default=False)
+
+ # Adding field 'Page.subnav_title'
+ db.add_column('pages_page', 'subnav_title',
+ self.gf('django.db.models.fields.CharField')(max_length=100, null=True, blank=True),
+ keep_default=False)
+
+ # Adding field 'PageSection.subnav_title'
+ db.add_column('pages_pagesection', 'subnav_title',
+ self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True),
+ keep_default=False)
+
+ def backwards(self, orm):
+ # Deleting field 'Page.show_subnav'
+ db.delete_column('pages_page', 'show_subnav')
+
+ # Deleting field 'Page.subnav_title'
+ db.delete_column('pages_page', 'subnav_title')
+
+ # Deleting field 'PageSection.subnav_title'
+ db.delete_column('pages_pagesection', 'subnav_title')
+
+ models = {
+ 'pages.page': {
+ 'Meta': {'object_name': 'Page'},
+ 'additional_content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'path': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
+ 'show_subnav': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'subnav_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+ },
+ 'pages.pagesection': {
+ 'Meta': {'ordering': "['id']", 'object_name': 'PageSection'},
+ 'content': ('django.db.models.fields.TextField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sections'", 'to': "orm['pages.Page']"}),
+ 'poster': ('make_mozilla.core.fields.SizedImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'quotes': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['pages.Quote']", 'null': 'True', 'blank': 'True'}),
+ 'sidebar': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'subnav_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+ },
+ 'pages.quote': {
+ 'Meta': {'object_name': 'Quote'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'quote': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
+ 'show_source_image': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pages.QuoteSource']", 'null': 'True', 'blank': 'True'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ },
+ 'pages.quotesource': {
+ 'Meta': {'object_name': 'QuoteSource'},
+ 'avatar': ('make_mozilla.core.fields.SizedImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+ 'strapline': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ }
+ }
+
+ complete_apps = ['pages']
Oops, something went wrong.

No commit comments for this range