debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Split about.css from error.html for about:private

Browse source
This commit is contained in:
Christian Dywan 2012-01-27 23:06:37 +01:00
parent f1e168b569
commit ce527689c6
3 changed files with 11 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
data/error.html
View file

@ -2,67 +2,11 @@
Error page template for Midori. Error page template for Midori.
This file is licensed under the terms of the expat license, see the file EXPAT. This file is licensed under the terms of the expat license, see the file EXPAT.
--> -->
<html> <html>
<head> <head>
<title>{title}</title> <title>{title}</title>
<link rel="shortcut icon" href="{icon}" /> <link rel="shortcut icon" href="{icon}" />
<style type="text/css"> <link rel="stylesheet" type="text/css" href="res://about.css" />
body {
background-color: #eee;
margin: 0;
padding: 0;
}
#container {
background: #f6fff3;
min-width: 70%;
max-width: 70%;
margin: 2em auto 1em;
padding: 1em;
border: 0.2em solid #9acb7f;
-webkit-border-radius: 1em;
}
icon {
float: left;
padding-left: 1%;
padding-top: 1%;
}
#main {
float: right;
width: 90%;
}
h1 {
font-size: 1.4em;
font-weight: bold;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
#logo {
position: absolute; right: 15px; bottom: 15px;
z-index: -1;
}
button span,
button img {
vertical-align: middle;
padding: 2px 1px;
}
message {
font-size: 1.1em;
}
description {
font-size: 1em;
}
</style>
</head> </head>
<body> <body>
<div id="container"> <div id="container">

13
midori/midori-view.c
View file

@ -1089,7 +1089,7 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view,
const gchar* uri = webkit_network_request_get_uri (request); const gchar* uri = webkit_network_request_get_uri (request);
/* Only apply custom URIs to special pages for security purposes */ /* Only apply custom URIs to special pages for security purposes */
if (!view->special) if (!view->special && !midori_view_is_blank (view))
return; return;
if (g_str_has_prefix (uri, "res://")) if (g_str_has_prefix (uri, "res://"))
@ -3979,10 +3979,15 @@ midori_view_set_uri (MidoriView* view,
{ {
katze_assign (view->uri, g_strdup (uri)); katze_assign (view->uri, g_strdup (uri));
data = g_strdup_printf ( data = g_strdup_printf (
"<html><head><title>%s</title></head>" "<html><head><title>%s</title>"
"<body><h1>%s</h1>" "<link rel=\"stylesheet\" type=\"text/css\" href=\"res://about.css\">"
"</head><body><div id=\"container\">"
"<img id=\"logo\" src=\"res://logo-shade.png\">"
"<img id=\"icon\" src=\"stock://gtk-dialog-info\">"
"<div id=\"main\"><h1>%s</h1>"
"<p>%s</p><ul><li>%s</li><li>%s</li><li>%s</li></ul>" "<p>%s</p><ul><li>%s</li><li>%s</li><li>%s</li></ul>"
"<p>%s</p><ul><li>%s</li><li>%s</li><li>%s</li><li>%s</li></ul>", "<p>%s</p><ul><li>%s</li><li>%s</li><li>%s</li><li>%s</li></ul>"
"</div><br style=\"clear: both\"></div></body></html>",
_("Private Browsing"), _("Private Browsing"), _("Private Browsing"), _("Private Browsing"),
_("Midori doesn't store any personal data:"), _("Midori doesn't store any personal data:"),
_("No History or web cookies are being saved."), _("No History or web cookies are being saved."),

2
wscript
View file

@ -500,7 +500,7 @@ def build (bld):
else: else:
Utils.pprint ('BLUE', "logo-shade could not be rasterized.") Utils.pprint ('BLUE', "logo-shade could not be rasterized.")
for res_file in ['error.html', 'close.png']: for res_file in ['about.css', 'error.html', 'close.png']:
bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/' + res_file) bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/' + res_file)
bld.install_as ( \ bld.install_as ( \
'${MDATADIR}/' + APPNAME + '/res/speeddial-head-%s.html' % VERSION, \ '${MDATADIR}/' + APPNAME + '/res/speeddial-head-%s.html' % VERSION, \