From 02c82cfdb82809a36f5f2a697a6ecbc01880ace6 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 25 May 2012 16:17:45 +0200
Subject: Another clean up in rekonq file:// pages

---
 src/data/rekonqinfo.html | 11 ++++++-----
 src/protocolhandler.cpp  |  4 ++--
 src/webpage.cpp          |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'src')
diff --git a/src/data/rekonqinfo.html b/src/data/rekonqinfo.html
index c3e6a8fa..b09ea1f7 100644
--- a/src/data/rekonqinfo.html
+++ b/src/data/rekonqinfo.html
@@ -15,6 +15,9 @@ MAIN_CONTENT = page main content
 -->
 
 <head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
 <title>$PAGE_TITLE</title>
 
 <style type="text/css">
@@ -50,17 +53,15 @@ body{
 }
 
 h1{
-    font-size: 130%;
+    font-size: 150%;
     font-weight: bold;
     border-bottom: 1px solid lightgray;
-    margin-left: 48px;
 }
 
 h2{
-    font-size: 100%;
-    font-weight: normal;
+    font-size: 130%;
+    font-weight: bold;
     border-bottom: 1px solid lightgray;
-    margin-left: 48px;
 }
 
 ul {
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index ba59b8f1..691ab002 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -302,7 +302,7 @@ QString ProtocolHandler::dirHandling(const KFileItemList &list)
     QString title = _url.prettyUrl();
 
     // 3. main content
-    QString msg = i18nc("%1=an URL", "<h1>Index of %1</h1>", _url.prettyUrl());
+    QString msg = i18nc("%1=an URL", "<h2>Index of %1</h2>", _url.prettyUrl());
 
 
     if (rootUrl.cd(".."))
@@ -313,7 +313,7 @@ QString ProtocolHandler::dirHandling(const KFileItemList &list)
         msg += "<a href=\"" + path + "\">" + i18n("Up to higher level directory") + "</a><br /><br />";
     }
 
-    msg += QL1S("<table width=\"100%\">");
+    msg += QL1S("<table width=\"95%\" align=\"center\">");
     msg += QL1S("<tr>");
     msg += QL1S("<th align=\"left\">") + i18n("Name") + QL1S("</th>");
     msg += QL1S("<th align=\"center\">") + i18n("Size") + QL1S("</th>");
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 6cd52bd7..cbf1f573 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -574,6 +574,10 @@ QString WebPage::errorPage(QNetworkReply *reply)
         return QString("Couldn't open the rekonqinfo.html file");
     }
 
+    // NOTE:
+    // this, to take care about XSS (see BUG 217464)...
+    QString urlString = Qt::escape(reply->url().toString());
+
     // 1. data path
     QString dataPath = QL1S("file://") + notfoundFilePath;
     dataPath.remove(QL1S("/htmls/rekonqinfo.html"));
@@ -581,10 +585,6 @@ QString WebPage::errorPage(QNetworkReply *reply)
     // 2. title
     QString title = i18n("There was a problem while loading the page");
 
-    // NOTE:
-    // this, to take care about XSS (see BUG 217464)...
-    QString urlString = Qt::escape(reply->url().toString());
-
     QString iconPath = QString("file://") + KIconLoader::global()->iconPath("dialog-warning" , KIconLoader::Small);
     iconPath.replace(QL1S("16"), QL1S("128"));
 
-- 
cgit v1.2.1

