Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doc: sync from Wiki, generate HTML #294

Merged
merged 1 commit into from
Aug 4, 2015

Conversation

virtualtam
Copy link
Member

Closes #291
Fixes #227

Modifications

  • HTML content: match the new Wiki structure
  • Makefile
    • generate a custom HTML sidebar
    • include the sidebar on all pages
    • infer and prepend page titles
    • handle relative links
    • add title metadata, e.g. Shaarli - <Page Name>

@ArthurHoaro
Copy link
Member

The new organisation is great.

"3rd party libraries" and "Community & Related software" cover almost the same subject.

Also, I see two things missing:

  • Main title in sub-pages (e.g. "Troubleshooting" at the top of Troubleshooting.html).
    Pandoc variables could be enough.
  • Link to go back to index.html (e.g. using pandoc -B and/or -A).

More.

@virtualtam
Copy link
Member Author

"3rd party libraries" and "Community & Related software" cover almost the same subject.

May be confusing 'cause the first one is empty (for now):

  • 3rd party => libs included in Shaarli (Awesomeplete, bLazy, CSS Reset, RainTPL)
  • Community => derivative projects, forks, tools, alternatives

Main title in sub-pages
Link to go back

I've reworked the AWK hack for the index to be more concise & efficient, and am experimenting with solutions to improve navigability so it feels like being on GitHub :)

  • navigation sidebar floating on the right
  • page titles (head metadata, body header)

@virtualtam
Copy link
Member Author

Makefile further tuned with MOAR AWK!

By the way @nodiscc @ArthurHoaro, is it really needed to keep the Markdown files under doc/?

@virtualtam virtualtam force-pushed the doc/update branch 2 times, most recently from d8509f8 to a26029f Compare July 23, 2015 23:14
@nodiscc
Copy link
Member

nodiscc commented Jul 25, 2015

@virtualtam awwwwesome work on the documentation! thanks!

About switching to multiple pages + sidebar: I somehow miss the possibility to search for a word (Ctrl+F) in a single page (for example I was searching for htaccess, which was moved to the Security page. I also agree that a single-page layout with a huge TOC is not very comfortable either. What do you think?

The last link "Usage examples" (possibly more?) in https://github.com/shaarli/Shaarli/blob/master/README.md#features is now broken (should be https://github.com/shaarli/Shaarli/wiki/Usage).

Maybe it's a good time to shorten the README? (update and group features, link to the main documentation on installing...)

@virtualtam
Copy link
Member Author

Well, thanks :D

I went for a GitHub-like™ browsing Xperience for now, with the same multiple-page + sidebar look.

Another option would be to compile a proper one-file documentation for offline / dev usage, either as:

  • a single HTML file containing
    • all GH pages, in [???] order (maybe parse the menu, and order content accordingly)
    • a custom sidebar (which wouldn't be very AWKward, from the current status)
  • a single PDF file
  • compiled HTML help (not sure this one is supported by Pandoc though)

It's mostly a matter of knowing which information and features are relevant for people using embedded documentation (like, you like Shaarli so much, like, you prepare your PRs, like, in the public transports, rofl)

Regarding a Search feature, I guess it could be easily done with a bit of JS.

And yes, the README may be a bit behind, but I'd prefer to wait for this PR's content to be discussed, reviewed and merged before updating it ;-)

@virtualtam
Copy link
Member Author

Hello!

The relative links should now be OK, I've improved the AWK parsing to also process page content. The only case it won't work is when creating relative links with a custom name, e.g.
[I like trains](Railway Addiction).

Those are quite rare in the wiki, so this shouldn't harm browsing too much :)

#312 opened to add full-text search, suggestions of lightweight search libs are very welcome ;-)

Closes shaarli#291
Fixes shaarli#227

Modifications
 - HTML content: match the new Wiki structure
 - Makefile
   - generate a custom HTML sidebar
   - include the sidebar on all pages
   - infer and prepend page titles
   - handle relative links
   - add title metadata, e.g. Shaarli - <Page Name>

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
virtualtam added a commit that referenced this pull request Aug 4, 2015
Doc: sync from Wiki, generate HTML
@virtualtam virtualtam merged commit 27cf2e6 into shaarli:master Aug 4, 2015
@virtualtam virtualtam deleted the doc/update branch August 4, 2015 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants