Update skin.xsl so that it works better in nojs mode. #7015
Conversation
- Added missing translation
- Check authentication before displaying login link
- Use node configurations
- Fix issue with base url for url like /geonetwork/srv/api/records/{uuid}?language=eng
|
This is related to issue #6934 |
…into update_nojs_skin
| try { | ||
| translations.addContent(new Element(entry.getKey()).setText(entry.getValue())); | ||
| } catch (Exception e) { | ||
| System.out.println("Failed to add translation key for \"" + entry.getKey() + "\"=\"" + entry.getValue() + "\". " + e.getMessage()); |
There was a problem hiding this comment.
This should be changed to log the exception.
There was a problem hiding this comment.
Changed to log the exception
| Element translations = new Element("translations"); | ||
| Map<String, String> translationMap = new JSONLocCacheLoader(configurableApplicationContext, fparams.context.getLanguage()).call(); | ||
| for (Map.Entry<String, String> entry : translationMap.entrySet()) { | ||
| // Skip keys that are not alpha numeric only including "." - otherwhise chars like : ? +... cause problem when creating element. |
There was a problem hiding this comment.
Can you indicate some translation including such values in the keys?
There was a problem hiding this comment.
Updated comments to show some sample keys that cause issues.
Co-authored-by: Jose García <josegar74@gmail.com>
…into update_nojs_skin
…. In this case use defaults identified from CatController.js - defaultConfig
|
I just corrected an issue that was happening when the ui configuration was not set. In this case /root/request/ui was returning null and was not using the correct defaults. Maybe there should be a future fix for /root/request/ui to always have a value. Maybe it should return the same default that is defined in CatController.js - defaultConfig? |
…into update_nojs_skin
| title="{$t/reset}"> | ||
| <i class="fa fa-times"> </i> | ||
| </a> | ||
| <xsl:if test="/root/search/response"> |
There was a problem hiding this comment.
I'm not sure if this snippet is relevant anymore, the code looks specific to the 3.X versions, for example: https://github.com/geonetwork/core-geonetwork/pull/7015/files#diff-0288f54a93a5cbb90245269c2610c967bea1bfedad167b40f57270c08f9e0cc1R176
In any case it's not new in the PR.
* Update skin so that it works better in nojs mode.
- Added missing translation
- Check authentication before displaying login link
- Use node configurations
- Fix issue with base url for url like /geonetwork/srv/api/records/{uuid}?language=eng
* Update web/src/main/webapp/xslt/skin/default/skin.xsl
Co-authored-by: Jose García <josegar74@gmail.com>
* Added logging and sample data that causes issues.
* If no configuration has been setup then /root/request/ui will be null. In this case use defaults identified from CatController.js - defaultConfig
* Update typo in comments
---------
Co-authored-by: Jose García <josegar74@gmail.com>
Co-authored-by: Ian <ian.allen@dfo.mpo.gc.ca>
* Update skin so that it works better in nojs mode.
- Added missing translation
- Check authentication before displaying login link
- Use node configurations
- Fix issue with base url for url like /geonetwork/srv/api/records/{uuid}?language=eng
* Update web/src/main/webapp/xslt/skin/default/skin.xsl
Co-authored-by: Jose García <josegar74@gmail.com>
* Added logging and sample data that causes issues.
* If no configuration has been setup then /root/request/ui will be null. In this case use defaults identified from CatController.js - defaultConfig
* Update typo in comments
---------
Co-authored-by: Jose García <josegar74@gmail.com>
Co-authored-by: Ian <ian.allen@dfo.mpo.gc.ca>
Going to a link like the following
https://apps.titellus.net/geonetwork/srv/api/records/78f6187d-dac3-4721-8936-7682d934cd7b?language=fre
Can be used to link directly to a metadata records and it uses the skin.xsl however there are are couple problem.
Text and translation is missing.
Authentication link is always displayed.
It does not use node configurations
And there are issues with the links due to ../../ reference and in this sample link ../../ will go to generate /srv/srv/
So this PR does the following