Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

change Error and Private Browsing Pages from XHTML to HTML5, add <meta charset="utf-8"> (fixes issue #700) #710

Merged
merged 1 commit into from
Nov 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions app/src/main/res/raw/error_pages.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

<html xmlns="http://www.w3.org/1999/xhtml" class="error">
<html class="error">
<head>
<meta charset="utf-8">
<title>%pageTitle%</title>
<style>%css%</style>
</head>
Expand All @@ -16,9 +15,8 @@
<h1 class="errorTitleText">%messageShort%</h1>
</div>

<!-- LONG CONTENT (the section most likely to require scrolling) -->
<div id="errorLongContent">
<!-- Long Description (Note: See netError.dtd for used XHTML tags) -->
<!-- Long Description -->
<div id="errorLongDesc">%messageLong%</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/raw/private_mode.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

<html xmlns="http://www.w3.org/1999/xhtml" class="private">
<html class="private">
<head>
<meta charset="utf-8">
<title>%pageTitle%</title>
<style>%css%</style>
</head>
Expand All @@ -19,6 +18,7 @@
</svg>
<div class="container">
<svg class="icon"><use xlink:href="#icon-private"></use></svg>
<h1>%pageTitle%</h1>
<section class="section-main">%pageBody%</section>
</div>
<script>
Expand Down
15 changes: 5 additions & 10 deletions app/src/main/res/values/localpages.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,14 @@
<!-- Private Browsing -->
<string name="private_browsing_title">Private Browsing</string>
<string name="private_browsing_body"><![CDATA[
<h1>Private Browsing</h1>

<p>When you browse in a Private Window, %1$s <strong>does not save</strong>:</p>

<ul class="two-column">
<li>visited pages</li>
<li>searches</li>
<li>cookies</li>
<li>temporary files</li>
<li>visited pages</li>
<li>searches</li>
<li>cookies</li>
<li>temporary files</li>
</ul>

<p>Private Browsing <strong>doesn&rsquo;t make you anonymous</strong> on the Internet. Your employer or Internet service provider can still know what page you visit.</p>

<p>Private Browsing <strong>doesn’t make you anonymous</strong> on the Internet. Your employer or Internet service provider can still know what page you visit.</p>
<p class="about-info">Learn more about <a id="learnMore">Private Browsing</a>.</p>
]]></string>

Expand Down