Merge branch 'release/dspace-cris-2023.02.07.03' into dspace-cris-2023_02_x

vins01-4science · vins01-4science · commit 4821044df7cf · 2026-05-06T21:23:44.000+02:00
# Conflicts:
#	package.json
diff --git a/src/assets/images/opf.logo.icon.svg b/src/assets/images/opf.logo.icon.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="666" height="664" viewBox="0 0 666 664">
+<g>
+<path d="M 0.00 0.00 L 666.00 0.00 L 666.00 664.00 L 0.00 664.00 ZM 341.00 443.46 C351.85,446.25 368.52,446.82 383.09,444.89 C398.31,442.87 413.64,433.81 422.01,421.87 C428.46,412.68 429.24,409.30 428.84,392.26 C428.53,378.62 428.31,377.20 426.03,373.50 C422.26,367.42 416.15,361.17 409.60,356.73 C402.70,352.04 384.51,344.43 371.00,340.57 C344.94,333.13 334.17,322.33 342.25,311.74 C348.51,303.54 355.87,301.47 372.14,303.36 C382.43,304.55 384.72,305.22 396.42,310.48 C405.99,314.78 409.74,316.03 410.92,315.31 C414.39,313.17 425.00,294.93 425.00,291.10 C425.00,290.02 423.66,288.18 422.02,287.01 C414.41,281.60 392.60,273.78 379.91,271.93 C370.03,270.48 352.60,271.22 344.62,273.42 C324.72,278.91 309.69,293.19 305.97,310.15 C304.04,318.94 305.10,335.38 307.97,341.00 C315.59,355.94 327.66,363.70 358.50,373.50 C387.49,382.71 394.00,387.12 394.00,397.55 C394.00,406.50 386.95,412.93 374.76,415.11 C368.27,416.27 366.61,416.19 356.90,414.20 C345.05,411.78 333.24,407.19 323.07,401.04 C315.41,396.41 313.16,396.10 310.33,399.25 C306.77,403.22 298.00,418.49 298.00,420.71 C298.00,423.78 301.67,426.31 317.50,434.11 C326.40,438.50 334.96,441.91 341.00,443.46 ZM 509.00 443.57 C514.61,445.54 517.56,445.86 530.50,445.91 C551.58,445.99 562.56,444.67 570.37,441.13 C583.89,435.00 603.00,420.31 603.00,416.05 C603.00,413.58 584.19,393.00 581.94,393.00 C581.56,393.00 578.39,395.29 574.89,398.08 C542.83,423.71 502.36,413.68 490.01,377.04 C487.43,369.37 487.21,350.85 489.59,341.64 C492.95,328.70 502.81,316.23 514.90,309.65 C521.55,306.03 533.23,304.58 545.04,305.90 C555.09,307.02 556.18,307.50 569.50,316.53 C574.84,320.15 579.97,322.97 580.90,322.81 C582.58,322.50 603.00,301.19 603.00,299.74 C603.00,297.85 588.83,285.69 582.21,281.90 C566.78,273.07 552.28,270.23 529.14,271.49 C515.26,272.25 509.03,273.61 499.40,277.97 C481.25,286.20 467.25,299.72 457.74,318.19 C450.01,333.21 449.49,335.79 449.57,358.50 C449.64,380.47 450.83,386.91 457.04,398.96 C467.51,419.30 486.69,435.76 509.00,443.57 ZM 105.00 444.40 C111.42,446.11 134.58,446.45 145.81,444.99 C158.75,443.31 175.82,433.84 184.87,423.32 C190.35,416.96 197.47,402.45 200.00,392.53 C203.51,378.76 204.31,355.35 203.68,285.13 C203.36,249.73 202.82,220.48 202.47,220.13 C202.12,219.78 193.17,219.36 182.58,219.19 L 163.32 218.88 L 162.66 295.19 C162.29,337.16 161.56,374.75 161.03,378.72 C159.34,391.33 152.38,401.77 142.74,406.13 C138.20,408.18 135.96,408.50 126.00,408.50 C114.78,408.50 114.32,408.41 106.97,404.82 C101.76,402.27 96.78,398.65 90.82,393.07 C86.07,388.63 81.74,385.00 81.19,385.00 C80.07,385.00 59.34,406.50 57.93,409.13 C57.25,410.40 58.11,412.11 61.50,416.23 C71.72,428.65 89.76,440.33 105.00,444.40 ZM 236.61 441.89 L 237.11 444.29 L 254.65 443.76 C268.63,443.34 272.51,442.92 273.74,441.69 C275.10,440.32 275.29,431.14 275.30,362.32 C275.31,319.52 274.97,282.13 274.56,279.23 L 273.81 273.96 L 255.15 274.23 L 236.50 274.50 L 236.31 357.00 C236.20,402.38 236.34,440.58 236.61,441.89 ZM 245.50 252.44 C252.71,256.16 267.24,252.91 273.07,246.27 C280.91,237.33 282.31,226.25 276.75,216.99 C274.96,214.02 271.56,210.22 269.19,208.56 C265.52,205.98 263.76,205.48 257.38,205.15 C245.05,204.53 238.40,208.35 232.58,219.40 C229.44,225.36 229.18,232.65 231.90,238.50 C233.98,242.96 240.91,250.06 245.50,252.44 Z" fill="rgb(233,94,19)"/>
+<path d="M 105.00 444.40 C89.76,440.33 71.72,428.65 61.50,416.23 C58.11,412.11 57.25,410.40 57.93,409.13 C59.34,406.50 80.07,385.00 81.19,385.00 C81.74,385.00 86.07,388.63 90.82,393.07 C96.78,398.65 101.76,402.27 106.97,404.82 C114.32,408.41 114.78,408.50 126.00,408.50 C135.96,408.50 138.20,408.18 142.74,406.13 C152.38,401.77 159.34,391.33 161.03,378.72 C161.56,374.75 162.29,337.16 162.66,295.19 L 163.32 218.88 L 182.58 219.19 C193.17,219.36 202.12,219.78 202.47,220.13 C202.82,220.48 203.36,249.73 203.68,285.13 C204.31,355.35 203.51,378.76 200.00,392.53 C197.47,402.45 190.35,416.96 184.87,423.32 C175.82,433.84 158.75,443.31 145.81,444.99 C134.58,446.45 111.42,446.11 105.00,444.40 ZM 341.00 443.46 C334.96,441.91 326.40,438.50 317.50,434.11 C301.67,426.31 298.00,423.78 298.00,420.71 C298.00,418.49 306.77,403.22 310.33,399.25 C313.16,396.10 315.41,396.41 323.07,401.04 C333.24,407.19 345.05,411.78 356.90,414.20 C366.61,416.19 368.27,416.27 374.76,415.11 C386.95,412.93 394.00,406.50 394.00,397.55 C394.00,387.12 387.49,382.71 358.50,373.50 C327.66,363.70 315.59,355.94 307.97,341.00 C305.10,335.38 304.04,318.94 305.97,310.15 C309.69,293.19 324.72,278.91 344.62,273.42 C352.60,271.22 370.03,270.48 379.91,271.93 C392.60,273.78 414.41,281.60 422.02,287.01 C423.66,288.18 425.00,290.02 425.00,291.10 C425.00,294.93 414.39,313.17 410.92,315.31 C409.74,316.03 405.99,314.78 396.42,310.48 C384.72,305.22 382.43,304.55 372.14,303.36 C355.87,301.47 348.51,303.54 342.25,311.74 C334.17,322.33 344.94,333.13 371.00,340.57 C384.51,344.43 402.70,352.04 409.60,356.73 C416.15,361.17 422.26,367.42 426.03,373.50 C428.31,377.20 428.53,378.62 428.84,392.26 C429.24,409.30 428.46,412.68 422.01,421.87 C413.64,433.81 398.31,442.87 383.09,444.89 C368.52,446.82 351.85,446.25 341.00,443.46 ZM 509.00 443.57 C486.69,435.76 467.51,419.30 457.04,398.96 C450.83,386.91 449.64,380.47 449.57,358.50 C449.49,335.79 450.01,333.21 457.74,318.19 C467.25,299.72 481.25,286.20 499.40,277.97 C509.03,273.61 515.26,272.25 529.14,271.49 C552.28,270.23 566.78,273.07 582.21,281.90 C588.83,285.69 603.00,297.85 603.00,299.74 C603.00,301.19 582.58,322.50 580.90,322.81 C579.97,322.97 574.84,320.15 569.50,316.53 C556.18,307.50 555.09,307.02 545.04,305.90 C533.23,304.58 521.55,306.03 514.90,309.65 C502.81,316.23 492.95,328.70 489.59,341.64 C487.21,350.85 487.43,369.37 490.01,377.04 C502.36,413.68 542.83,423.71 574.89,398.08 C578.39,395.29 581.56,393.00 581.94,393.00 C584.19,393.00 603.00,413.58 603.00,416.05 C603.00,420.31 583.89,435.00 570.37,441.13 C562.56,444.67 551.58,445.99 530.50,445.91 C517.56,445.86 514.61,445.54 509.00,443.57 ZM 236.61 441.89 C236.34,440.58 236.20,402.38 236.31,357.00 L 236.50 274.50 L 255.15 274.23 L 273.81 273.96 L 274.56 279.23 C274.97,282.13 275.31,319.52 275.30,362.32 C275.29,431.14 275.10,440.32 273.74,441.69 C272.51,442.92 268.63,443.34 254.65,443.76 L 237.11 444.29 L 236.61 441.89 ZM 245.50 252.44 C240.91,250.06 233.98,242.96 231.90,238.50 C229.18,232.65 229.44,225.36 232.58,219.40 C238.40,208.35 245.05,204.53 257.38,205.15 C263.76,205.48 265.52,205.98 269.19,208.56 C271.56,210.22 274.96,214.02 276.75,216.99 C282.31,226.25 280.91,237.33 273.07,246.27 C267.24,252.91 252.71,256.16 245.50,252.44 Z" fill="rgb(253,252,250)"/>
+</g>
+</svg>
diff --git a/src/assets/images/sherpa.logo.icon.svg b/src/assets/images/sherpa.logo.icon.svg
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
@@ -273,8 +273,8 @@ export class DefaultAppConfig implements AppConfig {
             path: 'assets/images/ror.logo.icon.svg'
           },
           {
-            source: 'sherpa',
-            path: 'assets/images/sherpa.logo.icon.svg'
+            source: 'opf',
+            path: 'assets/images/opf.logo.icon.svg'
           },
           {
             source: 'zdb',

Original file line number	Diff line number	Diff line change
`@@ -273,8 +273,8 @@ export class DefaultAppConfig implements AppConfig {`
`273`	`273`	`path: 'assets/images/ror.logo.icon.svg'`
`274`	`274`	`},`
`275`	`275`	`{`
`276`		`- source: 'sherpa',`
`277`		`- path: 'assets/images/sherpa.logo.icon.svg'`
	`276`	`+ source: 'opf',`
	`277`	`+ path: 'assets/images/opf.logo.icon.svg'`
`278`	`278`	`},`
`279`	`279`	`{`
`280`	`280`	`source: 'zdb',`