From 70bc900f5af7781da081bc5355ae161ec2542efd Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 5 Aug 2020 10:14:09 +0300 Subject: [PATCH 1/7] Replaced german flag with austrian flag (ref #285) --- .../src/assets/splash/about/contributors.html | 8 ++++---- .../splash/assets/img/flag-of-austria.png | Bin 0 -> 19658 bytes 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 dmp-frontend/src/assets/splash/assets/img/flag-of-austria.png diff --git a/dmp-frontend/src/assets/splash/about/contributors.html b/dmp-frontend/src/assets/splash/about/contributors.html index e733e0660..de730366f 100644 --- a/dmp-frontend/src/assets/splash/about/contributors.html +++ b/dmp-frontend/src/assets/splash/about/contributors.html @@ -84,14 +84,14 @@

Turkish Higher Education Council Research Data and Open Data working group

- +
- Flag of Austria + Flag of Austria

UNIVERSITY OF VIENNA

Gerda McNeill, Raman Ganguly, Mihaela Hubert

-
+ @@ -144,4 +144,4 @@ - \ No newline at end of file + diff --git a/dmp-frontend/src/assets/splash/assets/img/flag-of-austria.png b/dmp-frontend/src/assets/splash/assets/img/flag-of-austria.png new file mode 100644 index 0000000000000000000000000000000000000000..09b15db052bf2d231f9b86f361fd700e2807d582 GIT binary patch literal 19658 zcmeIaX*`tcA3uJ}IdM*>MoEe?M}?%Kq{%WyR1!7HmXy&(Q6&2|w@yk(D#;cTD!VDN zFQYV+ZR|T!*0D~;j4}KF8t41{{hs_D{vUoHoY&EPU-z|qmiK49Cc^Tp>H0qv{)8ZC zz1gYb=OIXvFaA$@4S3>Rw=)m?Pr~cGsWDX0x_uh_<2RRMXO2P8$C!2eE5Cz(|8e(} zy%z*+_#*yKLT=CLPzbWXnH@i7?e920{KxC-HX*+RK|vL{6%ypKHtFU^-x!TMkA_~| z{`awm&C-SHe;Pl2adWrp%dmI@)iPz}$W5L&F5%_r7E(A!*1p&A4|+tZGK zpa@w3`19!h`%gAgvg??1|F=_@i1#CSbPsCq(zplgkasEZjK$YX*r_M4?1BoNPLW#c z+>+co^US^r&($dekfNU~G8h7G#tCgi8Le@kkao5oU_VDwTV=cFQwlH8l1j}pc!{gho}6#p0> zI=z_i-ecH*Y-NX^g^=4zu4XR}`{BGejQc!#44j90f)-5YpF!;}8OY&>J;RJ`3!wzs zUgOR42!gqlaC1XB$O6%h_)wq}$4XHaU|~J5gMJ!qT&H(Dzh`afP)DyjQJ9gJwnAB- z%E}9FeQjUlg7O>4_PDu6`0+)|Z_w;%rldg}HHPPJEBq{_IF(}8vI~{1kb?5KJ(c2u zrU$eP`z9BEUb}efd$>es=1#5zo>~`y5jNpUVE)*l1*ulU%Eeh6QTV{Rt#JzN!6$1f z1@||tE$Q27xR5HcR$JDdTs|gbN>>?o!Y^RR3;6 z#zBa-EggBPi>`*B4ady!M%a(st9@9qd-8{zlSd~ssZP|8u@M*O@5^A+x12V@N{h!p z=}3|$&d`4{aZxw#{$e!Bk;8~bu}Adrb)gi<$oM$M(j}(Kn-_(9g69oBkiXPMy@sM{ zhYT!DmHG|ldo0gQ{_}fE>6+lR(2NCBvY3(8hzk&M6fgPz%nMh#C@^)p7~PtpUou-D zsXu?XY^gP+8cdu282^T0oKVK>_(%|X^IthQUk;dP!{Rp)OxRB_ONkj$N=H`;<9%w* z^+`c*7+@1rr|5zrNqR zQ(`YNH5?^C&}B95{Y2Kci_lY zNyU5vW?PzFO^2NX)Cok+>W)$kW+4GO{KXxYWt5rPl@A7DaFvF z@HpvfQ>psg77zEk{Wsiu!UqBXp(i~X%2~)2NpKdGutgPfTl|=!qND#6T;&ern&NJ~ zxexZdg+UU%rUSVr0#Cc6Y;h@Y+5{>5^{Dr9CQBI|+cIfF#It_jdD$?{GaVV&F|)+& zb=1Gh_+F$GxX19f4xO6CdRevCZA18=2K*Zom_+4Yq6v^IwRuuXj}iAB4+)!Ho{HwF z8vvGZ!&7&1)1(Z7=O_DcB35mr95^Vt0PQi77kf6Tc(Hy48F-%-{`R4k=XaI)7`(Sw zD1Q6FMguY(p$eDn*U6uTPbJX8H|HzN6RSoe>w&O+GyI@hpUNBRG35O5YPC&usEB<@atZKSD91pVo&%ZW(AlcPd7BO*BgGK%U>pRsJK_lqZ&66log)$_xMg z`E!qF!}{tK@>#x#!f{O3CFyx$@Qu+T!j1~gRp2^B1!7PNGyI~gz!IB# zl83<0yFI}1lA2KWr%SlzHIJ65)Cf3By&d6GG^6i5NQXs0{Oi>q?RRKcn8&X1>(Ovj z7Nj|X6~5-Q+=Q6 zZZ)j@4rC6NY4Y%)7Pp+j5)6`bUhR*s|3K35-*vwO>gQ6S>EDT8WHm%~HyDziPK1@}$RD z=={Nw@2cbowIh?QIxFD|n*?ntfJCw+&Y9(&(pK&;ebglM_!<1DY={&xkC*0f9MfFZ zjaq=&mC-T5yA3615~1Bgi3mP1`k9#psW*Sav~0Yio^Zhrl!4=mCe8SFLFVR=o zWE6Ef0s2sIk?4Oybk4Me+lh%2YN;H@p-TyriH87P73{Mv^jn-%BccjdF7hd*8o7-@YFkO;5r8m(r0+yTU$pVv$Fu-Zx{TMI*u_oEu9aG*flZ1 z*MG#5o?xM@WFWn%!IYqXHP7@h{$EIol*Mi@n=M%REmY5qUgb3=p!*F-*~$u-RoxA2 z%*yAn`zw&Dn$l@ThiK z`ALeOBh|B^CGf|6@Qo5>ysd3qp43OWo5obLNhchC*fs!*Cgbet_d^D8aqHwaq=b|# zsF}Ibm35V$r23DJR|P~OLyHf2Prn-*bRX24c-h+I^lVEke$%Ee;|RPKe#kR=q6vt^ zg`oUlUpHYVCg5}Y%g6Zh8^5eH81{%hBf!jggdXMa!x*9GFcx4Xt90gM>&Ma>pW0Al zsJhM(zlB;g!z<(1HODbJ^2Pv$k}?TOrI1$lMUOzMB}rtPpeu=%Sz?P=5lwomT}3db zz$bSqZV8E^0n$`z2O(*bpvy`+1Ll=Jz;R9wt*K=yhKwmnVfD<|R;KBM3VWR&NX%q{ zFlZqH3pu@i;!$x+G=-tR#1!x1X2;1~l-ki%#b=cL9_oI9lVi6&WWlR~ps+Y`sq47( zH30f68}#?!p$d0eGIcxEy)r_ZGRI$X$&!r4&-@*>?Af5xs;A*D@kT)v!+2iPOB(q` zn2{A&59Y}7=lyDmJZJNPAXtCz<8vf42@5YVa#Q{Yxh-G%G7aPQJLauOWaYKCv`5Lu z#0}H45OU5PSepPB`Ou5E=%1{{zN~BEWvj;Gb6kM_-D}-WMi@mOE+FCWjZ`h)%G}1W zI;JYHwve6=Vc)srcX?=y(eS6`p&||}B0k5&UG2c$2-6ahHJ^GEMUP6o=}DrBgnjOn zH>L<4<5-^rrqz1oPfraB1KLk`u7g;pKxX>`HNx$2EI{juJKgVI=gVSmJBIiKuYs~} z&KKJ)m5p7Zne|5CEB1yht7jfI@C6HdAqt zH`i$}yKfj<3TE6L_7T0jwM?)KKI)400REp&FAZPuWggvJCNn_bkB`6B1+tdf0kel= zfx9c@5cKIqpPLU&yEs2=13t*4O8nRT5Hq!Bp%O(}T)zu;enE42pI7nDWp2O6HsI?5 z2@mY6l0Vu<-`Pg41Wyn&;{UCq3R~3Fs_RETV zjn*Q6N&^r1Z%Qd5M#*De`=w?WS|DTb?@guiGh*EFvku@>gShrxPq*@ag}3k$H>4A8 zS#A-fpJ>S?K6QYcT0WIhYdjap6$Eu45mtM{fK)a34%;kB*6Q6H^6ms;_mY&TH&fTO zNnnv8Q;*@7M zBq0UFHo>^XBP7>n?&GAu;*VH-50(>q^ZIpuw8tEK*B{XP&nv&~isWm4Y=L`X%`me+ zf12YA`d!d7Q%4ns&Ji7_i(o*;})v6sq-hMfzUIuz;8FJrOjQlsv<) zB=1{8YoJad3&b)M11omXhT|AF&9LP!52GDCqQP0;e<~d=0iId~0XVt#=E@dTKYlO5 z3ueoHhn!#81=&kEj^Bs|Yb-T?*Y(?*hi3hs^r|G4#d)fD0In z!gUGqz{xL2-dH4!?T7}Un!7}(>&bWyspuM2%}P=7sYmuw=xFy z-fqDSxFDT>A}Yxax1$s?N{Mbs)V@0rHz~+-?x5^d{sbJVMMrAUb;C#aa9%M z>2(+J79^YE8}>ubBE`~LP|;Y0Y^N?Yj#7Pk@9Wc_I6!~zk5zQ!D;MSdw$UTyA_F0AFU6!?cLgUE(w_l%*=QDgdxkfhPGGj}X?z z3U}vKpv0V+5y1J2hRTED;a(+2(KDpJjH82uj+ zJ`e@AajU0l{6){;$a|jKX=bmb^gOEOV*p2tlUloyTnNK@j8nrn(^h8h8R>k<4L1*5 zRw#ua?Oax)-4W8ti7DPJ`7Oz|aTGHu4c75KxAbM5gXxYNBRI`;lA&>e0efhYEDtDe z6#sG<<2#dGK{|OHJ`<+p%bgAZjuBX<%|;T*wd9FCK%bu$@R`>zzQo`2k|bnpGTV18 znT{`A5_GF^Xa5fSo?p7aqly3kh0a_k-0kpbPeJzHc3gn61qguhK#mK%*qbt_FWFs2!tRws~C<7(^+`#9`73%m_L*sQlg9RKQV_OK5e z7a`2~GflvVN90}D2+k>Y;##M9{wgvgH&K5LMv`nkIJ=ZhI|h(1lAm< zqWq+K3Jo}!RXlk@K04)IWB~l`vGC7rxWel{Itfn|q0j+^6`JXw*bB0hc*?duDIM!I zwOo7=kj>I1Hu@wrQf>psI?N2#c}XU*dcahtPU0%j;B4Z@G-9X>$VLpaNg_pX7_$T) zYRG)`a)-d?Z*FD&K4JB;>rk*4klfvGJ)8C)pcB`$Q*D3^T`pmGJOYF{b#{s&e6XQI zFs#C@R9p2CD2Dp(640h@;9vE8Y?u)q*d(}oev8Q7MQ7D}fKFXpa>FSC8|@93mK7G6 zw_-33RYwaXpun#$RQl6Tc((ktNiZz)1t4=v1-%9=LR&vZ2{ z<(Z>WP@tu#n*DUXrqaX^1cQ`3;MZ+$`&Yi-H2k#>H=;MQXBbm=T=du8DA9h8TmMQX zIvWI6^L|w(Y|8F-jFoZ1(b>GoUJ`IXA#~niH}Po-zG8uJ&~ZFPy-}OY%Id9bc3FFLL|Xt9ju8iF`vbv@PyE#DxPj9QwPRXskbum1bYdnr?#&uK+^8g&vzrYM*S&F>9pdT&jA%Km`M5!wd>LT4iA1G zK_jfav554tSenTNG8n4UCT4@;$Qxef0~#SvRvtIRpG1wV1#f!z%cTviXp}oZ4JNi& zMs=!XR&fW=9H^&${D%{Dhu_g5OtA$w(^~qPCjO&%A(tDcwb$7p2>PI;Fh!v1jXf#5QmxyGIkA003Q9P?fsIv; z6=utP0gfrKy`k#X_1%Eky5rg^$3=nb(tK(qBsFY--v?P;2iCV3SU)xq(@w%0ZxzkC zB%8;B_yV%Z@f`LUlfNW`%F}S+_EI=gAjATRbEwm)u$|`c@ykyk>q-Yn$#`qf;NYkN z6gu7B>s~5>!m=~Ui8cots1^F)N`D(WNzZ#-t^&ihelU1<4A*koP zbiT=kb9|8PY%iOB-*d3x=y*}danZmweR|d8jd=2UfRP297LT)+0&fj{aNbV0R|F_k z+$~Ox0VY&j8NG!~W_1$u#)~E`xV;yo=k02M<%GP4^QeLXpKr<=I3P|Zy&nLoKgOLE z^R&R#(YL?P#V~`{`)myDrW*FW+zTXcfC|0&bLdC8Gnl3}M==O^TSncV&SHi?z-Jx{ zGdF$d zB!BsE&2_V(Ut3$5nENvIz()j0V6o8U+~M0(W<>2V+ZW(Vs)87`u%6_Rw<{8m>swJT z$$iJ&P!q!#b0#MB`SbU%!EcZys^y(|)3Yc=CGuiwgY=c)@Eu%wH45-ED`s)Zuv9eQ zwu8ZuR27gk!+_^gW%4O7th*PeQQn?gJmQc;Hv`PXmrTn`zo*8vII2;hAv+Im(^ zodXv2PU(F)4e?n572rv29?ZWM9;|ewL-axB;;Q=woiY-6;5!4G9JVt8!f0^cw^QP@ zfg1$57I0X^%I{MfpR)4+WtD>d0trwcN|x~ae5uE!;EyJTDzQQvGCY$F@Z#@-(aG)# zqP~Xh4E02&i!4sa$g4xdC_>PtqU&ZQH_u&S=cL96fm6UtzhAik+#{&tP)WC~Wc=lx zvGCwPfj@;dWta)bwCTv*!8>E-ufCok&di&^(y>dEERfj*s-mty^&b-w_;2IG1!#k5 zL|QeyM!a+YNI6h1e#(lc(&mS0NRZL0_vsajrI{ND0X1=h)ZB(306)&j3~d}Z!Ly2w zx?XDwstQpE4s-l1Cag!w@C{fwun{;~z^lc1C^4qLn~DC9Dpp?~HOD2f9-+RTq0p*n z2(e}ZripRMu_IN#^xS)=m>rDi@-eh5mGcw;49y;7793n&Z$zOp8dL?!76u|t5uRNs z7GSo;?N9A_gYL80S76OET$7tA{^{aRJd2e4otQi5v}{yhkUH1&WDk{sQAb<|^=D8Z>VvBDt64qK=9=@*O$@6KP9v@`UW?-oDCXu+;4Dy{&Ru}6 z*E;A|@eric`>#n#DNssahPPGx_@@l0ndvQpkFDlkydb9zk7fi^8%w)?1)hl&$_&u) zeqia^YoBU&4Ohk;iC`S1PL6ENGrvw95<0z5Y0 ziq&3Jmn;NT8#700;#FqMlf#-7dw?Bwiq;{q@*~U-L?nmp_5*ueuHjWABcV{A&Jow# z`Wx{ozTec!%|zcG1Nu9q=(tzj;s3L4R8{Vlm@S%@`pQ^6fMcP>DB+w7o9b=$|MudjnEtFIAKOnBxmWIwz5?%z6}Gz(qctEX;ZGn5Khh8(d)!?QM2I!OYjWjJ zM+kb~^RGGEtu;p!0kLiOtFZz&sx`qqX=)1cc7L^&5%amGqHo_oK5=_51ZllnOF5bW z9%tt#nZnZZ46Gz5J16%v7}~P0z%3c@^|zj_x&Sz!&Nm>F;)7i7)#aMdf@juS(F+jN+t5b>sy*!Hh!4mQ7ZgY1uK}5Iwwzre5a}OCCGD%y^OtL?pJPb4fb~Qu zb1^$uUjc%A4ss_nd%gQ`O{;1-$tEFDU|YNNa0na96?lCHCTvkNSXs=gwZ#;D;?p{z z!b$P|5qKH#{vRk1M8P}41wK(=N)ba-yj5*?=4&rk)Ev=amDAOS#b4L2PxU-G|42|A z2?l~39Qe3R1>}J8dOwhC+cAeas(yVDQ~ba!fC$x(1gr?5j9x<~1ie{vQT~!;#uXS8 z#V^?o{U4S09{yKhF5l4soYVq7qj+sOt;Gyv_l-VWtQqMb;H;c=>=hWTDwrn-4;O&R z4xJ=cA1TPm-vD&z|GFVrk5(-YkOI)r^z3Y(mg$Xr*@)HoP zi3Du1T3CNy(N1lLoA%2gm+kN!m_zA6DYEi}ATI@bQ3IL>^M;sd$$XA?Gh&) zfub8d6o;yfb;6vJuynrOCH!v?lw162U-sMwQjR7g^}k_?(f*giB!K01W+&7H*MM&$ z2SHt5Y29`WHe~C2Kn=bw5ip>5xw@$bjrenRa%zJ7qSo_ZKV4@<9`In!xFEJ0aFc-z z-U%4@#?es3`Lm|gp_+!=c59!*7Qi@5jh1AOf*->va$>H7P+h#i_0gd6(fvpOo;`m) z`9ej^4V}X)-9+0veYkuYQbg7q1??HGxq?nYy^W6bbmLi+4}kixi0C6pK7)6<%PWhF zV}$?=#I)Hht_oWOPw9JFNq{&=W&p`|60g!yjMaUoM_jU11^D~Oy-X~bZzlCT9TIy3 zayJPy;9n2QfNtzIU=GvkZAxv%PK?N?mJHqNF+qqCxr_R*f?EId898mi1x_hQcR;>t6T5Olr^rKbmG@a$B%42pJI z!gP5S)yEFNkx}Hy(!Q&AufL6|6Be8W#}XsbcSSyjQpuaI8h#>d*C0LtsB>zd5y}6% zpdu{@*vf?0D58h=VRs4803fS)=kRRFV1>_@%%E7|^Nj#+jbaj5wUPh_&ki-09XJ6? zYk)M%7|{1XquC7Pe(j^~&bIOC@b&97H(V5OC1?_gPo8+s`ivBei~t0xzJ70_u`J1c zIN&+^v!eSq3@iJ#_u*t6jpT$q1M>{(7*d14M30z0|NgxU0y-NwbRlF@K&r=wV~dqk zxv??wBFz4DdCS)+?W|l}D`>B=z%&Fw(BGhX3)~GgF4*<|{`?;u{wDG#$&3B-U0dk!AxosOz_mWJ{xKiXz%iKe z6Di7T=bE=;j&79)L-Z$GqM{PJQ)rqc2|Mh>-#l7dWOX)rHnF=}K46N{WVf0acw5lt z6~liaibziEem91$tKN7RIR<8=x{{2W@ny!7{v33d2Zwu>8Zb<%em~d{bo#)Y6!iBwo1=qPGs3r| zCG)$r>Ei8$jfX4su|_p*oH}rSrX^^rd6bId?iu3FYr^xuxqQcvA60Rj`W@8Eq~>uC z!N6Tya|f<3h#fo59ai9Eixg19w$Wo~72*=`jbEVI-wtpHWeX*Z7ToagC=-M@?~_#- zur!vwX0P_N=EG<6{4aB?_PM0s9T;z3S4W=RAolLEh-lyZvy1UL zn+5i-L;{h+Uq?U=4{~*F9V*LuZ!Qrq+M+%+~BBT><%k< z0*|oR>qqWhpOQ@Lck%&9+c{PTpBLW%Jlrl*5Fm5zl-lg)YM`d+SskpCAQ`)5Lx@jz zB*~f#C?8cZ+5CNQUL2=E+FV4O8|G$hxa{|imOkE z-EglEIOqy{ge&C!e}4D0LffD_NlCGwbK2Um{pPrat@ZM4Z1$H};d#!wQr-cvi{AZd zu+`>(@O*Iw=~K6@rv!L%*w68jwM}sh`=#-olGg;xr$fNaesel-bfEV>EHP;);~zda{!?=~@6QgT#mxcKo`F|CKBDzH>4*06EwJ z7yQ^#qYK)Gp3rJ;1OD%?V|xdhtm==Pu`;Sd4c)G_C1Vu-JbHrlpAqxRBj+ zOV}-b8b^8~wJ%bvK?QcbV~0hqtVCwKo*HjzGT&AlQ=q!snsGUlw%fHNj+FeW+ZTbz(Y`ewynJt2M z`Kd^G5bH0cl6)?8nGQb{6UOnAIlgxolzu=vVc%RiN2j;Py#rTA(=4x-fXV zGvga^3wD}M!Qm3zrS|3A0(8&^qHfuooE)Rq50XjDy$aF6P)brG~$YlO0BP zuuDYSDH^4a{|!|y2ZD~6s~-|!ey67umi1J4`}03n=?}$6>-+P@B^@@nROLz)6D`}va=wB8j*I1*D{ppar6BLQfauIBd#gfo z{P1%lW-lxTjl}-CF9YV#j|so{ni^U>pn$cxSar__pqrVthZX*iht-G0YbO^5*u zP|P3aBKsZ2MN?nP%m-=H<}OhzE&%$ZYH~~?NnIN4RNa12Tv1foXF!KHr4y$7fJ>~<)Cl4EegVvR z52WQyxEygv&Edn}?tw-gRo{4zWg;*8w$f|VfDF*k)xYjsg5Si06@UKZC%Ii7L_lp# zj0Xr>HdyikkopCxh$60cI2KL6?+?dD&8D_rYY4KPy)^h=Twy)}5>5SB)mzVhH7Fe`mUacqAthvP(z}f<3Hu?ep@3PPYjMnpDwo>d0KyL?h-uiaME&Q+#+JXPh z5j|2g@awK8?LOd#QKTMfndu9b)#o+=!@_vZh{X*7L;0Ft9M1Fy&v~oTLkV&e{&*ms ze{bX}@#O{8hSPM~r9s#d=*_dp^ma>rZiLY0tkANAJSm=e6T?o^mY=ITvh-mUD{aN4 z-mIe0nAGR&89Pt(D>G3YIDW=cG3RFTyspKJ!kgPgd+0o;j~r+540q(ht1d2LKr0N1 z==IITeZ*Cq0rIi>YyCvis|cZ~_OvLZuCAOoyGA_k56R6Uq}DY2SMRbU)MfjxDOKf) zLd`_i%1V&Xo0`^@e@5Yb?IM4$$%8>rVt%VehAg+rFUX+`BFE6!zr(JE&o2eRa=-#u zI~=Ss!wc5e^Tm~0dxMfT_ygou$ywP|u>A{k@XjP~m zU0rHn2h66AQwQlR;JBj4 z-nGdcQDIJ~xZ72V=c^?WQKRe?a?vXJzucrxm6S$Y*JH#b{yzo&S zDGj0e^$yHC<2}p%W_Vtqc!_zr!8^$?eN#K;;c=1m(s@m&HgM08Aa{IAaU|>-A-rYj zEBZfVyP*A)ft7XPW_|{~$Jm(@8RGttyhMJp=3e3S-`q^oegRQmoR_~K%d0U6>UZ>P zc?k$M5N0`7@i%E{N=#o_jnt(%etq&2P9~`JpS{86)dRW9Jin?x>cZ(Ue~Pz)QY(>^ zwvyo@c0gk?k1~zOn0!#k$4U3|If))KzeE0)h%2#k=D00_&c?SecRj+-unOS&g`gVi zMG6!v-1hUGBNW=OC$;hxe%>b%Ui(;>c-~jE&aV;PC~jaWm8(l0@1?$3ad|`|9J|5x z5dFiqBZ>Q09Bm9{6FD*XycL%xG=lvNHU;q{l3q;^U|VU1dX0r$n)#hCGo@^JE!`J2yw&AU1aM1bW(2P0^vVi|KDcO zCrf||(096UD|7hfqC8FD#Tw-}PF18HkQH2hr8%S#w5p^=_aXs2WWH8Fc}I+)Dp$+k=+i3yWvFQaK3Cq&`f5Tm;Ew-o?)x8AOSg_UNohA^Qa*|A^C!?w1>}H2!#CA zXjJ>hG`7iIkUdJ=1wInH$SubJ4Yjm4;EP9z>aoHBU~$J(IP*9GmNaR+=c(RK(yviK;)L^LZP6alV#__!f(6&j z-T$a))V{w)+|(JW9tTfbkO@#b4xXTfi}21z{KU?xMI5j^TlPJ6n`vH5wGOkax*5+e zs05sFLbr_UtaSaFfLX69$leO{v*vvtUEH1cK}qji+KTMe4#F#$$fcT85@)~o>2f5Q zH$lLdEM^{Os%6dzdr3z`3vBUBcQzN5ers8Y-Nm)C_7xSZW9Y-;&Ly{Ry29hSorLtC zKN*sNi;W@TQ=h3C#cqakEV!L=#=gww{iWjm%22h%Y3vQ6q2*%cX{K8Koba;z^;RIl z*qoIvHHIX@mj8!WmD;TdYK2|&b%$2*aT_f8)ke(B0>0u31L-U^FQ!{eAHTf+g-Rqz z{^&@jBA}b$A-@_VZ`J3lp^<_Wi+c!4ij^?D%|vsw3WeYMP5P; zkZzC#jlhvp2KuB$)pANk1YRk_LbRiVLKoNov0hCz-)bs3=V*=XuC!OaH)bs0~kr_L6j#-<{` z)4rJnzc@9>`a=87&Ece;6KDfnO$Ngn1c{;nekB#~_06GGeSU7jH_&OPC`c8_?zmSlp?83FbmauZlpC$IqG)-Cr}lYq=R1@6K3#Ezl!!WpJmj^ww}yjjKl`~W~4i~MSN=ibZ26?-h0!dAGI`%{iQ)GvM$CvbcoGI5(s0p5Vc z!=FEcr)|jR!u{MqP}<|bad71*y7|_}Z^l@CiK?sklplf6$@W&#RyDut>Q&i6zTZmDn+fg#6zJgm=s+=?NBOFJ1ij}-Op zNV9oEpJpKp{SRc?3y&8*t3vmuL!)RYETN3;vPbPym%qm9d2{Pr$ zMnUsSAeA-m{TJSYgQN471{S(|_u!qM&|KEW4a4(3u^ybJ(P=EW8Th7Qv&n;4(;YvH zFFPk_3%pIF$^XTaHpQVPv(f}+=lZ(3iI^&e6ll{hnu&BSIy!Tgj1|8?D{rO;2KlxI zaBgZCN`!8fqXhT@$L1aZ^n7|dNcTtiQ5G%$bb7YMG%#yTLlCWm5&lEYJPM^`1DstT zWM;Hr)Wmb59pC!C876L{aS5-WpP>&_ai&?`2i{D%@goxm4mF}iC{AJ-D7;t zb^oKdKpWq#pX9ZQU)4bAo9yc#Z;DI=K@u2nbi_pEp=H%PvB={!q4d(6q|u$t1g<~+ zhw?qbpPK~M7ZQcQYooFU%YF~dnW-uYnv`FP2c6s5s_ocf&VnPfm!e;3P0$86dS>Vg zXzt^yH}`dDgYOS$p3YRD)RfhkCGMw%dz{x4IA0I6l5OxIg!3S z>9^2=y^q#LiDkU&u^Gl^>?H=eZ1Zo}c8?Hva5~f7mcYPFYDQ*a_Jb9+0U$V|#0ey0 zcO){c9DpLxUuoiim#B3|Zz^De-Wz%s9LMW=Ny}{28z#Bch<)hLTb2gb#`v!Y-$Gnl z7L{f|w*(-~)cnZ$BjCoR)6C}RlfHe*k%Zq8n6Y6psxh#guy~0fg#;StB=El?zPYt& zlX1!HKh0!AaBT~OvZUo_b1$vrFyCbaZ{N)cMP9*+6GcmL8saNoiXabCb0wY$u6u3% zzqoM01SDY&h|)&Y(2nCOCjk6*_g;rN^8NML7%cSTyP#dWuv8c~s%E1q*u6h&^s)z~ zRiK#}0#Xbq`YQ-@79D4}lWmqj%al4gFIg+Q$JygKP6s?m9YZriZ8Ae5Gd55zO(AOQ zBG*4E6qA!F9g7b%lkWHQ&}}Yg?21)Zzmj|vQ$ZraDdL+0h6>$)&>cdtd;3w=>#QP;N;>GM5FSa>x{lE z2j5zTDbIP#eVU98aa=oF(DXFK{NtENmH<6_b+vAN)Gi!hzkT}3w5O`zgX=gvtPG`! zskR)3FAo&1^@W;32Vr6LxS@ecEdGKvV5rTm{&V3j zitby%9Yqz8N7d&SbLLB@!mDf->yosl!;3c?`wrD21nl3(dCuj|w4sVrk*(=iiG4M_#1()tCz;dT>)(6eK;h zB_$dDv6+mR1$TsB?(Gykvzv;)3=}EvT`M~sWD)tYgl?|Z!{Zo>Vwu9{&q1G}7E9`a z!-l2W!{C1J9pKJ{cunPzm{R`dQ=*RImS5bSy~BWmiKF2lP`i?(JB#@BRj-`nPvVae zdbnEo;;Y8pD1NXBSMqqu5Zs;4XJQ*e5+u@*&X$Qn`q7eDp@toxOLar(%$H_af!0_f zQ#45W-s-SZaNn`B{P9xgi5lm1&Z)HU1Akm$06Br@tN3Z*qq3pia*B7XxASLetPJlY@*=YD^+3KC|KwBJRiRCf5UkV?pH$5&q#+%9% z<_?ADY!q19q?qHMwiHz8ky;XwZ)PI%3Gvn5G5m4F_mC{rc0@Pe?2UM5g7Ek<#(XI* z1I()9ytJ>It_7zkDE} zY?1oQkJBsC5Y2-dR<$$jLUX?+a0`AQd>p*qmJ(%%rB%^+7`sUXdNXoObtXtD3SRbHa2WmAs*P$!b%k3Bti=5G#yUNxX)6 z_Nn!bffVwYsLAw`A#-0l0<9S~_kd1$CD<4AXj4rURr}!pGGZ9 zv?IXPG_wBFmKx8RO2f4GktcTz`efd29pYyo<+-)Hj$?jpRko;M6BqXXtW5^n)KMes;>9mZZ*h9 zli;^Ml*8tR8(eT`HE{Zs-!33-%uZ>J=md={9nzd!V|5IS$g~i_2FjJZg7ogj1EfRn zw`#(NEs@UKxSEYe2KEfzUWb~Mv;x0;(s`}>Cn1>3$m2tI$=xG@hiV<$X6PT?j`%tH z7M9+-KfRNCe_GzSgv%6(E+wLwmci21`Tq6w{YsTL9GY9HE?Ec*{dPq28<|L1;Q<~e z#lAA-azL~nJgsx0C~>~T%TdUi)9wF`?BLb{H_j+N?3tjB>Vm;NkB*j~xApC2J%ygX z9SvA2)OENnknDf0TMkw|07mL~3zcg`D+g!HfUgUfN$+_w+7B)$;dr zWL5$o+BCAT5GC^7S2#_|RU_>CSWFXL7*KNW#*}0&a2Uh0t^RtIM%^~$;x##$`8tPj zAKdCT+N6hD%SVtY^yc~oJ@);x7S49ODJZY_?5Jj+uHx1`T;38W`K4Cc<41X6hR>jO z#O}Reqbq(sj?$?K-|Fl68BppeP(7Qk@aoyVZ?a`JNc4RZ^3)5ORG#drSto5AJ$hA2IAbXWuZQn!12{n)kjm|8;15KzeQvL}vU}Kc8=Td$zb~wS==5)Kt z>+sEcI~B{7J#=?;t&cvr{6+q{q@cf(@LVUk-|NWt4M)F~j;t{NKhf~vtZj(f1$-~1 zh|xg%dVDHZvJuwA$PMja5QaC3^no6I+xEg=WKNF^wxBc0xR*I4`rn;QwzC;WDL0!zJGShQ7fHm^xkIupRL($y4Q z3$D5lcxJ@iPqZ*_CbmDQ{eAjl~FI4BeDKFb81p`-uLKRXKNM3TL= X3N=2FaUe|(u0otRd%VEd>7V}(lP^V6 literal 0 HcmV?d00001 From 8e473d1a9f292ce536115999ed313103e45ba9e5 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 5 Aug 2020 11:20:02 +0300 Subject: [PATCH 2/7] On the Dataset Template Editor, distance the delete button in the sections from the expand/collapse button --- .../section/dataset-profile-editor-section.component.html | 2 +- .../section/dataset-profile-editor-section.component.scss | 4 ++-- .../editor/dataset-profile-editor.component.html | 2 +- .../editor/dataset-profile-editor.component.scss | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section/dataset-profile-editor-section.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section/dataset-profile-editor-section.component.html index f34dc1eee..c1f35e67a 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section/dataset-profile-editor-section.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/section/dataset-profile-editor-section.component.html @@ -54,7 +54,7 @@ {{i + 1}}. {{form.get('sections').get(''+i).get('title').value}} -
+
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss index 55e9eae24..cdba2f1cc 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss @@ -3,3 +3,7 @@ width: 100%; } } + +.deleteBtn{ + margin-right:2em; +} From 370360872ac1731f2f2c4b3970d5bd5378e96555 Mon Sep 17 00:00:00 2001 From: gpapavgeri Date: Wed, 5 Aug 2020 11:23:09 +0300 Subject: [PATCH 3/7] Guided tour comments added --- .../guided-tour/guided-tour.component.html | 16 ++++-- .../guided-tour/guided-tour.component.scss | 55 ++++++++++++------- .../guided-tour/guided-tour.component.ts | 9 ++- .../guided-tour/guided-tour.constants.ts | 5 +- .../guided-tour/guided-tour.service.ts | 54 +++++++++--------- 5 files changed, 84 insertions(+), 55 deletions(-) diff --git a/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html b/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html index 4438a2a72..3f8e8dc89 100644 --- a/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html +++ b/dmp-frontend/src/app/library/guided-tour/guided-tour.component.html @@ -1,12 +1,17 @@ +
-
+
-
{{currentTourStep.title}} +

