pages/team.tmpl - Issue 5097747367591936: Issue 332 - Add country flags to team page

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: pages/team.tmpl

Issue 5097747367591936: Issue 332 - Add country flags to team page (Closed)

Patch Set: Created April 29, 2014, 4:29 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
1 title=Meet the Team	1 title=Meet the Team

2	2

3 <header class="page-title">	3 <header class="page-title">

4 <h1>Meet the Team</h1>	4 <h1>Meet the Team</h1>

5 </header>	5 </header>

6	6

7 {%- from "includes/globals" import people %}	7 {%- from "includes/globals" import people %}

8	8

9 {%- macro profile(date, image, name, title, description) %}	9 {%- macro profile(date, country, image, name, title, description) %}

10 <div class="profile column">	10 <div class="profile column">

11 <p>	11 <p>

12 <img class="profile-image" src="/images/people/{{image}}" width="120" heig ht="120" alt=""/>	12 <img class="profile-image" src="/images/people/{{image}}" width="120" heig ht="120" alt=""/>

	13 <img class="country-image" src="/images/flags/{{country}}.png" width="30" height="30" alt=""/>

13 </p>	14 </p>

14 <h3 class="heading centered"><span>{{title}}</span></h3>	15 <h3 class="heading centered"><span>{{title}}</span></h3>

15 <h1>{{name}}</h1>	16 <h1>{{name}}</h1>

16 <h2>{{description}}</h2>	17 <h2>{{description}}</h2>

17 </div>	18 </div>

18 {% endmacro %}	19 {% endmacro %}

19	20

20 <div class="content-block columns-container four-columns">	21 <div class="content-block columns-container four-columns">

21 {%- for person in people\|datesort(basedate="2011-02-22") %}	22 {%- for person in people\|datesort(basedate="2011-02-22") %}

22 {%- if loop.index % 4 == 1 and not loop.first %}	23 {%- if loop.index % 4 == 1 and not loop.first %}

23 </div>	24 </div>

24 <div class="content-block columns-container four-columns">	25 <div class="content-block columns-container four-columns">

25 {%- endif %}	26 {%- endif %}

26	27

27 {{profile(*person)}}	28 {{profile(*person)}}

28 {%- endfor %}	29 {%- endfor %}

29 </div>	30 </div>

	31

	32 <!-- Flag icons: Copyright (c) 2013 Go Squared Ltd. http://www.gosquared.com/ -- >
	Wladimir Palant 2014/04/29 18:19:53 "The above copyright notice and this permission no "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software." - I don't think that this line complies to their license. Aren't there any public domain flag icons where we don't have licensing headaches? Thomas Greiner 2014/04/30 14:13:59 This addition was approved by Kai beforehand altho Show quoted text On 2014/04/29 18:19:53, Wladimir Palant wrote: > "The above copyright notice and this permission notice shall be included in all > copies or substantial portions of the Software." - I don't think that this line > complies to their license. Aren't there any public domain flag icons where we > don't have licensing headaches? This addition was approved by Kai beforehand although he doesn't consider it absolutely necessary. It definitely doesn't hurt to have it in there but I can ask the icon creators for clarification on that to make sure. After putting more time into searching for alternatives, I was not able to find flags that fit into the flat-design scheme of our page without looking cheap while not requiring backlinks or payment. Felix Dahlke 2014/04/30 15:04:31 Why not just do what they ask for and include the Show quoted text On 2014/04/30 14:13:59, Thomas Greiner wrote: > On 2014/04/29 18:19:53, Wladimir Palant wrote: > > "The above copyright notice and this permission notice shall be included in > all > > copies or substantial portions of the Software." - I don't think that this > line > > complies to their license. Aren't there any public domain flag icons where we > > don't have licensing headaches? > > This addition was approved by Kai beforehand although he doesn't consider it > absolutely necessary. It definitely doesn't hurt to have it in there but I can > ask the icon creators for clarification on that to make sure. > > After putting more time into searching for alternatives, I was not able to find > flags that fit into the flat-design scheme of our page without looking cheap > while not requiring backlinks or payment. Why not just do what they ask for and include the permission notice? Doesn't seem like something we need to involve a lawyer over. But if Kai already said he thinks it's fine...
OLD	NEW

« no previous file with comments | « includes/globals.tmpl ('k') | static/css/styles.css » ('j') | no next file with comments »