Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #94 from rossbruniges/prelaunch-nits

Prelaunch nits
  • Loading branch information...
commit 9a6a2133b7f49ce30cf933dcad9d125f917717ed 2 parents aa9e0ce + 70abfb3
@rossbruniges rossbruniges authored
View
3  gameon/base/static/base/css/master.css
@@ -342,6 +342,9 @@ nav li a {
.entries .cta {
margin-top: 0.5em;
}
+.filter {
+ margin-bottom: 1em;
+}
.filter ul {
padding-left: 0;
}
View
BIN  gameon/base/static/base/img/judges/kath.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  gameon/events/templates/events/list.html
@@ -25,7 +25,7 @@ <h2 class="summary">{{ ev.name }}</h2>
</ol>
{% else %}
<h2>We currently have no Game Jams planned</h2>
- <p>Keep an eye on the <a href="https://mozilla.org/gameon/">Game On blog</a> for further announcements, or equally you can try and <a href="https://donate.mozilla.org/page/event/create/">organise your own jam</a>!</p>
+ <p>Keep an eye on the <a href="https://blog.mozilla.org/gameon/">Game On blog</a> for further announcements, or equally you can try and <a href="https://donate.mozilla.org/page/event/create/">organise your own jam</a>!</p>
{% endif %}
</div>
<aside class="meta mini-col">
View
25 gameon/static_site/templates/static_site/judges.html
@@ -57,15 +57,6 @@ <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">Ed Rumley</h2> - COO, <span class="org">Chillingo</span>
</header>
<img class="photo" src="{{ static('base/img/judges/ed-chillingo.jpg') }}" width="120" height="120" />
@@ -97,6 +88,13 @@ <h2 class="fn exclaim">Jessica Rovello</h2> - <span class="org">Arkadium</span>
</article>
<article class="vcard">
<header>
+ <h2 class="fn exclaim">Katherine Isbister</h2> - <span class="org">New York University</span>
+ </header>
+ <img class="photo" src="{{ static('base/img/judges/kath.jpg') }}" width="120" height="120" />
+ <p class="whimper">Katherine Isbister has a joint appointment in Digital Media and Computer Science and Engineering at NYU's Polytechnic Institute in Brooklyn. She also maintains an affiliation with the IT University in Copenhagen's Center for Computer Games Research. Isbister directs the Social Game Lab, is an investigator in the Games for Learning Institute, and serves on the Advisory Committee for the NYU Game Center. Her research focuses on designing games that heighten social and emotional connections for players, toward innovating design theory and practice. She keeps a blog, Game Empathy, with ruminations on this challenge.</p>
+ </article>
+ <article class="vcard">
+ <header>
<h2 class="fn exclaim">Nick Fortugno</h2> - <span class="org">Parsons Design & Technology</span>
</header>
<img class="photo" src="{{ static('base/img/judges/Nick_Fortugno.jpg') }}" width="120" height="120" />
@@ -104,6 +102,15 @@ <h2 class="fn exclaim">Nick Fortugno</h2> - <span class="org">Parsons Design & T
</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">Zuraida Buter</h2> - <span class="org">Globla Game Jam, zo-ii</span>
</header>
<img class="photo" src="{{ static('base/img/judges/Zuraida.jpg') }}" width="120" height="120" />
View
5 gameon/static_site/templates/static_site/landing.html
@@ -36,7 +36,7 @@ <h1 class="logo"><a href="{{ url('static_site.home') }}"><img src="{{ static('ba
<div class="busta">
<h2 class="exclaim">Submit your game prototype by {{ request.challenge.end_date.strftime('%B %e, %Y') }}</h2>
<ul>
- <li class="make whimper">Make web-based hackable games, games for learning or cross-platform games.</li>
+ <li class="make whimper">Make web-only, hackable or multi-device games.</li>
<li class="invent whimper"><a href="{{ url('events.list') }}">Attend a Game Jam near you</a> or host your own! Our <a href="https://webmaker.org/events/guides/game-jam/">handy Event Kits</a> make it easy.</li>
<li class="win whimper">Win a trip to the <a href="http://www.gdconf.com/">Game Developers Conference</a> to meet industry pioneers.</li>
<li class="market whimper">Have your completed game featured in the <a href="http://www.mozilla.org/apps/">Firefox Marketplace</a> and published on <a href="http://www.chillingo.com/">Chilingo</a>.</li>
@@ -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://twitter.com/mozgames" class="twitter-follow-button" data-show-count="false" data-size="large" data-dnt="true">Follow @mozgames</a></p>
+ <p>Excited? Good! Want to get involved?</p>
+ <p><a href="https://donate.mozilla.org/page/signup/gameon-2012">Signup for our newsletter</a> or <a href="https://twitter.com/mozgames" class="twitter-follow-button" data-show-count="false" 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>
View
8 gameon/submissions/templates/submissions/list.html
@@ -67,7 +67,7 @@ <h1 class="busta shout">All Entries</h1>
</div>
<aside class="meta mini-col">
<h2 class="whimper">Filter entries</h2>
- <nav class="filter">
+ <nav class="filter cf">
<ul>
<li>
{% if not category %}
@@ -87,6 +87,12 @@ <h2 class="whimper">Filter entries</h2>
{% endfor %}
</ul>
</nav>
+ {% if request.challenge.has_started() %}
+ {% if not request.challenge.has_closed() %}
+ <h2 class="whimper">Add your own game</h2>
+ {% include '_signup_login.html' %}
+ {% endif %}
+ {% endif %}
</aside>
</div>
</div>
View
6 gameon/submissions/templates/submissions/single.html
@@ -50,6 +50,12 @@ <h2 class="whimper">Submitted by</h2>
<h2 class="whimper">Category</h2>
<p><a href="{{ url('submissions.entry_list', category=entry.category.slug) }}">{{ entry.category }}</a></p>
{% endif %}
+ {% if request.challenge.has_started() %}
+ {% if not request.challenge.has_closed() %}
+ <h2 class="whimper">Add your own game</h2>
+ {% include '_signup_login.html' %}
+ {% endif %}
+ {% endif %}
</aside>
</div>
</div>
View
6 gameon/users/templates/users/profile.html
@@ -42,6 +42,12 @@ <h1 class="busta shout">{{ profile.display_name }}</h1>
</li>
{% endfor %}
</ol>
+ {% if request.challenge.has_started() %}
+ {% if not request.challenge.has_closed() %}
+ <h2 class="exclaim">Submit another game</h2>
+ {% include '_signup_login.html' %}
+ {% endif %}
+ {% endif %}
{% else %}
<h2 class="announce">No entries yet</h2>
{% if request.challenge %}
Please sign in to comment.
Something went wrong with that request. Please try again.