Merge lp:~alexander-wilms/midori/midori into lp:midori
- midori
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Cody Garver | ||||
Approved revision: | 6248 | ||||
Merge reported by: | Cody Garver | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~alexander-wilms/midori/midori | ||||
Merge into: | lp:midori | ||||
Diff against target: |
331 lines (+121/-71) 4 files modified
data/about.css (+69/-40) data/error.html (+13/-13) midori/midori-app.c (+3/-0) midori/midori-view.c (+36/-18) |
||||
To merge this branch: | bzr merge lp:~alexander-wilms/midori/midori | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paweł Forysiuk | Approve | ||
Cris Dywan | Needs Fixing | ||
982c80311320c1b (community) | Needs Resubmitting | ||
Danielle Foré (community) | Needs Fixing | ||
Review via email:
|
Commit message
Error page redesign
Description of the change
Improved the error page: http://
- 6235. By 982c80311320c1b
-
tweaking
- 6236. By 982c80311320c1b
-
tweaking
- 6237. By 982c80311320c1b
-
tweaking
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) wrote : | # |
- 6238. By 982c80311320c1b
-
tweaking
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Cris Dywan (kalikiana) wrote : | # |
The title should mention the domain at minimum, I don't want to read all text to remember which page this actually is about.
The logo is gone. I'm open to tweaks and different layout, but I definitely expect it in some form.
It feels much cleaner, which is nice, but a bit too "borderless". How about a subtle gradient?
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Danielle Foré (danrabbit) wrote : | # |
I agree the title needs to state the entire problem concisely. I think something like "Foobar can't be found" would work well.
While I don't really think the logo is required, if Christian wants it in it needs to stay.
I do think that having the white "dialog" on a grey page looks a little nicer here (even though it's not 100% consistent with how granite does embedded error pages, it is more consistent with how other people do embedded error pages). I would suggest a small border radius (like 4px) and a very small, light shadow.
I'm not sure the line "You might want to try one of these suggestions:" is entirely necessary. I think you could jump straight from the description to the bulleted list.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Danielle Foré (danrabbit) wrote : | # |
Ah something else I forgot to mention: The button label should be Title Case "Try Again" and it'd be nice if it were a little bigger :)
- 6239. By 982c80311320c1b
-
Made msot changes suggested by kalikiana and DanRabbit
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) wrote : | # |
I can get Midori_
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) wrote : | # |
*can't
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Danielle Foré (danrabbit) wrote : | # |
For the "dialog" try:
border: 1px solid rgba(0, 0, 0, .3);
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
and the body color of "#DEDEDE" to make it blend into elementary's tabs ;D
Starting to look really slick :)
- 6240. By 982c80311320c1b
-
Tweaking
- 6241. By 982c80311320c1b
-
g_free (title)
- 6242. By 982c80311320c1b
-
Use parse_hostname
- 6243. By 982c80311320c1b
-
fix icon position
- 6244. By 982c80311320c1b
-
Merge Pawels branch
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) wrote : | # |
^ That was supposed to mean that I resubmitted the branch for a review
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Cris Dywan (kalikiana) wrote : | # |
No need to resubmit, just make sure Status says Needs Review. If you want to ensure people know you addressed their comment, just mention it briefly in a comment and it will send an email to all reviewers.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) wrote : | # |
Ah, ok. Well, I addressed your and Daniel's comments
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Cris Dywan (kalikiana) wrote : | # |
I didn't realize at first that you changed the icon which was among my suggestions, since it doesn't actually look less like an error than before - different icon, but same association.
How about network-error (error) and network-idle (delayed)? These look suitable to me.
Apart from that I love it.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) wrote : | # |
These don't seem to be part of the stock icons. How can I use them?
- 6245. By 982c80311320c1b
-
Use better icons
- 6246. By 982c80311320c1b
-
Added colon
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Paweł Forysiuk (tuxator) wrote : | # |
- There is no logo on the private page
- suggestion could be shown only on network error maybe with checking webkit error beforehand,
- in case of long-ish title of the page it spills over if you have a small monitor size
77 + result = midori_
278 + uri,
279 + "stock:
280 + title,
281 + message,
282 + error->message,
283 + g_string_free (suggestions, FALSE),
284 + _("Try Again"),
285 + web_frame);
could be squeezed to 2-3 lines
- 6247. By 982c80311320c1b
-
Fixes
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) wrote : | # |
- I added the logo, but somehow the CSS to position it doesn't work
- I don't understand what you mean. Maybe kalikiana knows what should be done
- Can't reproduce that: http://
- Condensed them a bit
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Paweł Forysiuk (tuxator) wrote : | # |
You added ellipsis so it no longer spills
for logo in private html dir="ltr" should to the trick
otherwise looks fine
- 6248. By 982c80311320c1b
-
Added ltr
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) wrote : | # |
The icons shown should be 48px, but they're 16px.
The dialog-warning was 48px, so what needs to be done to get the icons in the same size?
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Danielle Foré (danrabbit) wrote : | # |
Alex, I think this is something weird with GNOME icons and not with your branch. I pushed 48px network icons to lp:elementaryicons and they seem to work fine with your branch.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
982c80311320c1b (alexander-wilms) wrote : | # |
Interesting. I copied your icons inro .../elementary/
But I think now it's ready to be merged
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Paweł Forysiuk (tuxator) : | # |
Preview Diff
1 | === modified file 'data/about.css' | |||
2 | --- data/about.css 2013-03-21 17:09:08 +0000 | |||
3 | +++ data/about.css 2013-06-30 07:38:25 +0000 | |||
4 | @@ -3,48 +3,53 @@ | |||
5 | 3 | This file is licensed under the terms of the expat license, see the file EXPAT. | 3 | This file is licensed under the terms of the expat license, see the file EXPAT. |
6 | 4 | */ | 4 | */ |
7 | 5 | body { | 5 | body { |
27 | 6 | background-color: #eee; | 6 | background-color: #dedede; |
28 | 7 | margin: 0; | 7 | color: #222222; |
29 | 8 | padding: 0; | 8 | font-family: 'Open Sans', 'Droid Sans', Arial, sans-serif; |
30 | 9 | } | 9 | font-size: 14px; |
31 | 10 | 10 | font-style: normal; | |
32 | 11 | #container { | 11 | font-variant: normal; |
33 | 12 | background: #f6fff3; | 12 | font-weight: normal; |
34 | 13 | min-width: 70%; | 13 | margin-top: 100px; |
16 | 14 | max-width: 70%; | ||
17 | 15 | margin: 2em auto 1em; | ||
18 | 16 | padding: 1em; | ||
19 | 17 | border: 0.2em solid #9acb7f; | ||
20 | 18 | -webkit-border-radius: 1em; | ||
21 | 19 | } | ||
22 | 20 | |||
23 | 21 | #icon { | ||
24 | 22 | float: left; | ||
25 | 23 | padding-left: 1%; | ||
26 | 24 | padding-top: 1%; | ||
35 | 25 | } | 14 | } |
36 | 26 | 15 | ||
37 | 27 | html[dir="rtl"] #icon { | 16 | html[dir="rtl"] #icon { |
40 | 28 | float: right; | 17 | float: right; |
41 | 29 | padding-right: 1%; | 18 | padding-right: 1%; |
42 | 19 | } | ||
43 | 20 | |||
44 | 21 | .indent { | ||
45 | 22 | margin-left: 60px; | ||
46 | 30 | } | 23 | } |
47 | 31 | 24 | ||
48 | 32 | #main { | 25 | #main { |
51 | 33 | float: right; | 26 | max-width: 50%; |
52 | 34 | width: 75%; | 27 | margin-left: auto; |
53 | 28 | margin-right: auto; | ||
54 | 29 | min-width: 480px; | ||
55 | 30 | background-repeat: no-repeat; | ||
56 | 31 | background-color: #ffffff; | ||
57 | 32 | border: 1px solid rgba(0, 0, 0, .3); | ||
58 | 33 | padding: 25px; | ||
59 | 34 | -webkit-border-radius: 4px; | ||
60 | 35 | -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1); | ||
61 | 36 | background-position-x: 22px; | ||
62 | 37 | background-position-y: 54px; | ||
63 | 38 | } | ||
64 | 39 | |||
65 | 40 | #text { | ||
66 | 41 | margin-left: 80px; | ||
67 | 35 | } | 42 | } |
68 | 36 | 43 | ||
69 | 37 | h1 { | 44 | h1 { |
80 | 38 | font-size: 1.4em; | 45 | font-family: 'Open Sans', 'Droid Sans', arial, sans-serif; |
81 | 39 | font-weight: bold; | 46 | font-size: 32px; |
82 | 40 | white-space: nowrap; | 47 | font-style: normal; |
83 | 41 | overflow: hidden; | 48 | font-variant: normal; |
84 | 42 | text-overflow: ellipsis; | 49 | font-weight: 300; |
85 | 43 | } | 50 | width: 100%; |
86 | 44 | 51 | overflow: hidden; | |
87 | 45 | #logo { | 52 | text-overflow: ellipsis; |
78 | 46 | position: absolute; bottom: 15px; | ||
79 | 47 | z-index: -1; | ||
88 | 48 | } | 53 | } |
89 | 49 | 54 | ||
90 | 50 | html[dir="ltr"] #logo { | 55 | html[dir="ltr"] #logo { |
91 | @@ -61,11 +66,35 @@ | |||
92 | 61 | padding: 2px 1px; | 66 | padding: 2px 1px; |
93 | 62 | } | 67 | } |
94 | 63 | 68 | ||
102 | 64 | #message { | 69 | button { |
103 | 65 | font-size: 1.1em; | 70 | font-size: 14px; |
104 | 66 | word-wrap: break-word; | 71 | } |
105 | 67 | } | 72 | |
106 | 68 | 73 | .message { | |
107 | 69 | #description { | 74 | overflow: hidden; |
108 | 70 | font-size: 1em; | 75 | text-overflow: ellipsis; |
109 | 76 | } | ||
110 | 77 | |||
111 | 78 | .description { | ||
112 | 79 | font-size: 1em; | ||
113 | 80 | overflow: hidden; | ||
114 | 81 | text-overflow: ellipsis; | ||
115 | 82 | } | ||
116 | 83 | |||
117 | 84 | #suggestions { | ||
118 | 85 | overflow: hidden; | ||
119 | 86 | text-overflow: ellipsis; | ||
120 | 87 | } | ||
121 | 88 | |||
122 | 89 | #button { | ||
123 | 90 | text-align: right; | ||
124 | 91 | } | ||
125 | 92 | |||
126 | 93 | #logo { | ||
127 | 94 | position: absolute; bottom: 15px; | ||
128 | 95 | z-index: -1; | ||
129 | 96 | } | ||
130 | 97 | |||
131 | 98 | form { | ||
132 | 99 | margin-bottom: 0px; | ||
133 | 71 | } | 100 | } |
134 | 72 | 101 | ||
135 | === modified file 'data/error.html' | |||
136 | --- data/error.html 2013-02-25 23:51:48 +0000 | |||
137 | +++ data/error.html 2013-06-30 07:38:25 +0000 | |||
138 | @@ -9,21 +9,21 @@ | |||
139 | 9 | <link rel="stylesheet" type="text/css" href="res://about.css" /> | 9 | <link rel="stylesheet" type="text/css" href="res://about.css" /> |
140 | 10 | </head> | 10 | </head> |
141 | 11 | <body> | 11 | <body> |
152 | 12 | <div id="container"> | 12 | <img id="logo" src="res://logo-shade.png" /> |
153 | 13 | <img id="logo" src="res://logo-shade.png" /> | 13 | <div id="main" style="background-image: url({error_icon});"> |
154 | 14 | <img id="icon" src="stock://gtk-dialog-error" /> | 14 | <div id="text"> |
155 | 15 | <div id="main"> | 15 | <h1>{title}</h1> |
156 | 16 | <h1>{title}</h1> | 16 | <p class="message">{message}<br><i>{description}</i></p> |
157 | 17 | <p id="message">{message}</p> | 17 | {suggestions} |
158 | 18 | <p id="description">{description}</p> | 18 | </div> |
159 | 19 | <form method="GET" action="{uri}"> | 19 | <form method="GET" action="{uri}" id="button"> |
160 | 20 | <button type="submit" onclick="location.reload(); return false;"> | 20 | <button type="submit" onclick="location.reload(); return false;" autofocus="true" > |
151 | 21 | <img style="{hide-button-images}" src="stock://gtk-refresh"/> | ||
161 | 22 | <span>{tryagain}</span> | 21 | <span>{tryagain}</span> |
162 | 23 | </button> | 22 | </button> |
163 | 24 | </form> | 23 | </form> |
164 | 25 | </div> | 24 | </div> |
168 | 26 | <br style="clear: both;"/> | 25 | |
169 | 27 | </div> | 26 | <br style="clear: both;"/> |
170 | 28 | </body> | 27 | </div> |
171 | 28 | </body> | ||
172 | 29 | </html> | 29 | </html> |
173 | 30 | 30 | ||
174 | === modified file 'midori/midori-app.c' | |||
175 | --- midori/midori-app.c 2013-06-26 21:54:50 +0000 | |||
176 | +++ midori/midori-app.c 2013-06-30 07:38:25 +0000 | |||
177 | @@ -1320,6 +1320,7 @@ | |||
178 | 1320 | gchar** *argument_vector, | 1320 | gchar** *argument_vector, |
179 | 1321 | const GOptionEntry *entries) | 1321 | const GOptionEntry *entries) |
180 | 1322 | { | 1322 | { |
181 | 1323 | |||
182 | 1323 | GtkIconSource* icon_source; | 1324 | GtkIconSource* icon_source; |
183 | 1324 | GtkIconSet* icon_set; | 1325 | GtkIconSet* icon_set; |
184 | 1325 | GtkIconFactory* factory; | 1326 | GtkIconFactory* factory; |
185 | @@ -1329,6 +1330,8 @@ | |||
186 | 1329 | 1330 | ||
187 | 1330 | static GtkStockItem items[] = | 1331 | static GtkStockItem items[] = |
188 | 1331 | { | 1332 | { |
189 | 1333 | { "network-error" }, | ||
190 | 1334 | { "network-idle" }, | ||
191 | 1332 | { STOCK_IMAGE }, | 1335 | { STOCK_IMAGE }, |
192 | 1333 | { MIDORI_STOCK_WEB_BROWSER }, | 1336 | { MIDORI_STOCK_WEB_BROWSER }, |
193 | 1334 | { STOCK_NEWS_FEED }, | 1337 | { STOCK_NEWS_FEED }, |
194 | 1335 | 1338 | ||
195 | === modified file 'midori/midori-view.c' | |||
196 | --- midori/midori-view.c 2013-06-25 22:32:12 +0000 | |||
197 | +++ midori/midori-view.c 2013-06-30 07:38:25 +0000 | |||
198 | @@ -79,9 +79,11 @@ | |||
199 | 79 | static gboolean | 79 | static gboolean |
200 | 80 | midori_view_display_error (MidoriView* view, | 80 | midori_view_display_error (MidoriView* view, |
201 | 81 | const gchar* uri, | 81 | const gchar* uri, |
202 | 82 | const gchar* error_icon, | ||
203 | 82 | const gchar* title, | 83 | const gchar* title, |
204 | 83 | const gchar* message, | 84 | const gchar* message, |
205 | 84 | const gchar* description, | 85 | const gchar* description, |
206 | 86 | const gchar* suggestions, | ||
207 | 85 | const gchar* try_again, | 87 | const gchar* try_again, |
208 | 86 | #ifndef HAVE_WEBKIT2 | 88 | #ifndef HAVE_WEBKIT2 |
209 | 87 | WebKitWebFrame* web_frame); | 89 | WebKitWebFrame* web_frame); |
210 | @@ -667,7 +669,7 @@ | |||
211 | 667 | gchar* slots = g_strjoinv (" , ", (gchar**)gcr_pkcs11_get_trust_lookup_uris ()); | 669 | gchar* slots = g_strjoinv (" , ", (gchar**)gcr_pkcs11_get_trust_lookup_uris ()); |
212 | 668 | gchar* title = g_strdup_printf ("Error granting trust: %s", error->message); | 670 | gchar* title = g_strdup_printf ("Error granting trust: %s", error->message); |
213 | 669 | midori_tab_stop_loading (MIDORI_TAB (view)); | 671 | midori_tab_stop_loading (MIDORI_TAB (view)); |
215 | 670 | midori_view_display_error (view, NULL, NULL, title, slots, | 672 | midori_view_display_error (view, NULL, NULL, NULL, title, slots, NULL, |
216 | 671 | _("Trust this website"), NULL); | 673 | _("Trust this website"), NULL); |
217 | 672 | g_free (title); | 674 | g_free (title); |
218 | 673 | g_free (slots); | 675 | g_free (slots); |
219 | @@ -789,8 +791,8 @@ | |||
220 | 789 | { | 791 | { |
221 | 790 | midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_UNKNOWN); | 792 | midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_UNKNOWN); |
222 | 791 | midori_tab_stop_loading (MIDORI_TAB (view)); | 793 | midori_tab_stop_loading (MIDORI_TAB (view)); |
225 | 792 | midori_view_display_error (view, NULL, NULL, _("Security unknown"), | 794 | midori_view_display_error (view, NULL, NULL, NULL, _("Security unknown"), |
226 | 793 | midori_location_action_tls_flags_to_string (tls_flags), | 795 | midori_location_action_tls_flags_to_string (tls_flags), NULL, |
227 | 794 | _("Trust this website"), | 796 | _("Trust this website"), |
228 | 795 | NULL); | 797 | NULL); |
229 | 796 | } | 798 | } |
230 | @@ -1171,9 +1173,11 @@ | |||
231 | 1171 | static gboolean | 1173 | static gboolean |
232 | 1172 | midori_view_display_error (MidoriView* view, | 1174 | midori_view_display_error (MidoriView* view, |
233 | 1173 | const gchar* uri, | 1175 | const gchar* uri, |
234 | 1176 | const gchar* error_icon, | ||
235 | 1174 | const gchar* title, | 1177 | const gchar* title, |
236 | 1175 | const gchar* message, | 1178 | const gchar* message, |
237 | 1176 | const gchar* description, | 1179 | const gchar* description, |
238 | 1180 | const gchar* suggestions, | ||
239 | 1177 | const gchar* try_again, | 1181 | const gchar* try_again, |
240 | 1178 | #ifndef HAVE_WEBKIT2 | 1182 | #ifndef HAVE_WEBKIT2 |
241 | 1179 | WebKitWebFrame* web_frame) | 1183 | WebKitWebFrame* web_frame) |
242 | @@ -1210,8 +1214,10 @@ | |||
243 | 1210 | "rtl" : "ltr", | 1214 | "rtl" : "ltr", |
244 | 1211 | "{title}", title_escaped, | 1215 | "{title}", title_escaped, |
245 | 1212 | "{favicon}", katze_str_non_null (favicon), | 1216 | "{favicon}", katze_str_non_null (favicon), |
246 | 1217 | "{error_icon}", katze_str_non_null (error_icon), | ||
247 | 1213 | "{message}", message, | 1218 | "{message}", message, |
248 | 1214 | "{description}", description, | 1219 | "{description}", description, |
249 | 1220 | "{suggestions}", katze_str_non_null (suggestions), | ||
250 | 1215 | "{tryagain}", try_again, | 1221 | "{tryagain}", try_again, |
251 | 1216 | "{uri}", uri, | 1222 | "{uri}", uri, |
252 | 1217 | "{hide-button-images}", show_button_images ? "" : "display:none", | 1223 | "{hide-button-images}", show_button_images ? "" : "display:none", |
253 | @@ -1248,6 +1254,7 @@ | |||
254 | 1248 | #endif | 1254 | #endif |
255 | 1249 | gchar* title; | 1255 | gchar* title; |
256 | 1250 | gchar* message; | 1256 | gchar* message; |
257 | 1257 | GString* suggestions; | ||
258 | 1251 | gboolean result; | 1258 | gboolean result; |
259 | 1252 | 1259 | ||
260 | 1253 | /* The unholy trinity; also ignored in Webkit's default error handler */ | 1260 | /* The unholy trinity; also ignored in Webkit's default error handler */ |
261 | @@ -1262,10 +1269,18 @@ | |||
262 | 1262 | return FALSE; | 1269 | return FALSE; |
263 | 1263 | } | 1270 | } |
264 | 1264 | 1271 | ||
269 | 1265 | title = g_strdup_printf (_("Error - %s"), uri); | 1272 | title = g_strdup_printf (_("'%s' can't be found"), midori_uri_parse_hostname(uri, NULL)); |
270 | 1266 | message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri); | 1273 | message = g_strdup_printf (_("The page '%s' couldn't be loaded:"), midori_uri_parse_hostname(uri, NULL)); |
271 | 1267 | result = midori_view_display_error (view, uri, title, | 1274 | |
272 | 1268 | message, error->message, _("Try again"), web_frame); | 1275 | suggestions = g_string_new ("<ul id=\"suggestions\"><li>"); |
273 | 1276 | g_string_append_printf (suggestions, "%s</li><li>%s</li><li>%s</li></ul>", | ||
274 | 1277 | _("Check the address for typos"), | ||
275 | 1278 | _("Make sure that an ethernet cable is plugged in or the wireless card is activated"), | ||
276 | 1279 | _("Verify that your network settings are correct")); | ||
277 | 1280 | |||
278 | 1281 | result = midori_view_display_error (view, uri, "stock://network-error", title, | ||
279 | 1282 | message, error->message, g_string_free (suggestions, FALSE), | ||
280 | 1283 | _("Try Again"), web_frame); | ||
281 | 1269 | g_free (message); | 1284 | g_free (message); |
282 | 1270 | g_free (title); | 1285 | g_free (title); |
283 | 1271 | return result; | 1286 | return result; |
284 | @@ -1397,8 +1412,8 @@ | |||
285 | 1397 | const gchar* uri = webkit_web_view_get_uri (web_view); | 1412 | const gchar* uri = webkit_web_view_get_uri (web_view); |
286 | 1398 | gchar* title = g_strdup_printf (_("Oops - %s"), uri); | 1413 | gchar* title = g_strdup_printf (_("Oops - %s"), uri); |
287 | 1399 | gchar* message = g_strdup_printf (_("Something went wrong with '%s'."), uri); | 1414 | gchar* message = g_strdup_printf (_("Something went wrong with '%s'."), uri); |
290 | 1400 | midori_view_display_error (view, uri, title, | 1415 | midori_view_display_error (view, uri, NULL, title, |
291 | 1401 | message, "", _("Try again"), NULL); | 1416 | message, "", NULL, _("Try again"), NULL); |
292 | 1402 | g_free (message); | 1417 | g_free (message); |
293 | 1403 | g_free (title); | 1418 | g_free (title); |
294 | 1404 | } | 1419 | } |
295 | @@ -4093,15 +4108,16 @@ | |||
296 | 4093 | else if (!strcmp (uri, "about:private")) | 4108 | else if (!strcmp (uri, "about:private")) |
297 | 4094 | { | 4109 | { |
298 | 4095 | data = g_strdup_printf ( | 4110 | data = g_strdup_printf ( |
300 | 4096 | "<html><head><title>%s</title>" | 4111 | "<html dir=\"ltr\"><head><title>%s</title>" |
301 | 4097 | "<link rel=\"stylesheet\" type=\"text/css\" href=\"res://about.css\">" | 4112 | "<link rel=\"stylesheet\" type=\"text/css\" href=\"res://about.css\">" |
309 | 4098 | "</head><body><div id=\"container\">" | 4113 | "</head>" |
310 | 4099 | "<img id=\"logo\" src=\"res://logo-shade.png\" " | 4114 | "<body>" |
311 | 4100 | "style=\"position: absolute; right: 15px; bottom: 15px; z-index: -9;\">" | 4115 | "<img id=\"logo\" src=\"res://logo-shade.png\" />" |
312 | 4101 | "<img id=\"icon\" src=\"stock://gtk-dialog-info\">" | 4116 | "<div id=\"main\" style=\"background-image: url(stock://gtk-dialog-info);\">" |
313 | 4102 | "<div id=\"main\"><h1>%s</h1>" | 4117 | "<div id=\"text\">" |
314 | 4103 | "<p>%s</p><ul><li>%s</li><li>%s</li><li>%s</li></ul>" | 4118 | "<h1>%s</h1>" |
315 | 4104 | "<p>%s</p><ul><li>%s</li><li>%s</li><li>%s</li><li>%s</li></ul>" | 4119 | "<p class=\"message\">%s</p><ul class=\" suggestions\"><li>%s</li><li>%s</li><li>%s</li></ul>" |
316 | 4120 | "<p class=\"message\">%s</p><ul class=\" suggestions\"><li>%s</li><li>%s</li><li>%s</li><li>%s</li></ul>" | ||
317 | 4105 | "</div><br style=\"clear: both\"></div></body></html>", | 4121 | "</div><br style=\"clear: both\"></div></body></html>", |
318 | 4106 | _("Private Browsing"), _("Private Browsing"), | 4122 | _("Private Browsing"), _("Private Browsing"), |
319 | 4107 | _("Midori doesn't store any personal data:"), | 4123 | _("Midori doesn't store any personal data:"), |
320 | @@ -4204,8 +4220,10 @@ | |||
321 | 4204 | midori_tab_set_uri (MIDORI_TAB (view), uri); | 4220 | midori_tab_set_uri (MIDORI_TAB (view), uri); |
322 | 4205 | midori_tab_set_special (MIDORI_TAB (view), TRUE); | 4221 | midori_tab_set_special (MIDORI_TAB (view), TRUE); |
323 | 4206 | katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_PENDING_UNDELAY); | 4222 | katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_PENDING_UNDELAY); |
325 | 4207 | midori_view_display_error (view, NULL, NULL, _("Page loading delayed"), | 4223 | midori_view_display_error (view, NULL, "stock://network-idle", NULL, |
326 | 4224 | _("Page loading delayed:"), | ||
327 | 4208 | _("Loading delayed either due to a recent crash or startup preferences."), | 4225 | _("Loading delayed either due to a recent crash or startup preferences."), |
328 | 4226 | NULL, | ||
329 | 4209 | _("Load Page"), | 4227 | _("Load Page"), |
330 | 4210 | NULL); | 4228 | NULL); |
331 | 4211 | } | 4229 | } |
Now it looks like this: http:// i.imgur. com/SV8WBxF. png