Merge pull request #560 from NethServer/master

Update v7 branch

administrator-manual/en/.gitignore

@@ -4,5 +4,3 @@ locale/cs
 locale/de
 locale/ru
 locale/zh
-_static
-nscom/_static/_static

administrator-manual/en/conf.py

@@ -12,12 +12,7 @@
 # serve to show the default.
 
 import sys, os, datetime
-
-try:
-    import sphinx_rtd_theme
-    import sphinx_bootstrap_theme
-except ImportError:
-    pass
+import sphinx_rtd_theme
 
 copyright = u'%d, Nethesis Srl and the NethServer project contributors' % datetime.date.today().year
 
@@ -77,15 +72,15 @@
 
 if tags.has('nsent'):
     smartquotes = False
-    templates_path = ['nsent/_templates']
     project = u'NethServer Enterprise'
     html_title = "%s %s" % (project, release)
-    html_theme = "bootstrap"
-    html_logo = 'nsent/_static/favico_neth.png'
-    html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
+    html_theme = "sphinx_rtd_theme"
+    html_logo = 'nsent/_static/nethesis_enterprise_yellow.png'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
     html_favicon = 'nsent/_static/favicon.ico' 
     html_static_path = ['nsent/_static']
     html_extra_path = ['nsent/robots.txt']
+    html_css_files = ['nethesis.css']
     exclude_patterns.extend([
         'webvirtmgr.rst',
         'nscom_*.rst'
@@ -115,15 +110,11 @@
        'Miscellaneous'),
     ]
     html_theme_options = {
-        'navbar_title': 'NethServer Enterprise',
-        'navbar_pagenav': True,
-        'navbar_sidebarrel': False,
-        'navbar_pagenav_name': 'Contents',
-        'navbar_class': "navbar",
-        'navbar_fixed_top': "false",
-        'source_link_position': "none",
-        'bootswatch_theme': "cerulean",
         'nosidebar': "1",
+        'collapse_navigation': True,
+        'navigation_depth': -1,
+        'logo_only': True,
+        'style_nav_header_background': '#343131',
     }
 
 elif tags.has('nscom'):

administrator-manual/en/disaster_recovery.rst

@@ -59,15 +59,18 @@ Please, follow below steps:
 5. Map network interface names from the backup to the running system.
    This step is required only if :guilabel:`Restore network configuration` option is enabled.
 
-6. Click the :guilabel:`Restore` to start the restore process.
+6. During disaster recovery, to obtain a machine identical to original one, it's **mandatory** to keep the option :guilabel:`Reinstall packages` **enabled**!
+   Its deactivation could introduce unexpected behavior on restored system!
+
+7. Click the :guilabel:`Restore` to start the restore process.
 
    .. note::
 
       If you're connected to a network interface that will change the IP address during the restore,
       you will be disconnected from the Server Manager and you will need to login again using the
       new IP address.
 
-7. Verify the system is functional and then access the :guilabel:`Backup` page.
+8. Verify the system is functional and then access the :guilabel:`Backup` page.
    To restore all files, click on :guilabel:`Restore` button under the **Data Backup** section,
    select the name of the backup and click the :guilabel:`Restore` button.
 

administrator-manual/en/index.rst

@@ -105,6 +105,7 @@ Administrator Manual
    phone_home
    nethvoice_intro
    nethcti_intro
+   phonebook-mysql
    rspamd
 
 .. toctree::
@@ -153,7 +154,6 @@ Administrator Manual
    snmp
    fax_server
    hotspot
