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

Adjust to new help content #1641

Merged

Conversation

M4rtinK
Copy link
Contributor

@M4rtinK M4rtinK commented Oct 4, 2018

This pull requests adapts anaconda to changes in help content formatting.

  • the first commit changes the helpFile properties to help_id
  • the second commit updates help related paths in install classes
  • the third commit adapts the help handling code to work with the new help content format

@M4rtinK M4rtinK changed the title Rhel devel adjust to new help content Adjust to new help content Oct 4, 2018
Copy link
Member

@jkonecny12 jkonecny12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one small nitpick otherwise it is fine for me.

return placeholder_path
else:
log.error("placeholder {placeholder_name} not found in {help_folder}".format(placeholder_name=instclass.help_placeholder,
help_folder=instclass.help_folder))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this particular case I would prefer to use just {} instead of the long name. It is not used for translation and it should be able to get to one line, thought.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, changed! :)

@M4rtinK M4rtinK force-pushed the rhel-devel-adjust_to_new_help_content branch 2 times, most recently from b46a46d to 4583464 Compare October 5, 2018 12:12
Previously we used to have one help content file per screen,
which no longer works for the new help content, which is using
a single docbook file with anchors.

So replace the helpFile property with a help_id property, which
holds a unique string id corresponding to one screen needing help.

The help id can then be mapped into an anchor in the main docbook file,
or even something else if needed.

Related: rhbz#1593723
For RHEL the help content needs to go to the "rhel" sup folder
in case some layer products will want to include their branded
help content in the future.

Also drop the "placeholder_with_links" placeholder variant,
which is no longer really used anyway.

Related: rhbz#1593723
The structure of the help content has been changed and the
Anaconda built in help handling needs to be adjusted accordingly:
- single docbook file indexed via anchors
- help ids instead of hardcoded per-screen file names
- help id -> anchor translation table supplied by the
  anaconda-user-help package
- support for branded documentation variants

Resolves: rhbz#1593723
@M4rtinK M4rtinK force-pushed the rhel-devel-adjust_to_new_help_content branch from 4583464 to a681761 Compare October 5, 2018 13:43
@M4rtinK M4rtinK merged commit 388ff3c into rhinstaller:rhel-devel Oct 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants