Fix Bug 904632: Change HP copy for voting end.

Added additional copy for winners announce state. Updated text Added last tweak from gregory. Fixed indents so mkelly does not murder me. PR Fix: Create macro for HP CTAs
mozilla · Aug 23, 2013 · dea4124 · dea4124
1 parent cc2a492
commit dea4124
Show file tree

Hide file tree

Showing 2 changed files with 133 additions and 42 deletions.
diff --git a/flicks/base/templates/home.html b/flicks/base/templates/home.html
@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 
+{% import 'home_cta.html' as cta with context %}
 {% import 'judge_macros.html' as judge_bio %}
 
 {% from 'macros.html' import facebookShare, twitterShare with context %}
@@ -18,7 +19,6 @@
 
 
 {% block content %}
-
   <section id="intro" class="section alt">
     <div class="wrap">
       <h1 class="section-title">{{ _('You&#8217;re the director. Mobile is the star.') }}</h1>
@@ -48,40 +48,25 @@ <h1 class="section-title">{{ _('You&#8217;re the director. Mobile is the star.')
       <div class="actions">
         <ul>
           {% if waffle.flag('video-submit') %}
-            <li>
-              <h3>{{ _('Meet your competition') }}</h3>
-              <p><a href="{{ url('flicks.videos.list') }}" class="go">{{ _('View the gallery of entries') }}</a></p>
-            </li>
-            <li>
-              <h3>{{ _('Start thinking about your flick') }}</h3>
-              <p><a href="{{ settings.LINK_BRIEF[request.locale] }}" class="go ga_brief-dl" rel="external">{{ _('Read the creative brief') }}</a></p>
-            </li>
-            <li class="submit-link">
-              <h3>{{ _('Submit your flick today') }}</h3>
-              <div>
-                <a href="{{ url('flicks.videos.upload') }}" class="requires-auth">
-                  {{ _('Start here') }}
-                </a>
-              </div>
-            </li>
-          {% endif %}
-
-         {% if waffle.flag('voting') %}
-            <li>
-              <h3>{{ _('See Early Entry Award winners') }}</h3>
-              <p><a href="{{ url('flicks.videos.winners') }}" class="go">{{ _('View the winning flicks so far') }}</a></p>
-            </li>
-            <li>
-              <h3>{{ _('Vote for the People\'s Choice Award') }}</h3>
-              <p><a href="{{ url('flicks.videos.list') }}" class="go">{{ _('Choose your favorites here') }}</a></p>
-            </li>
-            <li>
-              <h3>{{ _('Explore 2013 Flicks') }}</h3>
-              <p><a href="{{ url('flicks.videos.list') }}" class="go">{{ _('View the gallery of entries') }}</a></p>
-            </li>
+            {{ cta.meet_your_competition() }}
+            {{ cta.think_about_flick() }}
+            {{ cta.submit_your_flick() }}
+          {% elif waffle.flag('voting') %}
+            {{ cta.see_early_award_winners() }}
+            {{ cta.vote_for_peoples_choice() }}
+            {{ cta.explore_2013_flicks() }}
+          {% elif waffle.flag('voting-end') %}
+            {{ cta.explore_2013_flicks() }}
+            {{ cta.see_early_award_winners() }}
+            {{ cta.meet_our_partners() }}
+          {% elif waffle.flag('winners-announce') %}
+            {{ cta.explore_2013_flicks() }}
+            {{ cta.see_2013_winners() }}
+            {{ cta.meet_our_partners() }}
           {% endif %}
         </ul>
       </div>
+
     </div>
   </section>
 
@@ -221,11 +206,19 @@ <h4 class="title">Valeriy Cherevatenko, <cite>Priority</cite></h4>
       <h1 class="section-title">{{ _('Meet the judges') }}</h1>
       <div class="section-intro">
         <p>
-        {% trans %}
-          Get to know our illustrious panel of celebrity judges &ndash; led by actor,
-          director, producer and activist Edward Norton &ndash; who will see your flick
-          and help us choose this year's winner.
-        {% endtrans %}
+        {% if waffle.flag('winners-announce') %}
+          {% trans %}
+            Get to know our illustrious panel of celebrity judges &ndash; led by
+            actor, director, producer and activist Edward Norton &ndash; who
+            helped us choose this year's winners.
+          {% endtrans %}
+        {% else %}
+          {% trans %}
+            Get to know our illustrious panel of celebrity judges &ndash; led by
+            actor, director, producer and activist Edward Norton &ndash; who
+            will see your flick and help us choose this year's winner.
+          {% endtrans %}
+        {% endif %}
         </p>
 
         <p>
@@ -485,10 +478,12 @@ <h1 class="section-title">{{ _('Prizes') }}</h1>
 
       <section class="prizes">
         <p>
-        {% trans %}
-          Here's a more detailed look at what you can win, but check back for prize
-          updates throughout the contest.
-        {% endtrans %}
+        {% if not waffle.flag('winners-announce') %}
+          {% trans %}
+            Here's a more detailed look at what you can win, but check back for prize
+            updates throughout the contest.
+          {% endtrans %}
+        {% endif %}
         </p>
         <div class="prize grand">
           <h2>{{ _('Grand Prize') }}</h2>
@@ -605,14 +600,23 @@ <h2>{{ _('How to enter') }}</h2>
             <a href="{{ submit_url }}" class="requires-auth">start here to submit your flick.</a>
           {% endtrans %}
           </p>
-        {% else %}
+        {% endif %}
+
+        {% if waffle.flag('voting') %}
           <h2>
           {% trans %}
             The contest is now closed. The winners will be announced on
             September 12 at the Toronto International Film Festival.
           {% endtrans %}
           </h2>
         {% endif %}
+
+        {% if waffle.flag('voting-end') or waffle.flag('winners-announce') %}
+          <h2>
+            {{ _('The contest is now closed.') }}
+          </h2>
+        {% endif %}
+
       </section>
 
     </div>

diff --git a/flicks/base/templates/home_cta.html b/flicks/base/templates/home_cta.html
@@ -0,0 +1,87 @@
+{% macro meet_your_competition() -%}
+  <li>
+    <h3>{{ _('Meet your competition') }}</h3>
+    <p>
+      <a href="{{ url('flicks.videos.list') }}" class="go">
+        {{ _('View the gallery of entries') }}
+      </a>
+    </p>
+  </li>
+{%- endmacro %}
+
+{% macro think_about_flick() -%}
+  <li>
+    <h3>{{ _('Start thinking about your flick') }}</h3>
+    <p>
+      <a href="{{ settings.LINK_BRIEF[request.locale] }}" class="go ga_brief-dl">
+        {{ _('Read the creative brief') }}
+      </a>
+    </p>
+  </li>
+{%- endmacro %}
+
+{% macro submit_your_flick() -%}
+  <li class="submit-link">
+    <h3>{{ _('Submit your flick today') }}</h3>
+    <p>
+      <a href="{{ url('flicks.videos.upload') }}" class="go requires-auth">
+        {{ _('Start here') }}
+      </a>
+    </p>
+  </li>
+{%- endmacro %}
+
+{% macro see_early_award_winners() -%}
+  <li>
+    <h3>{{ _('See Early Entry Award winners') }}</h3>
+    <p>
+      <a href="{{ url('flicks.videos.winners') }}" class="go">
+        {{ _('View the winning flicks so far') }}
+      </a>
+    </p>
+  </li>
+{%- endmacro %}
+
+{% macro vote_for_peoples_choice() -%}
+  <li>
+    <h3>{{ _('Vote for the People\'s Choice Award') }}</h3>
+    <p>
+      <a href="{{ url('flicks.videos.list') }}" class="go">
+        {{ _('Choose your favorites here') }}
+      </a>
+    </p>
+  </li>
+{%- endmacro %}
+
+{% macro explore_2013_flicks() -%}
+  <li>
+    <h3>{{ _('Explore 2013 Flicks') }}</h3>
+    <p>
+      <a href="{{ url('flicks.videos.list') }}" class="go">
+        {{ _('View the gallery of entries') }}
+      </a>
+    </p>
+  </li>
+{%- endmacro %}
+
+{% macro meet_our_partners() -%}
+  <li>
+    <h3>{{ _('Meet our partners') }}</h3>
+    <p>
+      <a href="{{ url('flicks.base.partners') }}" class="go">
+        {{ _('Get to know our friends who made Flicks 2013 possible') }}
+      </a>
+    </p>
+  </li>
+{%- endmacro %}
+
+{% macro see_2013_winners() -%}
+  <li>
+    <h3>{{ _('See Firefox Flicks 2013 winners') }}</h3>
+    <p>
+      <a href="{{ url('flicks.videos.winners') }}" class="go">
+        {{ _('Watch the winning entries') }}
+      </a>
+    </p>
+  </li>
+{%- endmacro %}