]> spindle.queued.net Git - midori/commitdiff
projects / midori / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8154316)
Handle RTL in special pages (errors)
authorChristian Dywan <christian@twotoasts.de>
Fri, 13 Jul 2012 22:26:23 +0000 (00:26 +0200)
committerChristian Dywan <christian@twotoasts.de>
Sat, 14 Jul 2012 22:13:43 +0000 (00:13 +0200)
data/about.css patch | blob | history
data/error.html patch | blob | history
midori/midori-view.c patch | blob | history

diff --git a/data/about.css b/data/about.css
index 42df9b5868305b1fab0a068617ca636594e49179..66cb3345bfb6f2f4c6de4d4901e15d01adc7fc60 100644 (file)
--- a/data/about.css
+++ b/data/about.css
@@ -24,6 +24,11 @@ body {
    padding-top: 1%;
 }
 
+html[dir="rtl"] #icon {
+   float: right;
+   padding-right: 1%;
+}
+
 #main {
    float: right;
    width: 75%;
@@ -38,8 +43,16 @@ h1 {
 }
 
 #logo {
-  position: absolute; right: 15px; bottom: 15px;
-  z-index: -1;
+   position: absolute; bottom: 15px;
+   z-index: -1;
+}
+
+html[dir="ltr"] #logo {
+   right: 15px;
+}
+
+html[dir="rtl"] #logo {
+   left: 15px;
 }
 
 button span,
diff --git a/data/error.html b/data/error.html
index 6bc9698eb8d3d2dbb15bfd481d01df35beb8cda7..b62649442cc20eceb7b367c63f00f04a6ee89228 100644 (file)
--- a/data/error.html
+++ b/data/error.html
@@ -2,7 +2,7 @@
  Error page template for Midori.
  This file is licensed under the terms of the expat license, see the file EXPAT.
 -->
-<html>
+<html dir="{dir}">
 <head>
 <title>{title}</title>
 <link rel="shortcut icon" href="{icon}" />
diff --git a/midori/midori-view.c b/midori/midori-view.c
index a4757633893601269e2c488f7761a50fd600ceb2..9d8eb0636bb11a33b96f77c39e09843688e10a00 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1439,6 +1439,8 @@ midori_view_display_error (MidoriView*     view,
         title_escaped = g_markup_escape_text (title, -1);
         icon = katze_item_get_icon (view->item);
         result = sokoke_replace_variables (template,
+            "{dir}", gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL ?
+                "rtl" : "ltr",
             "{title}", title_escaped,
             "{icon}", icon ? icon : "",
             "{message}", message,
Unnamed repository; edit this file 'description' to name the repository.