diff --git a/basis/help/help.factor b/basis/help/help.factor index 9493a9068c..734e16572f 100644 --- a/basis/help/help.factor +++ b/basis/help/help.factor @@ -104,23 +104,19 @@ M: word set-article-parent swap "help-parent" set-word-prop ; : ($navigation-table) ( element -- ) help-path-style get table-style [ $table ] with-variable ; -: $navigation-table ( topic -- ) - [ - [ prev-article [ 1array \ $long-link "Prev:" $navigation-row ] when* ] - [ next-article [ 1array \ $long-link "Next:" $navigation-row ] when* ] - bi - ] { } make [ ($navigation-table) ] unless-empty ; +: ($navigation-prev) ( topic -- ) + [ prev-article [ 1array \ $long-link "" $navigation-row ] when* ] + { } make [ ($navigation-table) ] unless-empty ; + +: ($navigation-next) ( topic -- ) + [ next-article [ 1array \ $long-link "" $navigation-row ] when* ] + { } make [ ($navigation-table) ] unless-empty ; : ($navigation-path) ( topic -- ) help-path-style get [ help-path [ reverse $breadcrumbs ] unless-empty ] with-style ; -: ($navigation-prev-next) ( topic -- ) - help-path-style get - [ $navigation-table ] - with-style ; - : $title ( topic -- ) title-style get [ title-style get [ @@ -128,12 +124,20 @@ M: word set-article-parent swap "help-parent" set-word-prop ; ] with-nesting ] with-style ; +: $navigation-prev ( topic -- ) + title-style get + [ help-path-style get [ ($navigation-prev) ] with-style ] + with-style ; + +: $navigation-next ( topic -- ) + title-style get + [ help-path-style get [ ($navigation-next) ] with-style ] + with-style ; + : print-topic ( topic -- ) >link last-element off - [ article-content print-content nl ] - [ ($blank-line) ($navigation-prev-next) ] - bi ; + article-content print-content ; SYMBOL: help-hook diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index a97100652c..707e83b0fa 100644 --- a/basis/ui/tools/browser/browser.factor +++ b/basis/ui/tools/browser/browser.factor @@ -42,6 +42,20 @@ M: browser-gadget set-history-value help-header-background >>interior { 1 0 } >>fill f track-add ; +: ( browser-gadget -- gadget ) + model>> [ '[ _ $navigation-prev ] try ] + toolbar-background >>interior ; + +: ( browser-gadget -- gadget ) + model>> [ '[ _ $navigation-next ] try ] + toolbar-background >>interior ; + +: add-help-footer ( track -- track ) + horizontal with-lines + dupd swap 1 track-add + dupd swap 1 track-add + f track-add ; + : ( browser-gadget -- gadget ) model>> [ '[ _ print-topic ] try ] ; @@ -77,7 +91,8 @@ M: browser-gadget set-history-value dup >>search-field add-browser-toolbar add-help-header - add-help-pane ; + add-help-pane + add-help-footer ; M: browser-gadget graft* [ add-definition-observer ] [ call-next-method ] bi ;