diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88e603088fc..a71e1a0e031 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -188,31 +188,31 @@ jobs: - name: Shutdown Docker containers run: docker-compose -f ./docker/docker-compose-ci.yml down - # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test - # job above. This is necessary because Codecov uploads seem to randomly fail at times. - # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954 - codecov: - # Must run after 'tests' job above - needs: tests - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - # Download artifacts from previous 'tests' job - - name: Download coverage artifacts - uses: actions/download-artifact@v3 - - # Now attempt upload to Codecov using its action. - # NOTE: We use a retry action to retry the Codecov upload if it fails the first time. - # - # Retry action: https://github.com/marketplace/actions/retry-action - # Codecov action: https://github.com/codecov/codecov-action - - name: Upload coverage to Codecov.io - uses: Wandalen/wretry.action@v1.0.36 - with: - action: codecov/codecov-action@v3 - # Try upload 5 times max - attempt_limit: 5 - # Run again in 30 seconds - attempt_delay: 30000 +# # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test +# # job above. This is necessary because Codecov uploads seem to randomly fail at times. +# # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954 +# codecov: +# # Must run after 'tests' job above +# needs: tests +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v3 +# +# # Download artifacts from previous 'tests' job +# - name: Download coverage artifacts +# uses: actions/download-artifact@v3 +# +# # Now attempt upload to Codecov using its action. +# # NOTE: We use a retry action to retry the Codecov upload if it fails the first time. +# # +# # Retry action: https://github.com/marketplace/actions/retry-action +# # Codecov action: https://github.com/codecov/codecov-action +# - name: Upload coverage to Codecov.io +# uses: Wandalen/wretry.action@v1.0.36 +# with: +# action: codecov/codecov-action@v3 +# # Try upload 5 times max +# attempt_limit: 5 +# # Run again in 30 seconds +# attempt_delay: 30000 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d5bf9e259ce..b9d77cec5fa 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,6 +12,10 @@ on: required: false default: true type: boolean + ERASE_DB: + required: false + default: false + type: boolean workflow_dispatch: inputs: @@ -28,10 +32,14 @@ on: required: true default: true type: boolean + ERASE_DB: + required: false + default: false + type: boolean jobs: - deploy: - if: github.event.inputs.INSTANCE == '*' || github.event.inputs.INSTANCE == '2' + deploy-5: + if: inputs.INSTANCE == '*' || inputs.INSTANCE == '2' runs-on: dspace-dep-1 timeout-minutes: 5 env: @@ -40,22 +48,33 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: ./.github/actions/erase-db + if: inputs.ERASE_DB + with: + INSTANCE: ${{ env.INSTANCE }} + NAME: dspace-${{ env.INSTANCE }} + - name: deploy to dev-5 working-directory: build-scripts/run/ run: | ./start.sh dspace-$INSTANCE deploy-8: - if: github.event.inputs.INSTANCE == '*' || github.event.inputs.INSTANCE == '8' + if: inputs.INSTANCE == '*' || inputs.INSTANCE == '8' runs-on: dspace-dep-1 timeout-minutes: 120 env: INSTANCE: '8' + # 2024/02: this .env replaces ENTRYPOINT to angular + # !!!!WARNING!!!! + # disable TSL checks = allowing to cooperate with https backend with invalid + # certificate ENVFILE: /opt/dspace-envs/.env.dspace.imported.dev-5 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/erase-db + if: inputs.ERASE_DB with: INSTANCE: ${{ env.INSTANCE }} NAME: dspace-${{ env.INSTANCE }} @@ -69,7 +88,7 @@ jobs: import-8: runs-on: dspace-dep-1 - if: github.event.inputs.IMPORT == 'true' + if: inputs.IMPORT needs: deploy-8 env: INSTANCE: '8' diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a618a4ef3ac..2d6f7be61da 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,6 +3,9 @@ name: Docker images # Run this Build for all pushes to 'main' or maintenance branches, or tagged releases. # Also run for PRs to ensure PR doesn't break Docker build process +# NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images +# https://github.com/DSpace/DSpace/blob/main/.github/workflows/reusable-docker-build.yml +# on: push: branches: @@ -15,130 +18,44 @@ permissions: contents: read # to fetch code (actions/checkout) jobs: - docker: + dspace-angular: # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular' if: github.repository == 'dataquest-dev/dspace-angular' - runs-on: ubuntu-latest - env: - # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action) - # For a new commit on default branch (main), use the literal tag 'dspace-7_x' on Docker image. - # For a new commit on other branches, use the branch name as the tag for Docker image. - # For a new tag, copy that tag name as the tag for Docker image. - IMAGE_TAGS: | - type=raw,value=dspace-7_x,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }} - type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }} - type=ref,event=tag - # Define default tag "flavor" for docker/metadata-action per - # https://github.com/docker/metadata-action#flavor-input - # We turn off 'latest' tag by default. - TAGS_FLAVOR: | - latest=false - - steps: - # https://github.com/actions/checkout - - name: Checkout codebase - uses: actions/checkout@v3 - - # https://github.com/docker/setup-buildx-action - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 - - # https://github.com/docker/setup-qemu-action - - name: Set up QEMU emulation to build for multiple architectures - uses: docker/setup-qemu-action@v2 - - # https://github.com/docker/login-action - - name: Login to DockerHub - # Only login if not a PR, as PRs only trigger a Docker build and not a push - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - # https://github.com/docker/metadata-action - # Get Metadata for docker_build step below - - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image - id: meta_build - uses: docker/metadata-action@v4 - with: - images: dataquest/dspace-angular - tags: ${{ env.IMAGE_TAGS }} - flavor: ${{ env.TAGS_FLAVOR }} - - # https://github.com/docker/build-push-action - - name: Build and push 'dspace-angular' image - id: docker_build - uses: docker/build-push-action@v4 - with: - context: . - file: ./Dockerfile - platforms: ${{ env.PLATFORMS }} - # For pull requests, we run the Docker build (to ensure no PR changes break the build), - # but we ONLY do an image push to DockerHub if it's NOT a PR - push: ${{ github.event_name != 'pull_request' }} - # Use tags / labels provided by 'docker/metadata-action' above - tags: ${{ steps.meta_build.outputs.tags }} - labels: ${{ steps.meta_build.outputs.labels }} + uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev + with: + build_id: dspace-angular + image_name: dataquest/dspace-angular + dockerfile_path: ./Dockerfile + run_python_version_script: true + python_version_script_dest: src/static-files/VERSION_D.html + secrets: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} ############################################################# # Build/Push the 'dataquest/dspace-angular' image ('-dist' tag) ############################################################# dspace-angular-dist: # Ensure this job never runs on forked repos. It's only executed for 'dataquest/dspace-angular' - if: github.repository == 'dataquest/dspace-angular' - runs-on: ubuntu-latest - - steps: - # https://github.com/actions/checkout - - name: Checkout codebase - uses: actions/checkout@v3 - - # https://github.com/docker/setup-buildx-action - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 - - # https://github.com/docker/setup-qemu-action - - name: Set up QEMU emulation to build for multiple architectures - uses: docker/setup-qemu-action@v2 - - # https://github.com/docker/login-action - - name: Login to DockerHub - # Only login if not a PR, as PRs only trigger a Docker build and not a push - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - # https://github.com/docker/metadata-action - # Get Metadata for docker_build_dist step below - - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular-dist' image - id: meta_build_dist - uses: docker/metadata-action@v4 - with: - images: dataquest/dspace-angular - tags: ${{ env.IMAGE_TAGS }} - # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same - # tagging logic as the primary 'dspace/dspace-angular' image above. - flavor: ${{ env.TAGS_FLAVOR }} - suffix=-dist - - - name: Build and push 'dspace-angular-dist' image - id: docker_build_dist - uses: docker/build-push-action@v4 - with: - context: . - file: ./Dockerfile.dist - platforms: ${{ env.PLATFORMS }} - # For pull requests, we run the Docker build (to ensure no PR changes break the build), - # but we ONLY do an image push to DockerHub if it's NOT a PR - push: ${{ github.event_name != 'pull_request' }} - # Use tags / labels provided by 'docker/metadata-action' above - tags: ${{ steps.meta_build_dist.outputs.tags }} - labels: ${{ steps.meta_build_dist.outputs.labels }} + if: github.repository == 'dataquest-dev/dspace-angular' && false # not used for now + uses: dataquest-dev/DSpace/.github/workflows/reusable-docker-build.yml@dtq-dev + with: + build_id: dspace-angular-dist + image_name: dspace/dspace-angular + dockerfile_path: ./Dockerfile.dist + # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same + # tagging logic as the primary 'dspace/dspace-angular' image above. + tags_flavor: suffix=-dist + run_python_version_script: true + python_version_script_dest: src/static-files/VERSION_D.html + secrets: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }} deploy: - needs: docker + needs: dspace-angular uses: dataquest-dev/dspace-angular/.github/workflows/deploy.yml@customer/uk + with: + INSTANCE: '2' + IMPORT: false secrets: inherit diff --git a/.github/workflows/import.yml b/.github/workflows/import.yml deleted file mode 100644 index a0c22d2241a..00000000000 --- a/.github/workflows/import.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Import DSpace v5 - -on: - workflow_dispatch: - inputs: - INSTANCE: - required: true - default: '8' - type: choice - options: - - '8' - -jobs: - import: - runs-on: dspace-dep-1 - steps: - - - uses: actions/checkout@v4 - - - uses: ./.github/actions/erase-db - with: - INSTANCE: ${{ env.INSTANCE }} - NAME: dspace-${{ env.INSTANCE }} - - - name: deploy dspace-import on dev-5 - working-directory: build-scripts/run/ - run: | - ENVFILE=/opt/dspace-envs/.env.dspace.imported.dev-5 ./start.sh dspace-$INSTANCE - /bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://dev-5.pc:8$INSTANCE/server/api)" != "200" ]]; do sleep 5; done' - - - uses: ./.github/actions/import-db - if: github.event.inputs.IMPORT != false - with: - INSTANCE: ${{ env.INSTANCE }} - DATADIR: /opt/dspace-data/clarin-dspace/ diff --git a/.github/workflows/reindex.yml b/.github/workflows/reindex.yml deleted file mode 100644 index 06aaa4d7aa3..00000000000 --- a/.github/workflows/reindex.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Reindex dev-5 -on: - workflow_dispatch: -jobs: - reindex: - runs-on: dspace-dep-1 - steps: - - uses: actions/checkout@v3 - - name: reindex everything - run: | - cd $GITHUB_WORKSPACE/build-scripts/run/ - pwd - ./reindex.sh - docker exec dspace /dspace/bin/dspace oai clean-cache diff --git a/scripts/sourceversion.py b/scripts/sourceversion.py new file mode 100644 index 00000000000..6ac25034273 --- /dev/null +++ b/scripts/sourceversion.py @@ -0,0 +1,14 @@ +import subprocess +from datetime import datetime + +if __name__ == '__main__': + ts = datetime.now() + print(f"timestamp: {ts}") + + cmd = 'git log -1 --pretty=format:"%h - %ai"' + print(f">{cmd}") + subprocess.check_call(cmd, shell=True) + + cmd = 'git status --porcelain' + print(f">{cmd}:") + subprocess.check_call(cmd, shell=True) diff --git a/src/aai/aai.js b/src/aai/aai.js index cdfc7fc508e..e40e1c388dc 100644 --- a/src/aai/aai.js +++ b/src/aai/aai.js @@ -43,7 +43,7 @@ // Encode the redirect URL targetUrl += window.encodeURIComponent(redirectUrl); - window.location = opts.host + '/Shibboleth.sso/Login?SAMLDS=1&target=' + targetUrl + '&entityID=' + window.encodeURIComponent(e.entityID); + window.location = opts.host + opts.port + '/Shibboleth.sso/Login?SAMLDS=1&target=' + targetUrl + '&entityID=' + window.encodeURIComponent(e.entityID); }; //console.log(opts); if(!opts.target){ @@ -56,7 +56,7 @@ opts.ourEntityID, opts.responseUrl, [ ], - opts.host + '/Shibboleth.sso/Login?SAMLDS=1&target=' + targetUrl + '&entityID='); + opts.host + opts.port + '/Shibboleth.sso/Login?SAMLDS=1&target=' + targetUrl + '&entityID='); djc.discoPath = window.location.origin + (namespace === '' ? namespace : '/' + namespace) + "/assets/"; djc.metadata = [opts.metadataFeed]; djc.subtitle = "Login via Your home institution (e.g. university)"; diff --git a/src/aai/discojuice/discojuice.js b/src/aai/discojuice/discojuice.js index 821562e0848..4fd1397fcb4 100644 --- a/src/aai/discojuice/discojuice.js +++ b/src/aai/discojuice/discojuice.js @@ -33,7 +33,7 @@ d+" entries listed"))},error:function(a){console.log("error"+a);this.popu DiscoJuice.Dict.helpMore),h=this.parent.Utils.options.get("subtitle",null),c='";var f=this,d=$("body");this.parent.Utils.options.get("useTarget",!1)&&(d=this.parent.Utils.options.get("target",d));/*console.log("Target is");console.log(d);*/this.parent.Utils.options.get("overlay",!0)&&(/*console.log("DiscoJuice Enable: adding overlay"),*/$('').appendTo($("body")));this.popup=$(c).appendTo(d); var that = this; diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html index 3506faa5c3f..f9f8ce50836 100644 --- a/src/app/home-page/home-page.component.html +++ b/src/app/home-page/home-page.component.html @@ -44,13 +44,16 @@
{{'home-page.carousel.deposit.cite' |
-
- +
+ - - + +
@@ -58,24 +61,39 @@
{{'home-page.carousel.deposit.cite' |
-
-
+
+
{{'home-page.hyperlink.author.message' | translate}} +
-
+
{{'home-page.hyperlink.subject.message' | translate}} +
-
+
{{'home-page.hyperlink.language.message' | translate}} +
@@ -85,7 +103,10 @@
{{'home-page.carousel.deposit.cite' |
-
{{'home-page.whats-new.message' | translate}}
+
+
{{'home-page.whats-new.message' | translate}}
+ +
diff --git a/src/app/home-page/home-page.component.scss b/src/app/home-page/home-page.component.scss index cd12fc6b637..ffded7a153b 100644 --- a/src/app/home-page/home-page.component.scss +++ b/src/app/home-page/home-page.component.scss @@ -122,6 +122,7 @@ background-color: #eee; border: 1px solid #ccc; border-right: 0px; + max-width: fit-content; } .btn-repository { @@ -154,11 +155,6 @@ margin-top: -10px; } - - - - - @media (max-width: 991.98px) { .carousel-ldata-info { left: 42%; @@ -190,4 +186,5 @@ width: 100%; } } + } diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts index 1508f46b53a..e1bf4112914 100644 --- a/src/app/home-page/home-page.component.ts +++ b/src/app/home-page/home-page.component.ts @@ -58,6 +58,11 @@ export class HomePageComponent implements OnInit { baseUrl = ''; + /** + * Link to the search page + */ + searchLink: string; + constructor( private route: ActivatedRoute, config: NgbCarouselConfig, protected searchService: SearchService, @@ -90,6 +95,8 @@ export class HomePageComponent implements OnInit { // Load the most viewed Items and the new Items this.loadTopItems(); this.loadNewItems(); + + this.searchLink = this.searchService.getSearchLink(); } /** @@ -253,6 +260,10 @@ export class HomePageComponent implements OnInit { redirectToSearch(searchValue) { this.router.navigateByUrl('/search?query=' + searchValue); } + + redirectToBrowseByField(field) { + this.router.navigateByUrl('/browse/' + field); + } } /** diff --git a/src/app/shared/clarin-item-author-preview/clarin-item-author-preview.component.html b/src/app/shared/clarin-item-author-preview/clarin-item-author-preview.component.html index f89be75e97a..f7292884695 100644 --- a/src/app/shared/clarin-item-author-preview/clarin-item-author-preview.component.html +++ b/src/app/shared/clarin-item-author-preview/clarin-item-author-preview.component.html @@ -1,26 +1,30 @@
- ; - and + ; + + {{'item.view.box.author.preview.and' | translate}} + {{ author.name }}
- {{ author.name }} ; et al. + {{ author.name }}; et al.
- Show everyone + {{'item.view.box.author.preview.show-everyone' | translate}}
- ; - and + ; + + {{'item.view.box.author.preview.and' | translate}} + {{author.name}}
diff --git a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html index b7c800c71f8..17bdc7786ad 100644 --- a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html +++ b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.html @@ -7,24 +7,27 @@
-
+
{{'item.view.box.author.message' | translate}}
-
- +
+
-
Description:
+
{{'item.view.box.description.message' | translate}}
{{itemDescription}}
-
{{'item.view.box.files.message.0' | translate}} {{ (itemCountOfFiles | async) }} {{'item.view.box.files.message.1' | translate}} ({{(itemFilesSizeBytes | async) | dsFileSize }}).
+
{{'item.view.box.files.message.0' | translate}} {{ (itemCountOfFiles | async) }} {{'item.view.box.files.message.1' | translate}} ({{(itemFilesSizeBytes | async) | dsFileSize }}).
+
{{'item.view.box.one.file.message' | translate}} ({{(itemFilesSizeBytes | async) | dsFileSize }}).
{{'item.view.box.no-files.message' | translate}}
@@ -38,9 +41,7 @@
-
-
diff --git a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.scss b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.scss index 186ff733d6e..c76e77cd37a 100644 --- a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.scss +++ b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.scss @@ -31,7 +31,7 @@ .artifact-icon { position: absolute; - right: 2%; + right: 7%; width: 60px; } @@ -79,7 +79,6 @@ .item-name { color: #428bca; - text-decoration: none; } .item-author { diff --git a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.ts b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.ts index 51168bb4b98..1b6154a8be0 100644 --- a/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.ts +++ b/src/app/shared/clarin-item-box-view/clarin-item-box-view.component.ts @@ -28,6 +28,7 @@ import { LicenseType } from '../../item-page/clarin-license-info/clarin-license- import { ListableObject } from '../object-collection/shared/listable-object.model'; import { ItemSearchResult } from '../object-collection/shared/item-search-result.model'; import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; +import { FindListOptions } from '../../core/data/find-list-options.model'; /** * Show item on the Home/Search page in the customized box with Item's information. @@ -39,6 +40,9 @@ import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; }) export class ClarinItemBoxViewComponent implements OnInit { + ITEM_TYPE_IMAGES_PATH = '/assets/images/item-types/'; + ITEM_TYPE_DEFAULT_IMAGE_NAME = 'application-x-zerosize.png'; + /** * Show information of this item. */ @@ -132,7 +136,12 @@ export class ClarinItemBoxViewComponent implements OnInit { if (isNull(this.item)) { return; } - this.bundleService.findByItemAndName(this.item, 'ORIGINAL', true, true, followLink('bitstreams')) + const configAllElements: FindListOptions = Object.assign(new FindListOptions(), { + elementsPerPage: 9999 + }); + + this.bundleService.findByItemAndName(this.item, 'ORIGINAL', true, true, + followLink('bitstreams', { findListOptions: configAllElements })) .pipe(getFirstSucceededRemoteDataPayload()) .subscribe((bundle: Bundle) => { bundle.bitstreams @@ -219,6 +228,15 @@ export class ClarinItemBoxViewComponent implements OnInit { hasItemType() { return !isEmpty(this.itemType); } + + hasMoreFiles() { + return this.itemCountOfFiles.value > 1; + } + + handleImageError(event) { + const imgElement = event.target as HTMLImageElement; + imgElement.src = this.ITEM_TYPE_IMAGES_PATH + this.ITEM_TYPE_DEFAULT_IMAGE_NAME; + } } /** diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5 index 2dfbb3cbec6..39e9e7d00f6 100644 --- a/src/assets/i18n/cs.json5 +++ b/src/assets/i18n/cs.json5 @@ -809,6 +809,8 @@ "browse.metadata.subject": "Předmět", // "browse.metadata.title": "Title", "browse.metadata.title": "Název", + // "browse.metadata.language": "Language", + "browse.metadata.language": "Jazyk", // "browse.metadata.author.breadcrumbs": "Browse by Author", "browse.metadata.author.breadcrumbs": "Procházet podle autora", // "browse.metadata.dateissued.breadcrumbs": "Browse by Date", @@ -1857,6 +1859,8 @@ "home-page.hyperlink.subject.message": "Klíčové slovo", // "home-page.hyperlink.language.message": "Language (ISO)", "home-page.hyperlink.language.message": "Jazyk", + // "home-page.hyperlink.view-more.message": "... View More", + "home-page.hyperlink.view-more.message": "... zobrazit další", // "home-page.whats-new.message": "What's New", "home-page.whats-new.message": "Nově přidané", // "home-page.new-items.message": "Most Viewed Items - Last Month", @@ -2675,8 +2679,16 @@ "item.view.box.author.message": "Autoři", // "item.view.box.files.message": ["This item contains", "files"], "item.view.box.files.message": ["Tento záznam obsahuje", "souborů"], + // "item.view.box.one.file.message": "This item contains 1 file", + "item.view.box.one.file.message": "Tento záznam obsahuje 1 soubor", // "item.view.box.no-files.message": "This item contains no files.", "item.view.box.no-files.message": "Tento záznam neobsahuje soubory.", + // "item.view.box.description.message": "Description:", + "item.view.box.description.message": "Popis:", + // "item.view.box.author.preview.and": "and:", + "item.view.box.author.preview.and": "a", + // "item.view.box.author.preview.show-everyone": "show everyone:", + "item.view.box.author.preview.show-everyone": "zobraz všechny autory", // "item.file.description.not.supported.video": "Your browser does not support the video tag.", "item.file.description.not.supported.video": "Váš prohlížeč nepodporuje videa.", // "item.file.description.name": "Name", diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 2c1b3374ac1..c17f10e2049 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -843,6 +843,8 @@ "browse.metadata.title": "Title", + "browse.metadata.language": "Language", + "browse.metadata.author.breadcrumbs": "Browse by Author", "browse.metadata.dateissued.breadcrumbs": "Browse by Date", @@ -1933,6 +1935,8 @@ "home-page.hyperlink.language.message": "Language (ISO)", + "home-page.hyperlink.view-more.message": "... View More", + "home-page.whats-new.message": "What's New", "home-page.new-items.message": "Most Viewed Items - Last Month", @@ -2782,8 +2786,17 @@ "item.view.box.files.message": ["This item contains", "files"], + "item.view.box.one.file.message": "This item contains 1 file", + "item.view.box.no-files.message": "This item contains no files.", + "item.view.box.description.message": "Description:", + + + "item.view.box.author.preview.and": "and", + + "item.view.box.author.preview.show-everyone": "show everyone", + "item.file.description.not.supported.video": "Your browser does not support the video tag.", @@ -5805,7 +5818,7 @@ "navbar.repository": "Repository", - "navbar.community-list": "Catalogue", + "navbar.community-list": "Catalog", "navbar.education": "Education", diff --git a/src/assets/images/LINDAT-CLARIAH-cz-gray_0.svg b/src/assets/images/LINDAT-CLARIAH-cz-gray_0.svg new file mode 100644 index 00000000000..604709a61f9 --- /dev/null +++ b/src/assets/images/LINDAT-CLARIAH-cz-gray_0.svg @@ -0,0 +1,26 @@ + + + + LINDAT-CLARIAH-cz-blue + Created with Sketch. + + + + + + + + + + C + L + AR + I + A + H + - + C + Z + + + \ No newline at end of file diff --git a/src/assets/images/clarin.png b/src/assets/images/clarin.png new file mode 100644 index 00000000000..d75ec4cd638 Binary files /dev/null and b/src/assets/images/clarin.png differ diff --git a/src/assets/images/dariah-eu.png b/src/assets/images/dariah-eu.png new file mode 100644 index 00000000000..21696e253b1 Binary files /dev/null and b/src/assets/images/dariah-eu.png differ diff --git a/src/assets/images/item-types/Software.png b/src/assets/images/item-types/Software.png new file mode 100644 index 00000000000..e9d5738a277 Binary files /dev/null and b/src/assets/images/item-types/Software.png differ diff --git a/src/assets/images/item-types/application-x-zerosize.png b/src/assets/images/item-types/application-x-zerosize.png new file mode 100644 index 00000000000..3af6e6e1afb Binary files /dev/null and b/src/assets/images/item-types/application-x-zerosize.png differ diff --git a/src/assets/images/item-types/cite.png b/src/assets/images/item-types/cite.png new file mode 100644 index 00000000000..56a3a614ac6 Binary files /dev/null and b/src/assets/images/item-types/cite.png differ diff --git a/src/assets/images/corpus.png b/src/assets/images/item-types/corpus.png similarity index 100% rename from src/assets/images/corpus.png rename to src/assets/images/item-types/corpus.png diff --git a/src/assets/images/item-types/deposit.png b/src/assets/images/item-types/deposit.png new file mode 100644 index 00000000000..abb41d19fe2 Binary files /dev/null and b/src/assets/images/item-types/deposit.png differ diff --git a/src/assets/images/item-types/evaluationPackage.png b/src/assets/images/item-types/evaluationPackage.png new file mode 100644 index 00000000000..c3b710564d3 Binary files /dev/null and b/src/assets/images/item-types/evaluationPackage.png differ diff --git a/src/assets/images/item-types/glass.png b/src/assets/images/item-types/glass.png new file mode 100644 index 00000000000..f779ad507ed Binary files /dev/null and b/src/assets/images/item-types/glass.png differ diff --git a/src/assets/images/item-types/languageDescription.png b/src/assets/images/item-types/languageDescription.png new file mode 100644 index 00000000000..5e21689930e Binary files /dev/null and b/src/assets/images/item-types/languageDescription.png differ diff --git a/src/assets/images/item-types/lexicalConceptualResource.png b/src/assets/images/item-types/lexicalConceptualResource.png new file mode 100644 index 00000000000..4e0cc350d7d Binary files /dev/null and b/src/assets/images/item-types/lexicalConceptualResource.png differ diff --git a/src/assets/images/item-types/technologyToolService.png b/src/assets/images/item-types/technologyToolService.png new file mode 100644 index 00000000000..ab564852330 Binary files /dev/null and b/src/assets/images/item-types/technologyToolService.png differ diff --git a/src/assets/images/item-types/toolService.png b/src/assets/images/item-types/toolService.png new file mode 100644 index 00000000000..4c90e263e73 Binary files /dev/null and b/src/assets/images/item-types/toolService.png differ diff --git a/src/styles/_clarin-styles.scss b/src/styles/_clarin-styles.scss index 6e6c30c0e48..545d4699758 100644 --- a/src/styles/_clarin-styles.scss +++ b/src/styles/_clarin-styles.scss @@ -25,3 +25,22 @@ .cursor-pointer { cursor: pointer; } + +ds-home-page ds-themed-search-form { + input.form-control { + border-radius: 0; + height: 48px; + font-size: 18px; + } + + input.form-control:focus { + border-color: #66afe9; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%), 0 0 8px rgb(102 175 233 / 60%); + box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%), 0 0 8px rgb(102 175 233 / 60%); + } +} + +ds-rss.override-css div { + margin-right: 0 !important; +}