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

VIVO-359 and VIVO-345

Browse source
This commit is contained in:
tworrall 2013-10-14 16:29:01 -04:00
parent 2da5324c1a
commit e33070b3a8
4 changed files with 50 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
doc/install.html
View file

@ -250,6 +250,30 @@
support websites.
</p>
<p>
The following browsers are supported for this release
</p>
<ul>
<li>
Mac:
<ul>
<li>Chrome 30.0.1599.69 and above</li>
<li>FireFox 3.6.28, 10.0.12, 24</li>
<li>Opera 12.02</li>
<li>Safari 5.0.3</li>
</ul>
</li>
<li>
PC:
<ul>
<li>Chrome 25.1364.2 and above</li>
<li>FireFox 10.0.12, 24</li>
<li>Internet Explorer 8, 9, 10</li>
<li>Opera 12.02</li>
</ul>
</li>
</ul>
<h3 id="create_database">II. Create an empty MySQL database </h3>
<p>
Decide on a database name, username, and password. Log into your

2
webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
View file

@ -32,6 +32,8 @@
</h3>
<#elseif rangeClass == "Name" && property.statements?has_content && editable >
<h3 id="${property.localName}">${property.name} <@p.verboseDisplay property /> </h3>
<#elseif rangeClass == "Title" && property.statements?has_content && editable >
<h3 id="${property.localName}">${property.name} <@p.verboseDisplay property /> </h3>
<#else>
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
</#if>

2
webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
View file

@ -10,6 +10,7 @@
<ul class="propertyTabsList">
<li class="groupTabSpacer">&nbsp;</li>
<#list propertyGroups.all as groupTabs>
<#if ( groupTabs.properties?size > 0 ) >
<#assign groupName = groupTabs.getName(nameForOtherGroup)>
<#if groupName?has_content>
<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
@ -26,6 +27,7 @@
<li class="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
<li class="groupTabSpacer">&nbsp;</li>
</#if>
</#if>
</#list>
<#if (propertyGroups.all?size > 1) >
<li class="nonSelectedGroupTab clickable" groupName="viewAll">${i18n().view_all_capitalized}</li>

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

@ -123,16 +123,21 @@ name will be used as the label. -->
</#macro>
<#macro addLink property editable label="${property.name}">
<#if property.rangeUri?? >
<#local rangeUri = property.rangeUri />
<#else>
<#local rangeUri = "" />
</#if>
<#if editable>
<#local url = property.addUrl>
<#if url?has_content>
<@showAddLink property.localName property.name label url />
<@showAddLink property.localName label url rangeUri/>
</#if>
</#if>
</#macro>
<#macro showAddLink propertyLocalName propertyName label url>
<#if propertyName == "authors" || propertyName == "webpage" || propertyLocalName == "hasResearchArea">
<#macro showAddLink propertyLocalName label url rangeUri>
<#if rangeUri?contains("Authorship") || rangeUri?contains("URL") || rangeUri?contains("Editorship") || label == "hasResearchArea">
<a class="add-${propertyLocalName}" href="${url}" title="${i18n().manage_list_of} ${label?lower_case}">
<img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${i18n().manage}" /></a>
<#else>
@ -147,17 +152,23 @@ name will be used as the label. -->
<#macro propertyListItem property statement editable >
<#if property.rangeUri?? >
<#local rangeUri = property.rangeUri />
<#else>
<#local rangeUri = "" />
</#if>
<li role="listitem">
<#nested>
<@editingLinks "${property.localName}" "${property.name}" statement editable/>
<@editingLinks "${property.localName}" "${property.name}" statement editable rangeUri/>
</li>
</#macro>
<#macro editingLinks propertyLocalName propertyName statement editable>
<#if editable && (propertyName != "authors" && propertyName != "webpage" && propertyLocalName != "hasResearchArea")>
<#macro editingLinks propertyLocalName propertyName statement editable rangeUri="">
<#if editable >
<#if (!rangeUri?contains("Authorship") && !rangeUri?contains("URL") && !rangeUri?contains("Editorship") && propertyLocalName != "hasResearchArea")>
<@editLink propertyLocalName propertyName statement />
<@deleteLink propertyLocalName propertyName statement />
</#if>
</#if>
</#macro>
<#macro editLink propertyLocalName propertyName statement>
@ -250,7 +261,7 @@ name will be used as the label. -->
<#local label = individual.nameStatement>
${label.value}
<#if useEditLink>
<@editingLinks "label" "" label editable />
<@editingLinks "label" "" label editable ""/>
<#elseif (editable && (labelCount > 0)) || (languageCount > 1)>
<#--We display the link even when the user is not logged in case of multiple labels with different languages-->
<#assign labelLink = ""/>