Permalink
Browse files

Merge pull request #90 from rossbruniges/bobbins

Text fixes and the like
  • Loading branch information...
2 parents d54f60f + 4ca9d2c commit be77e4e5823699747f80fa3c49ecdac23be09854 @rossbruniges rossbruniges committed Dec 6, 2012
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -15,7 +15,7 @@
<script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
{% block page_css %}{% endblock %}
- <link rel="icon" href="{{ MEDIA_URL }}img/favicon.ico" />
+ <link rel="icon" href="{{ static('base/img/favicon.ico') }}" />
{% block social_meta %}{% endblock %}
</head>
<body id="{% block page_id %}{% endblock %}" class="{% block section_class %}{% endblock %}">
@@ -57,6 +57,15 @@ <h2 class="fn exclaim">Phil Fish</h2> - <span class="org">FEZ</span>
</article>
<article class="vcard">
<header>
+ <h2 class="fn exclaim">Mark Surman</h2> - <span class="org">Mozilla Foundation</span>
+ </header>
+ <img class="photo" src="{{ static('base/img/judges/surman.jpg') }}" width="120" height="120" />
+ <p class="whimper">A community activist and technology executive of 20+ years, Mark currently serves as Executive Director of Mozilla, makers of Firefox and one of the largest social enterprises in the world. At Mozilla, he is focused on using the open technology and ethos of the web to transform fields such as education, journalism and filmmaking.</p>
+ <p class="whimper">Prior to Mozilla, Mark served as the Director of Telecentre.org, a $26M initiative to connect community technology centres around the world supported by Microsoft, Canada's International Development Research Centre, and the Swiss Development Cooperation. Earlier in his career, Mark worked as a consultant and social entreprenuer working on technology projects for organizations as diverse as Government of Canada, 211 Toronto, the Association for Progressive Communications and the Canadian Labour Congress. In the early 1990s, he started the web development arm of Canada's first nationwide non-profit internet provider.</p>
+ <p class="whimper">Mark has raised more than $30M for projects he has led, authored two books, presented at 100+ conferences, written dozens of papers, and traveled to more than 40 countries. Mark holds a BA in the History of Community Media from the University of Toronto. He was also awarded a Shuttleworth Foundation Fellowship in 2008 to explore the application of open source thinking to the field of philanthropy.</p>
+ </article>
+ <article class="vcard">
+ <header>
<h2 class="fn exclaim">Alice Taylor</h2> - <span class="org">Makie Lab</span>
</header>
<img class="photo" src="{{ static('base/img/judges/alice_taylor.jpg') }}" width="120" height="120" />
@@ -70,7 +70,8 @@ <h2 class="announce">In partnership with:</h2>
<div class="inner">
<h2 class="exclaim">Submit Your Game</h2>
<p>Mozilla invites you to imagine how next-generation web technologies can revolutionize the way we make and play games. It's your opportunity to invent new game mechanics and re-imagine the web as a gaming platform.</p>
- <p>Excited? Good! Want to get involved? <a href="https://mozilla.org/gameon/">Sign up for more information</a>.</p>
+ <p>Excited? Good! Want to get involved? <a href="https://twitter.com/mozgames" class="twitter-follow-button" data-show-count="false" data-size="large" data-dnt="true">Follow @mozgames</a></p>
+ <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
{% if request.challenge %}
<p><strong>Submit your game prototype by {{ request.challenge.end_date.strftime('%B %e, %Y') }}</strong></p>
{% if request.challenge.is_open() %}
@@ -13,7 +13,7 @@
'title': 'Web-Only Games',
'slug': 'web-only-games',
'desc': 'Create games that can only be played on the web. Get inspired by web-only mechanics such as sharing links and data, finding clues on the web that will help you advance in the game, always-on multi-player, and more—creating the most webilicious game possible!',
- 'award': ' Awarded to the game that can only be played on the web. Get inspired by web-only mechanics such as sharing links and data, finding clues on the web that will help you advance in the game, always-on multi-player, and more—creating the most webilicious game possible!'
+ 'award': 'Awarded to the game that pushes the limits of what is possible on the web. Get inspired by web-only mechanics such as sharing links and data, finding clues on the web that will help you advance in the game, always-on multi-player, and more—creating the most webilicious game possible!'
},
{
'title': 'Hackable Games',
@@ -21,7 +21,7 @@ def forwards(self, orm):
'name': 'Gameon 2013',
'slug': GAMEON_CHALLENGE_SLUG,
'start_date': '2012-12-11 00:00:00',
- 'end_date': '2013-02-20 23:59:59',
+ 'end_date': '2013-02-24 23:59:59',
}
category = orm['submissions.Challenge'].objects.create(**category_data)

0 comments on commit be77e4e

Please sign in to comment.