Doc: Fixed QDoc's navigation mechanism.

The HTML pages need to display minimal navigation such
as a link to the module landing page or Qt 5's index.html.

-new variables available in qdocconf files:
    navigation.landingpage
    navigation.homepage
    navigation.cppclassespage
    navigation.qmltypespage
    buildversion

The navigation variables are for the new navigation bar.
The buildversion variable is to insert documentation build
information into the pages.

Note about compatibility with Qt Creator docs:
The HTML template files for Qt Creator is retained to keep
Qt Creator compatible with 5.0.x and 5.1.x.

Change-Id: Ibb4d7cada19644204457d822b6b77b2aa7b70f8d
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

2 files changed, 109 insertions, 54 deletions

diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index 0e4dd5e9a4..5a036c7f07 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -181,6 +181,74 @@ footer and license
 text-align:center
 }
 
+.navigationbar{
+display: block;
+position: relative;
+top:-20px;
+/*border-top:2px solid #ffffff;*/
+border-bottom: 1px solid #cecece;
+background-color:#F2F2F2;
+z-index:1;
+height:20px;
+padding-left:7px;
+margin:0px;
+padding-top:2px;
+margin-left:-5px;
+margin-right:-5px;
+}
+
+.navigationbar ul{
+ margin:0px;
+ padding:0px;
+}
+
+.navigationbar ul li{
+list-style-type:none;
+padding-top:2px;
+padding-left: 4px;
+margin:0;
+height:20px;
+}
+
+.navigationbar li{
+float:left;
+}
+
+.navigationbar .first {
+background:url(../images/home.png);
+background-position:left;
+background-repeat:no-repeat;
+padding-left:20px;
+}
+
+
+.navigationbar li a{
+display:block;
+text-decoration:none;
+background:url(../images/arrow_bc.png);
+background-repeat:no-repeat;
+background-position:right;
+padding-right:17px;
+}
+
+
+/*
+-----------
+footer and license
+-----------
+*/
+.footer{
+text-align:center
+}
+
+#buildversion{
+font-style: italic;
+font-size: small;
+float: right;
+margin-right: 5px;
+}
+/*
+
 /* table of content
 no display
 */
@@ -441,7 +509,7 @@ padding: 3px 15px 3px 0;
 
 .qml{
 display: block;
-margin: 10;
+margin: 10px;
 overflow: auto;
 padding: 20px 20px 20px 20px;
 }
@@ -493,7 +561,7 @@ vertical-align:top;
 -moz-border-radius: 7px 7px 7px 7px;
 -webkit-border-radius: 7px 7px 7px 7px;
 border-radius: 7px 7px 7px 7px;
- background:#FFF url(../images/bgrContent.png);
+ background:#FFF url('../images/bgrContent.png');
 background-position:top;
 background-repeat:repeat-x;
 border: 1px solid #E6E6E6;
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index fd2b7abed7..09c863feff 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -12,7 +12,7 @@ height: auto
 }
 
 .content{
-    margin: 30px;
+    margin: 15px;
 }
 
 .descr{
@@ -137,64 +137,46 @@ height:20px;
 margin-left:30px;
 }
 
-.breadcrumb{
-display: block;
-position: relative;
-z-index:1;
-height:20px;
-padding:0px;
-margin:0px;
-padding-left:10px;
-padding-top:12px;
-margin-left:-5px;
-margin-right:-5px;
-}
-
-.breadcrumb ul{
- margin:0px;
- padding:0px;
+.navigationbar {
+    background-repeat: no-repeat;
+    height: 33px;
+    margin: 0px !important;
+    padding: 0px !important;
+    border-bottom: 1px solid rgb(209, 209, 209);
+    background-image: -moz-linear-gradient(center top , rgb(246, 245, 245), rgb(239, 239, 239));
+background-image: -webkit-gradient( linear, left bottom, left top, color-stop(0.0, #efefef), color-stop(0.5,    #f6f5f5) );
+    border-radius: 10px 10px 0px 0px;
 }
 
-.breadcrumb ul li{
-list-style-type:none;
-padding:0;
-margin:0;
+.navigationbar ul{
+margin:0px;
+padding:8px 0px 15px 15px;
 height:20px;
 }
 
-.breadcrumb li{
+.navigationbar li{
+list-style-type:none;
 float:left;
+font-size: 15px;
 }
 
-.breadcrumb .first {
-background:url('../images/home.png');
-background-position:left;
-background-repeat:no-repeat;
-padding-left:20px;
-}
-
-
-.breadcrumb li a{
+.navigationbar li a{
 display:block;
 text-decoration:none;
-background:url('../images/arrow.png');
+background:url('../images/arrow_bc.png');
 background-repeat:no-repeat;
 background-position:right;
 padding-right:25px;
-padding-left:10px;
+font-size: inherit;
 }
 
-.breadcrumb li a:hover{
-color:#909090;
-display:block;
-text-decoration:none;
-background:url('../images/arrow.png');
-background-repeat:no-repeat;
-background-position:right;
-padding-right:20px;
-padding-left:10px;
-}
 
+#buildversion{
+font-style: italic;
+font-size: small;
+float: right;
+margin-right: 5px;
+}
 
 /*
 -----------
@@ -844,7 +826,7 @@ p.forum-overview-title,
 p.forum-description,
 p.desc,
 p.forum-lastpost,
-div.breadcrumbs li,
+div.navigationbars li,
 div.block-profile div
 {
     font-size: 13px;
@@ -866,14 +848,6 @@ div.notes p
     font-size: 12px !important;
 }
 
-.line {
-    display: inline-block;
-    background: none repeat scroll 0% 0% rgb(255,255,255);
-    width: 100%;
-    border: 1px solid #DADADA;
-    border-radius: 10px 10px 10px 10px;
-    box-shadow: 0 0 3px #C4C4C4;
-}
 a {
 color: #44a51c;
 text-decoration: none;
@@ -881,3 +855,16 @@ text-decoration: none;
 .wrap{
 padding-left: 30px
 }
+
+.main {
+    padding: 0px 30px 30px 30px;
+}
+.main-rounded {
+    display: inline-block;
+    background: none repeat scroll 0% 0% rgb(255,255,255);
+    width: 100%;
+    border: 1px solid #DADADA;
+    border-radius: 10px 10px 10px 10px;
+    box-shadow: 0 0 3px #C4C4C4;
+    padding-bottom: 30px;
+}