Re #6630. Finished moving files around.

mantidproject · Mar 5, 2013 · e2ade0c · e2ade0c
1 parent e5064f4
commit e2ade0c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/Code/Mantid/docs/qtassistant/algorithm_help.py b/Code/Mantid/docs/qtassistant/algorithm_help.py
@@ -8,7 +8,7 @@
     1:"output",
     2:"input/output"
 }
-from assistant_common import WEB_BASE
+from assistant_common import WEB_BASE, HTML_DIR
 
 def make_wiki(algo_name, version, latest_version):
     """ Return wiki text for a given algorithm
@@ -179,7 +179,7 @@ def process_algorithm(name, versions, qhp, outputdir, **kwargs): # was (args, al
 
     # write out the fiel
     outfile = "Algo_%s.html" % (name)
-    qhp.addFile(outfile, name)
+    qhp.addFile(os.path.join(HTML_DIR, outfile), name)
     outfile = os.path.join(outputdir, outfile)
     handle = open(outfile, 'w')
     handle.write(le.tostring(root, pretty_print=True,

diff --git a/Code/Mantid/docs/qtassistant/fitfunctions_help.py b/Code/Mantid/docs/qtassistant/fitfunctions_help.py
@@ -3,7 +3,7 @@
 from lxml.html import builder as lhbuilder
 import os
 
-from assistant_common import WEB_BASE
+from assistant_common import WEB_BASE, HTML_DIR
 
 def process_function(name, qhp, outputdir, **kwargs): # was (args, algo):
     import mantid.api
@@ -53,7 +53,7 @@ def process_function(name, qhp, outputdir, **kwargs): # was (args, algo):
 
     # write out the file
     outfile = "FitFunc_%s.html" % name
-    qhp.addFile(outfile, name)
+    qhp.addFile(os.path.join(HTML_DIR, outfile), name)
     outfile = os.path.join(outputdir, outfile)
     handle = open(outfile, 'w')
     handle.write(le.tostring(root, pretty_print=True,

diff --git a/Code/Mantid/docs/qtassistant/make_algorithms_help.py b/Code/Mantid/docs/qtassistant/make_algorithms_help.py
@@ -70,7 +70,7 @@ def processCategories(categories, qhp, outputdir):
                 ul.append(genAlgoElement(name, versions))
 
         filename = "AlgoCat_%s.html" % page_name
-        qhp.addFile(filename, page_name+" Algorithm Category")
+        qhp.addFile(os.path.join(HTML_DIR, filename), page_name)
         filename = os.path.join(outputdir, filename)
         handle = open(filename, 'w')
         handle.write(le.tostring(root, pretty_print=True, xml_declaration=False))
@@ -151,7 +151,7 @@ def process(algos, qhp, outputdir):
     handle.write(le.tostring(root, pretty_print=True, xml_declaration=False))
 
     shortname = os.path.split(filename)[1]
-    qhp.addFile(shortname, "Algorithms Index")
+    qhp.addFile(os.path.join(HTML_DIR, shortname), "Algorithms Index")
 
     # create all of the category pages
     processCategories(categories, qhp, outputdir)

diff --git a/Code/Mantid/docs/qtassistant/make_fitfunctions_help.py b/Code/Mantid/docs/qtassistant/make_fitfunctions_help.py
@@ -59,7 +59,7 @@ def process(functions, qhp, outputdir):
     handle.write(le.tostring(root, pretty_print=True, xml_declaration=False))
 
     shortname = os.path.split(filename)[1]
-    qhp.addFile(shortname, "Fit Functions Index")
+    qhp.addFile(os.path.join(HTML_DIR, shortname), "Fit Functions Index")
 
     # create individual html pages
     from fitfunctions_help import process_function

diff --git a/Code/Mantid/docs/qtassistant/mantid.qhcp.template b/Code/Mantid/docs/qtassistant/mantid.qhcp.template
@@ -2,11 +2,11 @@
 <QHelpCollectionProject version="1.0">
      <assistant>
          <title>Mantid Help</title>
-         <startPage>qthelp://org.mantidproject/doc/index.html</startPage>
+         <startPage>qthelp://org.mantidproject/doc/html/index.html</startPage>
          <applicationIcon>src/images/MantidPlot_Icon_32offset.png</applicationIcon>
          <enableFilterFunctionality>false</enableFilterFunctionality>
          <enableDocumentationManager>true</enableDocumentationManager>
-         <enableAddressBar visible="true">false</enableAddressBar>
+         <enableAddressBar visible="false">true</enableAddressBar>
          <cacheDirectory>mantidproject</cacheDirectory>
          <aboutMenuText>
              <text>About Mantid</text>

diff --git a/Code/Mantid/docs/qtassistant/qhpfile.py b/Code/Mantid/docs/qtassistant/qhpfile.py
@@ -38,7 +38,7 @@ def addFile(self, filename, keyword=None):
                 self.__keywordsEle = le.SubElement(self.__filterSect, "keywords")
             if not keyword in self.__keywords:
                 le.SubElement(self.__keywordsEle, "keyword",
-                              **{"name":keyword, "ref":os.path.split(filename)[1]})
+                              **{"name":keyword, "ref":filename})
                 self.__keywords.append(keyword)
         if self.__filesEle is None:
             self.__filesEle = le.SubElement(self.__filterSect, "files")

diff --git a/Code/Mantid/docs/qtassistant/src/mantidgeneral.qhp b/Code/Mantid/docs/qtassistant/src/mantidgeneral.qhp
@@ -4,14 +4,14 @@
      <virtualFolder>doc</virtualFolder>
      <filterSection>
          <toc>
-             <section title="Mantid overview" ref="index.html"/>
-             <section title="MantidPlot" ref="./mantidplot.html">
-	       <section title="User Interfaces" ref="./userui.html"/>
-	       <section title="Algorithms" ref="algorithms_index.html"/>
-	       <section title="Fitting Functions" ref="fitfunctions_index.html"/>
+             <section title="Mantid overview" ref="html/index.html"/>
+             <section title="MantidPlot" ref="html/mantidplot.html">
+	       <section title="User Interfaces" ref="html/userui.html"/>
+	       <section title="Algorithms" ref="html/algorithms_index.html"/>
+	       <section title="Fitting Functions" ref="html/fitfunctions_index.html"/>
 	     </section>
-             <section title="Mantid Python" ref="./mantidpython.html"/>
-	     <section title="Developer information" ref="./developers.html"/>
+             <section title="Mantid Python" ref="html/mantidpython.html"/>
+	     <section title="Developer information" ref="html/developers.html"/>
          </toc>
 	 <!--
          <keywords>