From 73c6a2710b36ec2db4926ba9986c46dbad660d57 Mon Sep 17 00:00:00 2001
From: Svetlana Rastegina <rasteginas@yandex.ru>
Date: Wed, 17 Feb 2021 15:22:32 +0100
Subject: [PATCH] Modified article page styles and added new images.

---
 .../templates/freemarker/elenphAritcle.ftl    |  10 +--
 webapp/src/main/webapp/themes/iph/css/iph.css |  70 +++++++++++++++++-
 .../webapp/themes/iph/images/arrow_brown.png  | Bin 0 -> 422 bytes
 .../webapp/themes/iph/images/arrow_down.png   | Bin 0 -> 318 bytes
 .../webapp/themes/iph/images/book_icon.png    | Bin 0 -> 484 bytes
 .../webapp/themes/iph/images/bullet_icon.png  | Bin 0 -> 219 bytes
 .../webapp/themes/iph/images/circle_title.png | Bin 0 -> 454 bytes
 7 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 webapp/src/main/webapp/themes/iph/images/arrow_brown.png
 create mode 100644 webapp/src/main/webapp/themes/iph/images/arrow_down.png
 create mode 100644 webapp/src/main/webapp/themes/iph/images/book_icon.png
 create mode 100644 webapp/src/main/webapp/themes/iph/images/bullet_icon.png
 create mode 100644 webapp/src/main/webapp/themes/iph/images/circle_title.png

diff --git a/webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl b/webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl
index 9ce5a3a82..618d58ae4 100644
--- a/webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl
@@ -204,10 +204,10 @@ ${scripts.add('<script async type="text/javascript" src="${urls.base}/themes/iph
 </div>
 
 <#if works?? && works?has_content>
-  <button type="button" class="collapsible" style="border:none;padding: 18px;width: 100%;text-align:left;">Работы</button>
-    <div class="works" style="display:none;">
+  <button type="button" class="collapsible" style="border: none; color: #8B4513; padding: 18px;width: 100%;text-align:left; background-color: #ffffff; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Работы</button>
+    <div class="works" style="display:block;">
       <#list works as work>
-        <div class="work" style="list-style:none;">
+        <div class="work" style="display:list-item;list-style-image:url(${urls.base}/themes/iph/images/bullet_icon.png); font-style: italic; font-family: PT Serif;">
           <p> ${work.works} </p>
         </div>
       </#list>
@@ -215,7 +215,7 @@ ${scripts.add('<script async type="text/javascript" src="${urls.base}/themes/iph
 </#if>
 
 <#if bibliography?? && bibliography?has_content>
-  <button type="button" class="collapsible" style="border:none;padding: 18px;width: 100%; text-align: left;">Литература</button>
+  <button type="button" class="collapsible" style="border:none; color: #8B4513; padding: 18px;width: 100%; text-align: left; background-color: #ffffff; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Литература</button>
     <div class="bibliography" style="display:none;">
       <#list bibliography as one_bibliography>
         <div class="bibliography_entry" style="list-style:none;">
@@ -227,7 +227,7 @@ ${scripts.add('<script async type="text/javascript" src="${urls.base}/themes/iph
 
 <#if authors??>
   <#list authors as author>
-    <div class="authors" style="display:block;float:right; margin:15px;">
+    <div class="authors" style="display:block;">
       <#if author.authorFamily??>${author.authorFamily}</#if>&nbsp;<#if author.authorInitials??>${author.authorInitials}</#if>
     </div>
   </#list>
diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css
index 0fbda80eb..3beb934e5 100644
--- a/webapp/src/main/webapp/themes/iph/css/iph.css
+++ b/webapp/src/main/webapp/themes/iph/css/iph.css
@@ -1631,6 +1631,9 @@ ul#individual-tools-people li a {
     text-align: center;
     background: #fff;
 }
+#menupage-intro {
+	margin: 0.7em auto;
+}
 #menupage-intro h2 {
     font-size: 1.375em;
     color: #000000;
@@ -1783,6 +1786,7 @@ nav#alpha-browse-container {
     border-top: 1px solid #dde4e3;
     background-color: #fff;
     margin-right: 0;
+    margin-top: 10px;
 }
 ul#alpha-browse-individuals {
     float: left;
@@ -1922,10 +1926,18 @@ h2#mainImage,
 h3.internal-auth {
     color: #5e6363;
 }
+#individual-info {
+	border-bottom: 1px solid #8B4513;
+}
 #individual-info h1.fn {
     font-size: 1.375em;
     color: #595B5B;
     line-height: 1.3em;
+    background-image: url(../images/circle_title.png);
+    background-repeat: no-repeat;
+    background-position: left center;
+    padding-left: 22px;
+    color: #000000;
 }
 #individual-info h2 {
     color: #5E6363;
@@ -1955,6 +1967,11 @@ ul#individual-hasResearchArea li {
 ul#individual-facultyMemberships li {
     border-right: 1px solid #A6B1B0;
 }
