diff --git a/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php b/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php index 2e4e20f781f64da981a27f3acc7d92744d90a904..992aa281024abf2df4661ef27697d2d76ce78003 100644 --- a/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php +++ b/module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php @@ -198,10 +198,10 @@ class RecordDataFormatterFactory 'data-hierarchyParentTitle.phtml' ); $spec->setTemplateLine( - 'ISBN', 'getISBNs', 'data-escapeHtml.phtml' + 'ISBN', 'getISBNs', 'data-isbn.phtml' ); $spec->setTemplateLine( - 'ISSN', 'getISSNs', 'data-escapeHtml.phtml' + 'ISSN', 'getISSNs', 'data-issn.phtml' ); $spec->setTemplateLine( 'Notes', @@ -422,10 +422,10 @@ class RecordDataFormatterFactory 'Bibliography', 'getBibliographyNotes', 'data-escapeHtml.phtml' ); $spec->setTemplateLine( - 'ISBN', 'getISBNs', 'data-escapeHtml.phtml' + 'ISBN', 'getISBNs', 'data-isbn.phtml' ); $spec->setTemplateLine( - 'ISSN', 'getISSNs', 'data-escapeHtml.phtml' + 'ISSN', 'getISSNs', 'data-issn.phtml' ); $spec->setTemplateLine( 'DOI', 'getCleanDOI', 'data-escapeHtml.phtml' diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss index 31843eb62d943fe64dc524df28fd6b2932408534..5ca2f624cf4db0eae44fc2eb93e6407e3ffd262e 100644 --- a/themes/finc/scss/compiled.scss +++ b/themes/finc/scss/compiled.scss @@ -804,7 +804,7 @@ table.collapse.in { ////// NO margin bottom .no-margin-btm { - margin-top: 0; + margin-btm: 0; } ////// NO margin left diff --git a/themes/finc/templates/RecordDriver/SolrAI/core.phtml b/themes/finc/templates/RecordDriver/SolrAI/core.phtml index da91f88d83fa0d91bb1e007ff356a072fdb39ddc..ae088dc6da92c2182c77ee251b2986ca6e0ef2be 100644 --- a/themes/finc/templates/RecordDriver/SolrAI/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrAI/core.phtml @@ -38,8 +38,11 @@ <? endif; ?> <div class="media-body"> - <? /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars */ ?> - <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> + <? /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars; + remove schema name tag here but keep in description, CK + */ + ?> + <h3><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> <? $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?> <? if ($summary): ?> diff --git a/themes/finc/templates/RecordDriver/SolrDefault/core.phtml b/themes/finc/templates/RecordDriver/SolrDefault/core.phtml index b921fe2429d2110c1289aacbb4bc36e3530d0ef2..961f931ef871b69a2af9d12c4fe1f95d05a4dfbf 100644 --- a/themes/finc/templates/RecordDriver/SolrDefault/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrDefault/core.phtml @@ -37,8 +37,11 @@ <? endif; ?> <div class="media-body"> - <? /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars */ ?> - <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> + <? /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars + remove schema name tag here but keept in description, CK + */ + ?> + <h3><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> <? $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?> <? if ($summary): ?> diff --git a/themes/finc/templates/RecordDriver/SolrDefault/data-isbn.phtml b/themes/finc/templates/RecordDriver/SolrDefault/data-isbn.phtml new file mode 100644 index 0000000000000000000000000000000000000000..ea31c702f8fa2433a122d82d56ad7dbab05914c7 --- /dev/null +++ b/themes/finc/templates/RecordDriver/SolrDefault/data-isbn.phtml @@ -0,0 +1,11 @@ +<!-- finc: RecordDriver - SolrDefault - data-isbn --> +<? if (!empty($data)): ?> +<? if (is_array($data)): ?> + <span property="isbn"> + <?=implode('<br/>', array_map(array($this, 'escapeHtml'), $data))?> + </span> +<? else: ?> +<?=$this->escapeHtml($data)?> +<? endif; ?> +<? endif; ?> +<!-- finc: RecordDriver - SolrDefault - data-isbn - END --> diff --git a/themes/finc/templates/RecordDriver/SolrDefault/data-issn.phtml b/themes/finc/templates/RecordDriver/SolrDefault/data-issn.phtml new file mode 100644 index 0000000000000000000000000000000000000000..9c83fd7b91e51f936f89a0f608e3a10ac880b231 --- /dev/null +++ b/themes/finc/templates/RecordDriver/SolrDefault/data-issn.phtml @@ -0,0 +1,11 @@ +<!-- finc: RecordDriver - SolrDefault - data-issn --> +<? if (!empty($data)): ?> +<? if (is_array($data)): ?> + <span property="issn"> + <?=implode('<br/>', array_map(array($this, 'escapeHtml'), $data))?> + </span> +<? else: ?> +<?=$this->escapeHtml($data)?> +<? endif; ?> +<? endif; ?> +<!-- finc: RecordDriver - SolrDefault - data-issn - END --> diff --git a/themes/finc/templates/RecordDriver/SolrDefault/data-titleDetails.phtml b/themes/finc/templates/RecordDriver/SolrDefault/data-titleDetails.phtml index f159ec0210700fd39f9febbcdd5524a0e317b24e..c903481e56b98d5b47a1325da919e01c05f95c04 100644 --- a/themes/finc/templates/RecordDriver/SolrDefault/data-titleDetails.phtml +++ b/themes/finc/templates/RecordDriver/SolrDefault/data-titleDetails.phtml @@ -1,5 +1,5 @@ <!-- finc: RecordDriver - solrDefault - data-titleDetails --> -<span property="title"> +<span property="name"> <? if (!empty($data)): ?> <? $i = 0; foreach ($data as $title): ?> <?=($i > 0 ? '<br />':'')?><?=$this->escapeHtml($title)?><? $i++ ;?> diff --git a/themes/finc/templates/RecordDriver/SolrLido/core.phtml b/themes/finc/templates/RecordDriver/SolrLido/core.phtml index 5f4d4deeced48802c5f16b29df58aeb129b81a36..3ade8f8e601d49c0834e7b0dc1a24b34176e0c62 100644 --- a/themes/finc/templates/RecordDriver/SolrLido/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrLido/core.phtml @@ -55,7 +55,10 @@ <? endif; ?> <div class="media-body"> - <? /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars */ ?> + <? /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars + remove schema name tag here but keept in description, CK + */ + ?> <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> <? $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?> diff --git a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml index 24ea546d21cb2f69579c0968d957bef2f9323550..6be3f73ba42e07abef1cd5b399411c229c8ea08b 100644 --- a/themes/finc/templates/RecordDriver/SolrMarc/core.phtml +++ b/themes/finc/templates/RecordDriver/SolrMarc/core.phtml @@ -37,8 +37,11 @@ <? endif; ?> <div class="media-body"> - <? /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars */ ?> - <h3 property="name"><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> + <? /* finc: We want to get rid of trailing special chars in the title and limit its length to 100 chars + remove schema name tag here but keept in description, CK + */ + ?> + <h3><?=$this->escapeHtml(preg_replace('/(\s[\/\.:]\s*)*$/', '', $this->truncate($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection(), 100)))?></h3> <? $summary = $this->driver->getSummary(); $summary = isset($summary[0]) ? $this->escapeHtml($summary[0]) : false; ?> <? if ($summary): ?>