- + . - -"""JS/CSS bundles for theme.""" - -from __future__ import absolute_import, print_function - -from flask_assets import Bundle -from invenio_assets import NpmBundle - -from ...bundles import i18n - -detailed_js = Bundle( - i18n, - NpmBundle( - 'js/rero_ils/translations.js', - 'js/rero_ils/thumbnail.js', - 'js/rero_ils/detailed_app.js', - 'js/rero_ils/documents_jq.js', - filters='requirejs', - depends=('node_modules/d3/*'), - npm={ - "almond": "~0.3.1", - 'angular': '~1.4.10', - 'angular-loading-bar': '~0.9.0', - 'd3': '^3.5.17', - 'jquery': '~1.9.1', - } - ), - filters='jsmin', - output='gen/rero_ils.detailed.%(version)s.js', -) diff --git a/rero_ils/modules/documents/static/js/rero_ils/detailed_app.js b/rero_ils/modules/documents/static/js/rero_ils/detailed_app.js deleted file mode 100644 index 11152188f6..0000000000 --- a/rero_ils/modules/documents/static/js/rero_ils/detailed_app.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -require([ - 'node_modules/d3/d3', - 'node_modules/angular/angular', - 'node_modules/angular-loading-bar/build/loading-bar' - ], function() { - // When the DOM is ready bootstrap the `invenio-serach-js` - - angular.element(document).ready(function() { - angular.bootstrap( - document.getElementById("thumbnail"), [ - 'angular-loading-bar', 'reroilsAppTranslations', 'reroThumbnails' - ] - ); - }); - }); diff --git a/rero_ils/modules/documents/static/js/rero_ils/documents.js b/rero_ils/modules/documents/static/js/rero_ils/documents.js deleted file mode 100644 index 4ddaa88c38..0000000000 --- a/rero_ils/modules/documents/static/js/rero_ils/documents.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -angular.module('reroilsUtils', []) - - .controller('exportController', ['$scope', function($scope) { - $scope.csvURL = function() { - return window.location.href.toString().replace('search', 'api/export/documents/csv').replace(/size=\d+/, 'size=19999'); - }; - }]) - - .directive('reroilsExportCsv', function() { - return { - template: 'CSV Export' - }; - }) - - .controller('recordController', ['$scope', function($scope) { - record = $scope.rec; - }]); diff --git a/rero_ils/modules/documents/static/js/rero_ils/documents_jq.js b/rero_ils/modules/documents/static/js/rero_ils/documents_jq.js deleted file mode 100644 index 06e014573c..0000000000 --- a/rero_ils/modules/documents/static/js/rero_ils/documents_jq.js +++ /dev/null @@ -1,28 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -$(document).ready(function() { - $('.collapse').on('hidden.bs.collapse shown.bs.collapse', function () { - var element = $('#' + $(this).data('holdingId')).find('.availability'); - element.hasClass('d-none') ? - element.removeClass('d-none') : element.addClass('d-none'); - }); - - $('#nav-tab').keeptab({ localeItemName: 'document-tab'}); - }); diff --git a/rero_ils/modules/documents/static/js/rero_ils/thumbnail.js b/rero_ils/modules/documents/static/js/rero_ils/thumbnail.js deleted file mode 100644 index 0281b8437f..0000000000 --- a/rero_ils/modules/documents/static/js/rero_ils/thumbnail.js +++ /dev/null @@ -1,96 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -angular.module('reroThumbnails', []) - .controller('thumbnailController', ['$scope', '$log', '$http', '$sce', function($scope, $log, $http, $sce) { - $scope.thumbnail_url = '/static/images/icon_'+$scope.type+'.png'; - $scope.type = undefined; - $scope.identifiers = { - isbn: undefined - }; - $scope.thumbnail_service_url = undefined; - - - $scope.$on('thumbnail.init', thumbnailInit); - function thumbnailInit(init, thumbnailurl, identifiers, type, config) { - var thumbnail_service_url = angular.fromJson(config).thumbnail_service_url; - $scope.thumbnail_service_url = $sce.trustAsResourceUrl(thumbnail_service_url); - $scope.type = type; - $scope.identifiers = angular.fromJson(identifiers); - $scope.thumbnail_url = thumbnailurl - }; - - $scope.$watch( - "identifiers", - function handleIdentifiers( identifiers ) { - if(identifiers) { - getThumbnailUrl(identifiers); - } - }, - true - ); - - $scope.$watch( - "thumbnailurl", - function handleThumbnailUrl( thumbnailurl ) { - if(thumbnailurl) { - $scope.thumbnail_url = thumbnailurl; - } - }, - true - ); - - function getThumbnailUrl(identifiers) { - var isbn = identifiers.isbn; - if(isbn) { - var config = { - jsonpCallbackParam: 'callback', - type: 'isbn', - value: isbn, - width: '250px', - height: '250px' - } - // $log.log(angular.version); - $http.jsonp($scope.thumbnail_service_url, {params: config}) - .then(function(response){ - if(response.status === 200) { - $scope.thumbnail_url = response.data.image; - } - }); - } - } - - }]) - .directive('iconThumbnail', ['$log', 'gettextCatalog', function($log, gettextCatalog) { - return { - restrict: 'E', - controller: "thumbnailController", - scope: { - type: '@' - }, - template: ' \ - {{ type | translate }} \ - ', - link: function (scope, element, attrs) { - scope.$broadcast( - 'thumbnail.init', attrs.thumbnailurl, attrs.identifiers, attrs.type, attrs.config - ); - } - }; - }]); diff --git a/rero_ils/modules/documents/templates/rero_ils/_documents_get.html b/rero_ils/modules/documents/templates/rero_ils/_documents_get.html index a34404d869..11372409f7 100644 --- a/rero_ils/modules/documents/templates/rero_ils/_documents_get.html +++ b/rero_ils/modules/documents/templates/rero_ils/_documents_get.html @@ -232,8 +232,8 @@ {{ _('Select a Pickup Location') }} {%- elif reasons %} - - + + {{ _('Request') }} diff --git a/rero_ils/modules/documents/templates/rero_ils/detailed_view_documents.html b/rero_ils/modules/documents/templates/rero_ils/detailed_view_documents.html index d1dc9d9019..56a96e99ac 100644 --- a/rero_ils/modules/documents/templates/rero_ils/detailed_view_documents.html +++ b/rero_ils/modules/documents/templates/rero_ils/detailed_view_documents.html @@ -24,29 +24,14 @@ {{ _('Back') }} - {% if record | get_cover_art%} - - - - - {% else %} - - + + + {{ _(record.type) }} + - {% endif %} {{ record.title | create_title_text }} @@ -132,7 +117,7 @@ {% if accesses|length < 1 and not holdings %} - + {% else %} - + ') def cover(isbn): """Document cover service.""" - cover_service = current_app.config.get('RERO_ILS_THUMBNAIL_SERVICE_URL') - url = cover_service + '?height=60px&jsonpCallbackParam=callback'\ - '&type=isbn&width=60px&callback=thumb&value=' + isbn - response = requests.get( - url, headers={'referer': flask_request.host_url}) - return jsonify(json.loads(response.text[len('thumb('):-1])) + return jsonify(get_remote_cover(isbn)) blueprint = Blueprint( @@ -392,12 +385,18 @@ def get_cover_art(record): :param record: record :return: url for cover art or None """ + # electronic for electronic_locator in record.get('electronicLocator', []): type = electronic_locator.get('type') content = electronic_locator.get('content') if type == 'relatedResource' and content == 'coverImage': return electronic_locator.get('url') - return None + # isbn + isbn = document_isbn(record.get('identifiedBy', [])).get('isbn') + if not isbn: + return None + res = get_remote_cover(isbn) + return res.get('image') @blueprint.app_template_filter() diff --git a/rero_ils/modules/ext.py b/rero_ils/modules/ext.py index 95f2c79dfb..07f0528f78 100644 --- a/rero_ils/modules/ext.py +++ b/rero_ils/modules/ext.py @@ -48,8 +48,8 @@ from .patron_transactions.listener import enrich_patron_transaction_data from .patrons.listener import create_subscription_patron_transaction, \ enrich_patron_data, update_from_profile -from ..filter import empty_data, format_date_filter, jsondumps, text_to_id, \ - to_pretty_json +from ..filter import empty_data, format_date_filter, jsondumps, node_assets, \ + text_to_id, to_pretty_json class REROILSAPP(object): @@ -70,6 +70,7 @@ def __init__(self, app=None): # register filters app.add_template_filter(format_date_filter, name='format_date') + app.add_template_global(node_assets, name='node_assets') app.add_template_filter(to_pretty_json, name='tojson_pretty') app.add_template_filter(text_to_id, name='text_to_id') app.add_template_filter(jsondumps, name='jsondumps') diff --git a/rero_ils/modules/ill_requests/bundles.py b/rero_ils/modules/ill_requests/bundles.py deleted file mode 100644 index 93eed7d28c..0000000000 --- a/rero_ils/modules/ill_requests/bundles.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# -# RERO ILS -# Copyright (C) 2020 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 . - -"""JS/CSS bundles for theme.""" - -from __future__ import absolute_import, print_function - -from flask_assets import Bundle -from invenio_assets import NpmBundle - -ill_request_form_js = Bundle( - NpmBundle( - 'js/rero_ils/ill_request_form.js', - filters='requirejs', - npm={ - 'jquery': '~1.9.1', - } - ), - filters='jsmin', - output='gen/rero_ils.ill_request_form.%(version)s.js', -) diff --git a/rero_ils/modules/ill_requests/static/js/rero_ils/ill_request_form.js b/rero_ils/modules/ill_requests/static/js/rero_ils/ill_request_form.js deleted file mode 100644 index 4aa54b61d0..0000000000 --- a/rero_ils/modules/ill_requests/static/js/rero_ils/ill_request_form.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2020 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 . - -*/ - -$(document).ready(function() { - - function toggleField(checked) { - var target = $('div').find('[data-form-id="pages"]'); - if (checked == 0) { - target.addClass('d-none'); - } else { - target.removeClass('d-none'); - } - } - $('input:radio[name="request_copy"]').on('change', function() { - toggleField($(this).val()); - }); - $('input:radio[name="request_copy"]:checked').trigger('change'); -}); diff --git a/rero_ils/modules/patrons/static/js/rero_ils/patron_fees_toogle.js b/rero_ils/modules/patrons/static/js/rero_ils/patron_fees_toogle.js deleted file mode 100644 index c20b873b0f..0000000000 --- a/rero_ils/modules/patrons/static/js/rero_ils/patron_fees_toogle.js +++ /dev/null @@ -1,53 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2020 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 . - -*/ - -$(document).ready(function() { - // Toogle - $('.btn-toogle').on('click', function() { - toogle($(this), 'target-id'); - }); - - /** - * Toogle element - * @param object element - * @param string elementId - */ - function toogle(element, elementId) { - var target = $('#' + element.data(elementId)); - var iCaret = element.find('i'); - if(iCaret.hasClass('fa-caret-right')) { - iCaret - .removeClass('fa-caret-right') - .addClass('fa-caret-down'); - } else { - iCaret - .removeClass('fa-caret-down') - .addClass('fa-caret-right'); - } - if (target.hasClass('d-none')) { - target - .removeClass('d-none') - .addClass('d-block'); - } else { - target - .removeClass('d-block') - .addClass('d-none'); - } - } -}); diff --git a/rero_ils/modules/patrons/templates/rero_ils/patron_profile.html b/rero_ils/modules/patrons/templates/rero_ils/patron_profile.html index 0c4904ecf4..68a0458af8 100644 --- a/rero_ils/modules/patrons/templates/rero_ils/patron_profile.html +++ b/rero_ils/modules/patrons/templates/rero_ils/patron_profile.html @@ -37,7 +37,7 @@ - + diff --git a/rero_ils/static/js/rero_ils/invenio_config.js b/rero_ils/static/js/rero_ils/invenio_config.js deleted file mode 100644 index ae68066f13..0000000000 --- a/rero_ils/static/js/rero_ils/invenio_config.js +++ /dev/null @@ -1,38 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -angular.module('invenioConfig', []) - .controller('configController', ['$scope', '$log', '$http', '$sce', function($scope, $log, $http, $sce) { - $scope.config = {} - $scope.$on('config.init', configInit); - function configInit(init, config){ - $scope.config = angular.fromJson(config); - }; - }]) - .directive('invenioConfig', ['$log', function($log) { - return { - restrict: 'E', - controller: 'configController', - link: function (scope, element, attrs) { - scope.$broadcast( - 'config.init', attrs.config - ); - } - }; - }]); diff --git a/rero_ils/static/js/rero_ils/rero_ils.js b/rero_ils/static/js/rero_ils/rero_ils.js deleted file mode 100644 index 2da42e1404..0000000000 --- a/rero_ils/static/js/rero_ils/rero_ils.js +++ /dev/null @@ -1,94 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 RERO -Copyright (C) 2015-2018 CERN -Copyright (C) 2016 TIND - -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 . - -*/ - -require([ - "node_modules/jquery/jquery", - "node_modules/bootstrap/dist/js/bootstrap.bundle", - // "node_modules/bootstrap-autohide-navbar/dist/bootstrap-autohide-navbar", - "node_modules/angular/angular", - "node_modules/angular-gettext/dist/angular-gettext" -], function () { - - $(document).ready(function () { - - $('[data-toggle="tooltip"]').tooltip(); - - // flash messages - $('.toast-container .toast').toast({ - delay: 5000 - }).toast('show'); - - /* Enable the sticky autohide header */ - $('button.delete').on('click', function (e) { - var next = $(this).data('next'); - $.ajax({ - url: $(this).data('delete-url'), - type: 'DELETE', - success: function (result) { - window.location.replace(next); - return false; - }, - error: function (result, statut, error) { - console.log('error: ', result, status, error); - } - }); - }); - - $("#login-user").submit(function (e) { - - e.preventDefault(); // avoid to execute the actual submit of the form. - - var form = $(this); - var url = form.attr('data-action'); - - $.ajax({ - type: "POST", - url: url, - data: form.serialize(), // serializes the form's elements. - success: function (data) { - var next = getUrlParameter('next'); - window.location.replace(next? next : '/'); - }, - error: function (data) { - var response = $.parseJSON(data.responseText); - var alert = $("#js-alert"); - var msg = $("#js-alert span.msg").html(response.errors[0].message); - alert.show(); - } - }); - }); - - var getUrlParameter = function getUrlParameter(sParam) { - var sPageURL = window.location.search.substring(1), - sURLVariables = sPageURL.split('&'), - sParameterName, - i; - - for (i = 0; i < sURLVariables.length; i++) { - sParameterName = sURLVariables[i].split('='); - - if (sParameterName[0] === sParam) { - return sParameterName[1] === undefined ? true : decodeURIComponent(sParameterName[1]); - } - } - }; - }); -}); diff --git a/rero_ils/static/js/rero_ils/rero_keep_tab.js b/rero_ils/static/js/rero_ils/rero_keep_tab.js deleted file mode 100644 index 8eb9548866..0000000000 --- a/rero_ils/static/js/rero_ils/rero_keep_tab.js +++ /dev/null @@ -1,49 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2020 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 . - -*/ - -(function ( $, window ) { - $.fn.keeptab = function( options ) { - - var opts = $.extend( { - tabsName: '.nav-tabs', - localeItemName: 'navkeeptab', - selector: '.nav-link' - }, options ); - - $(opts.tabsName).find(opts.selector).on('click', function() { - var elementId = undefined; - if ($(this).attr('id')) { - elementId = '#' + $(this).attr('id'); - } else if ($(this).attr('href')) { - elementId = $(this).attr('href') - } else { - window.console.log('Missing id or href.'); - } - if (elementId) { - localStorage.setItem(opts.localeItemName, elementId); - } - }); - - var activeTab = localStorage.getItem(opts.localeItemName); - if (activeTab && $(activeTab).length) { - $(activeTab).tab('show'); - } - return this; - }; -}( jQuery, window )); diff --git a/rero_ils/static/js/rero_ils/search_app.js b/rero_ils/static/js/rero_ils/search_app.js deleted file mode 100644 index 5694db4935..0000000000 --- a/rero_ils/static/js/rero_ils/search_app.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -require([ - 'node_modules/d3/d3', - 'node_modules/angular/angular', - 'node_modules/angular-loading-bar/build/loading-bar', - 'node_modules/invenio-search-js/dist/invenio-search-js', - ], function() { - // When the DOM is ready bootstrap the `invenio-search-js` - - angular.element(document).ready(function() { - angular.bootstrap( - document.getElementById("invenio-search"), [ - 'angular-loading-bar', - 'invenioSearch', - 'invenioConfig', - 'reroilsAppTranslations', - 'reroilsUtils', - 'reroilsPerson', - 'reroThumbnails' - ] - ); - }); -}); diff --git a/rero_ils/static/js/rero_ils/translations.js b/rero_ils/static/js/rero_ils/translations.js deleted file mode 100644 index 1245fe454d..0000000000 --- a/rero_ils/static/js/rero_ils/translations.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -angular.module('reroilsAppTranslations') - .run(['gettextCatalog', function (gettextCatalog) { - gettextCatalog.setCurrentLanguage(document.documentElement.lang); - }]); diff --git a/rero_ils/static/scss/rero_ils/cover.scss b/rero_ils/static/scss/rero_ils/cover.scss deleted file mode 100644 index 4d5ca1afe5..0000000000 --- a/rero_ils/static/scss/rero_ils/cover.scss +++ /dev/null @@ -1,22 +0,0 @@ -/* - - RERO ILS - Copyright (C) 2019 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 . - - */ - -.rero-ils-cover-logo { - width: 10em; -} diff --git a/rero_ils/static/templates/rero_ils/count.html b/rero_ils/static/templates/rero_ils/count.html deleted file mode 100644 index 735d5d5edb..0000000000 --- a/rero_ils/static/templates/rero_ils/count.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - Found {{$count}} result. - No results found. - - diff --git a/rero_ils/static/templates/rero_ils/facets.html b/rero_ils/static/templates/rero_ils/facets.html deleted file mode 100644 index 166ef2bea4..0000000000 --- a/rero_ils/static/templates/rero_ils/facets.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - {{ aggr.key | translate }} - - - - - - - - {{ item.name | translate }}{{ item.key | translate }} ({{ item.doc_count }}) - - - - {{ (tree[item.key]) ? '-' : '+' }} - - - - - - - - {{ subFacets.name | translate }} - {{ subFacets.key | translate }} - ({{ subFacets.doc_count }}) - - - - - - - - - diff --git a/rero_ils/static/templates/rero_ils/pagination.html b/rero_ils/static/templates/rero_ils/pagination.html deleted file mode 100644 index 84cd5a7f5d..0000000000 --- a/rero_ils/static/templates/rero_ils/pagination.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - First - - - - - - Previous - - - - - {{ page.value }} - - - - - - Next - - - - - - Last - - - - diff --git a/rero_ils/static/templates/rero_ils/searchbar.html b/rero_ils/static/templates/rero_ils/searchbar.html deleted file mode 100644 index c86e929a3c..0000000000 --- a/rero_ils/static/templates/rero_ils/searchbar.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - diff --git a/rero_ils/modules/patrons/bundles.py b/rero_ils/theme/__init__.py similarity index 61% rename from rero_ils/modules/patrons/bundles.py rename to rero_ils/theme/__init__.py index c6a559acaa..4df70e011c 100644 --- a/rero_ils/modules/patrons/bundles.py +++ b/rero_ils/theme/__init__.py @@ -15,21 +15,4 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -"""JS/CSS bundles for theme.""" - -from __future__ import absolute_import, print_function - -from flask_assets import Bundle -from invenio_assets import NpmBundle - -patron_profile_js = Bundle( - NpmBundle( - 'js/rero_ils/patron_fees_toogle.js', - filters='requirejs', - npm={ - 'jquery': '~1.9.1', - } - ), - filters='jsmin', - output='gen/rero_ils.patron_profile.%(version)s.js', -) +"""RERO ILS theme module.""" diff --git a/rero_ils/theme/assets/js/reroils/login.js b/rero_ils/theme/assets/js/reroils/login.js new file mode 100644 index 0000000000..0b2829a62b --- /dev/null +++ b/rero_ils/theme/assets/js/reroils/login.js @@ -0,0 +1,59 @@ +/* + +RERO ILS +Copyright (C) 2020 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 $ from 'jquery'; + +$("#login-user").submit(function (e) { + + e.preventDefault(); // avoid to execute the actual submit of the form. + + var form = $(this); + var url = form.attr('data-action'); + + $.ajax({ + type: "POST", + url: url, + data: form.serialize(), // serializes the form's elements. + success: function (data) { + var next = getUrlParameter('next'); + window.location.replace(next ? next : '/'); + }, + error: function (data) { + var response = JSON.parse(data.responseText); + var alert = $("#js-alert"); + var msg = $("#js-alert span.msg").html(response.errors[0].message); + alert.show(); + } + }); +}); + +var getUrlParameter = function getUrlParameter(sParam) { + var sPageURL = window.location.search.substring(1), + sURLVariables = sPageURL.split('&'), + sParameterName, + i; + + for (i = 0; i < sURLVariables.length; i++) { + sParameterName = sURLVariables[i].split('='); + + if (sParameterName[0] === sParam) { + return sParameterName[1] === undefined ? true : decodeURIComponent(sParameterName[1]); + } + } +}; diff --git a/rero_ils/assets/js/admin_ui.js b/rero_ils/theme/assets/js/reroils/public.js similarity index 80% rename from rero_ils/assets/js/admin_ui.js rename to rero_ils/theme/assets/js/reroils/public.js index 961ee692d3..a4ef9513e3 100644 --- a/rero_ils/assets/js/admin_ui.js +++ b/rero_ils/theme/assets/js/reroils/public.js @@ -17,6 +17,8 @@ along with this program. If not, see . */ -import '@rero/rero-ils-ui/dist/admin/runtime.js'; -import '@rero/rero-ils-ui/dist/admin/polyfills.js'; -import '@rero/rero-ils-ui/dist/admin/main.js'; +import 'bootstrap'; +import './tooltip'; +import './toast'; +import './login'; +import './toggle'; diff --git a/rero_ils/assets/js/public-search_ui.js b/rero_ils/theme/assets/js/reroils/toast.js similarity index 78% rename from rero_ils/assets/js/public-search_ui.js rename to rero_ils/theme/assets/js/reroils/toast.js index 7906768b4d..d2b9694741 100644 --- a/rero_ils/assets/js/public-search_ui.js +++ b/rero_ils/theme/assets/js/reroils/toast.js @@ -17,6 +17,9 @@ along with this program. If not, see . */ -import '@rero/rero-ils-ui/dist/public-search/runtime.js'; -import '@rero/rero-ils-ui/dist/public-search/polyfills.js'; -import '@rero/rero-ils-ui/dist/public-search/main.js'; +import $ from 'jquery'; + +// flash messages +$('.toast-container .toast').toast({ + delay: 5000 +}).toast('show'); diff --git a/rero_ils/theme/assets/js/reroils/toggle.js b/rero_ils/theme/assets/js/reroils/toggle.js new file mode 100644 index 0000000000..03ec83f544 --- /dev/null +++ b/rero_ils/theme/assets/js/reroils/toggle.js @@ -0,0 +1,77 @@ +/* + +RERO ILS +Copyright (C) 2020 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 $ from 'jquery'; + +// Documents +$('.collapse').on('hidden.bs.collapse shown.bs.collapse', function () { + var element = $('#' + $(this).data('holdingId')).find('.availability'); + element.hasClass('d-none') ? + element.removeClass('d-none') : element.addClass('d-none'); +}); + +// Patrons +$('.btn-toogle').on('click', function () { + toogle($(this), 'target-id'); +}); + +// ILLRequest +$('input:radio[name="request_copy"]').on('change', function () { + toggleField($(this).val()); +}); +$('input:radio[name="request_copy"]:checked').trigger('change') + +/** + * Toogle element + * @param object element + * @param string elementId + */ +function toogle(element, elementId) { + var target = $('#' + element.data(elementId)); + var iCaret = element.find('i'); + if (iCaret.hasClass('fa-caret-right')) { + iCaret + .removeClass('fa-caret-right') + .addClass('fa-caret-down'); + } else { + iCaret + .removeClass('fa-caret-down') + .addClass('fa-caret-right'); + } + if (target.hasClass('d-none')) { + target + .removeClass('d-none') + .addClass('d-block'); + } else { + target + .removeClass('d-block') + .addClass('d-none'); + } +} + +function toggleField(checked) { + var target = $('div').find('[data-form-id="pages"]'); + if (checked == 0) { + target.addClass('d-none'); + } else { + target.removeClass('d-none'); + } +} + + diff --git a/rero_ils/modules/contributions/static/js/rero_ils/contribution_jq.js b/rero_ils/theme/assets/js/reroils/tooltip.js similarity index 87% rename from rero_ils/modules/contributions/static/js/rero_ils/contribution_jq.js rename to rero_ils/theme/assets/js/reroils/tooltip.js index 2b42983d41..c2e39906cc 100644 --- a/rero_ils/modules/contributions/static/js/rero_ils/contribution_jq.js +++ b/rero_ils/theme/assets/js/reroils/tooltip.js @@ -17,6 +17,6 @@ along with this program. If not, see . */ -$(document).ready(function() { - $('#nav-tab').keeptab({ localeItemName: 'person-tab'}); -}); +import $ from 'jquery'; + +$('[data-toggle="tooltip"]').tooltip(); diff --git a/rero_ils/modules/contributions/static/scss/rero_ils/person.scss b/rero_ils/theme/assets/scss/rero_ils/contributions/detailed.scss similarity index 100% rename from rero_ils/modules/contributions/static/scss/rero_ils/person.scss rename to rero_ils/theme/assets/scss/rero_ils/contributions/detailed.scss diff --git a/rero_ils/modules/documents/static/scss/rero_ils/item_detail.scss b/rero_ils/theme/assets/scss/rero_ils/documents/detailed.scss similarity index 100% rename from rero_ils/modules/documents/static/scss/rero_ils/item_detail.scss rename to rero_ils/theme/assets/scss/rero_ils/documents/detailed.scss diff --git a/rero_ils/static/scss/rero_ils/footer.scss b/rero_ils/theme/assets/scss/rero_ils/footer.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/footer.scss rename to rero_ils/theme/assets/scss/rero_ils/footer.scss diff --git a/rero_ils/static/scss/rero_ils/frontpage.scss b/rero_ils/theme/assets/scss/rero_ils/frontpage.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/frontpage.scss rename to rero_ils/theme/assets/scss/rero_ils/frontpage.scss diff --git a/rero_ils/static/scss/rero_ils/header.scss b/rero_ils/theme/assets/scss/rero_ils/header.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/header.scss rename to rero_ils/theme/assets/scss/rero_ils/header.scss diff --git a/rero_ils/static/scss/rero_ils/page.scss b/rero_ils/theme/assets/scss/rero_ils/page.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/page.scss rename to rero_ils/theme/assets/scss/rero_ils/page.scss diff --git a/rero_ils/modules/patrons/static/scss/rero_ils/patrons_profile.scss b/rero_ils/theme/assets/scss/rero_ils/patrons/profile.scss similarity index 100% rename from rero_ils/modules/patrons/static/scss/rero_ils/patrons_profile.scss rename to rero_ils/theme/assets/scss/rero_ils/patrons/profile.scss diff --git a/rero_ils/static/scss/rero_ils/search.scss b/rero_ils/theme/assets/scss/rero_ils/search.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/search.scss rename to rero_ils/theme/assets/scss/rero_ils/search.scss diff --git a/rero_ils/static/scss/rero_ils/styles.scss b/rero_ils/theme/assets/scss/rero_ils/styles.scss similarity index 84% rename from rero_ils/static/scss/rero_ils/styles.scss rename to rero_ils/theme/assets/scss/rero_ils/styles.scss index 43fac8b351..21ff015bdf 100644 --- a/rero_ils/static/scss/rero_ils/styles.scss +++ b/rero_ils/theme/assets/scss/rero_ils/styles.scss @@ -21,21 +21,28 @@ @import "variables"; // Setting the path to fonts files. -$fa-font-path: "/static/node_modules/font-awesome/fonts"; -$icon-font-path: "/static/node_modules/bootstrap-sass/assets/fonts/bootstrap/"; -@import "../../node_modules/bootstrap/scss/bootstrap"; -@import "../../node_modules/font-awesome/scss/font-awesome"; +$fa-font-path: "~font-awesome/fonts"; +$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/"; +@import '~bootstrap/scss/bootstrap'; +@import "~font-awesome/scss/font-awesome"; +// general styles @import "page"; @import "header"; @import "footer"; @import "search"; -@import "thumbnail"; -@import "person"; @import "frontpage"; -@import "patrons_profile"; -@import "cover"; -@import "item_detail"; +@import "thumbnail"; + +// modules +@import "contributions/detailed"; +@import "patrons/profile"; +@import "documents/detailed"; + +// cover +.rero-ils-cover-logo { + width: 10em; +} // CSS code to allow `ng-csp="no-inline-css"` [ng\:cloak], @@ -92,8 +99,8 @@ html [type=button] { color: $secondary; } -button:disabled:hover { - cursor: not-allowed; +button:disabled { + pointer-events: none; } div.tooltip div.tooltip-inner{ diff --git a/rero_ils/modules/documents/static/scss/rero_ils/thumbnail.scss b/rero_ils/theme/assets/scss/rero_ils/thumbnail.scss similarity index 89% rename from rero_ils/modules/documents/static/scss/rero_ils/thumbnail.scss rename to rero_ils/theme/assets/scss/rero_ils/thumbnail.scss index ccbcb00138..fd814c8e08 100644 --- a/rero_ils/modules/documents/static/scss/rero_ils/thumbnail.scss +++ b/rero_ils/theme/assets/scss/rero_ils/thumbnail.scss @@ -24,16 +24,8 @@ } } -.thumb-brief { - img { - max-height: 122px; - width: 80px; - } -} - @media (max-width: 960px) { - .thumb, - .thumb-brief { + .thumb { img { max-width: 48px; } diff --git a/rero_ils/static/scss/rero_ils/variables.scss b/rero_ils/theme/assets/scss/rero_ils/variables.scss similarity index 95% rename from rero_ils/static/scss/rero_ils/variables.scss rename to rero_ils/theme/assets/scss/rero_ils/variables.scss index 0c564ba334..f5aaabe71f 100644 --- a/rero_ils/static/scss/rero_ils/variables.scss +++ b/rero_ils/theme/assets/scss/rero_ils/variables.scss @@ -32,7 +32,7 @@ $footer-height: 50px; $form-check-input-margin-y: .2rem !default; // controls the checkbox vertical alignement -$static-images: "/static/images"; +$static-images: "../../../static/images"; /* diff --git a/rero_ils/static/apple-touch-icon-144-precomposed.png b/rero_ils/theme/static/apple-touch-icon-144-precomposed.png similarity index 100% rename from rero_ils/static/apple-touch-icon-144-precomposed.png rename to rero_ils/theme/static/apple-touch-icon-144-precomposed.png diff --git a/rero_ils/static/apple-touch-icon.png b/rero_ils/theme/static/apple-touch-icon.png similarity index 100% rename from rero_ils/static/apple-touch-icon.png rename to rero_ils/theme/static/apple-touch-icon.png diff --git a/rero_ils/static/css/rero_ils/wiki.css b/rero_ils/theme/static/css/rero_ils/wiki.css similarity index 100% rename from rero_ils/static/css/rero_ils/wiki.css rename to rero_ils/theme/static/css/rero_ils/wiki.css diff --git a/rero_ils/static/favicon.ico b/rero_ils/theme/static/favicon.ico similarity index 100% rename from rero_ils/static/favicon.ico rename to rero_ils/theme/static/favicon.ico diff --git a/rero_ils/static/images/GitHub-Mark-120px-plus.png b/rero_ils/theme/static/images/GitHub-Mark-120px-plus.png similarity index 100% rename from rero_ils/static/images/GitHub-Mark-120px-plus.png rename to rero_ils/theme/static/images/GitHub-Mark-120px-plus.png diff --git a/rero_ils/static/images/Twitter_Logo_Blue.png b/rero_ils/theme/static/images/Twitter_Logo_Blue.png similarity index 100% rename from rero_ils/static/images/Twitter_Logo_Blue.png rename to rero_ils/theme/static/images/Twitter_Logo_Blue.png diff --git a/rero_ils/static/images/homepage_image_bleu.jpg b/rero_ils/theme/static/images/homepage_image_bleu.jpg similarity index 100% rename from rero_ils/static/images/homepage_image_bleu.jpg rename to rero_ils/theme/static/images/homepage_image_bleu.jpg diff --git a/rero_ils/static/images/logo-taiga-color.png b/rero_ils/theme/static/images/logo-taiga-color.png similarity index 100% rename from rero_ils/static/images/logo-taiga-color.png rename to rero_ils/theme/static/images/logo-taiga-color.png diff --git a/rero_ils/static/images/logo_explore_height_119.png b/rero_ils/theme/static/images/logo_explore_height_119.png similarity index 100% rename from rero_ils/static/images/logo_explore_height_119.png rename to rero_ils/theme/static/images/logo_explore_height_119.png diff --git a/rero_ils/static/images/logo_rero_21_inline.png b/rero_ils/theme/static/images/logo_rero_21_inline.png similarity index 100% rename from rero_ils/static/images/logo_rero_21_inline.png rename to rero_ils/theme/static/images/logo_rero_21_inline.png diff --git a/rero_ils/static/images/logo_rero_ils.png b/rero_ils/theme/static/images/logo_rero_ils.png similarity index 100% rename from rero_ils/static/images/logo_rero_ils.png rename to rero_ils/theme/static/images/logo_rero_ils.png diff --git a/rero_ils/static/images/logo_rerodoc_height_119.png b/rero_ils/theme/static/images/logo_rerodoc_height_119.png similarity index 100% rename from rero_ils/static/images/logo_rerodoc_height_119.png rename to rero_ils/theme/static/images/logo_rerodoc_height_119.png diff --git a/rero_ils/static/images/rero21.svg b/rero_ils/theme/static/images/rero21.svg similarity index 100% rename from rero_ils/static/images/rero21.svg rename to rero_ils/theme/static/images/rero21.svg diff --git a/rero_ils/templates/__init__.py b/rero_ils/theme/templates/__init__.py similarity index 100% rename from rero_ils/templates/__init__.py rename to rero_ils/theme/templates/__init__.py diff --git a/rero_ils/templates/rero_ils/_editor_button_actions.html b/rero_ils/theme/templates/rero_ils/_editor_button_actions.html similarity index 100% rename from rero_ils/templates/rero_ils/_editor_button_actions.html rename to rero_ils/theme/templates/rero_ils/_editor_button_actions.html diff --git a/rero_ils/templates/rero_ils/_info_pilot.html b/rero_ils/theme/templates/rero_ils/_info_pilot.html similarity index 100% rename from rero_ils/templates/rero_ils/_info_pilot.html rename to rero_ils/theme/templates/rero_ils/_info_pilot.html diff --git a/rero_ils/templates/rero_ils/_info_test.html b/rero_ils/theme/templates/rero_ils/_info_test.html similarity index 100% rename from rero_ils/templates/rero_ils/_info_test.html rename to rero_ils/theme/templates/rero_ils/_info_test.html diff --git a/rero_ils/templates/rero_ils/breadcrumbs.html b/rero_ils/theme/templates/rero_ils/breadcrumbs.html similarity index 100% rename from rero_ils/templates/rero_ils/breadcrumbs.html rename to rero_ils/theme/templates/rero_ils/breadcrumbs.html diff --git a/rero_ils/templates/rero_ils/collections.html b/rero_ils/theme/templates/rero_ils/collections.html similarity index 100% rename from rero_ils/templates/rero_ils/collections.html rename to rero_ils/theme/templates/rero_ils/collections.html diff --git a/rero_ils/templates/rero_ils/footer.html b/rero_ils/theme/templates/rero_ils/footer.html similarity index 100% rename from rero_ils/templates/rero_ils/footer.html rename to rero_ils/theme/templates/rero_ils/footer.html diff --git a/rero_ils/templates/rero_ils/forgot_password.html b/rero_ils/theme/templates/rero_ils/forgot_password.html similarity index 100% rename from rero_ils/templates/rero_ils/forgot_password.html rename to rero_ils/theme/templates/rero_ils/forgot_password.html diff --git a/rero_ils/templates/rero_ils/frontpage.html b/rero_ils/theme/templates/rero_ils/frontpage.html similarity index 100% rename from rero_ils/templates/rero_ils/frontpage.html rename to rero_ils/theme/templates/rero_ils/frontpage.html diff --git a/rero_ils/templates/rero_ils/header.html b/rero_ils/theme/templates/rero_ils/header.html similarity index 100% rename from rero_ils/templates/rero_ils/header.html rename to rero_ils/theme/templates/rero_ils/header.html diff --git a/rero_ils/templates/rero_ils/header_frontpage.html b/rero_ils/theme/templates/rero_ils/header_frontpage.html similarity index 100% rename from rero_ils/templates/rero_ils/header_frontpage.html rename to rero_ils/theme/templates/rero_ils/header_frontpage.html diff --git a/rero_ils/templates/rero_ils/javascript.html b/rero_ils/theme/templates/rero_ils/javascript.html similarity index 67% rename from rero_ils/templates/rero_ils/javascript.html rename to rero_ils/theme/templates/rero_ils/javascript.html index 9247e35f6c..6eaf420532 100644 --- a/rero_ils/templates/rero_ils/javascript.html +++ b/rero_ils/theme/templates/rero_ils/javascript.html @@ -17,12 +17,9 @@ #} {%- block javascript %} -{% assets "rero_ils_main_js" %} - -{% endassets %} - -{% assets "rero_ils_search_bar_ui_js" %} - -{% endassets %} - +{{ webpack['manifest.js']}} +{{ webpack['vendor.js']}} +{{ webpack['reroils_public.js']}} +{{ node_assets('@rero/rero-ils-ui/dist/search-bar', patterns=['polyfills-es5*.js','main-es5*.js'], tags='nomodule defer') }} +{{ node_assets('@rero/rero-ils-ui/dist/search-bar', patterns=['polyfills-es2015*.js','main-es2015*.js'], tags='type="module"') }} {%- endblock javascript %} diff --git a/rero_ils/templates/rero_ils/login_user.html b/rero_ils/theme/templates/rero_ils/login_user.html similarity index 100% rename from rero_ils/templates/rero_ils/login_user.html rename to rero_ils/theme/templates/rero_ils/login_user.html diff --git a/rero_ils/templates/rero_ils/macros/header_menus.html b/rero_ils/theme/templates/rero_ils/macros/header_menus.html similarity index 100% rename from rero_ils/templates/rero_ils/macros/header_menus.html rename to rero_ils/theme/templates/rero_ils/macros/header_menus.html diff --git a/rero_ils/templates/rero_ils/macros/macro.html b/rero_ils/theme/templates/rero_ils/macros/macro.html similarity index 100% rename from rero_ils/templates/rero_ils/macros/macro.html rename to rero_ils/theme/templates/rero_ils/macros/macro.html diff --git a/rero_ils/templates/rero_ils/macros/messages.html b/rero_ils/theme/templates/rero_ils/macros/messages.html similarity index 100% rename from rero_ils/templates/rero_ils/macros/messages.html rename to rero_ils/theme/templates/rero_ils/macros/messages.html diff --git a/rero_ils/templates/rero_ils/page.html b/rero_ils/theme/templates/rero_ils/page.html similarity index 95% rename from rero_ils/templates/rero_ils/page.html rename to rero_ils/theme/templates/rero_ils/page.html index 199a8068b8..c6b4504718 100644 --- a/rero_ils/templates/rero_ils/page.html +++ b/rero_ils/theme/templates/rero_ils/page.html @@ -71,9 +71,8 @@ {%- endblock head_links %} {%- block header %}{% endblock header %} {%- block css %} - {% assets "rero_ils_main_css" %} - {% endassets %} - {%- endblock css %} {%- endblock head %} diff --git a/rero_ils/templates/rero_ils/page_cover.html b/rero_ils/theme/templates/rero_ils/page_cover.html similarity index 92% rename from rero_ils/templates/rero_ils/page_cover.html rename to rero_ils/theme/templates/rero_ils/page_cover.html index 40c630e74b..bbea618f9f 100644 --- a/rero_ils/templates/rero_ils/page_cover.html +++ b/rero_ils/theme/templates/rero_ils/page_cover.html @@ -57,6 +57,10 @@ {% block page_footer %} {% endblock page_footer %} - {%- block javascript %}{% endblock javascript %} - {%- block trackingcode %}{% include config.THEME_TRACKINGCODE_TEMPLATE %}{% endblock %} +{%- block javascript %} +{% include 'rero_ils/javascript.html' %} +{%- endblock javascript %} +{%- block trackingcode %} +{% include 'rero_ils/trackingcode.html' %} +{%- endblock %} {%- endblock outer_body %} diff --git a/rero_ils/templates/rero_ils/page_error.html b/rero_ils/theme/templates/rero_ils/page_error.html similarity index 100% rename from rero_ils/templates/rero_ils/page_error.html rename to rero_ils/theme/templates/rero_ils/page_error.html diff --git a/rero_ils/templates/rero_ils/page_settings.html b/rero_ils/theme/templates/rero_ils/page_settings.html similarity index 100% rename from rero_ils/templates/rero_ils/page_settings.html rename to rero_ils/theme/templates/rero_ils/page_settings.html diff --git a/rero_ils/templates/rero_ils/page_wiki.html b/rero_ils/theme/templates/rero_ils/page_wiki.html similarity index 100% rename from rero_ils/templates/rero_ils/page_wiki.html rename to rero_ils/theme/templates/rero_ils/page_wiki.html diff --git a/rero_ils/templates/rero_ils/professional.html b/rero_ils/theme/templates/rero_ils/professional.html similarity index 62% rename from rero_ils/templates/rero_ils/professional.html rename to rero_ils/theme/templates/rero_ils/professional.html index e487c1e426..4cda12eed7 100644 --- a/rero_ils/templates/rero_ils/professional.html +++ b/rero_ils/theme/templates/rero_ils/professional.html @@ -25,15 +25,12 @@ Admin - - + {{ node_assets('@rero/rero-ils-ui/dist/admin', ['styles.*css'], 'css') }} - {% assets "rero_ils_admin_ui_js" %} - - {% endassets %} + {{ node_assets('@rero/rero-ils-ui/dist/admin') }}
- + diff --git a/rero_ils/static/js/rero_ils/invenio_config.js b/rero_ils/static/js/rero_ils/invenio_config.js deleted file mode 100644 index ae68066f13..0000000000 --- a/rero_ils/static/js/rero_ils/invenio_config.js +++ /dev/null @@ -1,38 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -angular.module('invenioConfig', []) - .controller('configController', ['$scope', '$log', '$http', '$sce', function($scope, $log, $http, $sce) { - $scope.config = {} - $scope.$on('config.init', configInit); - function configInit(init, config){ - $scope.config = angular.fromJson(config); - }; - }]) - .directive('invenioConfig', ['$log', function($log) { - return { - restrict: 'E', - controller: 'configController', - link: function (scope, element, attrs) { - scope.$broadcast( - 'config.init', attrs.config - ); - } - }; - }]); diff --git a/rero_ils/static/js/rero_ils/rero_ils.js b/rero_ils/static/js/rero_ils/rero_ils.js deleted file mode 100644 index 2da42e1404..0000000000 --- a/rero_ils/static/js/rero_ils/rero_ils.js +++ /dev/null @@ -1,94 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 RERO -Copyright (C) 2015-2018 CERN -Copyright (C) 2016 TIND - -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 . - -*/ - -require([ - "node_modules/jquery/jquery", - "node_modules/bootstrap/dist/js/bootstrap.bundle", - // "node_modules/bootstrap-autohide-navbar/dist/bootstrap-autohide-navbar", - "node_modules/angular/angular", - "node_modules/angular-gettext/dist/angular-gettext" -], function () { - - $(document).ready(function () { - - $('[data-toggle="tooltip"]').tooltip(); - - // flash messages - $('.toast-container .toast').toast({ - delay: 5000 - }).toast('show'); - - /* Enable the sticky autohide header */ - $('button.delete').on('click', function (e) { - var next = $(this).data('next'); - $.ajax({ - url: $(this).data('delete-url'), - type: 'DELETE', - success: function (result) { - window.location.replace(next); - return false; - }, - error: function (result, statut, error) { - console.log('error: ', result, status, error); - } - }); - }); - - $("#login-user").submit(function (e) { - - e.preventDefault(); // avoid to execute the actual submit of the form. - - var form = $(this); - var url = form.attr('data-action'); - - $.ajax({ - type: "POST", - url: url, - data: form.serialize(), // serializes the form's elements. - success: function (data) { - var next = getUrlParameter('next'); - window.location.replace(next? next : '/'); - }, - error: function (data) { - var response = $.parseJSON(data.responseText); - var alert = $("#js-alert"); - var msg = $("#js-alert span.msg").html(response.errors[0].message); - alert.show(); - } - }); - }); - - var getUrlParameter = function getUrlParameter(sParam) { - var sPageURL = window.location.search.substring(1), - sURLVariables = sPageURL.split('&'), - sParameterName, - i; - - for (i = 0; i < sURLVariables.length; i++) { - sParameterName = sURLVariables[i].split('='); - - if (sParameterName[0] === sParam) { - return sParameterName[1] === undefined ? true : decodeURIComponent(sParameterName[1]); - } - } - }; - }); -}); diff --git a/rero_ils/static/js/rero_ils/rero_keep_tab.js b/rero_ils/static/js/rero_ils/rero_keep_tab.js deleted file mode 100644 index 8eb9548866..0000000000 --- a/rero_ils/static/js/rero_ils/rero_keep_tab.js +++ /dev/null @@ -1,49 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2020 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 . - -*/ - -(function ( $, window ) { - $.fn.keeptab = function( options ) { - - var opts = $.extend( { - tabsName: '.nav-tabs', - localeItemName: 'navkeeptab', - selector: '.nav-link' - }, options ); - - $(opts.tabsName).find(opts.selector).on('click', function() { - var elementId = undefined; - if ($(this).attr('id')) { - elementId = '#' + $(this).attr('id'); - } else if ($(this).attr('href')) { - elementId = $(this).attr('href') - } else { - window.console.log('Missing id or href.'); - } - if (elementId) { - localStorage.setItem(opts.localeItemName, elementId); - } - }); - - var activeTab = localStorage.getItem(opts.localeItemName); - if (activeTab && $(activeTab).length) { - $(activeTab).tab('show'); - } - return this; - }; -}( jQuery, window )); diff --git a/rero_ils/static/js/rero_ils/search_app.js b/rero_ils/static/js/rero_ils/search_app.js deleted file mode 100644 index 5694db4935..0000000000 --- a/rero_ils/static/js/rero_ils/search_app.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -require([ - 'node_modules/d3/d3', - 'node_modules/angular/angular', - 'node_modules/angular-loading-bar/build/loading-bar', - 'node_modules/invenio-search-js/dist/invenio-search-js', - ], function() { - // When the DOM is ready bootstrap the `invenio-search-js` - - angular.element(document).ready(function() { - angular.bootstrap( - document.getElementById("invenio-search"), [ - 'angular-loading-bar', - 'invenioSearch', - 'invenioConfig', - 'reroilsAppTranslations', - 'reroilsUtils', - 'reroilsPerson', - 'reroThumbnails' - ] - ); - }); -}); diff --git a/rero_ils/static/js/rero_ils/translations.js b/rero_ils/static/js/rero_ils/translations.js deleted file mode 100644 index 1245fe454d..0000000000 --- a/rero_ils/static/js/rero_ils/translations.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - -RERO ILS -Copyright (C) 2019 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 . - -*/ - -angular.module('reroilsAppTranslations') - .run(['gettextCatalog', function (gettextCatalog) { - gettextCatalog.setCurrentLanguage(document.documentElement.lang); - }]); diff --git a/rero_ils/static/scss/rero_ils/cover.scss b/rero_ils/static/scss/rero_ils/cover.scss deleted file mode 100644 index 4d5ca1afe5..0000000000 --- a/rero_ils/static/scss/rero_ils/cover.scss +++ /dev/null @@ -1,22 +0,0 @@ -/* - - RERO ILS - Copyright (C) 2019 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 . - - */ - -.rero-ils-cover-logo { - width: 10em; -} diff --git a/rero_ils/static/templates/rero_ils/count.html b/rero_ils/static/templates/rero_ils/count.html deleted file mode 100644 index 735d5d5edb..0000000000 --- a/rero_ils/static/templates/rero_ils/count.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - Found {{$count}} result. - No results found. - - diff --git a/rero_ils/static/templates/rero_ils/facets.html b/rero_ils/static/templates/rero_ils/facets.html deleted file mode 100644 index 166ef2bea4..0000000000 --- a/rero_ils/static/templates/rero_ils/facets.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - {{ aggr.key | translate }} - - - - - - - - {{ item.name | translate }}{{ item.key | translate }} ({{ item.doc_count }}) - - - - {{ (tree[item.key]) ? '-' : '+' }} - - - - - - - - {{ subFacets.name | translate }} - {{ subFacets.key | translate }} - ({{ subFacets.doc_count }}) - - - - - - - - - diff --git a/rero_ils/static/templates/rero_ils/pagination.html b/rero_ils/static/templates/rero_ils/pagination.html deleted file mode 100644 index 84cd5a7f5d..0000000000 --- a/rero_ils/static/templates/rero_ils/pagination.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - First - - - - - - Previous - - - - - {{ page.value }} - - - - - - Next - - - - - - Last - - - - diff --git a/rero_ils/static/templates/rero_ils/searchbar.html b/rero_ils/static/templates/rero_ils/searchbar.html deleted file mode 100644 index c86e929a3c..0000000000 --- a/rero_ils/static/templates/rero_ils/searchbar.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - diff --git a/rero_ils/modules/patrons/bundles.py b/rero_ils/theme/__init__.py similarity index 61% rename from rero_ils/modules/patrons/bundles.py rename to rero_ils/theme/__init__.py index c6a559acaa..4df70e011c 100644 --- a/rero_ils/modules/patrons/bundles.py +++ b/rero_ils/theme/__init__.py @@ -15,21 +15,4 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -"""JS/CSS bundles for theme.""" - -from __future__ import absolute_import, print_function - -from flask_assets import Bundle -from invenio_assets import NpmBundle - -patron_profile_js = Bundle( - NpmBundle( - 'js/rero_ils/patron_fees_toogle.js', - filters='requirejs', - npm={ - 'jquery': '~1.9.1', - } - ), - filters='jsmin', - output='gen/rero_ils.patron_profile.%(version)s.js', -) +"""RERO ILS theme module.""" diff --git a/rero_ils/theme/assets/js/reroils/login.js b/rero_ils/theme/assets/js/reroils/login.js new file mode 100644 index 0000000000..0b2829a62b --- /dev/null +++ b/rero_ils/theme/assets/js/reroils/login.js @@ -0,0 +1,59 @@ +/* + +RERO ILS +Copyright (C) 2020 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 $ from 'jquery'; + +$("#login-user").submit(function (e) { + + e.preventDefault(); // avoid to execute the actual submit of the form. + + var form = $(this); + var url = form.attr('data-action'); + + $.ajax({ + type: "POST", + url: url, + data: form.serialize(), // serializes the form's elements. + success: function (data) { + var next = getUrlParameter('next'); + window.location.replace(next ? next : '/'); + }, + error: function (data) { + var response = JSON.parse(data.responseText); + var alert = $("#js-alert"); + var msg = $("#js-alert span.msg").html(response.errors[0].message); + alert.show(); + } + }); +}); + +var getUrlParameter = function getUrlParameter(sParam) { + var sPageURL = window.location.search.substring(1), + sURLVariables = sPageURL.split('&'), + sParameterName, + i; + + for (i = 0; i < sURLVariables.length; i++) { + sParameterName = sURLVariables[i].split('='); + + if (sParameterName[0] === sParam) { + return sParameterName[1] === undefined ? true : decodeURIComponent(sParameterName[1]); + } + } +}; diff --git a/rero_ils/assets/js/admin_ui.js b/rero_ils/theme/assets/js/reroils/public.js similarity index 80% rename from rero_ils/assets/js/admin_ui.js rename to rero_ils/theme/assets/js/reroils/public.js index 961ee692d3..a4ef9513e3 100644 --- a/rero_ils/assets/js/admin_ui.js +++ b/rero_ils/theme/assets/js/reroils/public.js @@ -17,6 +17,8 @@ along with this program. If not, see . */ -import '@rero/rero-ils-ui/dist/admin/runtime.js'; -import '@rero/rero-ils-ui/dist/admin/polyfills.js'; -import '@rero/rero-ils-ui/dist/admin/main.js'; +import 'bootstrap'; +import './tooltip'; +import './toast'; +import './login'; +import './toggle'; diff --git a/rero_ils/assets/js/public-search_ui.js b/rero_ils/theme/assets/js/reroils/toast.js similarity index 78% rename from rero_ils/assets/js/public-search_ui.js rename to rero_ils/theme/assets/js/reroils/toast.js index 7906768b4d..d2b9694741 100644 --- a/rero_ils/assets/js/public-search_ui.js +++ b/rero_ils/theme/assets/js/reroils/toast.js @@ -17,6 +17,9 @@ along with this program. If not, see . */ -import '@rero/rero-ils-ui/dist/public-search/runtime.js'; -import '@rero/rero-ils-ui/dist/public-search/polyfills.js'; -import '@rero/rero-ils-ui/dist/public-search/main.js'; +import $ from 'jquery'; + +// flash messages +$('.toast-container .toast').toast({ + delay: 5000 +}).toast('show'); diff --git a/rero_ils/theme/assets/js/reroils/toggle.js b/rero_ils/theme/assets/js/reroils/toggle.js new file mode 100644 index 0000000000..03ec83f544 --- /dev/null +++ b/rero_ils/theme/assets/js/reroils/toggle.js @@ -0,0 +1,77 @@ +/* + +RERO ILS +Copyright (C) 2020 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 $ from 'jquery'; + +// Documents +$('.collapse').on('hidden.bs.collapse shown.bs.collapse', function () { + var element = $('#' + $(this).data('holdingId')).find('.availability'); + element.hasClass('d-none') ? + element.removeClass('d-none') : element.addClass('d-none'); +}); + +// Patrons +$('.btn-toogle').on('click', function () { + toogle($(this), 'target-id'); +}); + +// ILLRequest +$('input:radio[name="request_copy"]').on('change', function () { + toggleField($(this).val()); +}); +$('input:radio[name="request_copy"]:checked').trigger('change') + +/** + * Toogle element + * @param object element + * @param string elementId + */ +function toogle(element, elementId) { + var target = $('#' + element.data(elementId)); + var iCaret = element.find('i'); + if (iCaret.hasClass('fa-caret-right')) { + iCaret + .removeClass('fa-caret-right') + .addClass('fa-caret-down'); + } else { + iCaret + .removeClass('fa-caret-down') + .addClass('fa-caret-right'); + } + if (target.hasClass('d-none')) { + target + .removeClass('d-none') + .addClass('d-block'); + } else { + target + .removeClass('d-block') + .addClass('d-none'); + } +} + +function toggleField(checked) { + var target = $('div').find('[data-form-id="pages"]'); + if (checked == 0) { + target.addClass('d-none'); + } else { + target.removeClass('d-none'); + } +} + + diff --git a/rero_ils/modules/contributions/static/js/rero_ils/contribution_jq.js b/rero_ils/theme/assets/js/reroils/tooltip.js similarity index 87% rename from rero_ils/modules/contributions/static/js/rero_ils/contribution_jq.js rename to rero_ils/theme/assets/js/reroils/tooltip.js index 2b42983d41..c2e39906cc 100644 --- a/rero_ils/modules/contributions/static/js/rero_ils/contribution_jq.js +++ b/rero_ils/theme/assets/js/reroils/tooltip.js @@ -17,6 +17,6 @@ along with this program. If not, see . */ -$(document).ready(function() { - $('#nav-tab').keeptab({ localeItemName: 'person-tab'}); -}); +import $ from 'jquery'; + +$('[data-toggle="tooltip"]').tooltip(); diff --git a/rero_ils/modules/contributions/static/scss/rero_ils/person.scss b/rero_ils/theme/assets/scss/rero_ils/contributions/detailed.scss similarity index 100% rename from rero_ils/modules/contributions/static/scss/rero_ils/person.scss rename to rero_ils/theme/assets/scss/rero_ils/contributions/detailed.scss diff --git a/rero_ils/modules/documents/static/scss/rero_ils/item_detail.scss b/rero_ils/theme/assets/scss/rero_ils/documents/detailed.scss similarity index 100% rename from rero_ils/modules/documents/static/scss/rero_ils/item_detail.scss rename to rero_ils/theme/assets/scss/rero_ils/documents/detailed.scss diff --git a/rero_ils/static/scss/rero_ils/footer.scss b/rero_ils/theme/assets/scss/rero_ils/footer.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/footer.scss rename to rero_ils/theme/assets/scss/rero_ils/footer.scss diff --git a/rero_ils/static/scss/rero_ils/frontpage.scss b/rero_ils/theme/assets/scss/rero_ils/frontpage.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/frontpage.scss rename to rero_ils/theme/assets/scss/rero_ils/frontpage.scss diff --git a/rero_ils/static/scss/rero_ils/header.scss b/rero_ils/theme/assets/scss/rero_ils/header.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/header.scss rename to rero_ils/theme/assets/scss/rero_ils/header.scss diff --git a/rero_ils/static/scss/rero_ils/page.scss b/rero_ils/theme/assets/scss/rero_ils/page.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/page.scss rename to rero_ils/theme/assets/scss/rero_ils/page.scss diff --git a/rero_ils/modules/patrons/static/scss/rero_ils/patrons_profile.scss b/rero_ils/theme/assets/scss/rero_ils/patrons/profile.scss similarity index 100% rename from rero_ils/modules/patrons/static/scss/rero_ils/patrons_profile.scss rename to rero_ils/theme/assets/scss/rero_ils/patrons/profile.scss diff --git a/rero_ils/static/scss/rero_ils/search.scss b/rero_ils/theme/assets/scss/rero_ils/search.scss similarity index 100% rename from rero_ils/static/scss/rero_ils/search.scss rename to rero_ils/theme/assets/scss/rero_ils/search.scss diff --git a/rero_ils/static/scss/rero_ils/styles.scss b/rero_ils/theme/assets/scss/rero_ils/styles.scss similarity index 84% rename from rero_ils/static/scss/rero_ils/styles.scss rename to rero_ils/theme/assets/scss/rero_ils/styles.scss index 43fac8b351..21ff015bdf 100644 --- a/rero_ils/static/scss/rero_ils/styles.scss +++ b/rero_ils/theme/assets/scss/rero_ils/styles.scss @@ -21,21 +21,28 @@ @import "variables"; // Setting the path to fonts files. -$fa-font-path: "/static/node_modules/font-awesome/fonts"; -$icon-font-path: "/static/node_modules/bootstrap-sass/assets/fonts/bootstrap/"; -@import "../../node_modules/bootstrap/scss/bootstrap"; -@import "../../node_modules/font-awesome/scss/font-awesome"; +$fa-font-path: "~font-awesome/fonts"; +$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/"; +@import '~bootstrap/scss/bootstrap'; +@import "~font-awesome/scss/font-awesome"; +// general styles @import "page"; @import "header"; @import "footer"; @import "search"; -@import "thumbnail"; -@import "person"; @import "frontpage"; -@import "patrons_profile"; -@import "cover"; -@import "item_detail"; +@import "thumbnail"; + +// modules +@import "contributions/detailed"; +@import "patrons/profile"; +@import "documents/detailed"; + +// cover +.rero-ils-cover-logo { + width: 10em; +} // CSS code to allow `ng-csp="no-inline-css"` [ng\:cloak], @@ -92,8 +99,8 @@ html [type=button] { color: $secondary; } -button:disabled:hover { - cursor: not-allowed; +button:disabled { + pointer-events: none; } div.tooltip div.tooltip-inner{ diff --git a/rero_ils/modules/documents/static/scss/rero_ils/thumbnail.scss b/rero_ils/theme/assets/scss/rero_ils/thumbnail.scss similarity index 89% rename from rero_ils/modules/documents/static/scss/rero_ils/thumbnail.scss rename to rero_ils/theme/assets/scss/rero_ils/thumbnail.scss index ccbcb00138..fd814c8e08 100644 --- a/rero_ils/modules/documents/static/scss/rero_ils/thumbnail.scss +++ b/rero_ils/theme/assets/scss/rero_ils/thumbnail.scss @@ -24,16 +24,8 @@ } } -.thumb-brief { - img { - max-height: 122px; - width: 80px; - } -} - @media (max-width: 960px) { - .thumb, - .thumb-brief { + .thumb { img { max-width: 48px; } diff --git a/rero_ils/static/scss/rero_ils/variables.scss b/rero_ils/theme/assets/scss/rero_ils/variables.scss similarity index 95% rename from rero_ils/static/scss/rero_ils/variables.scss rename to rero_ils/theme/assets/scss/rero_ils/variables.scss index 0c564ba334..f5aaabe71f 100644 --- a/rero_ils/static/scss/rero_ils/variables.scss +++ b/rero_ils/theme/assets/scss/rero_ils/variables.scss @@ -32,7 +32,7 @@ $footer-height: 50px; $form-check-input-margin-y: .2rem !default; // controls the checkbox vertical alignement -$static-images: "/static/images"; +$static-images: "../../../static/images"; /* diff --git a/rero_ils/static/apple-touch-icon-144-precomposed.png b/rero_ils/theme/static/apple-touch-icon-144-precomposed.png similarity index 100% rename from rero_ils/static/apple-touch-icon-144-precomposed.png rename to rero_ils/theme/static/apple-touch-icon-144-precomposed.png diff --git a/rero_ils/static/apple-touch-icon.png b/rero_ils/theme/static/apple-touch-icon.png similarity index 100% rename from rero_ils/static/apple-touch-icon.png rename to rero_ils/theme/static/apple-touch-icon.png diff --git a/rero_ils/static/css/rero_ils/wiki.css b/rero_ils/theme/static/css/rero_ils/wiki.css similarity index 100% rename from rero_ils/static/css/rero_ils/wiki.css rename to rero_ils/theme/static/css/rero_ils/wiki.css diff --git a/rero_ils/static/favicon.ico b/rero_ils/theme/static/favicon.ico similarity index 100% rename from rero_ils/static/favicon.ico rename to rero_ils/theme/static/favicon.ico diff --git a/rero_ils/static/images/GitHub-Mark-120px-plus.png b/rero_ils/theme/static/images/GitHub-Mark-120px-plus.png similarity index 100% rename from rero_ils/static/images/GitHub-Mark-120px-plus.png rename to rero_ils/theme/static/images/GitHub-Mark-120px-plus.png diff --git a/rero_ils/static/images/Twitter_Logo_Blue.png b/rero_ils/theme/static/images/Twitter_Logo_Blue.png similarity index 100% rename from rero_ils/static/images/Twitter_Logo_Blue.png rename to rero_ils/theme/static/images/Twitter_Logo_Blue.png diff --git a/rero_ils/static/images/homepage_image_bleu.jpg b/rero_ils/theme/static/images/homepage_image_bleu.jpg similarity index 100% rename from rero_ils/static/images/homepage_image_bleu.jpg rename to rero_ils/theme/static/images/homepage_image_bleu.jpg diff --git a/rero_ils/static/images/logo-taiga-color.png b/rero_ils/theme/static/images/logo-taiga-color.png similarity index 100% rename from rero_ils/static/images/logo-taiga-color.png rename to rero_ils/theme/static/images/logo-taiga-color.png diff --git a/rero_ils/static/images/logo_explore_height_119.png b/rero_ils/theme/static/images/logo_explore_height_119.png similarity index 100% rename from rero_ils/static/images/logo_explore_height_119.png rename to rero_ils/theme/static/images/logo_explore_height_119.png diff --git a/rero_ils/static/images/logo_rero_21_inline.png b/rero_ils/theme/static/images/logo_rero_21_inline.png similarity index 100% rename from rero_ils/static/images/logo_rero_21_inline.png rename to rero_ils/theme/static/images/logo_rero_21_inline.png diff --git a/rero_ils/static/images/logo_rero_ils.png b/rero_ils/theme/static/images/logo_rero_ils.png similarity index 100% rename from rero_ils/static/images/logo_rero_ils.png rename to rero_ils/theme/static/images/logo_rero_ils.png diff --git a/rero_ils/static/images/logo_rerodoc_height_119.png b/rero_ils/theme/static/images/logo_rerodoc_height_119.png similarity index 100% rename from rero_ils/static/images/logo_rerodoc_height_119.png rename to rero_ils/theme/static/images/logo_rerodoc_height_119.png diff --git a/rero_ils/static/images/rero21.svg b/rero_ils/theme/static/images/rero21.svg similarity index 100% rename from rero_ils/static/images/rero21.svg rename to rero_ils/theme/static/images/rero21.svg diff --git a/rero_ils/templates/__init__.py b/rero_ils/theme/templates/__init__.py similarity index 100% rename from rero_ils/templates/__init__.py rename to rero_ils/theme/templates/__init__.py diff --git a/rero_ils/templates/rero_ils/_editor_button_actions.html b/rero_ils/theme/templates/rero_ils/_editor_button_actions.html similarity index 100% rename from rero_ils/templates/rero_ils/_editor_button_actions.html rename to rero_ils/theme/templates/rero_ils/_editor_button_actions.html diff --git a/rero_ils/templates/rero_ils/_info_pilot.html b/rero_ils/theme/templates/rero_ils/_info_pilot.html similarity index 100% rename from rero_ils/templates/rero_ils/_info_pilot.html rename to rero_ils/theme/templates/rero_ils/_info_pilot.html diff --git a/rero_ils/templates/rero_ils/_info_test.html b/rero_ils/theme/templates/rero_ils/_info_test.html similarity index 100% rename from rero_ils/templates/rero_ils/_info_test.html rename to rero_ils/theme/templates/rero_ils/_info_test.html diff --git a/rero_ils/templates/rero_ils/breadcrumbs.html b/rero_ils/theme/templates/rero_ils/breadcrumbs.html similarity index 100% rename from rero_ils/templates/rero_ils/breadcrumbs.html rename to rero_ils/theme/templates/rero_ils/breadcrumbs.html diff --git a/rero_ils/templates/rero_ils/collections.html b/rero_ils/theme/templates/rero_ils/collections.html similarity index 100% rename from rero_ils/templates/rero_ils/collections.html rename to rero_ils/theme/templates/rero_ils/collections.html diff --git a/rero_ils/templates/rero_ils/footer.html b/rero_ils/theme/templates/rero_ils/footer.html similarity index 100% rename from rero_ils/templates/rero_ils/footer.html rename to rero_ils/theme/templates/rero_ils/footer.html diff --git a/rero_ils/templates/rero_ils/forgot_password.html b/rero_ils/theme/templates/rero_ils/forgot_password.html similarity index 100% rename from rero_ils/templates/rero_ils/forgot_password.html rename to rero_ils/theme/templates/rero_ils/forgot_password.html diff --git a/rero_ils/templates/rero_ils/frontpage.html b/rero_ils/theme/templates/rero_ils/frontpage.html similarity index 100% rename from rero_ils/templates/rero_ils/frontpage.html rename to rero_ils/theme/templates/rero_ils/frontpage.html diff --git a/rero_ils/templates/rero_ils/header.html b/rero_ils/theme/templates/rero_ils/header.html similarity index 100% rename from rero_ils/templates/rero_ils/header.html rename to rero_ils/theme/templates/rero_ils/header.html diff --git a/rero_ils/templates/rero_ils/header_frontpage.html b/rero_ils/theme/templates/rero_ils/header_frontpage.html similarity index 100% rename from rero_ils/templates/rero_ils/header_frontpage.html rename to rero_ils/theme/templates/rero_ils/header_frontpage.html diff --git a/rero_ils/templates/rero_ils/javascript.html b/rero_ils/theme/templates/rero_ils/javascript.html similarity index 67% rename from rero_ils/templates/rero_ils/javascript.html rename to rero_ils/theme/templates/rero_ils/javascript.html index 9247e35f6c..6eaf420532 100644 --- a/rero_ils/templates/rero_ils/javascript.html +++ b/rero_ils/theme/templates/rero_ils/javascript.html @@ -17,12 +17,9 @@ #} {%- block javascript %} -{% assets "rero_ils_main_js" %} - -{% endassets %} - -{% assets "rero_ils_search_bar_ui_js" %} - -{% endassets %} - +{{ webpack['manifest.js']}} +{{ webpack['vendor.js']}} +{{ webpack['reroils_public.js']}} +{{ node_assets('@rero/rero-ils-ui/dist/search-bar', patterns=['polyfills-es5*.js','main-es5*.js'], tags='nomodule defer') }} +{{ node_assets('@rero/rero-ils-ui/dist/search-bar', patterns=['polyfills-es2015*.js','main-es2015*.js'], tags='type="module"') }} {%- endblock javascript %} diff --git a/rero_ils/templates/rero_ils/login_user.html b/rero_ils/theme/templates/rero_ils/login_user.html similarity index 100% rename from rero_ils/templates/rero_ils/login_user.html rename to rero_ils/theme/templates/rero_ils/login_user.html diff --git a/rero_ils/templates/rero_ils/macros/header_menus.html b/rero_ils/theme/templates/rero_ils/macros/header_menus.html similarity index 100% rename from rero_ils/templates/rero_ils/macros/header_menus.html rename to rero_ils/theme/templates/rero_ils/macros/header_menus.html diff --git a/rero_ils/templates/rero_ils/macros/macro.html b/rero_ils/theme/templates/rero_ils/macros/macro.html similarity index 100% rename from rero_ils/templates/rero_ils/macros/macro.html rename to rero_ils/theme/templates/rero_ils/macros/macro.html diff --git a/rero_ils/templates/rero_ils/macros/messages.html b/rero_ils/theme/templates/rero_ils/macros/messages.html similarity index 100% rename from rero_ils/templates/rero_ils/macros/messages.html rename to rero_ils/theme/templates/rero_ils/macros/messages.html diff --git a/rero_ils/templates/rero_ils/page.html b/rero_ils/theme/templates/rero_ils/page.html similarity index 95% rename from rero_ils/templates/rero_ils/page.html rename to rero_ils/theme/templates/rero_ils/page.html index 199a8068b8..c6b4504718 100644 --- a/rero_ils/templates/rero_ils/page.html +++ b/rero_ils/theme/templates/rero_ils/page.html @@ -71,9 +71,8 @@ {%- endblock head_links %} {%- block header %}{% endblock header %} {%- block css %} - {% assets "rero_ils_main_css" %} - {% endassets %} - {%- endblock css %} {%- endblock head %} diff --git a/rero_ils/templates/rero_ils/page_cover.html b/rero_ils/theme/templates/rero_ils/page_cover.html similarity index 92% rename from rero_ils/templates/rero_ils/page_cover.html rename to rero_ils/theme/templates/rero_ils/page_cover.html index 40c630e74b..bbea618f9f 100644 --- a/rero_ils/templates/rero_ils/page_cover.html +++ b/rero_ils/theme/templates/rero_ils/page_cover.html @@ -57,6 +57,10 @@ {% block page_footer %} {% endblock page_footer %}
- - - - - {{ item.name | translate }}{{ item.key | translate }} ({{ item.doc_count }}) - - - - {{ (tree[item.key]) ? '-' : '+' }} - - - - - - - - {{ subFacets.name | translate }} - {{ subFacets.key | translate }} - ({{ subFacets.doc_count }}) - - - - - - -