From 3fa1d68b403c463475acf96ba464db7e2e474e74 Mon Sep 17 00:00:00 2001 From: David Osumi-Sutherland Date: Tue, 25 Jun 2019 15:47:24 +0100 Subject: [PATCH 1/7] Add Entity restriction to core query Fixes #333 ** WARNING: DO NOT MERGE UNTIL pdb-dev IS REBUILT! DOING SO WILL BREAK ALL TERM INFO!!! *** --- model/vfb.xmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/vfb.xmi b/model/vfb.xmi index db33cc7c3..076a3a79d 100644 --- a/model/vfb.xmi +++ b/model/vfb.xmi @@ -359,7 +359,7 @@ xsi:type="gep_2:SimpleQuery" name="Get term core info" description="Fetches term core details." - query="MATCH (primary {short_form: '$ID'}) RETURN { core: { short_form: primary.short_form, label: primary.label, iri: primary.iri, types: labels(primary) }} as term" + query="MATCH (primary:Entity {short_form: '$ID'}) RETURN { core: { short_form: primary.short_form, label: primary.label, iri: primary.iri, types: labels(primary) }} as term" countQuery="MATCH (primary {short_form: '$ID'} ) RETURN count(primary) as count"/> Date: Thu, 4 Jul 2019 09:28:23 +0100 Subject: [PATCH 2/7] generalising formatting --- css/VFBTermInfo.less | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/css/VFBTermInfo.less b/css/VFBTermInfo.less index f78adc3f0..8e5ec7b75 100644 --- a/css/VFBTermInfo.less +++ b/css/VFBTermInfo.less @@ -217,23 +217,19 @@ color:white; background-color: grey; font-size: 10px!important; - display: inline-block; margin-left: 1px; + margin-right:1px; + float:right; } /* link label positioning */ -li>span.label.types{ +.label.types{ margin-right:30px; float:right; padding-top: 0em; padding-bottom: 0em; } - li>span.label.types>.label{ - float:right; - margin-right:1px; -} - /* icon customisations: */ .terminfo-licenseicon { From fde8cfe45553e08c2e1110dfb024f2f2d00a058f Mon Sep 17 00:00:00 2001 From: Rob Court Date: Thu, 4 Jul 2019 09:43:45 +0100 Subject: [PATCH 3/7] order fix --- components/VFBMain.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/VFBMain.js b/components/VFBMain.js index 260506135..02d5e8be3 100644 --- a/components/VFBMain.js +++ b/components/VFBMain.js @@ -854,6 +854,7 @@ export default class VFBMain extends React.Component { 'Source', 'License', 'Relationships', + 'Query for', 'Query For', 'Description', 'Cross References', From ccb36b78a70d76bb521ab47b6651f3f35b9f75ce Mon Sep 17 00:00:00 2001 From: Rob Court Date: Thu, 4 Jul 2019 10:31:16 +0100 Subject: [PATCH 4/7] adding logo --- components/VFBMain.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/VFBMain.js b/components/VFBMain.js index 02d5e8be3..b20dbdb0a 100644 --- a/components/VFBMain.js +++ b/components/VFBMain.js @@ -849,6 +849,7 @@ export default class VFBMain extends React.Component { 'Types', 'Classification', 'Parents', + 'Logo', 'Thumbnail', 'Examples', 'Source', From 40ea0239c3ae32aca76714c28c18ceca990439ec Mon Sep 17 00:00:00 2001 From: Rob Court Date: Thu, 4 Jul 2019 12:30:41 +0100 Subject: [PATCH 5/7] adding alternative names --- components/VFBMain.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/VFBMain.js b/components/VFBMain.js index b20dbdb0a..2a29717c8 100644 --- a/components/VFBMain.js +++ b/components/VFBMain.js @@ -846,6 +846,7 @@ export default class VFBMain extends React.Component { termInfoId={this.termInfoId} order={['Name', 'Label', + 'Alternative Names', 'Types', 'Classification', 'Parents', From eee4f27f366eaa44a22ca55b8228d90ab2d01720 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Thu, 4 Jul 2019 12:44:14 +0100 Subject: [PATCH 6/7] styling logo --- css/VFBTermInfo.less | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/css/VFBTermInfo.less b/css/VFBTermInfo.less index 8e5ec7b75..8cd3a3b92 100644 --- a/css/VFBTermInfo.less +++ b/css/VFBTermInfo.less @@ -245,6 +245,13 @@ max-width: 165px; } +.terminfo-logo { + display: block; + margin-left: auto; + margin-right: auto; + max-width: 50%; +} + /* title modifications: */ .terminfo-comment-title { From c11ef9cf1a2eabf8d068d72e8d1a5ff6b7dc6d68 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Thu, 4 Jul 2019 16:18:30 +0100 Subject: [PATCH 7/7] adding link --- components/VFBMain.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/VFBMain.js b/components/VFBMain.js index 2a29717c8..eb7793dea 100644 --- a/components/VFBMain.js +++ b/components/VFBMain.js @@ -851,6 +851,7 @@ export default class VFBMain extends React.Component { 'Classification', 'Parents', 'Logo', + 'Link', 'Thumbnail', 'Examples', 'Source',