-
Notifications
You must be signed in to change notification settings - Fork 183
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
Integrate metaschema-produced documentation into Pages site #286
Comments
Linking #279 |
Sprint 18 Progress Feb 21 2019 Documentation produced from the catalog schema is now being pushed to a directory for Jekyll, in my branch here: https://github.com/wendellpiez/OSCAL/tree/docs-wip/docs_jekyll_uswds/schemas/_catalog With help from @howieavp76 I will continue to improve the HTML to his specifications. % complete: 70% |
…om other metaschemas (35 new files) usnistgov#286 usnistgov#314
@anweiss @wendellpiez - Sent a PR to Andrew that has the Bootstrap code template. You should be able to use that format in your transform to generate updated HTML that is better organized visually. |
Awesome. Very cool. Progress. I am still concerned however that the nested-list view, and the tabular view, are somewhat redundant. However, we could also stabilize the output (and the feed) and then worry about further redesign. |
@wendellpiez - we can refactor and iterate as we go. The formatting looks nice to start and it helps with visual organization. There are a lot of other concepts we can play with such as accordions for collapsing and expanding (since there is a lot of content on one screen). Will help me to see it all reformatted in a new transform and then we can discuss an improvements list that we can work. |
Resolved the S3 issue. You can see the updated format at: |
02/28/2019@howieavp76 and @wendellpiez will work on it on Monday, March 4. |
@wendellpiez - worked with Wendell this AM on the publishing workflow for the XML transformations. Now have this running end to end and updating the site collections to pull from the new location (content->documentation->schemas->oscal-catalog). Working on formatting next and making the USWDS markup match the general template I previously created in Bootstrap. |
* Create Readme.md * Create readme.md * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete DesignElements.md * Add files via upload * Update Design Elements.md * Add files via upload * Update Design Elements.md * Update Landing Page.md * Update Landing Page.md * Update Landing Page.md * Update Roadmap.md * Update Roadmap.md * Update Roadmap.md * Update Roadmap.md * Add files via upload * Update Design Elements.md * Update Design Elements.md * Update Case Studies.md * Update Case Studies.md * Update Case Studies.md * Update Case Studies.md * Update Case Studies.md * Update Overview.md * Update Overview.md * Update Landing Page.md * Update Roadmap.md * Update Roadmap.md * Add files via upload * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Update Overview.md * Update Roadmap.md * Update Overview.md * Update Overview.md * Update Overview.md * Add files via upload * Add files via upload * Add files via upload * Delete OSCAL_ContentPage_Sample.png * Update Landing Page.md * Update Landing Page.md * Update Content Page.md * Update Content Page.md * Update Content Page.md * Update Products.md * Update Products.md * Update Products.md * Add files via upload * Update Design Elements.md * Update Case Studies.md * Add files via upload * Delete Products.md * Delete Roadmap.md * Update Design Elements.md * Add files via upload * Add files via upload * Update Landing Page.md * Update Overview.md * Add files via upload * Update Get Involved.md * Update Get Involved.md * Update Get Involved.md * Update Get Involved.md * Update Design Elements.md * Add files via upload * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Delete OSCAL_Logo1.png * Delete OSCAL_Logo2.png * Delete OSCAL_Logo3.png * Delete OSCAL_Logo4.png * Add files via upload * Update Design Elements.md * Delete OSCAL_Logo1.png * Delete OSCAL_Logo2.png * Add files via upload * Delete OSCAL_Logo1.png * Add files via upload * Update Readme.md * Update Get Involved.md * Rename Case Studies.md to Case Study.md * Update Case Study.md * Update Scenario.md * Update Producer.md * Update Producer.md * Update Consumer.md * Update Consumer.md * Update Get Involved.md * Update Producer.md * Update Consumer.md * Update Producer.md * Delete Design Elements.md * Update Get Involved.md * Update Consumer.md * Update Producer.md * Add files via upload * Add files via upload * Update Contact.md * Update Contact.md * Update Consumer.md * Update Producer.md * Update and rename Overview.md to LearnMore.md * Rename LearnMore.md to Learn More.md * Update Contact.md * Update Contact.md * Update Learn More.md * Create Schemas.md * Update Schemas.md * Update Schemas.md * Update Schemas.md * Create Producer Examples.md * Update Schemas.md * Delete Content Page.md * Update and rename Producer Examples.md to Consumer Examples.md * Update Scenario.md * Update Scenario.md * Delete Landing Page.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Feature metaschema d2 next (usnistgov#277) * Patched with changes from feature-metaschema-d2 * Moving testing schema into schema/demo dir for more robust testing of (portable, replicable) metaschema infrastructure * Cleanup and refactoring metaschema production for demo * Patched with changes from feature-metaschema-d2 * Cleanup and refactoring metaschema production for demo * More adjustments and documentation of metaschema * Adjustments to metaschema notes doc * Now supporting namespace assignment per metaschema * Better support for modular metaschemas * Metaschema support for namespaces, acquired (imported) models * Scrubbing old prose modules * Metaschema XML documentation now respecting namespaces in XML artifacts * Minor tweaks to comments * More improvements in view of namespaces. JSON examples not yet working. * Better handling of examples now * Removing unneeded test files * Correcting syntax error * Adjustments in demo metaschema * Added draft metadata to SP800-53 profiles; also new SP800-53 catalog with (draft) metadata. * Adding Markdown-conversion and JSON-handling code * 'Hardening' markdown conversion * Adding placeholder files for new catalog and profile metaschemas with namespace support - nb namespaces assigned have not been changed. But namespace support in the metaschema infrastructure can be tested. * Cleaning up catalog and profile schemas (with namespaces) and examples * Updated demo schema readme * Tighter co-occurrence testing * docs redesign prototype * add Docker artifacts for dev * volume mount quotes * walkthrough prototype * add walkthrough page * use official nist header and foot * initial refactor based on new site map * site nav prototyping * oscalkit addition * Test * fix sidenav and schema ref * Early version JSON-docs production from metaschema * Removed unwanted namespace declarations from XML samples * Removed unwanted namespace declaration from XML samples * Experiments with serialization of XML literals in JSON from XSLT pipeline * Travis website updates (#3) * Website Updates - Splash Page * fix sidenav and schema ref * Updates based on initial NIST feedback (#4) * relationship page per Wendell (#5) * Setting up metaschema documentation -- HTML feed for Jekyll * Improved serialization on working example * Improved serialization * Now added uswds tables * Now including JSON examples * On XML and JSON examples, now emulating mockup with hooks for Jekyll/uswds CSS and scripting * More enhancements to schema docs * Adding catalog schema docs as HTML fragments * Testing documentation handling * Testing documentation; metaschema Schematron adjustment * Adding YAML header to top level file * Reverting back to safer version * Now including docs for elements included in metaschemas via import from other metaschemas (35 new files) usnistgov#286 usnistgov#314 * Provided descriptive YAML headers to HTML outputs from metaschema docs production for Jekyll integration. * New file set in correct subdirectory for Jekyll * Removing extraneous file left from debugging * Removing diagnostic output from metaschema docs generation * Corrected production of header id for navigation * Providing some simple tagging for syntax coloring over XML literals * Improvements to representation of samples in schema docs, now to use Jekyll syntax highlighting. * Moving the documentation outputs to a path for Jekyll * More corrections to samples serializations * merge split html from metaschema * JSON prettify block * Initial Schema Formatting * css changes
* Feature metaschema d2 next (usnistgov#277) * Patched with changes from feature-metaschema-d2 * Moving testing schema into schema/demo dir for more robust testing of (portable, replicable) metaschema infrastructure * Cleanup and refactoring metaschema production for demo * Patched with changes from feature-metaschema-d2 * Cleanup and refactoring metaschema production for demo * More adjustments and documentation of metaschema * Adjustments to metaschema notes doc * Now supporting namespace assignment per metaschema * Better support for modular metaschemas * Metaschema support for namespaces, acquired (imported) models * Scrubbing old prose modules * Metaschema XML documentation now respecting namespaces in XML artifacts * Minor tweaks to comments * More improvements in view of namespaces. JSON examples not yet working. * Better handling of examples now * Removing unneeded test files * Correcting syntax error * Adjustments in demo metaschema * Added draft metadata to SP800-53 profiles; also new SP800-53 catalog with (draft) metadata. * Adding Markdown-conversion and JSON-handling code * 'Hardening' markdown conversion * Adding placeholder files for new catalog and profile metaschemas with namespace support - nb namespaces assigned have not been changed. But namespace support in the metaschema infrastructure can be tested. * Cleaning up catalog and profile schemas (with namespaces) and examples * Updated demo schema readme * Tighter co-occurrence testing * Docs redesign (#9) * Create Readme.md * Create readme.md * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete DesignElements.md * Add files via upload * Update Design Elements.md * Add files via upload * Update Design Elements.md * Update Landing Page.md * Update Landing Page.md * Update Landing Page.md * Update Roadmap.md * Update Roadmap.md * Update Roadmap.md * Update Roadmap.md * Add files via upload * Update Design Elements.md * Update Design Elements.md * Update Case Studies.md * Update Case Studies.md * Update Case Studies.md * Update Case Studies.md * Update Case Studies.md * Update Overview.md * Update Overview.md * Update Landing Page.md * Update Roadmap.md * Update Roadmap.md * Add files via upload * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Update Overview.md * Update Roadmap.md * Update Overview.md * Update Overview.md * Update Overview.md * Add files via upload * Add files via upload * Add files via upload * Delete OSCAL_ContentPage_Sample.png * Update Landing Page.md * Update Landing Page.md * Update Content Page.md * Update Content Page.md * Update Content Page.md * Update Products.md * Update Products.md * Update Products.md * Add files via upload * Update Design Elements.md * Update Case Studies.md * Add files via upload * Delete Products.md * Delete Roadmap.md * Update Design Elements.md * Add files via upload * Add files via upload * Update Landing Page.md * Update Overview.md * Add files via upload * Update Get Involved.md * Update Get Involved.md * Update Get Involved.md * Update Get Involved.md * Update Design Elements.md * Add files via upload * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Delete OSCAL_Logo1.png * Delete OSCAL_Logo2.png * Delete OSCAL_Logo3.png * Delete OSCAL_Logo4.png * Add files via upload * Update Design Elements.md * Delete OSCAL_Logo1.png * Delete OSCAL_Logo2.png * Add files via upload * Delete OSCAL_Logo1.png * Add files via upload * Update Readme.md * Update Get Involved.md * Rename Case Studies.md to Case Study.md * Update Case Study.md * Update Scenario.md * Update Producer.md * Update Producer.md * Update Consumer.md * Update Consumer.md * Update Get Involved.md * Update Producer.md * Update Consumer.md * Update Producer.md * Delete Design Elements.md * Update Get Involved.md * Update Consumer.md * Update Producer.md * Add files via upload * Add files via upload * Update Contact.md * Update Contact.md * Update Consumer.md * Update Producer.md * Update and rename Overview.md to LearnMore.md * Rename LearnMore.md to Learn More.md * Update Contact.md * Update Contact.md * Update Learn More.md * Create Schemas.md * Update Schemas.md * Update Schemas.md * Update Schemas.md * Create Producer Examples.md * Update Schemas.md * Delete Content Page.md * Update and rename Producer Examples.md to Consumer Examples.md * Update Scenario.md * Update Scenario.md * Delete Landing Page.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Feature metaschema d2 next (usnistgov#277) * Patched with changes from feature-metaschema-d2 * Moving testing schema into schema/demo dir for more robust testing of (portable, replicable) metaschema infrastructure * Cleanup and refactoring metaschema production for demo * Patched with changes from feature-metaschema-d2 * Cleanup and refactoring metaschema production for demo * More adjustments and documentation of metaschema * Adjustments to metaschema notes doc * Now supporting namespace assignment per metaschema * Better support for modular metaschemas * Metaschema support for namespaces, acquired (imported) models * Scrubbing old prose modules * Metaschema XML documentation now respecting namespaces in XML artifacts * Minor tweaks to comments * More improvements in view of namespaces. JSON examples not yet working. * Better handling of examples now * Removing unneeded test files * Correcting syntax error * Adjustments in demo metaschema * Added draft metadata to SP800-53 profiles; also new SP800-53 catalog with (draft) metadata. * Adding Markdown-conversion and JSON-handling code * 'Hardening' markdown conversion * Adding placeholder files for new catalog and profile metaschemas with namespace support - nb namespaces assigned have not been changed. But namespace support in the metaschema infrastructure can be tested. * Cleaning up catalog and profile schemas (with namespaces) and examples * Updated demo schema readme * Tighter co-occurrence testing * docs redesign prototype * add Docker artifacts for dev * volume mount quotes * walkthrough prototype * add walkthrough page * use official nist header and foot * initial refactor based on new site map * site nav prototyping * oscalkit addition * Test * fix sidenav and schema ref * Early version JSON-docs production from metaschema * Removed unwanted namespace declarations from XML samples * Removed unwanted namespace declaration from XML samples * Experiments with serialization of XML literals in JSON from XSLT pipeline * Travis website updates (#3) * Website Updates - Splash Page * fix sidenav and schema ref * Updates based on initial NIST feedback (#4) * relationship page per Wendell (#5) * Setting up metaschema documentation -- HTML feed for Jekyll * Improved serialization on working example * Improved serialization * Now added uswds tables * Now including JSON examples * On XML and JSON examples, now emulating mockup with hooks for Jekyll/uswds CSS and scripting * More enhancements to schema docs * Adding catalog schema docs as HTML fragments * Testing documentation handling * Testing documentation; metaschema Schematron adjustment * Adding YAML header to top level file * Reverting back to safer version * Now including docs for elements included in metaschemas via import from other metaschemas (35 new files) usnistgov#286 usnistgov#314 * Provided descriptive YAML headers to HTML outputs from metaschema docs production for Jekyll integration. * New file set in correct subdirectory for Jekyll * Removing extraneous file left from debugging * Removing diagnostic output from metaschema docs generation * Corrected production of header id for navigation * Providing some simple tagging for syntax coloring over XML literals * Improvements to representation of samples in schema docs, now to use Jekyll syntax highlighting. * Moving the documentation outputs to a path for Jekyll * More corrections to samples serializations * merge split html from metaschema * JSON prettify block * Initial Schema Formatting * css changes * Revert "Docs redesign (#9)" This reverts commit ef1e5a9.
3/7/2019 - Staging site is ready. Capabilities are ready (printing, etc.) Ready to hand-off to team for work on the content.
PR 2 will be merged into NIST Pages. |
3/14/2019Will meet on 3/15/2019 to complete. |
3/18/2019@wendellpiez, @david-waltermire-nist, and @anweiss met on 3/15/2019 to discuss the separate XML and JSON model documentation. @anweiss agreed to frame out the website navigation and @wendellpiez started working on generating the XML and JSON schema docs in Jeckyll, with supervision from @anweiss . |
3/21/2019about 90% done. The content review needs to happen on the web page review before considering the issue completed. |
Latest updates are on AWS |
…om other metaschemas (35 new files) usnistgov#286 usnistgov#314
* Feature metaschema d2 next (usnistgov#277) * Patched with changes from feature-metaschema-d2 * Moving testing schema into schema/demo dir for more robust testing of (portable, replicable) metaschema infrastructure * Cleanup and refactoring metaschema production for demo * Patched with changes from feature-metaschema-d2 * Cleanup and refactoring metaschema production for demo * More adjustments and documentation of metaschema * Adjustments to metaschema notes doc * Now supporting namespace assignment per metaschema * Better support for modular metaschemas * Metaschema support for namespaces, acquired (imported) models * Scrubbing old prose modules * Metaschema XML documentation now respecting namespaces in XML artifacts * Minor tweaks to comments * More improvements in view of namespaces. JSON examples not yet working. * Better handling of examples now * Removing unneeded test files * Correcting syntax error * Adjustments in demo metaschema * Added draft metadata to SP800-53 profiles; also new SP800-53 catalog with (draft) metadata. * Adding Markdown-conversion and JSON-handling code * 'Hardening' markdown conversion * Adding placeholder files for new catalog and profile metaschemas with namespace support - nb namespaces assigned have not been changed. But namespace support in the metaschema infrastructure can be tested. * Cleaning up catalog and profile schemas (with namespaces) and examples * Updated demo schema readme * Tighter co-occurrence testing * Docs redesign (#9) * Create Readme.md * Create readme.md * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Delete DesignElements.md * Add files via upload * Update Design Elements.md * Add files via upload * Update Design Elements.md * Update Landing Page.md * Update Landing Page.md * Update Landing Page.md * Update Roadmap.md * Update Roadmap.md * Update Roadmap.md * Update Roadmap.md * Add files via upload * Update Design Elements.md * Update Design Elements.md * Update Case Studies.md * Update Case Studies.md * Update Case Studies.md * Update Case Studies.md * Update Case Studies.md * Update Overview.md * Update Overview.md * Update Landing Page.md * Update Roadmap.md * Update Roadmap.md * Add files via upload * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Update Overview.md * Update Roadmap.md * Update Overview.md * Update Overview.md * Update Overview.md * Add files via upload * Add files via upload * Add files via upload * Delete OSCAL_ContentPage_Sample.png * Update Landing Page.md * Update Landing Page.md * Update Content Page.md * Update Content Page.md * Update Content Page.md * Update Products.md * Update Products.md * Update Products.md * Add files via upload * Update Design Elements.md * Update Case Studies.md * Add files via upload * Delete Products.md * Delete Roadmap.md * Update Design Elements.md * Add files via upload * Add files via upload * Update Landing Page.md * Update Overview.md * Add files via upload * Update Get Involved.md * Update Get Involved.md * Update Get Involved.md * Update Get Involved.md * Update Design Elements.md * Add files via upload * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Update Design Elements.md * Delete OSCAL_Logo1.png * Delete OSCAL_Logo2.png * Delete OSCAL_Logo3.png * Delete OSCAL_Logo4.png * Add files via upload * Update Design Elements.md * Delete OSCAL_Logo1.png * Delete OSCAL_Logo2.png * Add files via upload * Delete OSCAL_Logo1.png * Add files via upload * Update Readme.md * Update Get Involved.md * Rename Case Studies.md to Case Study.md * Update Case Study.md * Update Scenario.md * Update Producer.md * Update Producer.md * Update Consumer.md * Update Consumer.md * Update Get Involved.md * Update Producer.md * Update Consumer.md * Update Producer.md * Delete Design Elements.md * Update Get Involved.md * Update Consumer.md * Update Producer.md * Add files via upload * Add files via upload * Update Contact.md * Update Contact.md * Update Consumer.md * Update Producer.md * Update and rename Overview.md to LearnMore.md * Rename LearnMore.md to Learn More.md * Update Contact.md * Update Contact.md * Update Learn More.md * Create Schemas.md * Update Schemas.md * Update Schemas.md * Update Schemas.md * Create Producer Examples.md * Update Schemas.md * Delete Content Page.md * Update and rename Producer Examples.md to Consumer Examples.md * Update Scenario.md * Update Scenario.md * Delete Landing Page.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Update Learn More.md * Feature metaschema d2 next (usnistgov#277) * Patched with changes from feature-metaschema-d2 * Moving testing schema into schema/demo dir for more robust testing of (portable, replicable) metaschema infrastructure * Cleanup and refactoring metaschema production for demo * Patched with changes from feature-metaschema-d2 * Cleanup and refactoring metaschema production for demo * More adjustments and documentation of metaschema * Adjustments to metaschema notes doc * Now supporting namespace assignment per metaschema * Better support for modular metaschemas * Metaschema support for namespaces, acquired (imported) models * Scrubbing old prose modules * Metaschema XML documentation now respecting namespaces in XML artifacts * Minor tweaks to comments * More improvements in view of namespaces. JSON examples not yet working. * Better handling of examples now * Removing unneeded test files * Correcting syntax error * Adjustments in demo metaschema * Added draft metadata to SP800-53 profiles; also new SP800-53 catalog with (draft) metadata. * Adding Markdown-conversion and JSON-handling code * 'Hardening' markdown conversion * Adding placeholder files for new catalog and profile metaschemas with namespace support - nb namespaces assigned have not been changed. But namespace support in the metaschema infrastructure can be tested. * Cleaning up catalog and profile schemas (with namespaces) and examples * Updated demo schema readme * Tighter co-occurrence testing * docs redesign prototype * add Docker artifacts for dev * volume mount quotes * walkthrough prototype * add walkthrough page * use official nist header and foot * initial refactor based on new site map * site nav prototyping * oscalkit addition * Test * fix sidenav and schema ref * Early version JSON-docs production from metaschema * Removed unwanted namespace declarations from XML samples * Removed unwanted namespace declaration from XML samples * Experiments with serialization of XML literals in JSON from XSLT pipeline * Travis website updates (#3) * Website Updates - Splash Page * fix sidenav and schema ref * Updates based on initial NIST feedback (#4) * relationship page per Wendell (#5) * Setting up metaschema documentation -- HTML feed for Jekyll * Improved serialization on working example * Improved serialization * Now added uswds tables * Now including JSON examples * On XML and JSON examples, now emulating mockup with hooks for Jekyll/uswds CSS and scripting * More enhancements to schema docs * Adding catalog schema docs as HTML fragments * Testing documentation handling * Testing documentation; metaschema Schematron adjustment * Adding YAML header to top level file * Reverting back to safer version * Now including docs for elements included in metaschemas via import from other metaschemas (35 new files) usnistgov#286 usnistgov#314 * Provided descriptive YAML headers to HTML outputs from metaschema docs production for Jekyll integration. * New file set in correct subdirectory for Jekyll * Removing extraneous file left from debugging * Removing diagnostic output from metaschema docs generation * Corrected production of header id for navigation * Providing some simple tagging for syntax coloring over XML literals * Improvements to representation of samples in schema docs, now to use Jekyll syntax highlighting. * Moving the documentation outputs to a path for Jekyll * More corrections to samples serializations * merge split html from metaschema * JSON prettify block * Initial Schema Formatting * css changes * Revert "Docs redesign (#9)" This reverts commit ef1e5a9.
04-19-19One issue remains with the linking of the profile documentation between the XML and JSON versions. Current linking incorrectly points to the catalog pages. @anweiss is fixing this. |
5/2/2019waiting for review from @david-waltermire-nist |
5/9/2019@david-waltermire-nist directed us to close this issue. |
User Story:
OSCAL end users need up-to-date documentation for the OSCAL models. The Pages redesign is clearly a step forward, but it breaks the current integration with metaschema artifact production, which is now producing markdown files for the old Slate framework. We need this to work so we can dependably produce schema documentation for the site.
Goals:
The new Pages site has up to date XML and JSON schema documentation for the Catalog, Profile, and Implementation models, produced from their respective metaschemas. This also includes documentation for imported models (e.g., metadata module).
Dependencies:
Acceptance Criteria
Schema documentation under the new Pages site can be shown to be current and correct to the metaschemas they represent.
Follow-up Work
The text was updated successfully, but these errors were encountered: