diff options
author | Carlos Garcia Campos <cgarcia@igalia.com> | 2013-03-29 00:06:47 +0800 |
---|---|---|
committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2013-04-05 21:47:37 +0800 |
commit | a2181b928e5a0f6d27487859fe86a276c1eed25c (patch) | |
tree | 9a4915e37cb5f7f75ff686c8936bc34b47ea481c /data | |
parent | efccc1eac4ac4e15fd4f5695d27a85c7d25c3cc6 (diff) | |
download | gsoc2013-epiphany-a2181b928e5a0f6d27487859fe86a276c1eed25c.tar gsoc2013-epiphany-a2181b928e5a0f6d27487859fe86a276c1eed25c.tar.gz gsoc2013-epiphany-a2181b928e5a0f6d27487859fe86a276c1eed25c.tar.bz2 gsoc2013-epiphany-a2181b928e5a0f6d27487859fe86a276c1eed25c.tar.lz gsoc2013-epiphany-a2181b928e5a0f6d27487859fe86a276c1eed25c.tar.xz gsoc2013-epiphany-a2181b928e5a0f6d27487859fe86a276c1eed25c.tar.zst gsoc2013-epiphany-a2181b928e5a0f6d27487859fe86a276c1eed25c.zip |
Compile template pages as GResources
So that they are loaded from memory instead of disk every time they are
needed.
We also get rid of ephy_file searching for the files in the file system.
https://bugzilla.gnome.org/show_bug.cgi?id=696792
Diffstat (limited to 'data')
-rw-r--r-- | data/pages/Makefile.am | 8 | ||||
-rw-r--r-- | data/pages/error.html | 87 | ||||
-rw-r--r-- | data/pages/process_crash.html | 74 | ||||
-rw-r--r-- | data/pages/recovery.html | 87 |
4 files changed, 1 insertions, 255 deletions
diff --git a/data/pages/Makefile.am b/data/pages/Makefile.am index 4b00a41b5..0ff154064 100644 --- a/data/pages/Makefile.am +++ b/data/pages/Makefile.am @@ -1,11 +1,5 @@ -errorpagesdir = $(pkgdatadir)/pages -errorpages_DATA = \ - recovery.html \ - process_crash.html \ - error.html - stylepagesdir = $(pkgdatadir)/pages stylepages_DATA = \ about.css -EXTRA_DIST = $(errorpages_DATA) $(stylepages_DATA) +EXTRA_DIST = $(stylepages_DATA) diff --git a/data/pages/error.html b/data/pages/error.html deleted file mode 100644 index 9aa39f605..000000000 --- a/data/pages/error.html +++ /dev/null @@ -1,87 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- - Copyright © 2010, 2011 Vinicius Depizzol - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ---> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%s" lang="%s" dir="%s"> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>%s</title> - <style type="text/css"> - body { - margin: 0 auto; - font: message-box; - } - - #container { - padding: 10% 12% 5%; - margin: 0 auto; - max-width: 650px; - } - - #main_icon { - float: left; - padding-right: 20px; - } - - html[dir="rtl"] #main_icon { - padding-left: 20px; - padding-right: 0; - float: right; - } - - #content { - display: table-cell; - vertical-align: top; - } - - #content h1 { - margin-top: 0; - } - - #content .buttonbox { - text-align: right; - } - - html[dir="rtl"] #content .buttonbox { - text-align: left; - } - </style> - <script type="text/javascript"> - function load_anyway() - { - window.location = '%s'; - } - </script> -</head> -<body> - <div id="container"> - <div id="main_icon"> - <img src="%s" /> - </div> - <div id="content"> - <h1>%s</h1> - <div class="explanation"> - %s - </div> - - <div class="buttonbox"> - <button onclick="javascript:load_anyway()">%s</button> - </div> - </div> - </div> -</body> -</html> diff --git a/data/pages/process_crash.html b/data/pages/process_crash.html deleted file mode 100644 index 7cf7ab93c..000000000 --- a/data/pages/process_crash.html +++ /dev/null @@ -1,74 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- - Copyright © 2013 Igalia S.L. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ---> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%s" lang="%s" dir="%s"> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>%s</title> - <style type="text/css"> - body { - margin: 0 auto; - font: message-box; - background-color: #2e3436; - color: #d0d1cf; - } - - #container { - padding: 10% 12% 5%; - margin: 0 auto; - max-width: 650px; - } - - #main_icon { - float: left; - padding-right: 20px; - } - - html[dir="rtl"] #main_icon { - padding-left: 20px; - padding-right: 0; - float: right; - } - - #content { - display: table-cell; - vertical-align: top; - } - - #content h1 { - margin-top: 0; - font-size: 200%; - } - </style> - -</head> -<body> - <div id="container"> - <div id="main_icon"> - <!-- We do nothing with the URI for now: %s --> - <img width="150px" height="150px" src="%s" alt="Sad face icon"/> - </div> - <div id="content"> - <h1>%s</h1> - <div class="explanation"> - %s - </div> - </div> - </div> -</body> -</html> diff --git a/data/pages/recovery.html b/data/pages/recovery.html deleted file mode 100644 index 9aa39f605..000000000 --- a/data/pages/recovery.html +++ /dev/null @@ -1,87 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- - Copyright © 2010, 2011 Vinicius Depizzol - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ---> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%s" lang="%s" dir="%s"> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>%s</title> - <style type="text/css"> - body { - margin: 0 auto; - font: message-box; - } - - #container { - padding: 10% 12% 5%; - margin: 0 auto; - max-width: 650px; - } - - #main_icon { - float: left; - padding-right: 20px; - } - - html[dir="rtl"] #main_icon { - padding-left: 20px; - padding-right: 0; - float: right; - } - - #content { - display: table-cell; - vertical-align: top; - } - - #content h1 { - margin-top: 0; - } - - #content .buttonbox { - text-align: right; - } - - html[dir="rtl"] #content .buttonbox { - text-align: left; - } - </style> - <script type="text/javascript"> - function load_anyway() - { - window.location = '%s'; - } - </script> -</head> -<body> - <div id="container"> - <div id="main_icon"> - <img src="%s" /> - </div> - <div id="content"> - <h1>%s</h1> - <div class="explanation"> - %s - </div> - - <div class="buttonbox"> - <button onclick="javascript:load_anyway()">%s</button> - </div> - </div> - </div> -</body> -</html> |