[qemu-web PATCH 5/7] Simplify and restructure the page footer

["Daniel P. Berrangé" <berrange@redhat.com>]

The page footer currently has a large wall of links.

Many of the links duplicate what is already present in the page header
navbar. The header is styled to have a fixed position, it will always
be on screen. The footer meanwhile is often off the bottom of the
screen.

Other links from the footer are already present in the 'contribute' and
'documentation' pages, with more descriptive text.

The wiki link would be better placed in the top header where it is more
obviously visible to users.

With this change the footer is slimmed down to avoid link duplication,
leaving it primarily focused on providing links to the related external
sites.

The wiki link is moved to the header nav which has extra space after the
previous patch.

Finally the conservancy link pulled out and placed just below the footer
adjacent to the licensing link, giving it more prominence.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 _includes/copyright.html     |  8 --------
 _includes/footer.html        | 30 +++++++++---------------------
 _includes/nav.html           |  1 +
 _layouts/blog.html           |  1 -
 _layouts/home.html           |  1 -
 _layouts/page.html           |  1 -
 assets/css/style-desktop.css | 24 ++++--------------------
 assets/css/style-mobile.css  | 13 +------------
 assets/css/style.css         | 36 ++++++++++++++++++++++++++----------
 9 files changed, 41 insertions(+), 74 deletions(-)
 delete mode 100644 _includes/copyright.html

diff --git a/_includes/copyright.html b/_includes/copyright.html
deleted file mode 100644
index cdcd98f..0000000
--- a/_includes/copyright.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="copyright">
-	<div id="copyright-inner">
-	  <div class="container">
-	    This site is made available under the terms of
-	    <a href="{{ relative_root }}/license.html">a number of licenses</a>.
-	  </div>
-	</div>
-</div>
diff --git a/_includes/footer.html b/_includes/footer.html
index b614795..2dd247b 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,30 +1,18 @@
 <div id="footer">
-	<div id="footer-inner">
+	<div id="external-links">
 		<ul class="style">
-			<li><a href="{{ relative_root }}/">Home</a></li>
-			<li><a href="{{ relative_root }}/download">Download</a></li>
-			<li><a href="{{ relative_root }}/conservancy/">Conservancy / Committee</a></li>
-			<li><a href="http://qemu-advent-calendar.org">QEMU advent calendar</a></li>
-		</ul>
-		<ul class="style">
-			<li><a href="{{ relative_root }}/contribute">Contribute</a></li>
-			<li><a href="{{ relative_root }}/contribute/report-a-bug">Reporting a bug</a></li>
-			<li><a href="https://wiki.qemu.org/Documentation/GettingStartedDevelopers">New contributors</a></li>
-			<li><a href="https://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></li>
-			<li><a href="https://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></li>
-		</ul>
-		<ul class="style">
-			<li><a href="{{ relative_root }}/documentation">Documentation</a></li>
-			<li><a href="https://www.qemu.org/docs/master/">Main docs</a></li>
-			<li><a href="https://wiki.qemu.org/Category:Developer_documentation">Developer docs</a></li>
-			<li><a href="https://wiki.qemu.org/">Wiki</a></li>
-		</ul>
-		<ul class="style">
-			<li><a href="https://planet.virt-tools.org/">virt tools planet</a></li>
+			<li><a href="http://qemu-advent-calendar.org">Advent calendar</a></li>
+			<li><a href="https://planet.virt-tools.org/">Blog planet</a></li>
 			<li><a href="https://www.linux-kvm.org/">KVM</a></li>
 			<li><a href="http://libguestfs.org/">Libguestfs</a></li>
 			<li><a href="https://libvirt.org/">Libvirt</a></li>
 			<li><a href="https://xenproject.org">Xen</a></li>
 		</ul>
 	</div>
+	<div id="conservancy">
+	  QEMU is a member of <a href="{{ relative_root }}/conservancy/">Software Freedom Conservancy</a>
+	</div>
+	<div id="licenses">
+	  <a href="{{ relative_root }}/license.html">Website licenses</a>
+	</div>
 </div>
diff --git a/_includes/nav.html b/_includes/nav.html
index c66ee92..73b39b3 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -7,6 +7,7 @@
 			</li><li {% if current[1] == 'support' %}class='current'{% endif %}><a href="{{ relative_root }}/support">Support</a>
 			</li><li {% if current[1] == 'contribute' %}class='current'{% endif %}><a href="{{ relative_root }}/contribute">Contribute</a>
 			</li><li {% if current[1] == 'documentation' %}class='current'{% endif %}><a href="{{ relative_root }}/documentation">Docs</a>
