From e316f595bbd21fc5a58586ad0a136a8f6ce07086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastien=20De=CC=81le=CC=80ze?= Date: Mon, 21 Jun 2021 12:20:31 +0200 Subject: [PATCH] projects: dedicated view for HEP BEJUNE. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Configures the dedicated view for HEP BEJUNE organisation. * Adds fixture and logo for the organisation. * Closes #571. Co-Authored-by: Sébastien Délèze --- data/oai_sources.json | 2 +- data/organisations/data.json | 13 ++++++ data/organisations/hepbejune/logo.png | Bin 0 -> 8909 bytes .../modules/documents/dojson/rerodoc/model.py | 2 +- .../documents/dojson/rerodoc/overdo.py | 21 ++++++--- .../assets/scss/hepbejune/_variables.scss | 22 ++++++++++ sonar/theme/assets/scss/hepbejune/theme.scss | 41 ++++++++++++++++++ sonar/theme/webpack.py | 1 + 8 files changed, 93 insertions(+), 9 deletions(-) create mode 100644 data/organisations/hepbejune/logo.png create mode 100644 sonar/theme/assets/scss/hepbejune/_variables.scss create mode 100644 sonar/theme/assets/scss/hepbejune/theme.scss diff --git a/data/oai_sources.json b/data/oai_sources.json index 03cb8ffe..228fa737 100644 --- a/data/oai_sources.json +++ b/data/oai_sources.json @@ -5,7 +5,7 @@ "url": "http://doc.rero.ch/oai2d", "metadataprefix": "marcxml", "comment": "", - "setspecs": "unisi unifr nl-epfl nl-ethz nl-fachhochschulen nl-lib4ri nl-unibas nl-unibe nl-unifr nl-unige nl-unil nl-unilu nl-unine nl-unisg nl-usi nl-uzh bge mhnge baage bmuge imvge mhsge" + "setspecs": "unisi unifr nl-epfl nl-ethz nl-fachhochschulen nl-lib4ri nl-unibas nl-unibe nl-unifr nl-unige nl-unil nl-unilu nl-unine nl-unisg nl-usi nl-uzh bge mhnge baage bmuge imvge mhsge hepbejune" }, { "key": "archive_ouverte_unige", diff --git a/data/organisations/data.json b/data/organisations/data.json index 35858a89..d2c17121 100644 --- a/data/organisations/data.json +++ b/data/organisations/data.json @@ -23,5 +23,18 @@ "path": "./hepvs/hepvs.png" } ] + }, + { + "code": "hepbejune", + "name": "Haute École Pédagogique BEJUNE", + "isShared": true, + "isDedicated": true, + "platformName": "# ROAR\n#### Répertoire ouvert et archives BEJUNE", + "files": [ + { + "key": "logo.jpg", + "path": "./hepbejune/logo.png" + } + ] } ] diff --git a/data/organisations/hepbejune/logo.png b/data/organisations/hepbejune/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8f24188925bc6a477575bbe310e8305e1159dcb6 GIT binary patch literal 8909 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 XuBq2o{tfsy6%2W4WvLPgL%;t4en42% literal 0 HcmV?d00001 diff --git a/sonar/modules/documents/dojson/rerodoc/model.py b/sonar/modules/documents/dojson/rerodoc/model.py index 35f3e7ae..48dab0ce 100644 --- a/sonar/modules/documents/dojson/rerodoc/model.py +++ b/sonar/modules/documents/dojson/rerodoc/model.py @@ -135,7 +135,7 @@ def marc21_to_title_245(self, key, value): title = { 'type': 'bf:Title', 'mainTitle': [{ - 'value': main_title, + 'value': main_title.rstrip(':'), 'language': language }] } diff --git a/sonar/modules/documents/dojson/rerodoc/overdo.py b/sonar/modules/documents/dojson/rerodoc/overdo.py index c027b217..6917308f 100644 --- a/sonar/modules/documents/dojson/rerodoc/overdo.py +++ b/sonar/modules/documents/dojson/rerodoc/overdo.py @@ -44,12 +44,14 @@ def create_organisation(organisation_key): if not organisation: # Create organisation record - organisation = OrganisationRecord.create({ - 'code': organisation_key, - 'name': organisation_key, - 'isShared': False, - 'isDedicated': False - }, dbcommit=True) + organisation = OrganisationRecord.create( + { + 'code': organisation_key, + 'name': organisation_key, + 'isShared': False, + 'isDedicated': False + }, + dbcommit=True) organisation.reindex() @staticmethod @@ -94,7 +96,12 @@ def do(self, blob, ignore_missing=True, exception_handlers=None): # Add default license if not set. if not result.get('usageAndAccessPolicy'): - result['usageAndAccessPolicy'] = {'license': 'License undefined'} + default_license = 'License undefined' + if result.get('organisation') and result['organisation'][0][ + '$ref'] == 'https://sonar.ch/api/organisations/hepbejune': + default_license = 'CC BY-NC-SA' + + result['usageAndAccessPolicy'] = {'license': default_license} return result diff --git a/sonar/theme/assets/scss/hepbejune/_variables.scss b/sonar/theme/assets/scss/hepbejune/_variables.scss new file mode 100644 index 00000000..7d080690 --- /dev/null +++ b/sonar/theme/assets/scss/hepbejune/_variables.scss @@ -0,0 +1,22 @@ +/* + Swiss Open Access Repository + Copyright (C) 2021 RERO + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +$primary: #0065a9 !default; +$secondary: #adcb57 !default; +$color-white: #ffffff !default; + +@import "../common/variables"; diff --git a/sonar/theme/assets/scss/hepbejune/theme.scss b/sonar/theme/assets/scss/hepbejune/theme.scss new file mode 100644 index 00000000..510ccc99 --- /dev/null +++ b/sonar/theme/assets/scss/hepbejune/theme.scss @@ -0,0 +1,41 @@ +/* + Swiss Open Access Repository + Copyright (C) 2021 RERO + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +@import "variables"; +@import "../common/theme"; + +.bg-header { + background-color: darken($primary, 5%); + @extend .navbar-dark; + + .nav-link { + color: $color-white !important; + } +} + +.bg-organisation { + @extend .navbar-dark; + color: $color-white !important; + + .nav-link { + color: $color-white !important; + } + + .form-control { + border: 1px solid $color-white !important; + } +} diff --git a/sonar/theme/webpack.py b/sonar/theme/webpack.py index 0a6b11ba..1f61a1e2 100644 --- a/sonar/theme/webpack.py +++ b/sonar/theme/webpack.py @@ -30,6 +30,7 @@ 'usi-theme': './scss/usi/theme.scss', 'hepvs-theme': './scss/hepvs/theme.scss', 'vge-theme': './scss/vge/theme.scss', + 'hepbejune-theme': './scss/hepbejune/theme.scss', 'preview': './scss/preview.scss', }, dependencies={