Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[Lighthouse-159] Changing all reference of 'proposals' to 'apps'

  • Loading branch information...
commit 9155a166c0952945fd27693d6c358e016d90c087 1 parent 2c557e3
@rossbruniges rossbruniges authored
View
6 apps/challenges/models.py
@@ -140,7 +140,7 @@ def natural_key(self):
@models.permalink
def get_absolute_url(self):
- slug = 'ideas' if self.is_ideation else 'proposals'
+ slug = 'ideas' if self.is_ideation else 'apps'
return ('entries_all', [slug])
@cached_property
@@ -227,7 +227,7 @@ def is_development(self):
@cached_property
def slug_url(self):
- return 'proposals' if self.is_development else 'ideas'
+ return 'apps' if self.is_development else 'ideas'
@receiver(signals.post_save, sender=Phase)
@@ -398,7 +398,7 @@ def is_proposal(self):
def phase_slug(self):
if self.is_idea:
return 'ideas'
- return 'proposals'
+ return 'apps'
def get_absolute_url(self):
"""Return this submission's URL."""
View
30 apps/challenges/tests/test_integration_ignite.py
@@ -23,7 +23,7 @@ class SubmissionBaseTest(TestCase):
def setUp(self):
self.profile = create_user('bob')
self.ideation_url = reverse('create_entry', args=['ideas'])
- self.development_url = reverse('create_entry', args=['proposals'])
+ self.development_url = reverse('create_entry', args=['apps'])
def _get_valid_data(self, **kwargs):
defaults = {
@@ -150,7 +150,7 @@ def test_ideation_show_get(self):
ok_(item in context)
def test_invalid_url_development_show_get(self):
- url = reverse('entry_show', args=['proposals',
+ url = reverse('entry_show', args=['apps',
self.submission.parent.slug])
response = self.client.get(url)
eq_(response.status_code, 404)
@@ -216,7 +216,7 @@ def test_ideation_edit_post(self):
eq_(item.tags, 'success')
def test_invalid_development_url(self):
- url = reverse('entry_edit', args=['proposals', self.submission.parent.slug])
+ url = reverse('entry_edit', args=['apps', self.submission.parent.slug])
response = self.client.get(url)
eq_(response.status_code, 403)
@@ -297,7 +297,7 @@ def test_ideation_show_get(self):
ok_(item in context)
def test_invalid_url_development_show_get(self):
- url = reverse('entry_show', args=['proposals',
+ url = reverse('entry_show', args=['apps',
self.submission.parent.slug])
response = self.client.get(url)
eq_(response.status_code, 404)
@@ -362,7 +362,7 @@ def test_ideation_save_edit_failed(self):
def test_invalid_development_url(self):
url = reverse('entry_edit',
- args=['proposals', self.submission.parent.slug])
+ args=['apps', self.submission.parent.slug])
response = self.client.get(url)
eq_(response.status_code, 403)
@@ -415,7 +415,7 @@ def test_development_phase_valid_submission(self):
data possible"""
self.valid_data.update(BLANK_EXTERNALS)
response = self.client.post(self.development_url, self.valid_data)
- self.assertRedirects(response, reverse('entries_all', args=['proposals']))
+ self.assertRedirects(response, reverse('entries_all', args=['apps']))
submission = Submission.objects.get()
eq_(submission.phase, self.initial_data['dev_phase'])
eq_(submission.phase_round, self.initial_data['round_a'])
@@ -424,7 +424,7 @@ def test_development_phase_valid_submission(self):
def test_development_phase_valid_submission_inline_links(self):
self.valid_data.update(EXTERNALS)
response = self.client.post(self.development_url, self.valid_data)
- self.assertRedirects(response, reverse('entries_all', args=['proposals']))
+ self.assertRedirects(response, reverse('entries_all', args=['apps']))
submission = Submission.objects.get()
link = ExternalLink.objects.get()
eq_(link.name, 'Mozilla')
@@ -450,7 +450,7 @@ def setUp(self):
phase=initial_data['dev_phase'],
phase_round=initial_data['round_b'])
self.edit_url = reverse('entry_edit',
- args=['proposals', self.submission.parent.slug])
+ args=['apps', self.submission.parent.slug])
def test_development_edit_get(self):
response = self.client.get(self.edit_url)
@@ -461,7 +461,7 @@ def test_development_edit_post(self):
self.assertRedirectsLogin(response)
def test_development_show_get(self):
- url = reverse('entry_show', args=['proposals',
+ url = reverse('entry_show', args=['apps',
self.submission.parent.slug])
response = self.client.get(url)
eq_(response.status_code, 200)
@@ -492,7 +492,7 @@ def setUp(self):
phase=initial_data['dev_phase'],
phase_round=initial_data['round_b'])
self.edit_url = reverse('entry_edit',
- args=['proposals', submission.parent.slug])
+ args=['apps', submission.parent.slug])
self.client.login(username='bob', password='bob')
def tearDown(self):
@@ -529,7 +529,7 @@ def setUp(self):
self.client.login(username='bob', password='bob')
def _get_edit_url(self, slug):
- return reverse('entry_edit', args=['proposals', slug])
+ return reverse('entry_edit', args=['apps', slug])
def tearDown(self):
super(SubmissionEditDevelopmentOpenTest, self).tearDown()
@@ -643,7 +643,7 @@ def setUp(self):
phase=initial_data['dev_phase'],
phase_round=initial_data['round_a'])
self.edit_url = reverse('entry_edit',
- args=['proposals', self.submission.parent.slug])
+ args=['apps', self.submission.parent.slug])
def test_development_edit_get(self):
response = self.client.get(self.edit_url)
@@ -654,7 +654,7 @@ def test_development_edit_post(self):
self.assertRedirectsLogin(response)
def test_development_show_get(self):
- url = reverse('entry_show', args=['proposals',
+ url = reverse('entry_show', args=['apps',
self.submission.parent.slug])
response = self.client.get(url)
eq_(response.status_code, 200)
@@ -687,7 +687,7 @@ def setUp(self):
phase=initial_data['dev_phase'],
phase_round=initial_data['round_a'])
self.edit_url = reverse('entry_edit',
- args=['proposals', submission.parent.slug])
+ args=['apps', submission.parent.slug])
self.client.login(username='bob', password='bob')
def tearDown(self):
@@ -716,7 +716,7 @@ def setUp(self):
phase=initial_data['dev_phase'],
phase_round=initial_data['round_a'])
self.edit_url = reverse('entry_edit',
- args=['proposals', self.submission.parent.slug])
+ args=['apps', self.submission.parent.slug])
self.client.login(username='bob', password='bob')
def tearDown(self):
View
4 apps/challenges/views.py
@@ -33,11 +33,11 @@
def get_phase_or_404(slug):
"""Returns the appropriate ``Phase`` to the given slug
- ``ideas`` or ``proposals`` or raise ``Http404``"""
+ ``ideas`` or ``apps`` or raise ``Http404``"""
phase = None
if slug == 'ideas':
phase = Phase.objects.get_ideation_phase()
- if slug == 'proposals':
+ if slug == 'apps':
phase = Phase.objects.get_development_phase()
if phase:
return phase
View
8 apps/ignite/templates/ignite/about.html
@@ -33,7 +33,7 @@ <h3 class="point box-title">Now to August 23rd: Brainstorm, connect and collabor
<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='proposals') }}">Submit your idea now</a>
+ <a class="cta" href="{{ url('create_entry', phase='apps') }}">Submit your idea now</a>
{% endif %}
</div>
</div>
@@ -104,7 +104,7 @@ <h3 class="point box-title">Get Involved</h3>
<li><strong><a href="{{ url('create_entry', phase='ideas') }}">Submit your ideas</a>.</strong> What’s your gigabit dream app?</li>
{% endif %}
{% if request.development.is_open %}
- <li><strong><a href="{{ url('create_entry', phase='proposals') }}">Submit your ideas</a>.</strong> What’s your gigabit dream app?</li>
+ <li><strong><a href="{{ url('create_entry', phase='apps') }}">Submit your ideas</a>.</strong> What’s your gigabit dream app?</li>
{% endif %}
<li><strong><a href="{{ url('entries_all', phase='ideas') }}">Check out</a></strong> ideas that have been submitted, ask questions and join the conversation.</li>
<li><strong>Attend</strong> an upcoming event, from instructional webcasts to in-person hackfests.</li>
@@ -204,7 +204,7 @@ <h3 class="wimper">Get support</h3>
<div class="box col">
<h3 class="wimper">How to apply</h3>
{% if request.development.is_open %}
- <p>To enter, assemble your team and fill out the <a href="{{ url('create_entry', phase='proposals') }}">online application form</a>.</p>
+ <p>To enter, assemble your team and fill out the <a href="{{ url('create_entry', phase='apps') }}">online application form</a>.</p>
{% else %}
<p><strong>Development applications open August 1</strong>. To enter, assemble your team and fill out the online application form.</p>
{% endif %}
@@ -290,7 +290,7 @@ <h3 class="box-title point">Got an app idea that doesn’t fit these categories?
<a href="{{ url('create_entry', phase='ideas') }}" class="cta">Submit your idea now</a>
{% endif %}
{% if request.development.is_open %}
- <a href="{{ url('create_entry', phase='proposals') }}" class="cta">Submit your idea now</a>
+ <a href="{{ url('create_entry', phase='apps') }}" class="cta">Submit your idea now</a>
{% endif %}
</footer>
{% endif %}
View
10 apps/ignite/templates/ignite/splash.html
@@ -25,7 +25,7 @@ <h2 class="busta">
Ideation is being judged and closed for new submissions; but the development phase will open in {{ request.development.days_until }} days
{% endif %}
{% if development.is_open %}
- <a href="{{ url('create_entry', phase='proposals') }}" class="cta">create a proposal</a><br /> or <a href="{{ url('about_ignite') }}">learn more</a>
+ <a href="{{ url('create_entry', phase='apps') }}" class="cta">create an application</a><br /> or <a href="{{ url('about_ignite') }}">learn more</a>
{% endif %}
</div>
</div>
@@ -37,7 +37,7 @@ <h2 class="busta">
<h3 class="exclaim">Compete</h3>
<p class="intro">Win funding and support to make your app a reality. <strong>$500,000 in prizes</strong> available over three rounds.</p>
{% if request.development.is_open %}
- <a class="col-foot" href="{{ url('create_entry', phase='proposals') }}">Submit your proposal</a>
+ <a class="col-foot" href="{{ url('create_entry', phase='apps') }}">Submit your application</a>
{% else %}
<a class="col-foot" href="{{ url('about_ignite')}}">Applications open August 1</a>
{% endif %}
@@ -72,7 +72,7 @@ <h2 class="point">Design and build apps that revolutionize focus areas like thes
{% for cat in categories %}
<li class="box col {{ cat.slug }}">
{% if request.development.is_open %}
- <a href="{{ url('entries_for_category', category=cat.slug, phase='proposals') }}"><strong>{{ cat.name }}</strong></a>
+ <a href="{{ url('entries_for_category', category=cat.slug, phase='apps') }}"><strong>{{ cat.name }}</strong></a>
{% endif %}
{% if request.ideation.is_open %}
<a href="{{ url('entries_for_category', category=cat.slug, phase='ideas') }}"><strong>{{ cat.name }}</strong></a>
@@ -108,7 +108,7 @@ <h2 class="point box-title">What's your big idea?</h2>
{% endif %}
{% if request.development.is_open %}
<h2 class="point box-title">What's your app?</h2>
- <a class="cta" href="{{ url('create_entry', phase='proposals') }}">Get started</a>
+ <a class="cta" href="{{ url('create_entry', phase='apps') }}">Get started</a>
{% endif %}
</div>
</div>
@@ -139,7 +139,7 @@ <h3 class="title wimper">
<p class="intro">Discover great ideas <a href="{{ url('entries_all', phase='ideas') }}" class="cta do">See all submissions</a></p>
{% endif %}
{% if development.is_open %}
- <p class="intro">Discover other applications <a href="{{ url('entries_all', phase='proposals') }}" class="cta do">See all proposals</a></p>
+ <p class="intro">Discover other applications <a href="{{ url('entries_all', phase='apps') }}" class="cta do">See all applications</a></p>
{% endif %}
</footer>
{% if waffle.switch('show_blog') and waffle.switch('show_events') %}
View
4 apps/ignite/views.py
@@ -22,7 +22,7 @@ def splash(request, project, slug, template_name='ignite/splash.html'):
.filter(phase__name="Development")
.order_by("?"))
num_entries = len(entries)
- entries_from = 'proposals'
+ entries_from = 'apps'
if num_entries < 5:
entries = (Submission.objects.visible()
.filter(phase__challenge=challenge)
@@ -71,7 +71,7 @@ def terms(request, project, slug, template_name='static/terms_conditions.html'):
def fail(request, template_name='404.html'):
return jingo.render(request, template_name, {}, status=404)
-
+
def app_fail(request, template_name='500.html'):
return jingo.render(request, template_name, {}, status=500)
View
6 settings_test.py
@@ -19,6 +19,12 @@
}
}
+# Create the these directories off media and set to 755 so the app can access them
+USER_AVATAR_PATH = 'img/uploads/avatars/'
+TOPIC_IMAGE_PATH = 'img/uploads/topics/'
+PROJECT_IMAGE_PATH = 'img/uploads/projects/'
+EVENT_IMAGE_PATH = 'img/uploads/events/'
+CHALLENGE_IMAGE_PATH = 'img/uploads/challenges/'
HMAC_KEYS = {
'2011-01-01': 'cheesecake',
View
2  templates_ignite/base.html
@@ -34,7 +34,7 @@
<ul>
<li><a href="{{ url('about_ignite') }}">{{ _('About the challenge') }}</a></li>
<li><a href="{{ url('entries_all', phase='ideas') }}">{{ _('Ideas') }}</a></li>
- {% if development.has_started %}<li><a href="{{ url('entries_all', phase='proposals') }}">{{ _('Proposals') }}</a></li>{% endif %}
+ {% if development.has_started %}<li><a href="{{ url('entries_all', phase='apps') }}">{{ _('Applications') }}</a></li>{% endif %}
{% if waffle.switch('show_judges') %}
<li><a href="{{ url('our_judges') }}">{{ _('Judges') }}</a></li>
{% endif %}
View
14 templates_ignite/challenges/all.html
@@ -16,7 +16,7 @@ <h1 class="shout">
Ideas
{% endif %}
{% if phase.is_development %}
- Proposals
+ Applications
{% endif %}
{% endblock %}
</h1>
@@ -40,7 +40,7 @@ <h1 class="shout">
<li><a{% if not category %} class="current"{% endif %} href="{{ url('entries_all', phase='ideas') }}">All ideas</a></li>
{% endif %}
{% if phase.is_development %}
- <li><a{% if not category %} class="current"{% endif %} href="{{ url('entries_all', phase='proposals') }}">All proposals</a></li>
+ <li><a{% if not category %} class="current"{% endif %} href="{{ url('entries_all', phase='apps') }}">All applications</a></li>
{% endif %}
{% if categories %}
{% for cat in categories %}
@@ -57,7 +57,7 @@ <h2 class="{{category.slug }}">{{ category.name }}</h2>
<h2 class="all">All ideas</h2>
{% endif %}
{% if phase.is_development %}
-<h2 class="all">All proposals</h2>
+<h2 class="all">All applications</h2>
{% endif %}
{% endif %}
@@ -120,7 +120,7 @@ <h3 class="title wimper">
</p>
{% endif %}
{% if phase.is_development %}
- <p class="point">We currently don't have any proposals for {{ category.name }} {% if phase.is_open %}- be the first to <a class="cta" href="{{ url('create_entry', phase='proposals') }}">create a proposal</a></p>{% endif %}
+ <p class="point">We currently don't have any applications for {{ category.name }} {% if phase.is_open %}- be the first to <a class="cta" href="{{ url('create_entry', phase='apps') }}">create an application</a></p>{% endif %}
{% endif %}
@@ -130,7 +130,7 @@ <h3 class="title wimper">
<p class="point">We currently don't have any ideas submitted for any of the focus areas - pick your favourite and be the first to <a class="cta" href="{{ url('create_entry', phase=phase.slug_url) }}">create an idea</a></p>
{% endif %}
{% if phase.is_development %}
-<p class="point">We currently don't have any proposal submitted for any of the focus areas - pick your favourite and be the first to <a class="cta" href="{{ url('create_entry', phase=phase.slug_url) }}">create a proposal</a></p>
+<p class="point">We currently don't have any applications submitted for any of the focus areas - pick your favourite and be the first to <a class="cta" href="{{ url('create_entry', phase=phase.slug_url) }}">create an application</a></p>
{% endif %}
{% endif %}
{% endif %}
@@ -138,9 +138,9 @@ <h3 class="title wimper">
</div>
{% if phase.is_ideation and request.development.is_open %}
{% if category %}
- <p class="wimper">See what has been submitted for development - <a href="{{ url('entries_for_category', category=category.slug, phase='proposals') }}">all development proposals in {{ category.name }}</a></p>
+ <p class="wimper">See what has been submitted for development - <a href="{{ url('entries_for_category', category=category.slug, phase='apps') }}">all development applications in {{ category.name }}</a></p>
{% else %}
- <p class="wimper">See what has been submitted for development - <a href="{{ url('entries_all', phase='proposals') }}">all development proposals</a></p>
+ <p class="wimper">See what has been submitted for development - <a href="{{ url('entries_all', phase='apps') }}">all development applications</a></p>
{% endif %}
{% endif %}
{% if phase.is_development %}
View
2  templates_ignite/challenges/create.html
@@ -25,7 +25,7 @@ <h1 class="shout">{{ _('Submit an idea') }}</h1>
{% endif %}
{% if phase.is_development %}
-<h1 class="shout">{{ _('Submit a proposal') }}</h1>
+<h1 class="shout">{{ _('Submit an application') }}</h1>
{% endif %}
<p class="page-intro">{{ _("Congratulations! You've taken the first step towards making the world, and the internet, a better place. Fill out the form below to get started in the Mozilla Ignite Challenge.") }}</p>
{% endblock %}
View
4 templates_ignite/challenges/show_entry.html
@@ -94,7 +94,7 @@ <h2 class="wimper">See also</h2>
{% endif %}
{% if help_required %}
<div class="description">
- <h2>Would you be interested in helping with this proposal?</h2>
+ <h2>Would you be interested in helping with this application?</h2>
<p>{{ help_required.notes }}</p>
</div>
{% endif %}
@@ -221,7 +221,7 @@ <h2 class="point box-title">How would you push the web further?</h2>
{% if request.development.is_open %}
<div class="highlight">
<h2 class="point box-title">How would you push the web further?</h2>
- <a class="cta" href="{{ url('create_entry', phase='proposals') }}">Submit a proposal</a>
+ <a class="cta" href="{{ url('create_entry', phase='apps') }}">Submit an application</a>
</div>
{% endif %}
</aside>
View
20 templates_ignite/users/profile.html
@@ -60,26 +60,26 @@ <h3 class="box-title wimper">Upcoming webcasts</h3>
{% endif %}
{% if development_submissions %}
- <h2 class="wimper">{{ _('Proposals') }}</h2>
+ <h2 class="wimper">{{ _('Applications') }}</h2>
<ul class="columns submissions">
- {% for proposal in development_submissions %}
+ {% for app in development_submissions %}
<li class="col box">
<article>
- <a class="title" href="{{ proposal.get_absolute_url() }}">
+ <a class="title" href="{{ app.get_absolute_url() }}">
<h3 class="title wimper">
<div class="frame box">
- <img src="{{ proposal.get_image_src() }}" alt="" />
+ <img src="{{ app.get_image_src() }}" alt="" />
</div>
- {{ proposal.title }}
+ {{ app.title }}
</h3>
</a>
</article>
- {% if proposal.editable_by(user) %}
- {% if proposal.is_draft %}
+ {% if app.editable_by(user) %}
+ {% if app.is_draft %}
<div class="alerts inline">
- <p><strong>Proposal in draft</strong></p>
+ <p><strong>Application in draft</strong></p>
<p>Only you can see this until you uncheck the "Save as draft?" option.</p>
- <a href="{{ proposal.get_edit_url() }}" class="cta do">Edit your proposal</a>
+ <a href="{{ app.get_edit_url() }}" class="cta do">Edit your application</a>
</div>
{% endif %}
{% endif %}
@@ -119,7 +119,7 @@ <h3 class="title wimper">
<a href="{{ url('create_entry', phase='ideas') }}" class="cta">{{ _('Create an idea') }}</a>
{% endif %}
{% if development.is_open %}
- <a href="{{ url('create_entry', phase='proposals') }}" class="cta">{{ _('Create a proposal') }}</a>
+ <a href="{{ url('create_entry', phase='apps') }}" class="cta">{{ _('Create an application') }}</a>
{% endif %}
View
2  urls_ignite.py
@@ -36,7 +36,7 @@
)
-pattern = '(?P<phase>(ideas|proposals))'
+pattern = '(?P<phase>(ideas|apps))'
urlpatterns += patterns(
'challenges.views',

0 comments on commit 9155a16

Please sign in to comment.
Something went wrong with that request. Please try again.