Redesign SALOME documentation

diff --git a/doc/conf.py.in b/doc/conf.py.in
index c0d7d0f0b267983621b58040ddddcdd5316c3e1e..e032e175310a3db381c62480eca66c69cc2102c9 100644 (file)
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -28,7 +28,7 @@ extensions = ['sphinx.ext.autodoc']
 #extensions = ['rst2pdf.pdfbuilder']
 
 # Add any paths that contain templates here, relative to this directory.
 #extensions = ['rst2pdf.pdfbuilder']
 
 # Add any paths that contain templates here, relative to this directory.

-templates_path = [os.path.join('@CMAKE_CURRENT_SOURCE_DIR@','_templates')]
+templates_path = [os.path.join('@CMAKE_CURRENT_SOURCE_DIR@','templates')]

 
 # The suffix of source filenames.
 source_suffix = '.rst'
 
 # The suffix of source filenames.
 source_suffix = '.rst'

diff --git a/doc/templates/layout.html b/doc/templates/layout.html
new file mode 100644 (file)
index 0000000..bb9325f
--- /dev/null
+++ b/doc/templates/layout.html
@@ -0,0 +1,11 @@
+{% extends "!layout.html" %}
+
+{%- block sidebarlogo %}
+{{ super() }}
+{%-
+include "searchbox.html"
+%}
+<p/>
+{%- endblock %}
+{%- block sidebarsearch %}
+{%- endblock %}
\ No newline at end of file

diff --git a/src/salomegui/resources/SalomeApp.xml.in b/src/salomegui/resources/SalomeApp.xml.in
index 3dd1fafffa10cf868414cf7453822fc9b78536f7..0d302ab6fcf539043f309b2543db98fc28bc6d8b 100644 (file)
--- a/src/salomegui/resources/SalomeApp.xml.in
+++ b/src/salomegui/resources/SalomeApp.xml.in
@@ -31,9 +31,8 @@
     <parameter name="YACS" value="%YACS_ROOT_DIR%/share/salome/resources/yacs"/>
   </section>
   <section name="yacs_help">
     <parameter name="YACS" value="%YACS_ROOT_DIR%/share/salome/resources/yacs"/>
   </section>
   <section name="yacs_help">

-    <parameter name="sub_menu"     value="%1 module"/>
-    <parameter name="User's Guide" value="%YACS_ROOT_DIR%/share/doc/salome/gui/YACS/index.html"/>
-    <parameter name="Developer's Guide" value="%YACS_ROOT_DIR%/share/doc/salome/tui/YACS/index.html"/>
+    <parameter name="User's Guide/YACS module" value="%YACS_ROOT_DIR%/share/doc/salome/gui/YACS/index.html"/>
+    <parameter name="Developer's Guide/YACS module" value="%YACS_ROOT_DIR%/share/doc/salome/tui/YACS/index.html"/>

   </section>
   <section name="YACS" >
     <!-- Module preferences -->
   </section>
   <section name="YACS" >
     <!-- Module preferences -->