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.

Sign up for GitHub

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

Jump to bottom

Fix missing finding aid logo, refs #13458 #1284

Merged
merged 2 commits into from Apr 30, 2021
Merged

Fix missing finding aid logo, refs #13458 #1284

merged 2 commits into from Apr 30, 2021

Conversation

djjuhasz
Copy link
Member

@djjuhasz djjuhasz commented Apr 24, 2021 •
edited

  • Fix invalid FO XSL template elements
  • Add "{{ app_root }}" template variables to XSL files
  • Add "{{ app_root }}" to helper-functions.xsl href
  • Replace template vars with AtoM application path at run time

mcantelon
mcantelon approved these changes Apr 29, 2021
View reviewed changes
Copy link
Member

@mcantelon mcantelon left a comment

Choose a reason for hiding this comment

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

One line in one of the commit messages has a typo (maybe "in" rather that "to">): "Use {{ app_root }} to helper-functions.xsl href.

Otherwise looks good to me! The app_root tag it a nice touch.

@qubot qubot force-pushed the dev/issue-13458-fix-finding-aid-logo branch from 7e50e18 to 5a079a1 Compare April 30, 2021 21:27
@djjuhasz
Cosmetic: reformat XSL docs with xmllint
0aa21e1 
xmllint command:

 export XMLLINT_INDENT="    "
 find lib/task/pdf/ -name "*.xsl" -type f -exec xmllint --output '{}' \
 --format --noblanks '{}' \;

After which I manually found and replaced extra whitespaces (more than
one space) between words [i.e. "(\S)  +(\S)" -> "$1 $2"].
@qubot qubot force-pushed the dev/issue-13458-fix-finding-aid-logo branch 7 times, most recently from d92f17c to d5e272f Compare April 30, 2021 22:38
@djjuhasz
Fix missing finding aid logo, refs #13458
3139adb 
- Add "{{ app_root }}" template variables to pdf-logo href
- Add "{{ app_root }}" to helper-functions.xsl href
- Replace template vars with AtoM application path at run time
- Cosmetic XSL format changes to indenting, etc.
@qubot qubot force-pushed the dev/issue-13458-fix-finding-aid-logo branch from d5e272f to 3139adb Compare April 30, 2021 22:49
@qubot qubot merged commit 3139adb into qa/2.x Apr 30, 2021
@qubot qubot deleted the dev/issue-13458-fix-finding-aid-logo branch April 30, 2021 22:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mcantelon mcantelon mcantelon approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@djjuhasz @mcantelon @qubot