diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css index 769634ca..645a889e 100644 --- a/webapp/src/main/webapp/themes/iph/css/iph.css +++ b/webapp/src/main/webapp/themes/iph/css/iph.css @@ -3106,16 +3106,16 @@ label.switch { padding-left: 12px; padding-right: 12px; } -#collapseTextControl:hover { +.collapseTextControl:hover { color: #8B4513; } -#expandTextControl:hover { +.expandTextControl:hover { color: #8B4513; } -label.switch >#expandTextControl >img { +label.switch >.expandTextControl >img { padding-left: 6px; } -label.switch >#collapseTextControl >img { +label.switch >.collapseTextControl >img { padding-left: 6px; } .firstPub { @@ -3615,4 +3615,4 @@ label.switch >#collapseTextControl >img { font-size: 0.8rem; line-height: 1.2em; } -} \ No newline at end of file +} diff --git a/webapp/src/main/webapp/themes/iph/js/collapsible_elements.js b/webapp/src/main/webapp/themes/iph/js/collapsible_elements.js index 39c95a59..ef2bad0b 100644 --- a/webapp/src/main/webapp/themes/iph/js/collapsible_elements.js +++ b/webapp/src/main/webapp/themes/iph/js/collapsible_elements.js @@ -41,44 +41,51 @@ function collapseNextElementOnClick(element){ } function applyExpandSettings() { - if (localStorage.getItem('switchExpand') === true || localStorage.getItem('switchExpand') === 'true') { - var expandSwitchCB = document.getElementById("expandCB"); + applyDocumentExpandSettings('switchExpand','expandCB','expandSettingsCB','.autoExpand'); + applyDocumentExpandSettings('metadataExpandSetting','metadataExpandCB','metadataExpandSettingCB','.autoMetadataExpand'); +} + +function applyDocumentExpandSettings(settingName,buttonId,settingButtonId,targetElementsClass){ + if (localStorage.getItem(settingName) === true || localStorage.getItem(settingName) === 'true') { + var expandSwitchCB = document.getElementById(buttonId); if ( expandSwitchCB != null ){ expandSwitchCB.checked = true; } - var expandSwitchSettingsCB = document.getElementById("expandSettingsCB"); + var expandSwitchSettingsCB = document.getElementById(settingButtonId); if ( expandSwitchSettingsCB != null ){ expandSwitchSettingsCB.checked = true; } - $('.autoExpand').show(); - showDocumentCollapseButton(); + $(targetElementsClass).show(); + showDocumentCollapseButton(buttonId); } else { - $('.autoExpand').hide(); - showDocumentExpandButton(); + $(targetElementsClass).hide(); + showDocumentExpandButton(buttonId); } } -function switchExpand() { - var checkBox = document.getElementById("expandCB"); +function switchExpand(inputID,elementsClass) { + var checkBox = document.getElementById(inputID); if (checkBox.checked == true) { - $('.autoExpand').show(); - showDocumentCollapseButton(); + $(elementsClass).show(); + showDocumentCollapseButton(inputID); } else { - $('.autoExpand').hide(); - showDocumentExpandButton(); + $(elementsClass).hide(); + showDocumentExpandButton(inputID); } } -function showDocumentCollapseButton(){ - var collapseTextControl = document.querySelector('#collapseTextControl'); +function showDocumentCollapseButton(inputID){ + var inputElement = document.getElementById(inputID); + var collapseTextControl = inputElement.parentElement.querySelector('.collapseTextControl'); collapseTextControl.style.display = "inline"; - var expandTextControl = document.querySelector('#expandTextControl'); + var expandTextControl = inputElement.parentElement.querySelector('.expandTextControl'); expandTextControl.style.display = "none"; } -function showDocumentExpandButton(){ - var collapseTextControl = document.querySelector('#collapseTextControl'); +function showDocumentExpandButton(inputID){ + var inputElement = document.getElementById(inputID); + var collapseTextControl = inputElement.parentElement.querySelector('.collapseTextControl'); collapseTextControl.style.display = "none"; - var expandTextControl = document.querySelector('#expandTextControl'); + var expandTextControl = inputElement.parentElement.querySelector('.expandTextControl'); expandTextControl.style.display = "inline"; } diff --git a/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl b/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl index b497fd52..3752f0ca 100644 --- a/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl +++ b/webapp/src/main/webapp/themes/iph/templates/elenphAritcle.ftl @@ -80,6 +80,7 @@ ${scripts.add('