tests/expected_output/relative/de/rel_path - Issue 29947567: Issue 5333 - Ensure links in metadata and in most tags can be made relative

Delta Between Two Patch Sets: tests/expected_output/relative/de/rel_path

Issue 29947567: Issue 5333 - Ensure links in metadata and in most tags can be made relative (Closed) Base URL: https://hg.adblockplus.org/cms/

Left Patch Set: Address comments on PS1 Created Nov. 21, 2018, 4:29 a.m.

Right Patch Set: Combine regex in converters.py Created Jan. 7, 2019, 10:23 p.m.

Left:
Right:

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

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 {{ head\|safe }}	1 <!DOCTYPE html>
Vasily Kuznetsov 2018/11/21 23:30:47 So what's happening here is that split_head_body() So what's happening here is that split_head_body() extracts the content of <head> tag into `head`, removes the tag itself and the rest comes here as `body`. If we want to produce a reasonable HTML on the output, one approach that can work is to move <!DOCTYPE> and <html> tags into the template and then include the head and the body into it: <!DOCTYPE html> <html> <head> {{ head \| safe }} ... more head stuff from template, maybe some links ... </head> {{ body \| safe }} </html> The page would then have those two tags at the top level without anything around them: <head> ... head stuff ... </head> <body> ... body stuff ... </body> Something like this should do. rhowell 2018/12/19 02:33:30 Done. Show quoted text On 2018/11/21 23:30:47, Vasily Kuznetsov wrote: > So what's happening here is that split_head_body() extracts the content of > <head> tag into `head`, removes the tag itself and the rest comes here as > `body`. If we want to produce a reasonable HTML on the output, one approach that > can work is to move <!DOCTYPE> and <html> tags into the template and then > include the head and the body into it: > > <!DOCTYPE html> > <html> > <head> > {{ head \| safe }} > ... more head stuff from template, maybe some links ... > </head> > {{ body \| safe }} > </html> > > The page would then have those two tags at the top level without anything > around them: > > <head> > ... head stuff ... > </head> > <body> > ... body stuff ... > </body> > > Something like this should do. Done.
	2 <html>

	3 <head>

	4

2 <title>Page Title</title>	5 <title>Page Title</title>

3 <link rel="stylesheet" href="../dist/css/main.min.css">	6 <link rel="stylesheet" href="../dist/css/main.min.css">

4 <base href="https://www.example.com/news/index.html">	7 <base href="https://www.example.com/news/index.html">

5 <script src="../scripts/myscript.js"></script>	8 <script src="../scripts/myscript.js"></script>

6	9 </head>

7

8

9 <!DOCTYPE html>

10 <html>

11

12	10

13 <body>	11 <body>

14 Simple TS with default: Übersetzen.	12 Simple TS with default: Übersetzen.

15 Same TS with no default: Übersetzen.	13 Same TS with no default: Übersetzen.

16 Nested translation: <a href="http://bar.de/">Bar</a> und <a href="http://baz.de/ ">Baz</a>.	14 Nested translation: <a href="http://bar.de/">Bar</a> und <a href="http://baz .de/">Baz</a>.

17 Link resolving: <a href="translate" hreflang="de">Diese Seite</a>.	15 Link resolving: <a href="translate" hreflang="de">Diese Seite</a>.

18 Link to a non-translatable page: <a href="../en/sitemap" hreflang="en">Seitenver zeichnis</a>.	16 Link to a non-translatable page: <a href="../en/sitemap" hreflang="en">Seite nverzeichnis</a>.

19 Entity escaping in links: <a href="http://foo.com/?a&b">Bar</a>.	17 Entity escaping in links: <a href="http://foo.com/?a&b">Bar</a>.

20 Image link: <img src="../img/icon"></img>	18 Image link: <img src="../img/icon"></img>

21 Iframe link: <iframe src="../default.asp"></iframe>	19 Iframe link: <iframe src="../default.asp"></iframe>

22 Script link: <script src="myscripts.js"></script>	20 Script link: <script src="myscripts.js"></script>

23 Input link: <input type="image" src="../img/submit.gif" alt="Submit">	21 Input link: <input type="image" src="../img/submit.gif" alt="Submit">

24 Link to external source: <a href="http://bar.de/">Bar</a>	22 Link to external source: <a href="http://bar.de/">Bar</a>

25 Link to self: <a href="rel_path" hreflang="de">	23 Link to self: <a href="rel_path" hreflang="de">

26 Link to self with extension: <a href="rel_path.html" hreflang="de">	24 Link to self with extension: <a href="rel_path.html" hreflang="de">

27 Relative link to local page: <a href="../en/sitemap">	25 Relative link to local page: <a href="../en/sitemap">

28 Absolute link to local page: <a href="../en/sitemap">	26 Absolute link to local page: <a href="../en/sitemap">

29 Relative link to different locale: <a href="../de/sitemap">	27 Relative link to different locale: <a href="../de/sitemap">

30 Absolute link to diferent locale: <a href="sitemap">	28 Absolute link to diferent locale: <a href="sitemap">

31 Relative link to page in subfolder: <a href="../foo/bar">	29 Relative link to page in subfolder: <a href="../foo/bar">

32 Absolute link to page in subfolder: <a href="../foo/bar">	30 Absolute link to page in subfolder: <a href="../foo/bar">

33 Resource URL: <link rel="stylesheet" href="../dist/css/main.min.css">	31 Resource URL: <link rel="stylesheet" href="../dist/css/main.min.css">

34 </body>	32 </body>

	33

35 </html>	34 </html>

LEFT	RIGHT