Merge branch 'master' of git://gitorious.org/rekonq/mainline into i18n

9 files changed, 197 insertions, 97 deletions

diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 0af92f5e..ef777c9c 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -1,10 +1,15 @@
 INSTALL( 
-    FILES bg2.png bg.png bot.gif busywidget.gif closed.png loading.mng open.png tile.gif top.png webkit-icon.png category.png button.png
+    FILES 
+    bg2.png bg.png tile.gif category.png button.png
+    busywidget.gif loading.mng  
+    webkit-icon.png
     DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics
 )
 
 INSTALL( 
-    FILES defaultbookmarks.xbel
+    FILES 
+    defaultbookmarks.xbel
+    default.css
     DESTINATION ${DATA_INSTALL_DIR}/rekonq
 )
 
@@ -14,6 +19,8 @@ INSTALL(
 )
 
 INSTALL( 
-    FILES rekonqinfo.html home.html
+    FILES 
+    rekonqinfo.html 
+    home.html
     DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls
 )
diff --git a/src/data/bot.gif b/src/data/bot.gif
deleted file mode 100644
index 2f9abde4..00000000
--- a/src/data/bot.gif
+++ /dev/null
diff --git a/src/data/closed.png b/src/data/closed.png
deleted file mode 100644
index 2b1bf01e..00000000
--- a/src/data/closed.png
+++ /dev/null
diff --git a/src/data/default.css b/src/data/default.css
new file mode 100644
index 00000000..3ddd3026
--- /dev/null
+++ b/src/data/default.css
@@ -0,0 +1,10 @@
+/*
+rekonq default css properties
+this file will not be considered
+setting a local stylesheet in rekonq config
+*/
+
+/* Set background color to white for sites forgetting this */
+body{
+background-color:#FFFFFF;
+}
\ No newline at end of file
diff --git a/src/data/home.html b/src/data/home.html
index 9d8f390f..25236743 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -6,134 +6,170 @@
 
 <style type="text/css">
 
-/* ------------------------------------------------------- */
-/* generic styles */
-
-html, body, div, h1, h2, h3, h4, a, p{
-margin:0;
-padding:0;
-border:0;
+/* -------------------------------------------------------- */
+/* css reset */
+* {
+border: 0; padding: 0; margin: 0;
 }
 
-body{
+/* -------------------------------------------------------- */
+/* generic styles */
+
+body {
 background: url(%2/tile.gif) repeat-x #fff;
-font-family: sans-serif;
-font-size: 0.8em;
-text-align: center;
+font-family: sans-serif; font-size: 0.8em;
 }
 
-h1{
-font: normal bold 2em sans-serif;
-text-align:right;
-color: #3F7AB7;
-margin-right:3%;
-margin-top: 0.5%;
-float:right;
+#rekonq-newtabpage {
+width: 100%;
+text-align: center; /* center #navigation */
 }
 
-h2{
-font: normal bold 1.2em sans-serif;
-color: #3F7AB7;
-margin-top: 2em;
+#content {
+text-align: left;
+margin: 0 1% 2% 1%;
 }
 
-h3{
+h3 {
 border-bottom-width: 1px;
 -webkit-border-image: url(%2/category.png) 1 1 1 1  stretch stretch;
-padding: 0.2em;
-margin-top: 0.5em;
-margin-bottom: 0.5em;
-font: normal bold 1em sans-serif;
+padding: 0.2em; margin: 0.5em 0;
+font: normal bold 1em;
 }
 
-h4{
-font-size: 1em;
-margin-top: 0.5em;
-}
-
-a{
+a {
 color: #3F7AB7;
 text-decoration: none;
+-webkit-transition-property: color;
+-webkit-transition-duration: 0.5s;
+-webkit-transition-timing-function: ease;
 }
-a:hover{
+a:hover {
 color: black;
 }
 
-/* ------------------------------------------------------- */
-/* page sections */
+/* -------------------------------------------------------- */
+/* Top bar */
 
-#container {
-width: 100%;
+#top {
+margin: 20px;
 }
 
-#navigation {
+.topBar {
 display: inline-block;
-margin-top: 2%;
-margin-bottom: 2%;
-text-align: center;
 border-width: 5px;
--webkit-border-image: url(%2/bg2.png) 12 12 12 12  stretch stretch;
 }
 
-#content {
-text-align: left;
-margin: 2%;
+#navigation {
+-webkit-border-image: url(%2/bg2.png) 12 12 12 12  stretch stretch;
+max-width: 55%;
 }
 
-/* -------------------------------------------------------- */
-/* div navigations styles */
+#actions, #balance {
+margin-top: 12px;
+width: 20%;
+}
 
-.link{
-display: inline-block;
+#actions {
+float: right;
 }
 
-.link img{
-vertical-align: middle;
-margin-right: 5px;
+#balance {
+display: hidden; float: left;
+height: 16px;
 }
 
-.link a{
+.link {
+display: inline-block;
+}
+.link img, .link span {
+vertical-align: middle; display: inline-block; 
+}
+.link a, .link span {
 color: black;
-text-decoration:none;
-font: normal 1em sans-serif;
+}
+
+#actions .link {
+-webkit-transition-property: opacity;
+-webkit-transition-duration: 0.8s;
+-webkit-transition-timing-function: ease;
+opacity: 0.2;
+}
+#actions .link:hover {
+opacity: 1;
+}
+#actions .link img {
+margin-right: 3px; width: 16px;
 }
 
 .current{
 border-width: 6px;
 -webkit-border-image: url(%2/button.png) 6 stretch stretch;
 }
