From 7a568d5fcafa345a4efab330dc82c496d55cb437 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 31 Oct 2016 11:25:26 +0000 Subject: [PATCH] docs: remove navigation sidebar from pages A combination of the index page, top nav bar and docs.html page provide links to all pages on the site. The left hand nav bar is thus redundant and can be removed to provide a simpler style for the site. Signed-off-by: Daniel P. Berrange --- docs/Makefile.am | 8 +- docs/docs.html.in | 2 +- docs/hvsupport.pl | 2 +- docs/libvirt.css | 106 +--------- docs/page.xsl | 60 ------ docs/sitemap.html.in | 478 ------------------------------------------- 6 files changed, 16 insertions(+), 640 deletions(-) delete mode 100644 docs/sitemap.html.in diff --git a/docs/Makefile.am b/docs/Makefile.am index a6e2cf97e4..033e482537 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -167,7 +167,7 @@ EXTRA_DIST= \ $(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \ $(logofiles) $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\ $(internals_html_in) $(internals_html) \ - sitemap.html.in aclperms.htmlinc \ + aclperms.htmlinc \ hvsupport.pl \ $(schema_DATA) @@ -208,7 +208,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ convert -rotate 90 $< $@ %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ - sitemap.html.in $(acl_generated) + $(acl_generated) @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ @@ -234,7 +234,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ || { rm $(srcdir)/$@ && exit 1; }; \ else echo "missing XHTML1 DTD"; cat $< > $(srcdir)/$@ ; fi ; fi -%.php.tmp: %.php.in site.xsl page.xsl sitemap.html.in +%.php.tmp: %.php.in site.xsl page.xsl @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ $(XSLTPROC) --stringparam pagename $(@:.tmp=) --nonet \ @@ -250,7 +250,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ $(apihtml_generated): html/index.html -html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in +html/index.html: libvirt-api.xml newapi.xsl page.xsl $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/ \ --stringparam builddir '$(abs_top_builddir)' \ diff --git a/docs/docs.html.in b/docs/docs.html.in index 38066428e6..b0d200b9e3 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -1,7 +1,7 @@ - +

Deployment / operation

diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index d1a41557c2..4c70efc168 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -334,7 +334,7 @@ print < - +

libvirt API support matrix

    diff --git a/docs/libvirt.css b/docs/libvirt.css index f852354dce..b2ed33926a 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -87,113 +87,27 @@ } #body { - float: left; - width: 100%; border: 0px; left: 0px; margin: 0px; margin-top: 120px; + margin-left: 1em; + margin-right: 1em; } #content { - margin-left: 230px; - margin-right: 1em; + margin-left: auto; + margin-right: auto; padding: 0px; padding-bottom: 1em; + max-width: 60em; } -#menu { - float: left; - width: 220px; - margin-bottom: 1em; -} - -#menu ul { - margin: 0px; - padding: 0px; - margin-left: 40px; -} - -#menu li ul { - margin-left: 0px; -} - -#menu ul li { - list-style: none; - color: black; - padding: 0px; - margin: 0px; - border: 0px; -} - -#menu ul li a, #menu ul li span { - text-decoration: inherit; - color: inherit; - display: block; - padding: 6px; - margin: 2px; -} - -#menu ul li .active { - background: #a4c6c2; -} - -#menu ul.l0 li .inactive { - background: #c5dbd8; -} - - -#menu ul.l1 li .inactive, -#menu ul.l2 li .inactive { - background: #dfebea; - border-left: 8px solid #dfebea; -} - -#menu ul.l1 li .inactive, -#menu ul.l1 li .active { - padding-left: 1em; -} - -#menu ul.l1 li .inactive { - border-left: 6px solid #dfebea; -} - -#menu ul.l1 li .active { - border-left: 6px solid #a5c6c2; -} - -#menu ul.l2 li .inactive, -#menu ul.l2 li .active { - padding-left: 2em; - border-left: 8px solid #c5dbd8; -} - -#menu ul.l3 li .inactive, -#menu ul.l3 li .active { - padding-left: 3em; -} - -#sitemap ul li { - list-style: none; -} - -#sitemap ul { - margin: 1em; - padding: 0em; -} - -#sitemap ul ul { - padding-left: 2em; -} - -#sitemap li { - margin: 0.5em; -} - -#sitemap a { - color: inherit; - text-decoration: underline; - font-weight: bold; +body.index #content, +body.docs #content, +body.hvsupport #content +{ + max-width: inherit; } pre { diff --git a/docs/page.xsl b/docs/page.xsl index 83f79bd044..fcb51916ce 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -7,9 +7,6 @@ exclude-result-prefixes="xsl exsl html" version="1.0"> - - - @@ -25,57 +22,6 @@ - - - - -
      - - -
    • - - - - - active - - - inactive - - - - - - - - - - - - - - - - - - - - - - - - -
      • -       -
    -     -
      @@ -148,12 +94,6 @@
      -
      diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in deleted file mode 100644 index 4f0eefa026..0000000000 --- a/docs/sitemap.html.in +++ /dev/null @@ -1,478 +0,0 @@ - - - - -

      Sitemap

      - -
      -
        -
      • - News - Details of new features and bugs fixed in each release - -
          -
        • - Git log - Latest commit messages from the source repository -
          • -
        -
        • -
      • - Applications - Applications known to use libvirt -
        • -
      • - Downloads - Get the latest source releases, binary builds and get access to the source repository -
          -
        • - Windows - Downloads for Windows -
          • -
        • - Language bindings - Bindings of the libvirt API for languages other than C -
          • -
        -
        • -
      • - Documentation - Information for users, administrators and developers -
          -
        • - Compiling - How to compile libvirt -
          • -
        • - Deployment - Information about deploying and using libvirt -
            -
          • - URI format - The URI formats used for connecting to libvirt -
            • -
          • - Remote access - Enable remote access over TCP -
            • -
          • - Authentication - Configure authentication for the libvirt daemon -
            • -
          • - Access control - Configure access control libvirt APIs - -
            • -
          • - Migration - Migrating guests between machines -
            • -
          • - Windows port - Access the libvirt daemon from a native Windows client -
            • -
          • - Logging - The library and the daemon logging support -
            • -
          • - Audit log - Audit trail logs for host operations -
            • -
          • - Firewall - Firewall and network filter configuration -
            • -
          • - Disk locking - Ensuring exclusive guest access to disks -
              -
            • - virtlockd - virtlockd lock manager plugin -
              • -
            • - Sanlock - Sanlock lock manager plugin -
              • -
            -
            • -
          • - CGroups - Control groups integration -
            • -
          • - Hooks - Hooks for system specific management -
            • -
          • - NSS module - Enable domain host name translation to IP addresses -
            • -
          -
          • -
        • - Architecture - Overview of the logical subsystems in the libvirt API -
            -
          • - Goals - Terminology and goals of libvirt API -
            • -
          • - API concepts - The libvirt API concepts -
            • -
          • - Domains - Managing virtual machines -
            • -
          • - Network - Providing isolated networks and NAT based network connectivity -
            • -
          • - Storage - Managing storage pools and volumes -
            • -
          • - Node Devices - Enumerating host node devices -
            • -
          • - Secure usage - Secure usage of the libvirt APIs -
            • -
          -
          • -
        • - XML format - Description of the XML formats used in libvirt - -
          • -
        • - Drivers - Hypervisor specific driver information -
            -
          • - Xen - Driver the Xen hypervisor -
            • -
          • - QEMU / KVM - Driver for QEMU, KQEMU, KVM and Xenner -
            • -
          • - Linux Container - Driver for the Linux native container API -
            • -
          • - Test - Pseudo-driver simulating APIs in memory for test suites -
            • -
          • - Remote - Driver providing secure remote to the libvirt APIs -
            • -
          • - OpenVZ - Driver for the OpenVZ container technology -
            • -
          • - UML - Driver for the User Mode Linux technology -
            • -
          • - Storage - Driver for the storage management APIs -
            • -
          • - VirtualBox - Driver for VirtualBox -
            • -
          • - VMware ESX - Driver for VMware ESX -
            • -
          • - VMware Workstation / Player - Driver for VMware Workstation / Player -
            • -
          • - Microsoft Hyper-V - Driver for Microsoft Hyper-V -
            • -
          • - IBM PowerVM - Driver for IBM PowerVM -
            • -
          • - Virtuozzo - Driver for Virtuozzo -
            • -
          • - Bhyve - Driver for bhyve -
            • -
          -
          • -
        • - API reference - Reference manual for the C public API - -
            -
          • - Common - common APIs for the libvirt library -
            • -
          • - Domain - domain APIs for the libvirt library -
            • -
          • - Domain snapshot - domain snapshot APIs for the libvirt library -
            • -
          • - Error - error handling APIs for the libvirt library -
            • -
          • - Event - event APIs for the libvirt library -
            • -
          • - Host - host APIs for the libvirt library -
            • -
          • - Interface - interface APIs for the libvirt library -
            • -
          • - Network - network APIs for the libvirt library -
            • -
          • - Node device - node device APIs for the libvirt library -
            • -
          • - Network filter - network filter APIs for the libvirt library -
            • -
          • - Secret - secret APIs for the libvirt library -
            • -
          • - Storage - storage APIs for the libvirt library -
            • -
          • - Stream - stream APIs for the libvirt library -
            • -
          • - Driver support - matrix of API support per hypervisor per release -
            • -
          -
          • -
        • - Language bindings - Bindings of the libvirt API for other languages -
            -
          • - Python - overview of the python API bindings -
            • -
          • - Java - overview of the Java API bindings -
            • -
          • - C# - overview of the C# API bindings -
            • -
          • - PHP - overview of the PHP API bindings -
            • -
          -
          • -
        • - Internals - Working on the internals of libvirt API, driver and daemon code - -
          • -
        • - Development Guide - A guide and reference for developing with libvirt -
          • -
        • - Virsh Commands - Command reference for virsh -
          • -
        • - Governance - Project governance and code of conduct -
          • -
        -
        • -
      • - Wiki - User contributed content -
        • -
      • - FAQ - Frequently asked questions -
        • -
      • - Bug reports - How and where to report bugs and request features - -
        • -
      • - Contact - How to contact the developers via email and IRC -
        • -
      • - Test suites - Available test suites for libvirt - -
        • -
      • - Sitemap - Overview of all content on the website -
        • -
      -
      - -