VIVO-359 and VIVO-345
This commit is contained in:
parent
2da5324c1a
commit
e33070b3a8
4 changed files with 50 additions and 11 deletions
|
@ -250,6 +250,30 @@
|
||||||
support websites.
|
support websites.
|
||||||
</p>
|
</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>
|
<h3 id="create_database">II. Create an empty MySQL database </h3>
|
||||||
<p>
|
<p>
|
||||||
Decide on a database name, username, and password. Log into your
|
Decide on a database name, username, and password. Log into your
|
||||||
|
|
|
@ -32,6 +32,8 @@
|
||||||
</h3>
|
</h3>
|
||||||
<#elseif rangeClass == "Name" && property.statements?has_content && editable >
|
<#elseif rangeClass == "Name" && property.statements?has_content && editable >
|
||||||
<h3 id="${property.localName}">${property.name} <@p.verboseDisplay property /> </h3>
|
<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>
|
<#else>
|
||||||
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
|
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
|
||||||
</#if>
|
</#if>
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
<ul class="propertyTabsList">
|
<ul class="propertyTabsList">
|
||||||
<li class="groupTabSpacer"> </li>
|
<li class="groupTabSpacer"> </li>
|
||||||
<#list propertyGroups.all as groupTabs>
|
<#list propertyGroups.all as groupTabs>
|
||||||
|
<#if ( groupTabs.properties?size > 0 ) >
|
||||||
<#assign groupName = groupTabs.getName(nameForOtherGroup)>
|
<#assign groupName = groupTabs.getName(nameForOtherGroup)>
|
||||||
<#if groupName?has_content>
|
<#if groupName?has_content>
|
||||||
<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
|
<#--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="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
|
||||||
<li class="groupTabSpacer"> </li>
|
<li class="groupTabSpacer"> </li>
|
||||||
</#if>
|
</#if>
|
||||||
|
</#if>
|
||||||
</#list>
|
</#list>
|
||||||
<#if (propertyGroups.all?size > 1) >
|
<#if (propertyGroups.all?size > 1) >
|
||||||
<li class="nonSelectedGroupTab clickable" groupName="viewAll">${i18n().view_all_capitalized}</li>
|
<li class="nonSelectedGroupTab clickable" groupName="viewAll">${i18n().view_all_capitalized}</li>
|
||||||
|
|
|
@ -123,16 +123,21 @@ name will be used as the label. -->
|
||||||
</#macro>
|
</#macro>
|
||||||
|
|
||||||
<#macro addLink property editable label="${property.name}">
|
<#macro addLink property editable label="${property.name}">
|
||||||
|
<#if property.rangeUri?? >
|
||||||
|
<#local rangeUri = property.rangeUri />
|
||||||
|
<#else>
|
||||||
|
<#local rangeUri = "" />
|
||||||
|
</#if>
|
||||||
<#if editable>
|
<#if editable>
|
||||||
<#local url = property.addUrl>
|
<#local url = property.addUrl>
|
||||||
<#if url?has_content>
|
<#if url?has_content>
|
||||||
<@showAddLink property.localName property.name label url />
|
<@showAddLink property.localName label url rangeUri/>
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
</#macro>
|
</#macro>
|
||||||
|
|
||||||
<#macro showAddLink propertyLocalName propertyName label url>
|
<#macro showAddLink propertyLocalName label url rangeUri>
|
||||||
<#if propertyName == "authors" || propertyName == "webpage" || propertyLocalName == "hasResearchArea">
|
<#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}">
|
<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>
|
<img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${i18n().manage}" /></a>
|
||||||
<#else>
|
<#else>
|
||||||
|
@ -147,17 +152,23 @@ name will be used as the label. -->
|
||||||
|
|
||||||
|
|
||||||
<#macro propertyListItem property statement editable >
|
<#macro propertyListItem property statement editable >
|
||||||
|
<#if property.rangeUri?? >
|
||||||
|
<#local rangeUri = property.rangeUri />
|
||||||
|
<#else>
|
||||||
|
<#local rangeUri = "" />
|
||||||
|
</#if>
|
||||||
<li role="listitem">
|
<li role="listitem">
|
||||||
<#nested>
|
<#nested>
|
||||||
<@editingLinks "${property.localName}" "${property.name}" statement editable/>
|
<@editingLinks "${property.localName}" "${property.name}" statement editable rangeUri/>
|
||||||
</li>
|
</li>
|
||||||
</#macro>
|
</#macro>
|
||||||
|
|
||||||
<#macro editingLinks propertyLocalName propertyName statement editable>
|
<#macro editingLinks propertyLocalName propertyName statement editable rangeUri="">
|
||||||
<#if editable && (propertyName != "authors" && propertyName != "webpage" && propertyLocalName != "hasResearchArea")>
|
<#if editable >
|
||||||
<@editLink propertyLocalName propertyName statement />
|
<#if (!rangeUri?contains("Authorship") && !rangeUri?contains("URL") && !rangeUri?contains("Editorship") && propertyLocalName != "hasResearchArea")>
|
||||||
<@deleteLink propertyLocalName propertyName statement />
|
<@editLink propertyLocalName propertyName statement />
|
||||||
|
<@deleteLink propertyLocalName propertyName statement />
|
||||||
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
</#macro>
|
</#macro>
|
||||||
<#macro editLink propertyLocalName propertyName statement>
|
<#macro editLink propertyLocalName propertyName statement>
|
||||||
|
@ -250,7 +261,7 @@ name will be used as the label. -->
|
||||||
<#local label = individual.nameStatement>
|
<#local label = individual.nameStatement>
|
||||||
${label.value}
|
${label.value}
|
||||||
<#if useEditLink>
|
<#if useEditLink>
|
||||||
<@editingLinks "label" "" label editable />
|
<@editingLinks "label" "" label editable ""/>
|
||||||
<#elseif (editable && (labelCount > 0)) || (languageCount > 1)>
|
<#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-->
|
<#--We display the link even when the user is not logged in case of multiple labels with different languages-->
|
||||||
<#assign labelLink = ""/>
|
<#assign labelLink = ""/>
|
||||||
|
|
Loading…
Add table
Reference in a new issue