+ 
+.display-title-not-editable {
+	color: #4F4F4F;
+}	
+
 /* INDIVIDUAL VISUALIZATION ------>  */
 .publication-year-range,
 p.view-all-coauthors {
@@ -2228,6 +2245,54 @@ span.subclassExpandMinus {
 .affiliations {
     margin-bottom: 1.5em;
 }
+/* ------------------------------------------------->  */
+/* ARTICLESTYLES  -------------------------------->  */
+/* ------------------------------------------------->  */
+.articleExcerpt {
+	background-color: #ffffff;
+	/*border: 1px solid #F6F6F6;*/
+}
+button.collapsible {
+	background-color: #F6F6F6;
+	/*border: 1px solid #F6F6F6 !important;*/
+	outline: none;
+	background-image: url(../images/arrow_down.png);
+	background-repeat: no-repeat;
+	background-position: 1% 50%;
+	padding-left: 40px !important;
+}
+button.collapsible:visited {
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	border: 0px;
+}
+
+button.collapsible.active {
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	border: 1px solid #F6F6F6;
+	outline: none;
+}
+button.collapsible.active:focus {
+	background-color: #F6F6F6;
+	border: 1px solid #F6F6F6;
+}
+
+.authors {
+	width: 100%;
+	border-top: 1px solid #8B4513;
+	margin-top: 20px;
+	margin-bottom: 10px;
+	text-align: right;
+	padding-top: 10px;
+	font-family: PT Serif;
+	font-style: italic;
+}
+.works {
+	padding-left: 40px;
+	
+}
+
 /* ------------------------------------------------->  */
 /* SCREEN RESOLUTION  -------------------------------->  */
 /* ------------------------------------------------->  */
@@ -2269,6 +2334,7 @@ span.subclassExpandMinus {
 	#footerWrapper {
 	width: 95%;
 	}
+	
 }
 @media screen and (max-width: 900px) {
 	h1.vivo-logo {
@@ -2315,7 +2381,9 @@ span.subclassExpandMinus {
 	#stats li {
 	width: 80px; 
 	}
-	
+	button.collapsible {
+	background-position: 2% 50%;	
+	}
 }
 
 @media screen and (max-width: 800px) {
diff --git a/webapp/src/main/webapp/themes/iph/images/arrow_brown.png b/webapp/src/main/webapp/themes/iph/images/arrow_brown.png
new file mode 100644
index 0000000000000000000000000000000000000000..b577fd8c138fd18974f1ade3d0a780283e94c64c
GIT binary patch
literal 422
zcmeAS@N?(olHy`uVBq!ia0vp^U^WLEkTt>lKP!-8OY(MiVfYV%3-&Ib3>4uk@Q5sC
zVBi)8VMc~ob0mO*>?NMQuIx{l1O!+Wd-o&*but=zx;Tbth$g2sG=){?$wsq&t7n)0
z_lr%~dD%>dIaSGQdTDCcB=W+ht*WYKlS^SWFf;Bb{9t)FU%YafJde*A!8JWHK~3N5
zWp*Ar@IihVhfA|)lSH-Lzp5u|PJEm<u~E^}YhrWu`M>hZ9Ud7lgmVbpsQ!OkH=VWb
zzK>7OOFb@```>JS6mqV1+VF_oUe8Lquz<nWuXNh;iml%d_Rm%*+>oBIE8)xh`2AtV
zMn?bAlm6s$e34-fYyBF<W0Ujd%~FSx>Hq)#i@jMf;URn5p-wHHH+O{oJpKRQ_{E=}
zzn3q5bYc2ygXjlg*O}*j4E8hlFRwiL?f?JvyI1qo*l`B8Bq>eb?7+tS_`gG2{eQL4
zH@~+?M+(LyE*E9izhK4M_Wyr+*qi@5_+kaQ_TQW5&7{G=Bl?Dc!7VIdyRCPaF)&0K
NJYD@<);T3K0RYC0sUZLW

literal 0
HcmV?d00001

diff --git a/webapp/src/main/webapp/themes/iph/images/arrow_down.png b/webapp/src/main/webapp/themes/iph/images/arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..6121c8da3fecfb21057ba3ecaead2fe42c11fa10
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp@K+M6x1|*f#O3wo+&H|6fVg?3oVGw3ym^DWND9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~z5|FWlxV@L&K?}US#ha3c4)62}iC+HmDJHn?V
z@xCm9TdpahaY56vrWssc)->j@C$VcfIKR93W`{P1kZ^(D;otwy^EA&sFkAQ{!#^FD
zGp=W|HAQv{I(yD~7n{as!J@MN(N_-L8-Bm`F>YM->Z8}RO5+XR?lu-wEE5zvefskm
z9iGeWEQ?NXRo^eY&Ez0)vmy13a$9Dhfzu+HiM8!5%6_vn44e65mmfC!(6{?Q_x-<H
zwww3=GE5e}@p;POGiExBCwSK%UGXx}cf*8KO)XnCrhu693zo)}iUoeoYf(=HdXK@=
L)z4*}Q$iB}{s(wy

literal 0
HcmV?d00001

diff --git a/webapp/src/main/webapp/themes/iph/images/book_icon.png b/webapp/src/main/webapp/themes/iph/images/book_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fad5896bee8ef90f2ba6425344b5f25670ee4c2
GIT binary patch
literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0eMM8K~#7F?Uc<*
zLO~SA&zU=l(4q<3=M$7~;Dr?0*}jdvftwOn*+PUA%m)Z;(W;H@q9pDkB)Cua3KO(2
zy)&mXhTumF7j2{t43~4x{r~5K`3=CI3!G0XM=BwWchAM{gv@QRt%ILLR~eN=6j_$%
zD1^)Nmtk|ou;QykM0#}t)UnbwW$2x7H_ff?7|e~BfR<7mBVfuR^pUXjt)vSppiy`l
zPIEaklu{-vQXdGQ_^5kaD!Wll@A^^n@(`f|URCX59G;c}t)0g82%!U(lAJCYPUj-h
z%iB9^4+1`lo(M&*@I1I%?k{Tu{BryoZmMBy1lnEpb^cv36o{!ZqcvX}#Xz}xIA5zC
z?(BoG*=4<4bQi$1G@|6?Yw7qlBlch>CUE4Ge09x3ZAp=H_%R{x%y9r{G@wYX7|Jkw
z9ZTUeqdw!eXBa~dppFqwRWtDb2^<j)HAT!j5xxneltIx)w5^#B!W!Wo4)^^8&@+xV
aH@*Ny0FsZsqlj|=0000<MNUMnLSTX#yT~&D

literal 0
HcmV?d00001

diff --git a/webapp/src/main/webapp/themes/iph/images/bullet_icon.png b/webapp/src/main/webapp/themes/iph/images/bullet_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..476f38d986d2fc8e7ec71887d8df91402e9dfbfd
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJx0U~c5>$3m}Bze2LF#HF>1$&oI28wVNctjR6
zFmMZlFeAgPITAoY_7YEDSN5k&g1pL%H~prs2MT3)x;Tb#$R?*SH07ButU6ZT!>aJD
zUhNp`(%tt&jF?z|Oa60aaTHSc@c#dQH?_8U9?k?gp@T<G%sAh2#66Kob%xra4hGBr
zk`iJ@@ArLw+pt?{x`OiKdR{lSHhG8J)~CPiS?dt)GlQSO=96?w?=sJIKsy;cUHx3v
IIVCg!0P%lE8UO$Q

literal 0
HcmV?d00001

diff --git a/webapp/src/main/webapp/themes/iph/images/circle_title.png b/webapp/src/main/webapp/themes/iph/images/circle_title.png
new file mode 100644
index 0000000000000000000000000000000000000000..f853a1022078738bb1fa21bad6ac79e45c1ca6c6
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq000jF001Hg1^@s6faHUs00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru<pL23Ha8>=@}~d*0aHmt
zK~zW$?NUEW!%z^vi>XotwUp}6ui)SZ5J9BYU8G1CH$Q;XBDlDSn#EOdbSb*3NG&dY
z0Y}$@h+tD49E?eR-b+bn>Wl7@Tkh`n=iTGpBT6IPz#kjnetx$+!Q*TeU5~bzunOXW
zWC!4TFj;qP`{w!)2t6_LVL7+L;0qF^HW<f72KCL$?z`fRP-HFTss@ZkqEQLK8~zs`
zom57H(*yHCDPJTQ`*NY7@UX-TUVpQ*%Zd-o;;2eJm1r0s7*tbG@7lnu)WZXs<d$hp
zk%1Y^W64S_lZng>yh!6~WqR;6GRx$aG@p8%7Cn#5wPvRwO<ODb0kR{|o`QP|lfre}
zd3n5N1^yBq!C%Y5ds3R%SF#o+3uKyC@*8G^8|mZKv@U?1ty}w4>L6m~5VT79ioE5b
w{L*Oy^x-o-$TrXF%}y{e)TKGyz<=GqH`jk+AB;fmfdBvi07*qoM6N<$g1YL(EC2ui

literal 0
HcmV?d00001