diff options
| author | Matthieu Gicquel <matthieu@bureau.home> | 2009-10-07 16:53:11 +0200 |
|---|---|---|
| committer | Matthieu Gicquel <matthieu@bureau.home> | 2009-10-07 16:53:11 +0200 |
| commit | 5eedff3b0ea920e5c63c151a8101ab48d4f5b759 (patch) | |
| tree | da74ded37acdf9d2b8fc84c31240f5e87692f141 | |
| parent | Fixing merge operation (diff) | |
| download | rekonq-5eedff3b0ea920e5c63c151a8101ab48d4f5b759.tar.xz | |
fix homepage
| -rw-r--r-- | data/home.html | 13 | ||||
| -rw-r--r-- | src/homepage.cpp | 16 |
2 files changed, 8 insertions, 21 deletions
diff --git a/data/home.html b/data/home.html index 1a193b07..abd3e56d 100644 --- a/data/home.html +++ b/data/home.html @@ -23,7 +23,7 @@ text-align: center; } h1{ -font: normal bold 1.5em sans-serif; +font: normal bold 2em sans-serif; text-align:right; color: #3F7AB7; margin-right:3%; @@ -34,8 +34,7 @@ float:right; h2{ font: normal bold 1.2em sans-serif; color: #3F7AB7; -text-align: left; -margin: 20px 20px 20px 22px; +margin-top: 2em; } h3{ @@ -68,6 +67,7 @@ width: 100%; #navigation { margin-top: 1%; +margin-bottom: 4%; text-align: center; } @@ -119,7 +119,6 @@ padding: 14px 16px; -webkit-background-clip: padding; cursor: pointer; } - .thumbnail a { display: block; text-align: center; @@ -143,11 +142,11 @@ margin-bottom: 0.5em; <body> <div id="container"> -%2 <div id="navigation"> -%3 +<h1>rekonq</h1> +%2 </div> -<div id="content">%4</div> +<div id="content">%3</div> </div> </body> diff --git a/src/homepage.cpp b/src/homepage.cpp index 98060bed..bd0fb22b 100644 --- a/src/homepage.cpp +++ b/src/homepage.cpp @@ -74,31 +74,18 @@ QString HomePage::rekonqHomePage(const KUrl &url) QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics"); QString menu = homePageMenu(url); - QString title, speed; + QString speed; if(url == KUrl("rekonq:lastSites")) - { - title = "<h2>" + i18n("Last Visited Sites") + "</h2>"; speed = lastVisitedSites(); - } if(url == KUrl("rekonq:history")) - { - title = "<h2>" + i18n("History") + "</h2>"; speed = fillHistory(); - } if(url == KUrl("rekonq:bookmarks")) - { - title = "<h2>" + i18n("Bookmarks") + "</h2>"; speed = fillBookmarks(); - } if(url == KUrl("rekonq:home") || url == KUrl("rekonq:favorites")) - { - title = "<h2>" + i18n("Favorites") + "</h2>"; speed = fillFavorites(); - } QString html = QString(QLatin1String(file.readAll())) .arg(imagesPath) - .arg(title) .arg(menu) .arg(speed) ; @@ -207,6 +194,7 @@ QString HomePage::homePageMenu(KUrl currentUrl) menu += "<img src=\"file:///" + loader->iconPath("rating", KIconLoader::Desktop) + "\" />"; menu += "Favorites</a></div>"; + return menu; } |