mise en forme de la doc de référence en anglais

diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt
index 11b406a3b9db3b7d40db14c0eff12b559bfba436..047df8e1b0ebc4bd361b501aa81c6b910a400d28 100644 (file)
--- a/doc/salome/gui/CMakeLists.txt
+++ b/doc/salome/gui/CMakeLists.txt
@@ -21,16 +21,3 @@
 #
 
 ADD_SUBDIRECTORY(HYDRO)
-
-# SALOME_CONFIGURE_FILE(doxyfile.in doxyfile)
-# #SALOME_CONFIGURE_FILE(static/header.html.in static/header.html)
-# 
-# ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE})
-# 
-# ADD_DEPENDENCIES(usr_docs html_docs)
-# 
-# INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)")
-# INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HYDRO DESTINATION ${SALOME_INSTALL_DOC}/gui)
-# #INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO) 
-# 
-# SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES GUI)

diff --git a/doc/salome/gui/HYDRO/CMakeLists.txt b/doc/salome/gui/HYDRO/CMakeLists.txt
index 4f1a9bc3b5eaafb2f2696a07b1bdefb0468042e0..6aeba5ef66afe86ac87e13e569ed394d9f3dcb5a 100644 (file)
--- a/doc/salome/gui/HYDRO/CMakeLists.txt
+++ b/doc/salome/gui/HYDRO/CMakeLists.txt
@@ -21,7 +21,6 @@ INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake)
 
 SALOME_CONFIGURE_FILE(doxyfile.in doxyfile)
 SALOME_CONFIGURE_FILE(static/header.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header.html)
-#SALOME_CONFIGURE_FILE(static/header_py.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header_py.html)
                 
 ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE})
 
@@ -29,6 +28,6 @@ ADD_DEPENDENCIES(usr_docs html_docs)
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)")
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HYDRO DESTINATION ${SALOME_INSTALL_DOC}/gui)
-INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GEOM)
+INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO)
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES HYDRO)

diff --git a/doc/salome/gui/HYDRO/doxyfile.in b/doc/salome/gui/HYDRO/doxyfile.in
index c48f4f11fbd9267786ec4409c74230b718225726..21aa3194dcf05aef247536beeafa2f39aa3eac6d 100644 (file)
--- a/doc/salome/gui/HYDRO/doxyfile.in
+++ b/doc/salome/gui/HYDRO/doxyfile.in
@@ -43,7 +43,7 @@ IMAGE_PATH            = @CMAKE_CURRENT_SOURCE_DIR@/images \
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
 HTML_OUTPUT            = .
-HTML_HEADER            = @CMAKE_CURRENT_SOURCE_DIR@/static/header.html
+HTML_HEADER            = @CMAKE_CURRENT_BINARY_DIR@/static/header.html
 HTML_FOOTER            = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html
 HTML_EXTRA_STYLESHEET  = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css
 TOC_EXPAND             = YES

diff --git a/doc/salome/gui/HYDRO/static/footer.html b/doc/salome/gui/HYDRO/static/footer.html
index affd43d8422006bcb1acafde91836112e5cf7b98..a7b8b641f846ea95895c62d024e00d4e619b5a53 100644 (file)
--- a/doc/salome/gui/HYDRO/static/footer.html
+++ b/doc/salome/gui/HYDRO/static/footer.html
@@ -4,7 +4,7 @@
   <ul>
     $navpath
     <li class="footer">
-      Copyright &copy; 2007-2015  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
+      Copyright &copy; 2007-2015  EDF R&amp;D, OPEN CASCADE<br>
       Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
     </li>
   </ul>