From bbde918161fbd61bfc742005cbee64939037b317 Mon Sep 17 00:00:00 2001
From: Craig Cook W5MRpJ#NS#V0Kq4ve_}PY0Ta#5OdrAC^^)e@u7CW;WoH3u
z|M=CY?##RZbjEkFpyi})0mNrP?WQh!5XBU#8d+m;h`r-%xNcIpEHR8sB>QT!JC91W
z`Yb%axSuMZ*OceyMpXP=t9Pi-2(5~tV0GQLZ7$FDmZ+f{HP%+F3l0FL8PXU!MFg^9
zPzbuV=an0%4ovQWH!=I?EW+HBvI*bvf|vauTw>S
zd8xT)!7=lKrCi9?!=6d-3J3
vo{Ysane29Q~_)VY%n#`SKFP=EL!84;Eg
zG)#OdC4M)8C#_dVg2Oq}%$>gX_3J|DKDWddWm-ni5=kgRbN*3g>_M@()FhUynHs83
zSe#y#T7J1h+IqXBmRJUS+9*F+W>5pxC4%1|oFjs&UT>lzOQjl~t1D%gof79Y1M589
z`@Nvr&$~8fXCU^#f!%R6*Rf!fhDPj>8*KB|kH3cPdnkTkj}$qm&{H-OG+i?qXv;da
z%tcJAyz>s_aR!rPu!nyF)w_VTs6w4D_Yp-Z(tvkjMiF#*-;Y#l97W8Xm3^qSD|K(!
z{S2fFa3lLM#QmLj%ZxDa_*PPI+cM-=R71+ly6_mCODl6^jbOT%RwiLWepOTNe1pHd
z29Jn0y2{_;yDxtJwq%D<_#>72B_uLUp}r%JM1AZ7Q!jp(nNg}^Y2O_`d;Z?;_nF&N
zy{{ _('What is Firefox Flicks?') }}
- {% trans link_brief=link_brief %} + {% trans link_brief=settings.LINK_BRIEF[request.locale] %} With that in mind, the 2013 Firefox Flicks theme is "Get Mobilized." That's where you come in: help us inspire people to get mobilized for individual and collective progress. Read the creative brief. @@ -46,7 +46,7 @@
- {% trans link_brief=link_brief %} + {% trans link_brief=settings.LINK_BRIEF[request.locale] %} Everything you need to know about creating a flick for the contest can be found in the filmmakers' creative brief. {% endtrans %} @@ -73,7 +73,7 @@
- {% trans link_submit='TBD' %} + {% trans link_submit=url('flicks.base.home')+'#submit' %} Fill out your filmmaker profile and submit your video here. All flicks will be posted to the Firefox Flicks website using the Vimeo API. You'll need to provide your contact information, including your email, title your flick and select @@ -122,7 +122,7 @@
{% trans link_ccommons='http://search.creativecommons.org', - link_pdwiki=link_pdwiki %} + link_pdwiki=settings.LINK_PDWIKI[request.locale] %} If you're looking for additional materials - whether music, video footage, artwork or graphics - we suggest you investigate public domain media. Creative Commons has a nice search diff --git a/flicks/base/templates/home.html b/flicks/base/templates/home.html index 1accc94..b61edee 100644 --- a/flicks/base/templates/home.html +++ b/flicks/base/templates/home.html @@ -40,8 +40,8 @@
{{ _('Get the creative brief') }}
+{{ _('Get the creative brief') }}
@@ -71,7 +71,7 @@{{ _('Meet our all-star cast') }}
+- {% trans rules_link=url('flicks.base.rules') %} + {% trans %} Nice work! You made it all the way to the end. When you're ready, start here to submit your flick. {% endtrans %} diff --git a/flicks/base/views.py b/flicks/base/views.py index 3a5dce3..fe60f4e 100644 --- a/flicks/base/views.py +++ b/flicks/base/views.py @@ -3,76 +3,14 @@ from jinja2 import TemplateNotFound -LINK_PDWIKI = { - 'en-US': 'https://en.wikipedia.org/wiki/Public_domain', - 'de': 'https://de.wikipedia.org/wiki/Gemeinfreiheit', - 'fr': 'https://fr.wikipedia.org/wiki/Domaine_public_%28propri%C3%A9t%C3%A9_intellectuelle%29', - 'es': 'https://es.wikipedia.org/wiki/Dominio_p%C3%BAblico', - 'nl': 'https://nl.wikipedia.org/wiki/Publiek_domein', - 'pl': 'https://pl.wikipedia.org/wiki/Domena_publiczna', - 'pt-BR': 'https://pt.wikipedia.org/wiki/Dom%C3%ADnio_p%C3%BAblico', - 'sl': 'https://sl.wikipedia.org/wiki/Javna_last', - 'sq': 'https://sq.wikipedia.org/wiki/Domen_publik', - 'zh-CN': 'https://zh.wikipedia.org/wiki/%E5%85%AC%E6%9C%89%E9%A2%86%E5%9F%9F', - 'zh-TW': 'https://zh.wikipedia.org/wiki/%E5%85%AC%E6%9C%89%E9%A2%86%E5%9F%9F', - 'it': 'https://it.wikipedia.org/wiki/Pubblico_dominio', - 'lij': 'https://it.wikipedia.org/wiki/Pubblico_dominio', - 'ja': 'https://ja.wikipedia.org/wiki/%E3%83%91%E3%83%96%E3%83%AA%E3%83%83%E3%82%AF%E3%83%89%E3%83%A1%E3%82%A4%E3%83%B3', -} - -LINK_BRIEF = { - 'en-US': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_en-US.pdf', - 'de': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_de.pdf', - 'es': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_es-ES.pdf', - 'nl': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_nl.pdf', - 'pl': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_pl.pdf', - 'sl': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_sl.pdf', - 'fr': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_fr.pdf', - 'zh-TW': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_zh-TW.pdf', - 'pt-BR': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_pt-BR.pdf', - 'it': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_it.pdf', - 'lij': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_lij.pdf', - 'ja': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_ja.pdf', -} - -LINK_CCLICENSE = { - 'en-US': 'http://creativecommons.org/licenses/by-nc-sa/2.5/', - 'de': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.de', - 'fr': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.fr', - 'es': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.es', - 'nl': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.nl', - 'pl': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.pl', - 'pt-BR': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.pt_BR', - 'sl': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.sl', - 'sq': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.sq', - 'zh-CN': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.zh_CN', - 'zh-TW': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.zh_TW', -} - -VIDEO_IC = { - 'en-US': '59415650', - 'de': '59416761', - 'es': '59418049', - 'fr': '59419952', - 'pt-BR': '59421007', -} - - def home(request): """Home page.""" - return render(request, 'home.html', { - 'link_brief': LINK_BRIEF.get(request.locale, LINK_BRIEF['en-US']), - 'video_ic': VIDEO_IC.get(request.locale, VIDEO_IC['en-US']), - }) + return render(request, 'home.html') def faq(request): """FAQ page.""" - return render(request, 'faq.html', { - 'link_pdwiki': LINK_PDWIKI.get(request.locale, LINK_PDWIKI['en-US']), - 'link_brief': LINK_BRIEF.get(request.locale, LINK_BRIEF['en-US']), - 'link_cclicense': LINK_CCLICENSE.get(request.locale, LINK_CCLICENSE['en-US']) - }) + return render(request, 'faq.html') def rules(request): diff --git a/flicks/settings/base.py b/flicks/settings/base.py index e19c3d2..f21d594 100644 --- a/flicks/settings/base.py +++ b/flicks/settings/base.py @@ -5,6 +5,8 @@ from flicks.base import regions from flicks.base.util import reverse_lazy +# Import locale-sensitive settings +from .locale import * PROD_LANGUAGES = ('de', 'en-US', 'fr', 'it', 'ja', 'nl', 'pt-BR', 'ru') diff --git a/flicks/settings/locale.py b/flicks/settings/locale.py new file mode 100644 index 0000000..b2c5aeb --- /dev/null +++ b/flicks/settings/locale.py @@ -0,0 +1,69 @@ +LINK_PDWIKI = { + 'en-US': 'https://en.wikipedia.org/wiki/Public_domain', + 'de': 'https://de.wikipedia.org/wiki/Gemeinfreiheit', + 'fr': 'https://fr.wikipedia.org/wiki/Domaine_public_%28propri%C3%A9t%C3%A9_intellectuelle%29', + 'es': 'https://es.wikipedia.org/wiki/Dominio_p%C3%BAblico', + 'nl': 'https://nl.wikipedia.org/wiki/Publiek_domein', + 'pl': 'https://pl.wikipedia.org/wiki/Domena_publiczna', + 'pt-BR': 'https://pt.wikipedia.org/wiki/Dom%C3%ADnio_p%C3%BAblico', + 'sl': 'https://sl.wikipedia.org/wiki/Javna_last', + 'sq': 'https://sq.wikipedia.org/wiki/Domen_publik', + 'zh-CN': 'https://zh.wikipedia.org/wiki/%E5%85%AC%E6%9C%89%E9%A2%86%E5%9F%9F', + 'zh-TW': 'https://zh.wikipedia.org/wiki/%E5%85%AC%E6%9C%89%E9%A2%86%E5%9F%9F', + 'it': 'https://it.wikipedia.org/wiki/Pubblico_dominio', + 'lij': 'https://it.wikipedia.org/wiki/Pubblico_dominio', + 'ja': 'https://ja.wikipedia.org/wiki/%E3%83%91%E3%83%96%E3%83%AA%E3%83%83%E3%82%AF%E3%83%89%E3%83%A1%E3%82%A4%E3%83%B3', +} + +LINK_BRIEF = { + 'en-US': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_en-US.pdf', + 'de': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_de.pdf', + 'es': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_es-ES.pdf', + 'nl': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_nl.pdf', + 'pl': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_pl.pdf', + 'sl': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_sl.pdf', + 'fr': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_fr.pdf', + 'zh-TW': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_zh-TW.pdf', + 'pt-BR': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_pt-BR.pdf', + 'it': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_it.pdf', + 'lij': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_lij.pdf', + 'ja': 'http://static.mozilla.com/firefoxflicks/pdf/Filmmakers_Creative_Brief_ja.pdf', +} + +LINK_CCLICENSE = { + 'en-US': 'http://creativecommons.org/licenses/by-nc-sa/2.5/', + 'de': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.de', + 'fr': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.fr', + 'es': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.es', + 'nl': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.nl', + 'pl': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.pl', + 'pt-BR': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.pt_BR', + 'sl': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.sl', + 'sq': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.sq', + 'zh-CN': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.zh_CN', + 'zh-TW': 'http://creativecommons.org/licenses/by-nc-sa/2.5/deed.zh_TW', +} + +VIDEO_IC = { + 'en-US': '59415650', + 'de': '59416761', + 'es': '59418049', + 'fr': '59419952', + 'pt-BR': '59421007', +} + +VIDEO_SLAPSTICK = { + 'en-US': '59415651', + 'de': '59416762', + 'es': '59418050', + 'fr': '59419953', + 'pt-BR': '59421008', +} + +VIDEO_ALLTHREE = { + 'en-US': '59415649', + 'de': '59416760', + 'es': '59418048', + 'fr': '59419955', + 'pt-BR': '59421006', +} diff --git a/flicks/videos/static/css/videos.css b/flicks/videos/static/css/videos.css index e139c48..8aab4cc 100644 --- a/flicks/videos/static/css/videos.css +++ b/flicks/videos/static/css/videos.css @@ -58,40 +58,56 @@ } /* Video List *********/ -.samples:after { - content: ""; - display: block; - width: 100%; - height: 6px; - position: absolute; - bottom: -6px; - left: 0; - background: url(/static/img/div-shadow.png) center top no-repeat; - z-index: 10; +#trailers { + background: #ececec; + background: rgba(0,0,0,.05); + border-radius: 6px; + box-shadow: inset 0 0 3px rgba(0,0,0,.05); + width: 190px; + padding: 20px 20px 0; + margin-right: -20px; } -.samples .entry { - width: 30%; - margin: 0 1.5%; +#trailers h3 { + margin: 0 0 1em; } -.samples .entry .thumbnail { - margin-left: 0; +#trailers .entry { + width: 190px; + float: none; + margin: 0 10px 1.5em; } +#trailers .title { + font-size: 14px; +} + +#gallery .thumbnail { + width: 200px; + height: 150px; +} + + /* Tablet Layout: 760px */ @media only screen and (min-width: 760px) and (max-width: 1000px) { - .samples .entry-list { + + #trailers { width: auto; + float: none; margin: 0 auto 1em; } - .samples .entry-list .entry:nth-child(3n+1) { - clear: none; + #trailers h3 { + text-align: center; } - .samples .entry-list .entry:nth-child(2n+1) { - clear: none; + #trailers .entry-list { + width: auto; + } + + #trailers .entry { + float: left; + margin: 0 15px 1.5em; } } @@ -108,25 +124,42 @@ width: auto; } - .samples .entry-list .entry { + #trailers { + width: auto; float: none; - width: 220px; margin: 0 auto 1em; } - .samples .entry-list .entry:nth-child(3n+1), - .samples .entry-list .entry:nth-child(2n+1) { - clear: none; + #trailers h3 { + text-align: center; } + #trailers .entry-list { + width: auto; + } + + #trailers .entry { + margin: 0 auto 1.5em; + } + + } /* Wide Mobile Layout: 480px */ @media only screen and (min-width: 480px) and (max-width: 760px) { - .samples .entry-list .entry { - float: left; + + #trailers .entry { width: 28%; - margin: 0 2.5%; + float: left; + margin: 0 2.5% 1em; + } + + #trailers .entry:nth-child(3n+1) { + clear: left; + } + + #trailers .entry:nth-child(2n+1) { + clear: none; } } diff --git a/flicks/videos/templates/videos/2013/list.html b/flicks/videos/templates/videos/2013/list.html index fc2dc98..46a42cc 100644 --- a/flicks/videos/templates/videos/2013/list.html +++ b/flicks/videos/templates/videos/2013/list.html @@ -30,13 +30,14 @@