Skip to content

Commit

Permalink
Updates from Will and Ignite team
Browse files Browse the repository at this point in the history
  • Loading branch information
rossbruniges committed Jun 18, 2013
1 parent 018b122 commit 422d516
Show file tree
Hide file tree
Showing 20 changed files with 71 additions and 88 deletions.
134 changes: 67 additions & 67 deletions apps/ignite/templates/ignite/_winners.html

Large diffs are not rendered by default.

23 changes: 3 additions & 20 deletions apps/ignite/templates/ignite/about-winners.html
Expand Up @@ -19,25 +19,12 @@ <h2 class="announce trigger">What is the Mozilla Ignite Challenge?</h2>
<iframe src="//player.vimeo.com/video/46589415" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe> <p><a href="http://vimeo.com/46589415">Mozilla Ignite Challenge 2012</a> from <a href="http://vimeo.com/youraface">Graham Wheeler</a> on <a href="http://vimeo.com">Vimeo</a>.</p>
<p class="intro"><strong>Mozilla Ignite is an open innovation challenge hosted by Mozilla and the National Science Foundation</strong> as part of the <a href="http://us-ignite.org/">US Ignite</a> initiative. The goal: imagine and build apps that show the full potential of next-generation networks, in areas that matter -- like healthcare, education, energy, manufacturing and public safety.</p>
<p class="intro"><strong>Show us what’s next</strong>. Imagine the limitations of today’s internet no longer apply. What becomes possible at 1 gigabit per second? How would you take advantage of deeply programmable, sliceable networks? How would you leverage speeds up to 250 times faster than today's?</p>
<p class="intro"><strong>The best ideas will win funding and support</strong>, and help shape the internet’s future.</p>
<p class="intro"><strong>The best ideas are getting funding and support</strong>, and will help shape the Internet's future.</p>
</div>
<div class="bonus col box">
<div class="highlight">
{% if request.development.is_open %}
<h3 class="point box-title">Now through September 28th: submit your app proposals.</h3>
{% else %}
<h3 class="point box-title">September 1st through September 28th: submit your app proposals.</h3>
{% endif %}
<p>Time to start hacking: we're offering $485,000 in prizes & support for teams over three rounds.</p>
{% if request.ideation.is_open %}
<a class="cta" href="{{ url('create_entry', phase='ideas') }}">Submit your idea now</a>
{% endif %}
{% if request.ideation.is_closed and not request.development.days_until == -1 %}
<p>Ideation is being judged and closed for new submissions; but the development phase will open in {{ request.development.days_until }} days.</p>
{% endif %}
{% if request.development.is_open %}
<a class="cta" href="{{ url('create_entry', phase='apps') }}">Submit your application now</a>
{% endif %}
<p class="point box-title">22 winning projects have been announced</p>
<p><a href="{{ url('challenge_show') }}#winners">See our winners</a> &amp; get involved with any you find exciting.</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -313,10 +300,6 @@ <h3 class="wimper">What is US Ignite?</h3>
<h3 class="wimper">Where are the official rules?</h3>
<p>You can check out the official rules <a href="{{ url('terms_conditions') }}" target="_blank">right here</a>.</p>
</li>
<li>
<h3 class="wimper">Do I have to participate in the Brainstorming Round?</h3>
<p>No, participation in the Brainstorming Round is encouraged but not required. But bear in mind that the brainstorm is an excellent opportunity to refine your application and find potential collaborators for your team.</p>
</li>
<li>
<h3 class="wimper">Why are you running three rounds of development?</h3>
<p>Rather than a winner-takes-all approach, the Mozilla Ignite apps challenge uses an "iterative funding" process. Over three rounds, the challenge jury will meet and award teams for the progress and promise they show. This way, teams with crazy ambitious ideas can compete side-by-side with smaller experiments.</p>
Expand Down
Binary file added media/ignite/img/winners/banyan.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed media/ignite/img/winners/briefcase-health.jpg
Binary file not shown.
Binary file added media/ignite/img/winners/briefcase-health.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/ignite/img/winners/cizzle.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed media/ignite/img/winners/consumer3D.jpg
Binary file not shown.
Binary file added media/ignite/img/winners/easy3D.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified media/ignite/img/winners/engage3D.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/ignite/img/winners/floodcube.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/ignite/img/winners/kinect-health.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed media/ignite/img/winners/kinectHealth.jpg
Binary file not shown.
Binary file added media/ignite/img/winners/public-transit.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/ignite/img/winners/real-time-emergency.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed media/ignite/img/winners/realtimeinfo.jpg
Binary file not shown.
Binary file added media/ignite/img/winners/software-lending.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed media/ignite/img/winners/transit.jpg
Binary file not shown.
Binary file added media/ignite/img/winners/web-conferencing.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed media/ignite/img/winners/webconferencing.jpg
Binary file not shown.
2 changes: 1 addition & 1 deletion templates_ignite/challenges/show_entry.html
Expand Up @@ -103,7 +103,7 @@ <h2>Would you be interested in helping with this application?</h2>
</div>
{% endif %}
{% endblock %}
<address class="vcard">
<address class="vcard" id="team_details">
<p class="wimper"><a class="fn url" href="{{ url('users_profile', username=entry.created_by.user.username) }}">{{ entry.created_by.name }}</a></p>
<p>{{ entry.created_by.bio }}</p>
{% if entry.team_members %}
Expand Down

0 comments on commit 422d516

Please sign in to comment.