Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/css/menupage/menupage.css
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ li.individual h1 {
line-height: 1.2em;
font-weight: bold;
}
li.individual h1.thumb {
li.individual p.thumb {
padding-top: 30px;
}
#individuals-in-class span.title {
Expand Down
5 changes: 5 additions & 0 deletions webapp/src/main/webapp/css/vitro.css
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,11 @@ table#table-listing td a {
word-wrap: break-word;
}

/* browseByVClass view browse people */
.individual > p {
margin-bottom: 0;
}

a.button.blue {
padding: 7px 22px 8px;
font-family: sans-serif;
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/main/webapp/js/individual/propertyGroupControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $(document).ready(function(){
var $visibleSection = $('section.property-group:visible');
$visibleSection.hide();
$('h2[pgroup=tabs]').addClass("hidden");
$('nav#scroller').addClass("hidden");
$('nav.scroller').addClass("hidden");
$('section#' + groupName).show();
}
manageLocalStorage();
Expand All @@ -55,7 +55,7 @@ $(document).ready(function(){
$(this).children('h2').css("margin-top", "-15px").css("border-bottom","1px solid #DFEBE5").css("padding","12px 25px 10px 20px");
$(this).show();
$('h2[pgroup=tabs]').removeClass("hidden");
$('nav#scroller').removeClass("hidden");
$('nav.scroller').removeClass("hidden");
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<li class="wookmark-group" style="float: left;">
<h2>${classGroup.displayName}</h2>
<ul id="class-group-list" role="list">
<ul class="class-group-list" role="list">
<#list classGroup.classes as class>
<#-- Only render populated classes -->
<#if (class.individualCount > 0)>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,40 @@
<article class="property" role="article">
<#-- Property display name -->
<#if rangeClass == "Authorship" && individual.editable && (property.domainUri)?? && property.domainUri?contains("Person")>
<h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<h3 class="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="${i18n().manage_publications_link}" <#if verbose>style="padding-top:10px"</#if> >
${i18n().manage_publications_link}
</a>
</h3>
<#elseif rangeClass == "ResearcherRole" && individual.editable >
<h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<h3 class="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<a id="manageGrantLink" class="manageLinks" href="${urls.base}/manageGrants?subjectUri=${subjectUri[1]!}" title="${i18n().manage_grants_and_projects_link}" <#if verbose>style="padding-top:10px"</#if> >
${i18n().manage_grants_and_projects_link}
</a>
</h3>
<#elseif rangeClass == "Position" && individual.editable >
<h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<h3 class="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<a id="managePeopleLink" class="manageLinks" href="${urls.base}/managePeople?subjectUri=${subjectUri[1]!}" title="${i18n().manage_affiliated_people}" <#if verbose>style="padding-top:10px"</#if> >
${i18n().manage_affiliated_people_link}
</a>
</h3>
<#elseif rangeClass == "Name" && property.statements?has_content && editable >
<h3 id="${property.localName}" title="${property.publicDescription!}">${property.name} <@p.verboseDisplay property /> </h3>
<h3 class="${property.localName}" title="${property.publicDescription!}">${property.name} <@p.verboseDisplay property /> </h3>
<#elseif rangeClass == "Title" && property.statements?has_content && editable >
<h3 id="${property.localName}" title="${property.publicDescription!}">${property.name} <@p.verboseDisplay property /> </h3>
<h3 class="${property.localName}" title="${property.publicDescription!}">${property.name} <@p.verboseDisplay property /> </h3>
<#elseif rangeClass == "Authorship" && !individual.editable && (property.domainUri)?? && property.domainUri?contains("Person")>
<h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
<h3 class="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
<#elseif rangeClass == "ResearcherRole" && !individual.editable>
<h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
<h3 class="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
<#else>
<h3 id="${property.localName}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
<h3 class="${property.localName}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
</#if>
<#-- List the statements for each property -->
<#assign limit = property.getDisplayLimit()!5 />
<#if limit == -1 || limit == 0 >
<#assign limit = 5 />
</#if>
<ul class="property-list" role="list" id="${property.localName}-${rangeClass}-List" displayLimit="${limit}">
<ul class="property-list" role="list" class="${property.localName}-${rangeClass}-List" displayLimit="${limit}">
<#-- data property -->
<#if property.type == "data">
<@p.dataPropertyList property editable />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
<#assign verbose = (verbosePropertySwitch.currentValue)!false>
<section id="${groupNameHtmlId?replace("/","-")}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
<nav id="scroller" class="scroll-up hidden" role="navigation">
<nav class="scroller scroll-up hidden" role="navigation">
<a href="#branding" title="${i18n().scroll_to_menus}" >
<img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

<#if (individual.thumbUrl)??>
<img src="${individual.thumbUrl}" width="90" alt="${individual.name}" />
<h1 class="thumb">
<p class="thumb">
<a href="${individual.profileUrl}" title="${i18n().view_profile_page_for} ${individual.name}">${individual.name}</a>
</h1>
</p>
<#else>
<h1>
<p>
<a href="${individual.profileUrl}" title="${i18n().view_profile_page_for} ${individual.name}">${individual.name}</a>
</h1>
</p>
</#if>

<#assign cleanTypes = 'edu.cornell.mannlib.vitro.webapp.web.TemplateUtils$DropFromSequence'?new()(individual.mostSpecificTypes, vclass!"") />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ name will be used as the label. -->
displayLimitAnnot, for example). Otherwise the display looks odd, since neighboring
properties have labels.
<#if addLink?has_content || verboseDisplay?has_content>
<h2 id="${property.localName}" title="${property.publicDescription!}">${label} ${addLink!} ${verboseDisplay!}</h2>
<h2 class="${property.localName}" title="${property.publicDescription!}">${label} ${addLink!} ${verboseDisplay!}</h2>
</#if>
-->
<#if editable>
<h2 id="${property.localName!}" title="${property.publicDescription!}">${label} ${addLink!}</h2>
<h2 class="${property.localName!}" title="${property.publicDescription!}">${label} ${addLink!}</h2>
${verboseDisplay!}
</#if>
</#macro>
Expand Down Expand Up @@ -155,7 +155,7 @@ name will be used as the label. -->
</#macro>

<#macro propertyLabel property label="${property.name?capitalize}">
<h2 id="${property.localName}" title="${property.publicDescription!}">${label} <@verboseDisplay property /></h2>
<h2 class="${property.localName}" title="${property.publicDescription!}">${label} <@verboseDisplay property /></h2>
</#macro>


Expand Down
8 changes: 4 additions & 4 deletions webapp/src/main/webapp/themes/vitro/css/vitroTheme.css
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ ul#footer-nav li {
}
ul#footer-nav li:last-child,
ul#header-nav li.last,
ul#individual-hasResearchArea li:last-child {
ul.individual-hasResearchArea li:last-child {
border-right: none;
}
#footer-nav a {
Expand Down Expand Up @@ -1295,13 +1295,13 @@ ul#individual-personInPosition li {
padding-top: 10px;
width: 100%;
}
ul#individual-hasResearchArea {
ul.individual-hasResearchArea {
padding-bottom: 24px;
}
ul#individual-hasResearchArea li {
ul.individual-hasResearchArea li {
border-right: 1px solid #A6B1B0;
}
ul#individual-hasResearchArea li a,
ul.individual-hasResearchArea li a,
ul#individual-personInPosition li a,
ul#individual-tools li a,
ul#individual-tools-people li a,
Expand Down
Loading