Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'develop' of github.com:mozilla/firefox-flicks into develop

  • Loading branch information...
commit db455d93ffcf23933a9131139ad75ba537420a34 2 parents e1a54cc + 7658723
Craig Cook authored May 15, 2012
3  flicks/base/templates/shared/header.html
... ...
@@ -1,6 +1,7 @@
1 1
 <div id="header">
2 2
   <div class="header-wrapper">
3  
-    <a href="{{ url('flicks.videos.recent') }}"
  3
+    <a href="{{ url('flicks.videos.winners') if waffle.flag('winners_page')
  4
+             else url('flicks.videos.recent') }}"
4 5
        title="{{ _('Firefox Flicks') }}" class="logo">{{ _('Firefox Flicks') }}</a>
5 6
     <ul>
6 7
       {% if waffle.flag('winners_page') %}
4  flicks/base/templates/shared/macros.html
... ...
@@ -1,7 +1,7 @@
1 1
 {% macro video_item(idx, video) -%}
2 2
   <li id="slide-{{ idx }}">
3 3
     <a href="{{ video.details_href }}" class="title" title="{{ video.title }}">
4  
-      {% if video.is_winner %}
  4
+      {% if waffle.flag('winners_page') and video.is_winner %}
5 5
         <img class="winner-mark" src="{{ MEDIA_URL }}img/winner-trophy-sm.png" alt="{{ _('Award') }}">
6 6
       {% endif %}
7 7
       <img src="{{ video.poster_href }}" height="141">
@@ -17,7 +17,7 @@
17 17
 {% macro video_details(video) -%}
18 18
   <a href="{{ url('flicks.users.details', user_id=video.user_id) }}"
19 19
      class="user">{{ video.user.userprofile.full_name }}, {{ video.user.userprofile.country }}</a>
20  
-  {% if video.is_winner %}
  20
+  {% if waffle.flag('winners_page') and video.is_winner %}
21 21
     {% for award in video.award_set.all() %}
22 22
       <div class="winner-details">
23 23
         {{ award.award_title }}
4  flicks/videos/templates/videos/details.html
... ...
@@ -1,5 +1,5 @@
1 1
 {% extends 'base.html' %}
2  
-{% from 'shared/macros.html' import share_container, video_details %}
  2
+{% from 'shared/macros.html' import share_container, video_details with context %}
3 3
 
4 4
 {% block page_title %}{{ video.title }}{% endblock %}
5 5
 
@@ -28,7 +28,7 @@
28 28
     <div class="video-content">
29 29
       <div class="video-wrapper">
30 30
         {{ video.embed_html }}
31  
-        {% if video.is_winner %}
  31
+        {% if waffle.flag('winners_page') and video.is_winner %}
32 32
           <img class="winner-mark" src="{{ MEDIA_URL }}img/winner-trophy-sm.png" alt="{{ _('Award') }}">
33 33
         {% endif %}
34 34
       </div>
2  flicks/videos/templates/videos/recent_contest_over.html
... ...
@@ -1,5 +1,5 @@
1 1
 {% extends 'base.html' %}
2  
-{% from 'shared/macros.html' import paginate, display_search_form, search_results, video_item %}
  2
+{% from 'shared/macros.html' import paginate, display_search_form, search_results, video_item  with context %}
3 3
 
4 4
 {% if search %}
5 5
   {% set title=_('Video Search Results') %}

0 notes on commit db455d9

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