-   phonebook-mysql
    weekly_report
    ui/*
 

administrator-manual/en/nscom/requirements.txt

@@ -1 +1 @@
-sphinx_rtd_theme===0.4.0
+sphinx_rtd_theme===0.5.1

administrator-manual/en/nsent/_static/nethesis.css

@@ -1,43 +1,51 @@
 @import 'https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700';
 body {
-    color: #333;
-    background-color: #efefef;
-    font-size: 15px;
+    color: #5B5B5B;
+    background-color: white;
+    font-size: 17px;
     line-height: 24px;
 }
 .container {
-    background-color: #fff;
+    background-color: #B0C4DE;
     border-radius: 6px;
     border: 1px solid #dcdcdc;
+
 }
 h1, h2, h6, .h1, .h2, .h6 {
     font-family: 'Open Sans Condensed', Helvetica, sans-serif !important;
     font-weight: 700 !important;
-    color: #333 !important;
+    color: #5B5B5B!important;
 }
 h1 {
-    padding-bottom: 15px;
+    background-color: white;
+    padding-top: 17px;
+    padding-bottom: 17px;
 }
 .caption-text, h2 {
-    padding-top: 5px;
-    margin-bottom: 25px;
-    font-size: 30px;
+    padding-top:   17px;
+    margin-bottom: 17px;
+    font-size: 17px;
+    padding-bottom: 13px;
+    color:#5B5B5B;
 }
 
 .toctree-wrapper > .caption, .content > .section > .section {
     margin-top: 35px;
-    border-top: 1px solid #f4af1a;
+    border-top: 4px solid #e1e4e5;
+    background-color: white;
+    margin-right: 10px;
+    margin-left: auto;
 }
 .section > h2 {
-    border-top: 6px solid #f4af1a;
-    display: inline-block;
+    border-top: 6px solid #e1e4e5;
     margin-top: 0;
+    line-height: 7px;
 }
 .caption-text {
-    border-top: 6px solid #f4af1a;
-    display: inline-block;
+    border-top: 0px solid ;
+    display: block;
     padding-top: 10px;;
-    font-weight: bold;
+    font-weight: bold  ;
 }
 
 .section > span:empty {
@@ -58,7 +66,7 @@ h3 {
 }
 h4 {
     font-size: medium;
-    margin: 25px 0 15px 0;
+    margin: 33px 0 15px 0;
 }
 h5 {
     font-size: inherit;
@@ -82,6 +90,12 @@ p {
 a {
     color: #049cdb;
 }
+a:hover {
+    color: orange;
+  }
+a:visited {
+    color: orange;
+}
 pre, blockquote {
     margin: 15px 20px;
 }
@@ -104,10 +118,12 @@ pre, blockquote {
     margin: 0;
 }
 .section li {
-    line-height: 26px;
+    line-height: 28px;
+    font-size: 15;  
 }
 .navbar-default .navbar-nav>li {
     border-right: #cccccc 1px solid !important;
+
 }
 .navbar-default .navbar-nav>li>a {
     color: #000000;
@@ -117,6 +133,7 @@ pre, blockquote {
 .navbar-default .navbar-nav>li>a:hover {
     color: white !important;
     background-color: #259ed5 !important;
+
 }
 .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:hover, .navbar-default .navbar-nav>.open>a:focus {
     background-color: #259ed5;
@@ -141,11 +158,11 @@ pre, blockquote {
     border-color: #efefef !important;
 }
 .navbar-toggle {
-    background-color: #259ed5;
+    background-color: #343131;
 }
 .current.reference.internal {
-    background-color: #259ed5;
-    color: white !important;
+    background-color: #343131;
+    color: grey !important;
 }
 .reference.internal[href="#"] {
     font-weight: bolder;
@@ -162,12 +179,14 @@ pre, blockquote {
 /* -- section --------------------------------------------------------------- */
 
 img[alt ^="NethServer"] {
+
     margin-left: calc(50% - 125px);
     width: 250px;
     margin-top: 10px;
 }
 h2 ~ .section, #manuale-amministratore, #appendice, .section:last-child {
     border-bottom: none;
+    background-color: white	;
 }
 div.sidebar {
     margin: 22px 0 0.5em 1em;
@@ -255,6 +274,9 @@ footer .pull-right a:hover {
         float: none;
         display: block;
     }
+    .wy-nav-content {
+        background-color: white;
+    }
 }
 @media (min-width: 768px) {
     .open>.dropdown-menu {
@@ -281,6 +303,12 @@ footer .pull-right a:hover {
         margin-left: 0;
         padding: 9px 0 9px 15px;
     }
+    .wy-nav-content-wrap {
+        background: white;
+    }
+    .wy-nav-content {
+        background-color: white;
+    }
 }
 @media (min-width: 992px) {
     .dropdown-menu.globaltoc {
@@ -295,6 +323,12 @@ footer .pull-right a:hover {
     .dropdown-menu.globaltoc li:nth-child(3n+0) {
         border-right: none;
     }
+    .wy-nav-content-wrap {
+        background: white;
+    }
+    .wy-nav-content {
+        background-color: white;
+    }
 }
 @media (min-width: 1200px) {
     .dropdown-menu.globaltoc {
@@ -309,4 +343,38 @@ footer .pull-right a:hover {
     .dropdown-menu.globaltoc li:nth-child(4n+0) {
         border-right: none;
     }
+    .wy-nav-content {
+        background-color: white;
+    }
+
+}
+.rst-content .sidebar {
+    border:4px #e1e4e5 !important;
+    }
+.wy-menu-vertical header,
+.wy-menu-vertical p.caption {
+    line-height:21px !important;
+    }
+.wy-side-nav-search>div.version {
+    font-size: 0px !important;
+    display:none;
+    }
+.wy-nav-content-wrap {
+    background: #efefef !important;
+    }
+.wy-side-nav-search input[type="text"] {
+    width: 100% !important;
+    border-radius: 70px !important;
+    padding: 6px 10px !important;
+    border-color: #343131 !important;
+    line-height: 21px !important;
+}
+.rst-content .sidebar .sidebar-title {
+    border-radius: 15px !important;
+   }
+.wy-nav-top {
+    background: #343131 !important;
+}
+.wy-menu-vertical li.current {
+    background: #c9c9c9 !important;
 }