-
-#navigation .link:not(.current){
-margin-right: 10px;
-margin-left: 10px;
+.link:not(.current){
+margin: 0 10px;
 }
 
+/* -------------------------------------------------------- */
+/* Previews */
 
-.favorites{
+#content.favorites, #content.closedTabs {
 text-align: center;
-margin-top: -5%;
 }
 
-/* -------------------------------------------------------- */
-/* Thumbnail class */
-
 .thumbnail {
-text-align: center;
 display: inline-block;
-width:25%;
-margin-top: 7%;
-min-width:250px;
-min-height:192px;
+width: 25%; min-width: 240px;
+height: 170px;
+margin: 3% 0 3% 0;
 }
 
-.thumbnail object{
-text-align: center;
-width:228px;
-height:192px;
+.thumb-inner {
+width: 232px; /* 200 + 16*2 */
+margin: auto;
+}
+
+.preview {
+display: table-cell; vertical-align: middle;
+width: 200px; height: 150px;
+padding: 14px 16px 12px;
+background: url(%2/bg.png) no-repeat;
+-webkit-background-size: 100% 100%; 
+}
+
+.title {
+padding: 0 12px;
+}
+
+.thumbnail:hover .preview , 
+.thumbnail:hover .button img {
+opacity: 0.8;
+}
+.button img, .preview {
+-webkit-transition-property: opacity;
+-webkit-transition-duration: 0.8s;
+-webkit-transition-timing-function: ease-in-out;
+}
+
+.button img {
+display: inline-block;
+width: 16px;
+height: 16px;
+opacity: 0;
+}
+.remove {
+float: right;
+}
+.modify {
+float: left;
+}
+
+.thumbnail a:hover, .thumbnail span {
+color:#3F7AB7;
 }
 
 /* -------------------------------------------------------- */
-/* Bookmarks page*/
+/* Bookmarks page */
 
 .bookfolder{
 margin-left: 2em;
@@ -141,39 +177,68 @@ margin-bottom: 0.5em;
 }
 
 /* -------------------------------------------------------- */
+/* Downloads page */
+
+.download{
+margin: 1.5em 0;
+}
+
+.download img{
+float: left;
+margin-right: 5px;
+}
+
+/* -------------------------------------------------------- */
+/* Empty pages : in the end : need to overwrite */
+#content.empty {
+margin-top: 10%;
+text-align: center;
+}
+
+
 </style>
 </head>
 
 <body>
 
