Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

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