+			</li><li><a href="https://wiki.qemu.org">Wiki</a>
 			</li><li {% if current[1] == 'blog' %}class='current'{% endif %}><a href="{{ relative_root }}/blog">Blog</a></li>
 		</ul>
 	</nav>
diff --git a/_layouts/blog.html b/_layouts/blog.html
index b300636..b7fcdbf 100644
--- a/_layouts/blog.html
+++ b/_layouts/blog.html
@@ -21,7 +21,6 @@ Released for free under the Creative Commons Attribution 3.0 license (templated.
 	
 	{% include sidebar.html %}
 	{% include footer.html %}
-	{% include copyright.html %}
 
 </body>
 </html>
diff --git a/_layouts/home.html b/_layouts/home.html
index d94c9b0..f7b6931 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -18,7 +18,6 @@ Released for free under the Creative Commons Attribution 3.0 license (templated.
 	{{ content }}
 
 	{% include footer.html %}
-	{% include copyright.html %}
 
 </body>
 </html>
diff --git a/_layouts/page.html b/_layouts/page.html
index d650054..765d204 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -23,7 +23,6 @@ Released for free under the Creative Commons Attribution 3.0 license (templated.
 	</div>
 	
 	{% include footer.html %}
-	{% include copyright.html %}
 
 </body>
 </html>
diff --git a/assets/css/style-desktop.css b/assets/css/style-desktop.css
index b7e403a..d45ec15 100644
--- a/assets/css/style-desktop.css
+++ b/assets/css/style-desktop.css
@@ -101,29 +101,13 @@
 /*********************************************************************************/
 /* Footer                                                                        */
 /*********************************************************************************/
-	
-	#footer
-	{
-		padding: 1em 0em;
-	}
-	
-	#footer-inner
-	{
-		width: 95%;
-		display: table;
-		margin: auto;
-	}
 
-	#footer ul
-	{
-		width: 25%;
-		display: table-cell;
-		padding-left: 2em;
+	#licenses {
+		float: right;
 	}
 
-	#footer ul:first-child
-	{
-		padding-left: 0px;
+	#conservancy {
+		float: left;
 	}
 
 /*********************************************************************************/
diff --git a/assets/css/style-mobile.css b/assets/css/style-mobile.css
index 8910e71..652650b 100644
--- a/assets/css/style-mobile.css
+++ b/assets/css/style-mobile.css
@@ -242,7 +242,7 @@
 /* Columns                                                                       */
 /*********************************************************************************/
 
-	#main, #footer-inner, #copyright-inner
+	#main, #copyright-inner
 	{
 		margin-left: 0%;
 		width: 100%;
@@ -283,19 +283,8 @@
 	
 	#footer
 	{
-		padding: 1em;
-	}
-	
-	#footer ul
-	{
-		padding: 0.6em 0px;
-		border-top: 1px solid white;
 	}
 
-	#footer ul:first-child
-	{
-		border-top: 0px;
-	}
 	
 /*********************************************************************************/
 /* Featured                                                                      */
diff --git a/assets/css/style.css b/assets/css/style.css
index e09b383..e2fee29 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -503,24 +503,40 @@
 	{
 		position: relative;
 		clear: left;
-		background: #401200;
-		color: #FFF;
 	}
 	
 	#footer a
 	{
 		color: inherit;
 	}
-	
-	#footer ul
-	{
-		vertical-align: top;
+
+	#footer ul {
+		margin: 0em;
 	}
 
-	#footer ul, #footer ul > li
-	{
-		padding: 0;
-		margin: 0
+	#conservancy, #licenses {
+		padding: 0em;
+		padding-left: 1em;
+		padding-right: 1em;
+		font-size: smaller;
+		color: #707070;
+		margin: 0em;
+	}
+
+	#external-links {
+		padding: 0em;
+		padding-top: 0.3em;
+		padding-bottom: 0.3em;
+		background: #401200;
+		color: #FFF;
+		text-align: center;
+	}
+
+	#external-links li {
+		display: inline;
+	}
+	#external-links li a {
+		padding-left: 1em;
 	}
 
 /*********************************************************************************/
-- 
2.26.2