Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into partners-page

  • Loading branch information...
commit 03c1232cc0699be1413b8b0d9d945343ba8ec49a 2 parents 5d8c1a5 + 8298094
@rossbruniges rossbruniges authored
View
68 gameon/base/static/base/css/home.css
@@ -168,18 +168,43 @@ div[role=main] .big-picture .busta {
}
.participate .exclaim {
color: #37d09e;
+ margin-top: 0;
+}
+.participate .wrapper {
+ display: table;
+ border-spacing: 20px;
+ margin-bottom: 12em;
+ height: 100%;
}
.participate article {
+ width: 50%;
+
+ display: table-cell;
+ position: relative;
+ height: 100%;
+}
+.participate article ul {
+ margin: 0;
+}
+.participate article p {
+ margin: 1em 0 0;
+}
+.participate article li {
+ margin: 1em 0 0;
+ padding: 0 0 0 34px;
+}
+.participate article .inner {
+ display: table;
+ height: 100%;
+ border-spacing: 0;
+ position: relative;
+ padding: 40px;
background: rgba(00, 40, 58, 0.8);
- color: #fff;
- width: 46%;
+ border-radius: 16px 16px 0 0;
+ color: #FFF;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
- padding: 1em 40px;
- float: left;
- margin: 0 2% 3em;
- border-radius: 16px;
}
.participate .vevent {
padding-bottom: 0.5em;
@@ -192,14 +217,23 @@ div[role=main] .big-picture .busta {
margin: 0;
}
.participate article footer {
- padding: 40px;
- margin: 2em -40px -1em -40px;
+ padding: 30px 40px;
border-radius: 0 0 16px 16px;
background: #00283a;
+ position: absolute;
+ top: 100%;
+ left: 0;
+ width: 100%;
+ min-height: 3.5em;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
}
.participate .submit_now footer {
padding-left: 100px;
- background: #00283a url('/static/base/img/css/clock.png') no-repeat 30px 30px;
+ background-image: url('/static/base/img/css/clock.png');
+ background-repeat: no-repeat;
+ background-position: 30px 30px;
}
/* so that the bottom section merges with the footer */
#home div[role=main] {
@@ -271,10 +305,24 @@ div[role=main] .big-picture .busta {
.participate .busta {
padding: 1.5em 1.5em 0;
}
+ .participate .wrapper {
+ display: block;
+ margin-bottom: 0;
+ }
.participate article {
- float: none;
width: auto;
margin: 0 0 1.5em;
+ display: block;
+ }
+ .participate article .inner {
+ display: block;
+ border-radius: 16px;
+ }
+ .participate article footer {
+ position: static;
+ margin: 40px -40px -40px;
+ width: auto;
+ min-height: 0;
}
}
@media all and (max-width: 460px) {
View
2  gameon/base/templates/404.html
@@ -12,7 +12,7 @@ <h1 class="busta shout">Oops - looks like you've found a broken link</h1>
<div class="busta">
<div class="cf">
<div class="main-col">
- <h2 class="exclaim"></h2>
+ <p>Nothing to worry about, probably one of the things below:</p>
<ul class="whimper">
<li>Check your spelling and check again.</li>
<li>if you clicked a link from somewhere else check that they're aren't any special hidden characters, if you find out that they've posted the wrong link then it would be awesome if you could let them know.</li>
View
2  gameon/base/templates/_signup_login.html
@@ -1,5 +1,5 @@
{% if request.user.is_authenticated() %}
- <a class="cta" href="{{ url('submissions.create_entry') }}">Submit a game</a>
+ <p><a class="cta" href="{{ url('submissions.create_entry') }}">Submit a game</a></p>
{% else %}
<p>Before you can submit a game you need to <a class="additional_persona" href="#">create a user account</a>.</p>
{% endif %}
View
3  gameon/settings/base.py
@@ -8,6 +8,9 @@
# clone.
PROJECT_MODULE = 'gameon'
+# This is used by get_current_challenge in gameon/submissions/managers.py
+# It gets added into the DB as part of gameon/submissions/migrations/0009_initial_challenge.py
+# If the DB value changes, or you add in a new current challenge also change this
GAMEON_CHALLENGE_SLUG = 'gameon-2013'
MARKETPLACE_URL = 'https://marketplace.firefox.com/developers/docs/mkt_submission'
View
84 gameon/static_site/templates/static_site/landing.html
@@ -21,7 +21,7 @@
{% if not request.challenge.has_started() %}
<p>Submissions open on {{ request.challenge.start_date.strftime('%B %e, %Y') }}</p>
{% endif %}
- {% if not request.challenge.has_closed() %}
+ {% if request.challenge.has_closed() %}
<p><a href="{{ url('submissions.entry_list') }}">See what people submitted</a></p>
{% endif %}
{% endif %}
@@ -61,44 +61,50 @@ <h2 class="announce">In partnerhip with:</h2>
</section>
<section class="participate cf">
<div class="busta cf">
- <article class="submit_now">
- <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>
- {% 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() %}
- {% include '_signup_login.html' %}
- {% endif %}
- <footer>
- Submissions open on {{ request.challenge.start_date.strftime('%B %e, %Y') }} and close {{ request.challenge.end_date.strftime('%B %e, %Y') }}.
- </footer>
- {% endif %}
- </article>
- <article class="events">
- <h2 class="exclaim">Come to a Game Jam!</h2>
- <ul class="checks">
- <li>Got a game idea for the competition you'd like help testing and finishing up?</li>
- <li>Interested in playing with new technologies and meeting people who love making and hacking games as much as you do?</li>
- </ul>
- {% if events %}
- <h3>Upcoming events</h3>
- <ol class="no-style">
- {% for ev in events %}
- <li class="vevent">
- <h4><a class="summary url" href="{{ ev.url }}">{{ ev.name }}</a></h4>
- <p><span class="dtstart">{{ ev.start_date.strftime('%B %d, %Y %l:%M%p') }}</span> in {{ ev.location.town }}, <span class="location">{{ ev.location.country }}</span></p>
- </li>
- {% endfor %}
- </ol>
- {% if num_events > 3 %}
- <a href="{{ url('events.list') }}">See all upcoming Game Jams</a>
- {% endif %}
- {% endif %}
- <footer>
- <a href="{{ url('events.list') }}">Register for an upcoming game jam</a> or <a href="https://webmaker.org/events/guides/game-jam/">run your own here</a>
- </footer>
- </article>
+ <div class="wrapper">
+ <article class="submit_now">
+ <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>
+ {% 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() %}
+ {% include '_signup_login.html' %}
+ {% endif %}
+ <footer>
+ Submissions open on {{ request.challenge.start_date.strftime('%B %e, %Y') }} and close {{ request.challenge.end_date.strftime('%B %e, %Y') }}.
+ </footer>
+ {% endif %}
+ </div>
+ </article>
+ <article class="events">
+ <div class="inner">
+ <h2 class="exclaim">Come to a Game Jam!</h2>
+ <ul class="checks">
+ <li>Got a game idea for the competition you'd like help testing and finishing up?</li>
+ <li>Interested in playing with new technologies and meeting people who love making and hacking games as much as you do?</li>
+ </ul>
+ {% if events %}
+ <h3>Upcoming events</h3>
+ <ol class="no-style">
+ {% for ev in events %}
+ <li class="vevent">
+ <h4><a class="summary url" href="{{ ev.url }}">{{ ev.name }}</a></h4>
+ <p><span class="dtstart">{{ ev.start_date.strftime('%B %d, %Y %l:%M%p') }}</span> in {{ ev.location.town }}, <span class="location">{{ ev.location.country }}</span></p>
+ </li>
+ {% endfor %}
+ </ol>
+ {% if num_events > 3 %}
+ <a href="{{ url('events.list') }}">See all upcoming Game Jams</a>
+ {% endif %}
+ {% endif %}
+ <footer>
+ <a href="{{ url('events.list') }}">Register for an upcoming game jam</a> or <a href="https://webmaker.org/events/guides/game-jam/">run your own here</a>
+ </footer>
+ </div>
+ </article>
+ </div>
</div>
</section>
{% endblock %}
View
110 gameon/submissions/migrations/0009_initial_challenge.py
@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+from south.v2 import DataMigration
+from django.core.exceptions import ObjectDoesNotExist
+from django.conf import settings
+
+GAMEON_CHALLENGE_SLUG = settings.GAMEON_CHALLENGE_SLUG
+
+
+class Migration(DataMigration):
+
+ depends_on = (
+ ('submissions', '0008_fix_desciption_typo'),
+ )
+
+ def forwards(self, orm):
+ try:
+ category = (orm['submissions.Challenge'].objects
+ .get(slug=GAMEON_CHALLENGE_SLUG))
+ except ObjectDoesNotExist:
+ category_data = {
+ 'name': 'Gameon 2013',
+ 'slug': GAMEON_CHALLENGE_SLUG,
+ 'start_date': '2012-12-11 00:00:00',
+ 'end_date': '2013-02-20 23:59:59',
+ }
+ category = orm['submissions.Challenge'].objects.create(**category_data)
+
+ def backwards(self, orm):
+ "Write your backwards methods here."
+ print "Not removing any data from the DB, we can't know for certain what was there before"
+ pass
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'submissions.category': {
+ 'Meta': {'object_name': 'Category'},
+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'submissions.challenge': {
+ 'Meta': {'object_name': 'Challenge'},
+ 'end_date': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '200'}),
+ 'start_date': ('django.db.models.fields.DateTimeField', [], {})
+ },
+ 'submissions.entry': {
+ 'Meta': {'object_name': 'Entry'},
+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['submissions.Category']", 'null': 'True', 'blank': 'True'}),
+ 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['users.Profile']", 'null': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'default': "''"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}),
+ 'team_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'team_members': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'team_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+ 'to_market': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '255'}),
+ 'video_url': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '255'})
+ },
+ 'users.profile': {
+ 'Meta': {'object_name': 'Profile'},
+ 'bio': ('django.db.models.fields.TextField', [], {'default': "''"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
+ 'website': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '255'})
+ }
+ }
+
+ complete_apps = ['submissions']
View
2  gameon/submissions/templates/submissions/single.html
@@ -39,8 +39,10 @@ <h2 class="whimper">Submitted by</h2>
{% if entry.editable_by(user=request.user) and request.challenge.is_open() %}
<a class="cta whimper" href="{{ url('submissions.entry_edit', slug=entry.slug) }}">Edit your game</a>
{% endif %}
+ {% if entry.category %}
<h2 class="whimper">Category</h2>
<p><a href="{{ url('submissions.entry_list', category=entry.category.slug) }}">{{ entry.category }}</a></p>
+ {% endif %}
</aside>
</div>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.