]> gitweb.factorcode.org Git - factor.git/commitdiff
projects / factor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bc71627)
webapps.help: Load the navbar from a Factor word instead of hardcoding it into the...
authorDoug Coleman <doug.coleman@gmail.com>
Sun, 6 Nov 2011 20:16:46 +0000 (12:16 -0800)
committerDoug Coleman <doug.coleman@gmail.com>
Sun, 6 Nov 2011 20:16:46 +0000 (12:16 -0800)
extra/webapps/help/help.factor patch | blob | history
extra/webapps/help/search.xml patch | blob | history

diff --git a/extra/webapps/help/help.factor b/extra/webapps/help/help.factor
index 5d96fd6e3e890aadcfdd1948d45e7049218e0738..c347f550df6dd9f2912bbe3be42a77606a0269d4 100644 (file)
--- a/extra/webapps/help/help.factor
+++ b/extra/webapps/help/help.factor
@@ -25,6 +25,7 @@ M: result link-href href>> ;
                     [ vocab-apropos "vocabs" set-value ] tri
                 ] with-directory
             ] unless-empty
+            help-navbar "navbar" set-value
 
             { help-webapp "search" } <chloe-content>
         ] >>display ;
diff --git a/extra/webapps/help/search.xml b/extra/webapps/help/search.xml
index f2b147316f6259c578175913e258e86d72219ebd..89add7a0bb64dafcdea3d1d7f26e00f2f926cc20 100644 (file)
--- a/extra/webapps/help/search.xml
+++ b/extra/webapps/help/search.xml
@@ -34,16 +34,7 @@
     </head>
 
     <body>
-        <div class="navbar">
-        <b> Factor Documentation </b> |
-        <a href="/">Home</a> |
-        <a href="article-conventions.html">Glossary</a> |
-        <t:form t:action="$help-webapp/search" style="display:inline;">
-            <t:field t:name="search" />
-            <button type="submit">Search</button>
-        </t:form>
-        <a href="http://factorcode.org" style="float:right; padding: 4px;" >factorcode.org</a>
-        </div>
+               <t:html t:name="navbar"/>
 
         <t:if t:value="articles">
             <h2>Articles</h2>
Factor programming language