litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2449 Remove vitro:moniker from individual profile, and display preferredTitle instead, falling back to mostSpecificTypes.

Browse source
This commit is contained in:
ryounes 2011-07-06 17:09:51 +00:00
parent 08f4ee8a5c
commit ceb4ba96e0
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/web/css/individual/individual.css
View file

@ -39,7 +39,7 @@
#individual-intro h1 { #individual-intro h1 {
padding-bottom: 8px; padding-bottom: 8px;
} }
#individual-intro span.most-specific-type { #individual-intro span.display-title {
padding-left: 10px; padding-left: 10px;
margin-left: 10px; margin-left: 10px;
} }
@ -191,7 +191,7 @@ ul#additional-emails li {
#individual-info.withThumb { #individual-info.withThumb {
width: 78%; width: 78%;
} }
h1.fn .most-specific-type { h1.fn .display-title {
padding-left: 10px; padding-left: 10px;
margin-left: 10px; margin-left: 10px;
} }

4
webapp/web/css/search.css
View file

@ -52,7 +52,7 @@ div.searchTips li {
} }
/* Search results */ /* Search results */
.most-specific-type { .display-title {
font-size: .825em; font-size: .825em;
color: #5e6363; color: #5e6363;
border-left: 1px solid #A6B1B0; border-left: 1px solid #A6B1B0;
@ -60,5 +60,3 @@ div.searchTips li {
padding-right: .35em; padding-right: .35em;
} }
*/

12
webapp/web/templates/freemarker/lib/lib-properties.ftl
View file

@ -27,6 +27,13 @@
Macros for generating property lists Macros for generating property lists
------------------------------------------------------------------------------> ------------------------------------------------------------------------------>
<#macro dataPropertyListing property editable>
<#if property?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@addLinkWithLabel property editable />
<@dataPropertyList property editable />
</#if>
</#macro>
<#macro dataPropertyList property editable> <#macro dataPropertyList property editable>
<#list property.statements as statement> <#list property.statements as statement>
<@propertyListItem property statement editable >${statement.value}</@propertyListItem> <@propertyListItem property statement editable >${statement.value}</@propertyListItem>
@ -85,7 +92,7 @@ name will be used as the label. -->
<#macro addLinkWithLabel property editable label="${property.name?capitalize}" extraParams=""> <#macro addLinkWithLabel property editable label="${property.name?capitalize}" extraParams="">
<#local addLink><@addLink property editable label extraParams /></#local> <#local addLink><@addLink property editable label extraParams /></#local>
<#local verboseDisplay><@verboseDisplay property /></#local> <#local verboseDisplay><@verboseDisplay property /></#local>
<#-- Display the label when user is in edit mode, even if there's no add link (due to <#-- Changed to display the label when user is in edit mode, even if there's no add link (due to
displayLimitAnnot, for example). Otherwise the display looks odd, since neighboring displayLimitAnnot, for example). Otherwise the display looks odd, since neighboring
properties have labels. properties have labels.
<#if addLink?has_content || verboseDisplay?has_content> <#if addLink?has_content || verboseDisplay?has_content>
@ -250,7 +257,8 @@ name will be used as the label. -->
<#-- Most specific types --> <#-- Most specific types -->
<#macro mostSpecificTypes individual> <#macro mostSpecificTypes individual>
<#list individual.mostSpecificTypes as type> <#list individual.mostSpecificTypes as type>
<span class="most-specific-type">${type}</span> <span class="display-title">${type}</span>
</#list> </#list>
</#macro> </#macro>

4
webapp/web/themes/vitro/css/vitroTheme.css
View file

@ -1151,7 +1151,7 @@ ul#alpha-browse-individuals .count-classes {
font-size: 1.375em; font-size: 1.375em;
color: #47B6D0; color: #47B6D0;
} }
#individual-intro span.most-specific-type { #individual-intro span.display-title {
font-size: .825em; font-size: .825em;
color: #5e6363; color: #5e6363;
border-left: 1px solid #A6B1B0; border-left: 1px solid #A6B1B0;
@ -1224,7 +1224,7 @@ ul.individual-urls-people li a {
color: #006279; color: #006279;
line-height: 1.3em; line-height: 1.3em;
} }
h1.fn .most-specific-type { h1.fn .display-title {
font-size: .825em; font-size: .825em;
color: #5e6363; color: #5e6363;
border-left: 1px solid #a6b1b0; border-left: 1px solid #a6b1b0;