-<div id="container">
-    <div id="navigation">
+<div id="rekonq-newtabpage">
+    <div id="top">
+        <div class="topBar" id="balance"></div> <!-- This # is the same size as #actions to center #navigation -->
+        <div class="topBar" id="navigation"></div>
+        <div class="topBar" id="actions"></div>
     </div>
-    
     <div id="content">
-    
     </div>
 </div>
 
 <div id="models" style="display:none">
+    <div></div>
     <div class="link">
         <a href="">
             <img src="" />
+            <span></span>
         </a>
     </div>
     <div class="thumbnail">
-        <object type="application/image-preview" data="">
-            <param name="title" />
-            <param name="index" />
-            <param name="isFavorite" />
-        </object>
+        <div class ="thumb-inner">
+            <a>
+                <div class ="preview">
+                    <img />
+                </div>
+            </a>
+            <div class="title">
+                <a class="button modify"><img /></a>
+                <span><a></a></span>
+                <a class="button remove"><img /></a>
+            </div>
+        </div>
     </div>
     <h3></h3>
     <a></a>
-    </br>
-    <p class="bookfolder"></h3>
+    <br />
+    <img />
+    <p class="bookfolder"></p>
 </div>
 
-
 </body>
 </html>
diff --git a/src/data/open.png b/src/data/open.png
deleted file mode 100644
index fee6f3fb..00000000
--- a/src/data/open.png
+++ /dev/null
diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index 62998336..b0f8f2e3 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -1,17 +1,35 @@
 [Desktop Entry]
 Name=rekonq
+Name[cs]=rekonq
+Name[da]=rekonq
+Name[de]=rekonq
+Name[en_GB]=rekonq
+Name[es]=rekonq
+Name[fr]=rekonq
+Name[ga]=rekonq
+Name[lt]=rekonq
+Name[nds]=Rekonq
+Name[pl]=rekonq
+Name[pt]=rekonq
+Name[pt_BR]=rekonq
 Name[sv]=Rekonq
-Name[tr]=Rekonq
+Name[uk]=rekonq
 Name[x-test]=xxrekonqxx
 GenericName=Webkit KDE Browser
-GenericName[de]=Webkit-Browser für KDE
-GenericName[et]=KDE Webkiti veebibrauser
-GenericName[km]=កម្មវិធី​រុករក​ Webkit KDE
-GenericName[pt]=Navegador Web com WebKit
+GenericName[cs]=Prohlížeč pro KDE založený na Webkitu
+GenericName[da]=KDE-browser baseret på Webkit
+GenericName[de]=WebKit-basierter Webbrowser für KDE
+GenericName[en_GB]=Webkit KDE Browser
+GenericName[es]=Navegador Webkit para KDE
+GenericName[fr]=Navigateur Webkit pour KDE
+GenericName[ga]=Brabhsálaí Webkit KDE
+GenericName[lt]=Webkit KDE naršyklė
+GenericName[nds]=Webkit-KDE-Kieker
+GenericName[pl]=Przeglądarka Webkit dla KDE
+GenericName[pt]=Navegador do KDE usando o WebKit
 GenericName[pt_BR]=Navegador Webkit do KDE
 GenericName[sv]=Webkit webbläsare för KDE
-GenericName[tr]=Webkit KDE Tarayıcı
-GenericName[uk]=Переглядач мережі на WebKit для KDE
+GenericName[uk]=Переглядач інтернету на WebKit для KDE
 GenericName[x-test]=xxWebkit KDE Browserxx
 Icon=rekonq
 Type=Application
diff --git a/src/data/top.png b/src/data/top.png
deleted file mode 100644
index 9ebf0234..00000000
--- a/src/data/top.png
+++ /dev/null
diff --git a/src/data/webkit-icon.png b/src/data/webkit-icon.png
index b3ec677a..780b0b16 100644
--- a/src/data/webkit-icon.png
+++ b/src/data/webkit-icon.png