From e53b404f3eee1b19ca97e00632b3fbf2f78d5e57 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Thu, 5 Oct 2023 13:29:17 +0200 Subject: [PATCH 1/4] Redirection was broken after updating the namespace. The redirection links was changed from `href` to `routerLink` --- src/aai/aai.js | 5 ++-- src/aai/discojuice/discojuice.js | 2 +- .../clarin-navbar-top.component.html | 4 +-- .../contact-page/contact-page.component.html | 2 +- src/app/contact-page/contact-page.module.ts | 12 +++++---- src/app/home-page/home-page.component.html | 10 ++++---- src/app/home-page/home-page.component.scss | 14 ---------- .../item-edit-bitstream.component.html | 2 +- .../autoregistration.component.html | 2 +- src/app/page-error/page-error.component.html | 2 +- .../page-internal-server-error.component.html | 2 +- .../clarin-item-box-view.component.html | 2 +- ...clarin-license-distribution.component.html | 2 +- .../section-license.component.html | 2 +- src/assets/images/error.png | Bin 0 -> 666 bytes src/styles/_global-styles.scss | 4 +++ .../dspace/app/header/header.component.html | 24 +++++++++--------- 17 files changed, 42 insertions(+), 49 deletions(-) create mode 100644 src/assets/images/error.png diff --git a/src/aai/aai.js b/src/aai/aai.js index f91ddc828bb..819c3e44a07 100644 --- a/src/aai/aai.js +++ b/src/aai/aai.js @@ -3,6 +3,7 @@ function AAI() { var host = 'https://' + window.location.hostname, ourEntityID = host.match("lindat.mff.cuni.cz") ? "https://ufal-point.mff.cuni.cz" : host; + var namespace = 'repository' this.defaults = { //host : 'https://ufal-point.mff.cuni.cz', host : host, //better default (useful when testing on ufal-point-dev) @@ -33,7 +34,7 @@ opts.responseUrl, [ ], opts.host + '/Shibboleth.sso/Login?SAMLDS=1&target='+opts.target+'&entityID='); - djc.discoPath = window.location.origin + "/assets/"; + djc.discoPath = window.location.origin + '/' + namespace + "/assets/"; djc.metadata = [opts.metadataFeed]; djc.subtitle = "Login via Your home institution (e.g. university)"; djc.textHelp = opts.textHelp; @@ -71,7 +72,7 @@ case 'local': // DiscoJuice.UI.setScreen(opts.localauth); // jQuery('input#login').focus(); - window.location = "/login?redirectUrl=" + window.location.href; + window.location = window.location.origin + '/' + namespace + "/login?redirectUrl=" + window.location.href; break; //case 'saml': default: diff --git a/src/aai/discojuice/discojuice.js b/src/aai/discojuice/discojuice.js index bbd08556bbf..821562e0848 100644 --- a/src/aai/discojuice/discojuice.js +++ b/src/aai/discojuice/discojuice.js @@ -31,7 +31,7 @@ this.parent.Utils.options.get("location",!1)&&navigator.geolocation&&$("div#loca a=c[1],d=c[2]);e.control.selectProvider(a,d)})});a?(a=''+this.sprintf(DiscoJuice.Dict.moreLink,c,this.parent.Control.data.length)+"\u2026",this.popup.find("p.discojuice_moreLinkContainer").empty().append(a),this.popup.find("p.discojuice_moreLinkContainer a.discojuice_showmore").click(function(a){a.preventDefault();e.control.increase()})):(this.popup.find("p.discojuice_moreLinkContainer").empty(),10'+ d+" entries listed"))},error:function(a){console.log("error"+a);this.popup.find("div#discojuice_error").show();this.popup.find("div.discojuice_errortext").append('

'+a+"

")},enable:function(a){var c=this.parent.Utils.options.get("discoPath","")+"images/",d=this.parent.Utils.options.get("textSearch",DiscoJuice.Dict.orSearch),e=this.parent.Utils.options.get("textHelp",DiscoJuice.Dict.help),g=this.parent.Utils.options.get("textHelpMore", DiscoJuice.Dict.helpMore),h=this.parent.Utils.options.get("subtitle",null),c='
- +
@@ -57,7 +57,7 @@
{{'home-page.carousel.deposit.cite' |
- {{'home-page.advanced-search' | translate}} + {{'home-page.advanced-search' | translate}}
diff --git a/src/app/home-page/home-page.component.scss b/src/app/home-page/home-page.component.scss index 8c4b558f604..1d5b2e50c75 100644 --- a/src/app/home-page/home-page.component.scss +++ b/src/app/home-page/home-page.component.scss @@ -21,23 +21,9 @@ } .lindat-color-line { - background-image: url('../../assets/images/lindat_color_line.png'); height: 3px; } - .lindat-logo-big { - background-image: url('../../assets/images/lindat-logo-new-sm.png'); - position: absolute; - height: 60%; - top: 0px; - bottom: 0px; - margin: auto; - } - - .clarin-logo-big { - background-image: url('../../assets/images/clarin-logo.png'); - } - .clarin-fix-to-navbar { margin-top: -25px; box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%), 0 0 6px silver; diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html index 0f0fad21993..a3e29ac10c2 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html @@ -25,7 +25,7 @@
- diff --git a/src/app/login-page/autoregistration/autoregistration.component.html b/src/app/login-page/autoregistration/autoregistration.component.html index 96437d68439..8b9ac388f4e 100644 --- a/src/app/login-page/autoregistration/autoregistration.component.html +++ b/src/app/login-page/autoregistration/autoregistration.component.html @@ -19,7 +19,7 @@
{{'clarin.autoregistration.welcome.message' | translate}}
{{'clarin.autoregistration.repository.policy.message.1' | translate}}
diff --git a/src/app/page-error/page-error.component.html b/src/app/page-error/page-error.component.html index 9a5f02600ae..d1a46602d50 100644 --- a/src/app/page-error/page-error.component.html +++ b/src/app/page-error/page-error.component.html @@ -5,6 +5,6 @@

{{"error-page.description." + status | translate}}

{{"error-page." + code | translate}}


- {{ status + ".link.home-page" | translate}} + {{ status + ".link.home-page" | translate}}

diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html index 87a3bef2357..3b4fa351d65 100644 --- a/src/app/page-internal-server-error/page-internal-server-error.component.html +++ b/src/app/page-internal-server-error/page-internal-server-error.component.html @@ -7,6 +7,6 @@

{{"500.help" | translate}}


- {{"500.link.home-page" | translate}} + {{"500.link.home-page" | translate}}

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 91f15be34b1..2b7b8047f18 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 @@ -8,7 +8,7 @@
- +
{{'item.view.box.author.message' | translate}}
diff --git a/src/app/submission/sections/clarin-license-distribution/clarin-license-distribution.component.html b/src/app/submission/sections/clarin-license-distribution/clarin-license-distribution.component.html index 6a70fcaf627..5201335dab0 100644 --- a/src/app/submission/sections/clarin-license-distribution/clarin-license-distribution.component.html +++ b/src/app/submission/sections/clarin-license-distribution/clarin-license-distribution.component.html @@ -4,7 +4,7 @@
{{'submission.sections.clarin-license.head.read-accept' | translate}} - {{'submission.sections.clarin-license.head.license-agreement' | translate}}
diff --git a/src/app/submission/sections/clarin-license-resource/section-license.component.html b/src/app/submission/sections/clarin-license-resource/section-license.component.html index 87e97eecd1b..50d68b73d7f 100644 --- a/src/app/submission/sections/clarin-license-resource/section-license.component.html +++ b/src/app/submission/sections/clarin-license-resource/section-license.component.html @@ -13,7 +13,7 @@
{{'submission.sections.clarin-license.head.license-select-providing.0' | translate}} - + {{'submission.sections.clarin-license.head.license-select-providing.1' | translate}} diff --git a/src/assets/images/error.png b/src/assets/images/error.png new file mode 100644 index 0000000000000000000000000000000000000000..628cf2dae3d419ae220c8928ac71393b480745a3 GIT binary patch literal 666 zcmV;L0%iS)P)eOSYYtbpBV}~vsBnU!_?2tr-P=|^T zED%wc9ezHgW@NMb!^uT_|SvCpFLJylbx zY%bpaTGI8IYXMN$9w<3j9VkA~NYOKEQXsj?6a9_hcwfU$acAhJhB)zb_w@MVUEy@S zX&I>K-R!bhu3?(6bHWIg$HEl7{9g>>&l_qdd+UYb(1~BCo9LptNq&8>!yoJ3Ui(i5 zRJ|XnYBklL!{@$-7=3mJ>P@1c=7Oc79e-V7yf+%lD2!I;Y&nXBZ>=B!5?CB>LvEx6 znI%n)qqi$#X#wKB(U7XP2P=+4{b@j#r%9-K(8UqtSDk>0UKzf*HM9yqMZ1D!$2MdZ zR=`U>0zhOH1XqN?nY@AQqB7)Fp4{v&dKXvb43hZKvnN8;Po;+jY*}~*Z|W9Q0W%{D z^T}Cc<|r(Su=1K=P5>Z4 zg`et&Va}tdzBS-G-ZcO)zCWpJvGQwrHZ`@wpM420ac@bI5~KkTFfGEM3sPWO8co4^fI6lPnA)Y{ef%@{+SnoUk0+dW+*{8WvF8}}l07*qoM6N<$g7cXs A&j0`b literal 0 HcmV?d00001 diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss index 3eaa30191e0..7836fdf447a 100644 --- a/src/styles/_global-styles.scss +++ b/src/styles/_global-styles.scss @@ -7,6 +7,10 @@ body { overflow-x: hidden; } +a { + cursor: pointer; +} + // Sticky Footer .outer-wrapper { display: flex; diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html index e3b822fb7da..0f2312456de 100644 --- a/src/themes/dspace/app/header/header.component.html +++ b/src/themes/dspace/app/header/header.component.html @@ -4,7 +4,7 @@