From 02e7a9d520bcd5aeb5a597317669a2c0a4961eac Mon Sep 17 00:00:00 2001 From: Svetlana Rastegina Date: Thu, 4 Mar 2021 17:33:29 +0100 Subject: [PATCH] Added right search panel on Compilations page.Modified title block. --- webapp/src/main/webapp/themes/iph/css/iph.css | 34 ++++++ .../webapp/themes/iph/images/exportPdf.svg | 68 +++++++++++ .../main/webapp/themes/iph/images/print.svg | 108 ++++++++++++++++++ .../main/webapp/themes/iph/images/save.svg | 99 ++++++++++++++++ .../themes/iph/templates/compilation.ftl | 8 +- .../themes/iph/templates/elenphExcerpt.ftl | 5 +- .../main/webapp/themes/iph/templates/page.ftl | 4 +- .../themes/iph/templates/rightPanel.ftl | 6 +- 8 files changed, 320 insertions(+), 12 deletions(-) create mode 100644 webapp/src/main/webapp/themes/iph/images/exportPdf.svg create mode 100644 webapp/src/main/webapp/themes/iph/images/print.svg create mode 100644 webapp/src/main/webapp/themes/iph/images/save.svg diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css index 1f6eb661..5034a9fb 100644 --- a/webapp/src/main/webapp/themes/iph/css/iph.css +++ b/webapp/src/main/webapp/themes/iph/css/iph.css @@ -2498,6 +2498,24 @@ ul.dropdown ul.sub_menu li a:hover { flex-wrap: nowrap; justify-content: space-between; } +.display.loggedIn >div#articleWrapper { + width: 80%; + margin-left: auto; + margin-right: auto; + display: flex; + flex-direction: row-reverse; + flex-wrap: nowrap; + justify-content: space-between; +} +.display >div#articleWrapper { + width: 80%; + margin-left: auto; + margin-right: auto; + display: flex; + flex-direction: row-reverse; + flex-wrap: nowrap; + justify-content: space-between; +} .individual.loggedIn >div#articleWrapper >div#searchRightpanel { width: 27%; margin-left: 3%; @@ -2506,6 +2524,10 @@ ul.dropdown ul.sub_menu li a:hover { width: 30%; margin-left: 3%; } +.display > div#articleWrapper > div#searchRightpanel { + width: 30%; + margin-left: 3%; +} .individual.loggedIn >div#articleWrapper >div#wrapper-content { width: 70%; } @@ -2791,6 +2813,12 @@ span.iconControlsNotEditable { .individual.loggedIn >div#articleWrapper { width: 90%; } + .display.loggedIn >div#articleWrapper { + width: 90%; + } + .display >div#articleWrapper { + width: 90%; + } } @media screen and (max-width: 1300px) { @@ -2827,6 +2855,12 @@ span.iconControlsNotEditable { .individual.loggedIn >div#articleWrapper { width: 95%; } + .display.loggedIn >div#articleWrapper { + width: 95%; + } + .display >div#articleWrapper { + width: 95%; + } } @media screen and (max-width: 1100px) { diff --git a/webapp/src/main/webapp/themes/iph/images/exportPdf.svg b/webapp/src/main/webapp/themes/iph/images/exportPdf.svg new file mode 100644 index 00000000..3e39df79 --- /dev/null +++ b/webapp/src/main/webapp/themes/iph/images/exportPdf.svg @@ -0,0 +1,68 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/webapp/src/main/webapp/themes/iph/images/print.svg b/webapp/src/main/webapp/themes/iph/images/print.svg new file mode 100644 index 00000000..cd0433c0 --- /dev/null +++ b/webapp/src/main/webapp/themes/iph/images/print.svg @@ -0,0 +1,108 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/src/main/webapp/themes/iph/images/save.svg b/webapp/src/main/webapp/themes/iph/images/save.svg new file mode 100644 index 00000000..df7f3aff --- /dev/null +++ b/webapp/src/main/webapp/themes/iph/images/save.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/webapp/src/main/webapp/themes/iph/templates/compilation.ftl b/webapp/src/main/webapp/themes/iph/templates/compilation.ftl index f1269194..0fe4dc16 100644 --- a/webapp/src/main/webapp/themes/iph/templates/compilation.ftl +++ b/webapp/src/main/webapp/themes/iph/templates/compilation.ftl @@ -33,6 +33,7 @@ ${scripts.add('