+ {{ currentTourStep.title }} +

- + diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.scss b/dmp-frontend/src/app/ui/navbar/navbar.component.scss index d9c757679..7d0e29640 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.scss +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.scss @@ -30,8 +30,8 @@ $mat-card-header-size: 40px !default; } .logo { - width: 98px; - height: 37px; + // width: 98px; + // height: 37px; margin-top: 15px; margin-left: 5px; } diff --git a/dmp-frontend/src/assets/splash/assets/img/argos-logo-2.svg b/dmp-frontend/src/assets/splash/assets/img/argos-logo-2.svg new file mode 100644 index 000000000..559d53513 --- /dev/null +++ b/dmp-frontend/src/assets/splash/assets/img/argos-logo-2.svg @@ -0,0 +1 @@ + \ No newline at end of file From 75a04a36d78870b35d9f00f896e3a1e98fca3638 Mon Sep 17 00:00:00 2001 From: gpapavgeri Date: Wed, 5 Aug 2020 12:42:04 +0300 Subject: [PATCH 5/7] keeping only dmp or dataset label for their title --- dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html | 2 +- .../recent-edited-activity.component.html | 2 +- .../recent-edited-dataset-activity.component.html | 2 +- .../listing/listing-item/dataset-listing-item.component.html | 2 +- dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html index 85ff1e9f8..fa430ba7c 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html @@ -26,7 +26,7 @@
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
-
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{activity.label}}
+
{{activity.label}}
{{ roleDisplay(activity.users) }} . diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html index 8fc40c152..d0246af86 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html @@ -101,7 +101,7 @@
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.publishedAt | date:"longDate"}}
-
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{activity.title}}
+
{{activity.title}}
{{ roleDisplay(activity.users) }} . diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html index 0770be123..725a12afb 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html @@ -28,7 +28,7 @@
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.dmpPublishedAt | date:"longDate"}}
-
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{activity.label}}
+
{{activity.label}}
{{ roleDisplay(activity.users) }} . diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html index 27231dc6c..72ec41e3c 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html @@ -5,7 +5,7 @@
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{dataset.modified | date:"longDate"}}
{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{dataset.dmpPublishedAt | date:"longDate"}}
-
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}: {{dataset.label}}
+
{{dataset.label}}
{{ roleDisplay(dataset.users) }} . diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index 3afbc4f1f..f24deada3 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -39,7 +39,7 @@
{{'DATASET-LISTING.TOOLTIP.PART-OF' | translate}}
{{'DATASET-LISTING.TOOLTIP.DMP' | translate}}
-
{{'DATASET-LISTING.TOOLTIP.DMP-FOR' | translate}}: {{ formGroup.get('label').value }}
+
{{ formGroup.get('label').value }}
open_in_new
From 5fd5ec9d63d3bdbb6548ba84b4a1ba7b9e9a8e3b Mon Sep 17 00:00:00 2001 From: gpapavgeri Date: Wed, 5 Aug 2020 13:58:20 +0300 Subject: [PATCH 6/7] Dataset overview update - finalize / reverse & delete comments --- .../overview/dataset-overview.component.ts | 50 ++++++------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts index 7832d54cb..a892f24bc 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts @@ -90,9 +90,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { this.dataset = data; this.researchers = this.dataset.dmp.researchers; this.users = this.dataset.dmp.users; - // this.getDmpResearchers(); - // this.getDmpUsers(); - // this.getDatasetWizardModel(this.dataset.id); this.checkLockStatus(this.dataset.id); this.setIsUserOwner(); const breadCrumbs = []; @@ -118,10 +115,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { this.dataset = data; this.researchers = this.dataset.dmp.researchers; this.users = this.dataset.dmp.users; - // this.getDmpResearchers(); - // this.getDmpUsers(); - // this.getDatasetWizardModel(this.dataset.id); - // this.checkLockStatus(this.dataset.id); const breadCrumbs = []; breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: "/explore" }); breadCrumbs.push({ parentComponentName: 'DatasetListingComponent', label: this.dataset.label, url: '/datasets/publicOverview/' + this.dataset.id }); @@ -138,14 +131,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { }); } - getDatasetWizardModel(id: string) { - this.datasetWizardService.getSingle(id) - .pipe(takeUntil(this._destroyed)) - .subscribe(data => { - this.datasetWizardModel = data; - }); - } - checkLockStatus(id: string) { this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed)) .subscribe(lockStatus => this.lockStatus = lockStatus); @@ -170,20 +155,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { this.router.navigateByUrl('/reload', { skipLocationChange: true }).then(() => this.router.navigate([path])); } - // getDmpResearchers() { - // this.dmpService.getSingle(this.dataset.dmp.id).pipe(takeUntil(this._destroyed)) - // .subscribe(data => { - // this.researchers = data.researchers; - // }); - // } - - // getDmpUsers() { - // this.dmpService.getSingle(this.dataset.dmp.id).pipe(takeUntil(this._destroyed)) - // .subscribe(data => { - // this.users = data.users; - // }); - // } - setIsUserOwner() { if (this.dataset) { const principal: Principal = this.authentication.current(); @@ -487,14 +458,19 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { }); dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { if (result) { - this.getDatasetWizardModel(this.dataset.id); - this.datasetWizardModel.status = DatasetStatus.Finalized; - this.datasetWizardService.createDataset(this.datasetWizardModel) + dataset.status = DatasetStatus.Finalized; + this.datasetWizardService.getSingle(dataset.id) + .pipe(takeUntil(this._destroyed)) + .subscribe(data => { + this.datasetWizardModel = data; + this.datasetWizardModel.status = DatasetStatus.Finalized; + this.datasetWizardService.createDataset(this.datasetWizardModel) .pipe(takeUntil(this._destroyed)) .subscribe( data => this.onUpdateCallbackSuccess(), error => this.onUpdateCallbackError(error) ); + }); } }); } @@ -515,14 +491,18 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { }); dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { if (result) { - this.getDatasetWizardModel(this.dataset.id); - this.datasetWizardModel.status = DatasetStatus.Draft; - this.datasetWizardService.createDataset(this.datasetWizardModel) + this.datasetWizardService.getSingle(dataset.id) + .pipe(takeUntil(this._destroyed)) + .subscribe(data => { + this.datasetWizardModel = data; + this.datasetWizardModel.status = DatasetStatus.Draft; + this.datasetWizardService.createDataset(this.datasetWizardModel) .pipe(takeUntil(this._destroyed)) .subscribe( data => this.onUpdateCallbackSuccess(), error => this.onUpdateCallbackError(error) ); + }); } }); } From 947ecc1874fed01299682411ff1b9704f3d9bf8b Mon Sep 17 00:00:00 2001 From: gpapavgeri Date: Wed, 5 Aug 2020 14:33:00 +0300 Subject: [PATCH 7/7] Dataset overview update finalize --- .../src/app/ui/dataset/overview/dataset-overview.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts index a892f24bc..62085aae5 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts @@ -458,7 +458,6 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { }); dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { if (result) { - dataset.status = DatasetStatus.Finalized; this.datasetWizardService.getSingle(dataset.id) .pipe(takeUntil(this._destroyed)) .subscribe(data => {