Skip to content

Commit 83d9a0d

Browse files
milanmajchrakmilanmajchrak
committed
Merge branch 'customer/vsb-tuo' of github.com:dataquest-dev/dspace-angular into customer/vsb-tuo
2 parents 547383b + a3606b6 commit 83d9a0d

126 files changed

Lines changed: 2124 additions & 3262 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/config.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,67 @@ cache:
9898
# This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR.
9999
allowStale: true
100100

101+
# Theme Config
102+
themes:
103+
# Add additional themes here. In the case where multiple themes match a route, the first one
104+
# in this list will get priority. It is advisable to always have a theme that matches
105+
# every route as the last one
106+
#
107+
# # A theme with a handle property will match the community, collection or item with the given
108+
# # handle, and all collections and/or items within it
109+
# - name: custom
110+
# handle: 10673/1233
111+
#
112+
# # A theme with a regex property will match the route using a regular expression. If it
113+
# # matches the route for a community or collection it will also apply to all collections
114+
# # and/or items within it
115+
# - name: custom
116+
# regex: collections\/e8043bc2.*
117+
#
118+
# # A theme with a uuid property will match the community, collection or item with the given
119+
# # ID, and all collections and/or items within it
120+
# - name: custom
121+
# uuid: 0958c910-2037-42a9-81c7-dca80e3892b4
122+
#
123+
# # The extends property specifies an ancestor theme (by name). Whenever a themed component is not found
124+
# # in the current theme, its ancestor theme(s) will be checked recursively before falling back to default.
125+
# - name: custom-A
126+
# extends: custom-B
127+
# # Any of the matching properties above can be used
128+
# handle: 10673/34
129+
#
130+
# - name: custom-B
131+
# extends: custom
132+
# handle: 10673/12
133+
#
134+
# # A theme with only a name will match every route
135+
# name: custom
136+
#
137+
# # This theme will use the default bootstrap styling for DSpace components
138+
# - name: BASE_THEME_NAME
139+
#
140+
- name: custom
141+
headTags:
142+
- tagName: link
143+
attributes:
144+
rel: icon
145+
href: assets/dspace/images/favicons/favicon.ico
146+
sizes: any
147+
- tagName: link
148+
attributes:
149+
rel: icon
150+
href: assets/dspace/images/favicons/favicon.svg
151+
type: image/svg+xml
152+
- tagName: link
153+
attributes:
154+
rel: apple-touch-icon
155+
href: assets/dspace/images/favicons/apple-touch-icon.png
156+
- tagName: link
157+
attributes:
158+
rel: manifest
159+
href: assets/dspace/images/favicons/manifest.webmanifest
160+
161+
101162
#info:
102163
# # Whether the end user agreement is required before users may use the repository.
103164
# # If enabled, the user will be required to accept the agreement before they can use the repository.

‎src/app/admin/admin-sidebar/admin-sidebar.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="sidebar-full-width-container" id="sidebar-header-container" aria-hidden="true">
1616
<div class="sidebar-section-wrapper">
1717
<div class="sidebar-fixed-element-wrapper">
18-
<img id="admin-sidebar-logo" src="assets/images/dspace-logo-mini.svg" [alt]="('menu.header.image.logo') | translate" aria-hidden="true">
18+
<img id="admin-sidebar-logo" src="assets/images/vsb-symbol-logo.svg" [alt]="('menu.header.image.logo') | translate" aria-hidden="true">
1919
</div>
2020
<div class="sidebar-collapsible-element-outer-wrapper">
2121
<div class="sidebar-collapsible-element-inner-wrapper sidebar-item">

‎src/app/bitstream-page/bitstream-page-routing.module.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-bread
1313
import { BitstreamBreadcrumbsService } from '../core/breadcrumbs/bitstream-breadcrumbs.service';
1414
import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
1515
import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
16-
import { ClarinBitstreamDownloadPageComponent } from './clarin-bitstream-download-page/clarin-bitstream-download-page.component';
1716

