templates/default.tmpl - Issue 29519587: Issue 5534 - Create Contact Section for help.eyeo.com

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: templates/default.tmpl

Issue 29519587: Issue 5534 - Create Contact Section for help.eyeo.com (Closed) Base URL: https://hg.adblockplus.org/help.eyeo.com

Patch Set: Update alt text, rebase, refactor links in section-accent Created Sept. 25, 2017, 8:45 a.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 <!DOCTYPE html>	1 {% extends "templates/minimal" %}

2 <!--

3 This file is part of help.eyeo.com.

4 Copyright (C) 2017-present eyeo GmbH

5	2

6 help.eyeo.com is free software: you can redistribute it and/or modify	3 {% block body %}

7 it under the terms of the GNU General Public License as published by	4 {{ body \| safe }}

8 the Free Software Foundation, either version 3 of the License, or

9 (at your option) any later version.

10	5

11 help.eyeo.com is distributed in the hope that it will be useful,	6 <? include contact ?>
	ire 2017/09/25 08:47:36 I'm having an issue here. The contact section does I'm having an issue here. The contact section doesn't show up on the product help home page (i.e. pages that use a template that extends this template). Is there an issue with the cms not including things from extended templates? juliandoucette 2017/09/25 12:15:22 The contents of blocks are replaced; not extended. Show quoted text On 2017/09/25 08:47:36, ire wrote: > I'm having an issue here. The contact section doesn't show up on the product > help home page (i.e. pages that use a template that extends this template). Is > there an issue with the cms not including things from extended templates? The contents of blocks are replaced; not extended. e.g. # parent.tmpl {% block test %} Parent text {% blockend %} # child.tmpl {% extends "templates/parent" %} {% block test %} Child text {% endblock %} # results Child text NOT Parent text Child text If you want Parent text AND Child text to appear then Parent text must be outside the block that is overwritten (or in a separate block). Does that make sense? (You are overwriting the contents of the "body" block in the "product-home" template.) ire 2017/09/25 14:02:25 Ah I see. Got it. Putting the include outside th Show quoted text On 2017/09/25 12:15:22, juliandoucette wrote: > On 2017/09/25 08:47:36, ire wrote: > > I'm having an issue here. The contact section doesn't show up on the product > > help home page (i.e. pages that use a template that extends this template). Is > > there an issue with the cms not including things from extended templates? > > The contents of blocks are replaced; not extended. e.g. > > # parent.tmpl > > {% block test %} > Parent text > {% blockend %} > > # child.tmpl > > {% extends "templates/parent" %} > > {% block test %} > Child text > {% endblock %} > > # results > > Child text > > NOT > > Parent text > Child text > > If you want Parent text AND Child text to appear then Parent text must be > outside the block that is overwritten (or in a separate block). > > Does that make sense? > > (You are overwriting the contents of the "body" block in the "product-home" > template.) Ah I see. Got it. Putting the include outside the "body" block made it not render at all, so I created a separate block for it.
12 but WITHOUT ANY WARRANTY; without even the implied warranty of	7 {% endblock %}

13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14 GNU General Public License for more details.

15

16 You should have received a copy of the GNU General Public License

17 along with help.eyeo.com. If not, see <http://www.gnu.org/licenses/>.

18 -->

19 <html

20 lang="{{ locale }}"

21 dir="{{ "rtl" if config.has_option("rtl", locale) else "ltr" }}"

22 class="no-js">

23 <head>

24 <meta charset="utf-8">

25 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to- fit=no">

26 <meta http-equiv="x-ua-compatible" content="ie=edge">

27

28 <title>{{ title \| translate("page-title", "Meta page title") }}</title>

29

30 <!--[if IE 8]>

31 <script src="/js/vendor/ie8.min.js"></script>

32 <![endif]-->

33

34 <link rel="stylesheet" href="/css/main.css">

35

36 <!--[if lt IE 9]>

37 <script src="/js/vendor/html5shiv.min.js"></script>

38 <script src="/js/vendor/respond.min.js"></script>

39 <![endif]-->

40

41 <!--[if lt IE 10]>

42 <script src="/js/vendor/classList.min.js"></script>

43 <![endif]-->

44

45 {% block head %}

46 {{ head \| safe }}

47 {% endblock %}

48 </head>

49 <body>

50 <? include layout/header ?>

51 <div class="outer">

52 {% block body %}

53 {{ body \| safe }}

54 {% endblock %}

55 </div>

56 <? include layout/footer ?>

57 <script src="/js/main.js"></script>

58 </body>

59 <html>

OLD	NEW

« no previous file with comments | « static/scss/layout/_body.scss ('k') | templates/minimal.tmpl » ('j') | no next file with comments »