<#if flash?has_content> @@ -24,7 +26,6 @@ - - <@lh.facultyMemberCount vClassGroups! /> - <#include "identity.ftl"> - - <#include "menu.ftl"> - -
-

${i18n().intro_title}

- -

${i18n().intro_para1}

-

${i18n().intro_para2}

- -
-

${i18n().intro_searchvivo} filteredSearch

- -
- ${i18n().search_form} - -
-
- -
- - <@widget name="login" /> - - - <@lh.researchClasses /> - - - <@lh.facultyMbrHtml /> - - - <@lh.academicDeptsHtml /> - - <#if geoFocusMapsEnabled > - - <@lh.geographicFocusHtml /> - - - - <@lh.allClassGroups vClassGroups! /> - - <#include "footer.ftl"> - <#-- builds a json object that is used by js to render the academic departments section --> - <@lh.listAcademicDepartments /> - +
+ <@lh.facultyMemberCount vClassGroups! /> + <#include "identity.ftl"> + + <#include "menu.ftl"> + +
+
+

${i18n().intro_title}

+ +

${i18n().intro_para1}

+

${i18n().intro_para2}

+ +
+

${i18n().intro_searchvivo} filteredSearch

+ +
+ ${i18n().search_form} + +
+
+ +
+ +
+ <@widget name="login" /> +
+
+ +
+ + <@lh.researchClasses /> + + + <@lh.facultyMbrHtml /> + + + <@lh.academicDeptsHtml /> + + <#if geoFocusMapsEnabled > + + <@lh.geographicFocusHtml /> + +
+ +
+ + + <@lh.allClassGroups vClassGroups! /> +
+ + <#include "footer.ftl"> + <#-- builds a json object that is used by js to render the academic departments section --> + <@lh.listAcademicDepartments /> +
+ diff --git a/webapp/src/main/webapp/themes/wilma/templates/page.ftl b/webapp/src/main/webapp/themes/wilma/templates/page.ftl index 9b4785605f..f03e13d3d4 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page.ftl @@ -9,19 +9,25 @@ - <#include "identity.ftl"> - <#include "search.ftl"> - <#include "menu.ftl"> +
+ <#include "identity.ftl"> + <#include "search.ftl"> + <#include "menu.ftl"> - <#-- VIVO OpenSocial Extension by UCSF --> - <#if openSocial??> - <#if openSocial.visible> -
- - +
+
+ <#-- VIVO OpenSocial Extension by UCSF --> + <#if openSocial??> + <#if openSocial.visible> +
+ + - ${body} + ${body} +
+
- <#include "footer.ftl"> + <#include "footer.ftl"> +
From bd9de0e9707affceb79c1b6ea168180360e6cd20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Popovi=C4=87?= Date: Mon, 22 Jan 2024 11:43:33 +0100 Subject: [PATCH 2/9] fix: css for login width, inline form labels, site admin menu, data property control panel buttons (#3932) --- .../main/webapp/themes/wilma/css/wilma.css | 36 ++++++++----------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/webapp/src/main/webapp/themes/wilma/css/wilma.css b/webapp/src/main/webapp/themes/wilma/css/wilma.css index d66010eeac..9537f36590 100644 --- a/webapp/src/main/webapp/themes/wilma/css/wilma.css +++ b/webapp/src/main/webapp/themes/wilma/css/wilma.css @@ -145,6 +145,7 @@ input.block { label { margin-top: .5em; margin-bottom: .5em; + display: block; } label.inline { display: inline; @@ -288,17 +289,17 @@ p.submit { border-color: #dfe6e6; } -.editingForm td { +.editingForm > table > tbody > tr > td.verticalfieldlabel { padding: 3px; } -.editingForm tr > td:first-child { +.editingForm > table > tbody > tr > td.verticalfieldlabel:first-child { width: 40%; } @media (min-width: 768px) { - .editingForm tr > td:first-child { + .editingForm > table > tbody > tr > td.verticalfieldlabel:first-child { width: 15%; } } @@ -723,13 +724,13 @@ ul.individual-urls-people li a { /* LOG IN------> */ #login { /* float: right; */ - /* width: 314px; */ + max-width: 332px; border: 1px solid #e8ece9; /* margin-right: 25px; */ padding-bottom: 30px; margin-bottom: 30px; overflow: hidden; - margin-top: 20px; + margin-top: 30px; padding: 15px; } body.login #login { @@ -767,7 +768,7 @@ h3.internal-auth:hover { } #login-form > div { - padding: 38px; + padding: 10px 28px; } #login-form label { @@ -859,13 +860,10 @@ p.password-note { padding: .25em; margin-bottom: 8px; } -/* #flash-msg-container, +#flash-msg-container, #welcome-msg-container { - margin-bottom: 8px; - margin-top: -10px; - margin-right:-10px; - height:34px; -} */ + padding: 10px; +} p.external-auth { margin: 0 auto; } @@ -1868,10 +1866,6 @@ p.address-line { /* -------------------------------------------------> */ /* SITE ADMIN DASHBOARD ----------------------------> */ /* -------------------------------------------------> */ -#adminDashboard { - display: flex; - flex-wrap: wrap; -} #adminDashboard .pageBodyGroup { padding: 0 1em .5em 1em; @@ -2321,10 +2315,10 @@ span.subclassExpandMinus { line-height: unset; } -table.form-background tr td { +/* table.form-background tr td { width: 100%; display: block; -} +} */ #wrapper-content > div > div > div > div > table > tbody > tr > td > div > form > div { display: flex; @@ -2340,9 +2334,9 @@ table.form-background tr td { } table.classHierarchy { - min-width: auto; - width: 100%; - margin-left: 0; + min-width: initial; + max-width: initial; + width: calc(100% - 25); } section#container div { From 24521d173f72a3ea3c329318923a4683049abd6a Mon Sep 17 00:00:00 2001 From: milospp Date: Tue, 9 Apr 2024 17:16:49 +0200 Subject: [PATCH 3/9] Avoided !important tags --- .../css/visualization/capabilitymap/graph.css | 4 +- .../visualization/capabilitymap/graph_new.js | 4 +- .../personlevel/coAuthorPersonLevelD3.ftl | 3 +- .../personlevel/coPIPersonLevelD3.ftl | 3 +- .../main/webapp/themes/wilma/css/wilma.css | 69 ++++++++++++------- 5 files changed, 49 insertions(+), 34 deletions(-) diff --git a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css index 51cb46c9b1..20e6264c99 100755 --- a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css +++ b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css @@ -41,7 +41,9 @@ body { /* Contains all the graphics. */ #container { - /*width: 1200px;*/width:940px; + /*width: 1200px;*/ + max-width:940px; + width: 100%; height: auto; /* margin:0 auto; */ /*margin-left:-130px;*/ diff --git a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js index e461dcdcad..9f2d87d13f 100755 --- a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js +++ b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js @@ -1025,11 +1025,9 @@ var unhide = function() { $("#resetButton").removeAttr("disabled"); if ($(window).width() > 1230) { $("#container").css("box-shadow", "0px 0px 20px -6px #000000"); - $("#container").animate({"height" : "600px", "width" : "1200px", "margin-bottom" : "20px", "margin-left" : (($("#main-content").width() - 1200) / 2) + "px"}, 500); - $("#center-container").css("width", "900px"); + $("#container").animate({"height" : "600px", "width" : "auto", "margin-bottom" : "20px"}, 500); } else { $("#container").animate({"height" : "600px"}); - $("#center-container").css("width", "640px"); } $("#helptext").fadeOut(); $("#center-container").fadeIn(); diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl index ee785e41c3..f4362386f4 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl @@ -135,8 +135,7 @@ $(document).ready(function(){ // #9edae5 var svg = d3.select('#chord').append('svg') - .attr('width', width+padding) - .attr('height', height+padding) + .attr('width', '100%') .append('g').attr('transform', 'translate(' + (width+padding) / 2 + ',' + (height+padding) / 2 +')') .datum(chord(matrix)); diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl index e2845a9825..983fe392d4 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl @@ -139,8 +139,7 @@ $(document).ready(function(){ // #9edae5 var svg = d3.select('#chord').append('svg') - .attr('width', width+padding) - .attr('height', height+padding) + .attr('width', '100%') .append('g').attr('transform', 'translate(' + (width+padding) / 2 + ',' + (height+padding) / 2 +')') .datum(chord(matrix)); diff --git a/webapp/src/main/webapp/themes/wilma/css/wilma.css b/webapp/src/main/webapp/themes/wilma/css/wilma.css index 9537f36590..210ebecb8b 100644 --- a/webapp/src/main/webapp/themes/wilma/css/wilma.css +++ b/webapp/src/main/webapp/themes/wilma/css/wilma.css @@ -1637,7 +1637,7 @@ ul.propertyTabsList > li { } ul.propertyTabsList > li.groupTabSpacer:last-child { - width: initial !important; + width: initial; flex-grow: 1; } @@ -2071,8 +2071,7 @@ span.subclassExpandMinus { /* -------------------------------------------------> */ #wrapper-content #main-content #container { - width: initial !important; - margin-left: initial !important; + display: flex; } #helptext { @@ -2096,7 +2095,7 @@ span.subclassExpandMinus { #center-container { position: relative; - width: 100% !important; + width: 100%; } @media (min-width: 768px) { @@ -2106,18 +2105,13 @@ span.subclassExpandMinus { } #right-container { - width: 30%; - position: absolute; + width: 34%; } #helptext { width: 70%; padding-right: 10px; } - - #center-container { - position: absolute; - } } @@ -2133,14 +2127,6 @@ span.subclassExpandMinus { margin-left: -54px; } -#infovis { - width: 100% !important; -} - -#infovis > svg { - width: 100% !important; -} - /* Author Network */ .propertyTabsList { @@ -2153,7 +2139,8 @@ span.subclassExpandMinus { #chord { width: 100%; - float: left !important; + height: 100%; + float: left; overflow: auto; } @@ -2163,11 +2150,17 @@ span.subclassExpandMinus { -webkit-transform-origin: 0 50%; -ms-transform-origin: 0 50%; transform-origin: 0 50%; + height: 100%; } @media (max-width: 360px) { - #chord > svg { + #body > #bodyPannel { + height: 360px; + } + + #chord > svg > * { scale: 0.3; + overflow: hidden; } #chord-info-div { @@ -2176,7 +2169,11 @@ span.subclassExpandMinus { } @media (min-width: 361px) and (max-width: 399px) { - #chord > svg { + #body > #bodyPannel { + height: 360px; + } + + #chord > svg > * { scale: 0.4; } @@ -2187,7 +2184,11 @@ span.subclassExpandMinus { @media (min-width: 400px) and (max-width: 449px) { - #chord > svg { + #body > #bodyPannel { + height: 400px; + } + + #chord > svg > * { scale: 0.44; } @@ -2199,7 +2200,11 @@ span.subclassExpandMinus { @media (min-width: 450px) and (max-width: 499px) { - #chord > svg { + #body > #bodyPannel { + height: 450px; + } + + #chord > svg > * { scale: 0.5; } @@ -2211,7 +2216,11 @@ span.subclassExpandMinus { @media (min-width: 500px) and (max-width: 575px) { - #chord > svg { + #body > #bodyPannel { + height: 500px; + } + + #chord > svg > * { scale: 0.55; } @@ -2221,14 +2230,22 @@ span.subclassExpandMinus { } @media (min-width: 576px) and (max-width: 767px) { - #chord > svg { + #body > #bodyPannel { + height: 576px; + } + + #chord > svg > * { scale: 0.6; } } @media (min-width: 768px) and (max-width: 991px) { - #chord > svg { + #body > #bodyPannel { + height: 768px; + } + + #chord > svg > * { scale: 0.8; } } From ca4438b8065c3af17585a920e05c15cefb7d0100 Mon Sep 17 00:00:00 2001 From: milospp Date: Tue, 9 Apr 2024 18:29:04 +0200 Subject: [PATCH 4/9] Fixed capability map animation --- .../css/visualization/capabilitymap/graph.css | 14 +++++++++++--- .../js/visualization/capabilitymap/graph_new.js | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css index 20e6264c99..9b690834e8 100755 --- a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css +++ b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css @@ -45,11 +45,19 @@ body { max-width:940px; width: 100%; height: auto; - /* margin:0 auto; */ - /*margin-left:-130px;*/ position:relative; - /*box-shadow:0px 0px 20px -6px #000000;*/ margin-top:15px; + transition: 0.5s ease all; + +} + +@media (min-width: 1200px) { + #container.wide-container { + width: 1200px; + max-width: 1200px; + margin-left:-130px; + margin-right:-130px; + } } #left-container, diff --git a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js index 9f2d87d13f..e33575dbb6 100755 --- a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js +++ b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js @@ -1026,6 +1026,7 @@ var unhide = function() { if ($(window).width() > 1230) { $("#container").css("box-shadow", "0px 0px 20px -6px #000000"); $("#container").animate({"height" : "600px", "width" : "auto", "margin-bottom" : "20px"}, 500); + $("#container").addClass("wide-container"); } else { $("#container").animate({"height" : "600px"}); } From 091fbe33eb2364d03429c10fdd1eae0315e05423 Mon Sep 17 00:00:00 2001 From: Milos Popovic Date: Mon, 27 May 2024 16:42:15 +0200 Subject: [PATCH 5/9] Removed debug prints --- webapp/src/main/webapp/js/individual/propertyGroupControls.js | 1 - 1 file changed, 1 deletion(-) diff --git a/webapp/src/main/webapp/js/individual/propertyGroupControls.js b/webapp/src/main/webapp/js/individual/propertyGroupControls.js index 1b50991dfe..2ec42b5e2b 100644 --- a/webapp/src/main/webapp/js/individual/propertyGroupControls.js +++ b/webapp/src/main/webapp/js/individual/propertyGroupControls.js @@ -155,7 +155,6 @@ $(document).ready(function(){ // deselect the default first tab if ( groupName == "viewAll" ) { - console.log("View all") showAllTabs(); } else { From c704233cb5ed800ae95f2b82280109b0cc556811 Mon Sep 17 00:00:00 2001 From: Milos Popovic Date: Mon, 27 May 2024 18:04:56 +0200 Subject: [PATCH 6/9] Reverted search form to GET method --- webapp/src/main/webapp/themes/wilma/templates/page-home.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl index f370c2a1bb..910e2cf776 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl @@ -44,7 +44,7 @@
${i18n().search_form} -