1817
const EDIT_BITSTREAM_PATH = ':id/edit';
1918
const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
@@ -39,11 +38,9 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
3938
{
4039
// Resolve angular bitstream download URLs
4140
path: ':id/download',
42-
component: ClarinBitstreamDownloadPageComponent,
43-
// component: BitstreamDownloadPageComponent,
41+
component: BitstreamDownloadPageComponent,
4442
resolve: {
45-
bitstream: BitstreamPageResolver,
46-
breadcrumb: BitstreamBreadcrumbResolver
43+
bitstream: BitstreamPageResolver
4744
},
4845
},
4946
{

‎src/app/core/metadata/metadata.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class MetadataService {
129129
const title = this.translate.get(routeInfo.data.value.title, routeInfo.data.value);
130130
combineLatest([titlePrefix, title]).pipe(take(1)).subscribe(([translatedTitlePrefix, translatedTitle]: [string, string]) => {
131131
this.addMetaTag('title', translatedTitlePrefix + translatedTitle);
132-
this.title.setTitle(translatedTitlePrefix + translatedTitle);
132+
this.title.setTitle(translatedTitlePrefix + ' - ' + translatedTitle);
133133
});
134134
}
135135
if (routeInfo.data.value.description) {

‎src/app/footer/footer.component.html‎

Lines changed: 79 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,83 @@
11
<footer class="text-lg-start">
2-
<div class="lindat-common2 lindat-common-footer">
3-
<footer data-version="3.5.0" data-build="67e455771cd6a00647a289a5d7b0c8a3380d3410">
4-
<div id="about-lindat">
5-
<h4><a href="https://lindat.cz/sites/default/files/2021-01/lindat_clariah_flyer.pdf">LINDAT/CLARIAH-CZ</a></h4>
6-
<ul>
7-
<li><a href="https://lindat.cz/files/mission-en.pdf">Mission Statement</a></li>
8-
<li><a href="https://lindat.cz/ab">Advisory Board</a></li>
9-
<li><a href="https://lindat.cz/events">Events</a></li>
10-
<li><a href="https://www.clarin.eu/">CLARIN Participation</a></li>
11-
<li><a href="https://www.dariah.eu/">DARIAH Participation</a></li>
12-
<br/>
13-
<li><a href="https://lindat.cz/faq-repository">FAQ</a></li>
14-
<li><a href="mailto:lindat-help@ufal.mff.cuni.cz">Helpdesk</a></li>
15-
<li><a href="https://lindat.cz/user_feedback">User Feedback Form</a></li>
16-
<br/>
17-
<li><a href="https://ufal.mff.cuni.cz/grants/lindatclariah-cz/en">Hosting Institution</a></li>
18-
<li><a href="https://lindat.cz/acknowledgement">Acknowledge LINDAT/CLARIAH-CZ</a></li>
19-
<li><a href="https://ror.org/00dd4fz34">Research Organization Registry</a></li>
20-
</ul>
2+
<div *ngIf="showTopFooter" class="top-footer">
3+
<!-- Grid container -->
4+
<div class=" container p-4">
5+
<!--Grid row-->
6+
<div class="row">
7+
8+
<!--Grid column-->
9+
<div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
10+
<h5 class="text-uppercase">Footer Content</h5>
11+
12+
<ul class="list-unstyled mb-0">
13+
<li>
14+
<a routerLink="./" class="">Lorem ipsum</a>
15+
</li>
16+
<li>
17+
<a routerLink="./" class="">Ut facilisis</a>
18+
</li>
19+
<li>
20+
<a routerLink="./" class="">Aenean sit</a>
21+
</li>
22+
</ul>
23+
</div>
24+
<!--Grid column-->
25+
<div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
26+
<h5 class="text-uppercase">Footer Content</h5>
27+
28+
<ul class="list-unstyled mb-0">
29+
<li>
30+
<a routerLink="./" class="">Suspendisse potenti</a>
31+
</li>
32+
</ul>
33+
</div>
34+
<!--Grid column-->
35+
36+
<!--Grid column-->
37+
<div class="col-lg-4 col-md-12 mb-4 mb-md-0">
38+
<h5 class="text-uppercase">Footer Content</h5>
39+
40+
<p>
41+
Lorem ipsum dolor sit amet consectetur, adipisicing elit. Iste atque ea quis
42+
molestias. Fugiat pariatur maxime quis culpa corporis vitae repudiandae aliquam
43+
voluptatem veniam, est atque cumque eum delectus sint!
44+
</p>
45+
</div>
46+
<!--Grid column-->
2147
</div>
22-
<div id="about-partners">
23-
<h4><a href="https://lindat.cz/partners">Partners</a></h4>
24-
<ul>
25-
<li>Charles University
26-
<ul>
27-
<li><a href="https://lindat.cz/partners/mff-uk">Faculty <i>of</i> Mathematics <i>and</i> Physics</a></li>
28-
<li><a href="https://lindat.cz/partners/ff-uk">Faculty <i>of</i> Arts</a></li>
29-
</ul>
30-
</li>
31-
<li>Masaryk University
32-
<ul>
33-
<li><a href="https://lindat.cz/partners/ff-mu">Faculty <i>of</i> Arts</a></li>
34-
<li><a href="https://lindat.cz/partners/fi-mu">Faculty <i>of</i> Informatics</a></li>
35-
</ul>
36-
</li>
37-
<li>University of West Bohemia
38-
<ul>
39-
<li><a href="https://lindat.cz/partners/zcu">Faculty <i>of</i> Applied Sciences</a></li>
40-
</ul>
41-
</li>
42-
<li>Terezín
43-
<ul>
44-
<li><a href="https://lindat.cz/partners/iti">Terezín Initiative Institute</a></li>
45-
<li><a href="https://lindat.cz/partners/pt">Terezín Memorial</a></li>
46-
</ul>
47-
</li>
48-
<li>Czech Academy of Sciences
49-
<ul>
50-
<li><a href="https://lindat.cz/partners/ujc">Czech Language Institute</a></li>
51-
<li><a href="https://lindat.cz/partners/knav">Library <i>of</i> Academy</a></li>
52-
<li><a href="https://lindat.cz/partners/hu">Institute <i>of</i> History</a></li>
53-
<li><a href="https://lindat.cz/partners/flu">Institute <i>of</i> Philosophy</a></li>
54-
<li><a href="https://lindat.cz/partners/mua">Masaryk Institute <i>and</i> Archives</a></li>
55-
</ul>
56-
</li>
57-
<li>Archives, Libraries and Galleries
58-
<ul>
59-
<li><a href="https://lindat.cz/partners/nk">National Library <i>of the Czech Republic</i></a></li>
60-
<li><a href="https://lindat.cz/partners/mzk">Moravian Library <i>in Brno</i></a></li>
61-
<li><a href="https://lindat.cz/partners/ng">National Gallery Prague</a></li>
62-
<li><a href="https://lindat.cz/partners/nfa">National Film Archive</a></li>
63-
<li><a href="https://lindat.cz/partners/na">National Archives</a></li>
64-
</ul>
65-
</li>
66-
</ul>
67-
</div>
68-
<div id="about-website">
69-
<h4><a href="https://lindat.cz/services">Services</a></h4>
70-
<ul>
71-
<li><a href="https://lindat.mff.cuni.cz/en/monitoring">Service Status</a></li>
72-
<li><a href="https://lindat.mff.cuni.cz/repository/static/about">About and Policies</a></li>
73-
<li><a href="https://lindat.mff.cuni.cz/en/terms-of-use">Terms of Use</a></li>
74-
</ul>
75-
</div>
76-
<div id="badges-a">
77-
<a href="https://www.clarin.eu/content/certified-centres"><img src="https://lindat.mff.cuni.cz/images/b-centre.png" alt="CLARIN CENTRE B" /></a>
78-
<a href="https://www.clarin.eu/content/knowledge-centres"><img src="https://lindat.mff.cuni.cz/images/k-centre.png" alt="CLARIN CENTRE K" style="filter:brightness(0.88)" /></a>
79-
<a href="https://hdl.handle.net/11234/6-CTS"><img src="https://lindat.mff.cuni.cz/images/core-trust-seal-mono.png" alt="CoreTrustSeal Certification" /></a>
80-
</div>
81-
<div id="badges-b">
82-
<a href="https://twitter.com/lindatclariahcz">Follow us on Twitter <img src="https://lindat.mff.cuni.cz/images/twitter-circular.svg" alt="Link to Profile" /></a>
83-
<a href="https://lindat.cz/user/login"><img src="https://lindat.mff.cuni.cz/sites/default/files/LINDAT-CLARIAH-cz-gray_0.svg" alt="Home Page" /></a>
84-
</div>
85-
<div id="ack-msmt">
86-
THE LINDAT/CLARIAH-CZ PROJECT (LM2023062; formerly LM2010013, LM2015071, LM2018101) IS FULLY SUPPORTED BY THE MINISTRY OF EDUCATION, SPORTS AND YOUTH OF THE CZECH REPUBLIC UNDER THE&#160;PROGRAMME LM OF "LARGE INFRASTRUCTURES"
87-
</div>
88-
<div id="ack-freepik">Icons © Smashicons and Freepik from flaticon.com licensed by <a href="https://creativecommons.org/licenses/by/3.0/">CC 3.0 BY</a></div>
89-
<div id="ack-ufal">website © 2025 by <a href="https://ufal.mff.cuni.cz/">ÚFAL</a></div>
90-
</footer>
48+
<!--Grid row-->
49+
</div>
50+
</div>
51+
<!-- Grid container -->
52+
<!-- Copyright -->
53+
<div class="bottom-footer p-1 d-flex justify-content-center align-items-center text-white">
54+
<div class="content-container">
55+
<p class="m-0">
56+
<a class="text-white"
57+
href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
58+
{{ 'footer.copyright' | translate:{year: dateObj | date:'y'} }}
59+
<a class="text-white"
60+
href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
61+
</p>
62+
<ul class="footer-info list-unstyled small d-flex justify-content-center mb-0">
63+
<li>
64+
<a class="text-white" href="javascript:void(0);"
65+
(click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
66+
</li>
67+
<li *ngIf="showPrivacyPolicy">
68+
<a class="text-white"
69+
routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
70+
</li>
71+
<li *ngIf="showEndUserAgreement">
72+
<a class="text-white"
73+
routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
74+
</li>
75+
<li *ngIf="showSendFeedback$ | async">
76+
<a class="text-white"
77+
routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
78+
</li>
79+
</ul>
80+
</div>
9181
</div>
82+
<!-- Copyright -->
9283
</footer>

0 commit comments

Comments
 (0)