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

fixed conflict with themes/wilma/templates/page-home.ftl

Browse source
This commit is contained in:
tworrall 2013-05-02 12:40:39 -04:00
commit ace464cb3e
13 changed files with 113 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -46,3 +46,13 @@
</#if>
<#include selectedTemplate >
${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/propertyGroupControls.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
<script type="text/javascript">
i18n_confirmDelete = "${i18n().confirm_delete}"
</script>

36
themes/wilma/i18n/all.properties Normal file
View file

@ -0,0 +1,36 @@
#
# Text strings for the controllers and templates
#
# Default (English)
#
menu_termuse = Terms of Use
menu_powered = Powered by
menu_about = About
menu_contactus = Contact Us
menu_support = Support
menu_version = Version
menu_copyright = copyright
menu_item = menu item
menu_welcomestart = Welcome
menu_logout = Log out
menu_login = Log in
menu_loginfull = Log in to manage this site
identity_title = VIVO | connect share discover
identity_index = Index
identity_edit = Edit Page
identity_admin = Site Admin
identity_myprofile = My profile
identity_myaccount = My account
identity_user = user
indiv_foafperson_for = for
indiv_foafperson_return = return to
intro_title = Welcome to VIVO
intro_para1 = VIVO is a research-focused discovery tool that enables collaboration among scientists across all disciplines.
intro_para2 = Browse or search information on people, departments, courses, grants, and publications.
intro_searchvivo = Search VIVO
intro_filtersearch = Filter search

40
themes/wilma/i18n/all_es.properties Normal file
View file

@ -0,0 +1,40 @@
#
# Text strings for the controllers and templates
#
# Spanish -
#
# TODO: verify translations from Google Translate are correct
menu_termuse = Términos de uso
menu_powered = Desarrollado por
menu_about = Respecto a
menu_contactus = Contáctenos
menu_support = Apoyar
menu_version = Versión
menu_copyright = derechos de autor
menu_item = elemento de menú
menu_welcomestart = Bienvenido
menu_login = Iniciar la sesión
menu_loginfull = Iniciar sesión para administrar este sitio
identity_title = VIVO | unir compartir descubrir
identity_index = Îndex
identity_edit = Editar página
identity_myprofile = Mi encuesta
identity_myaccount = Mi cuenta
identity_user = usuario
indiv_foafperson_for = para
intro_title = Bienvenido a VIVO
intro_para1 = VIVO es una herramienta de descubrimiento de la investigación centrada en que permite la colaboración entre los científicos de todas las disciplinas.
intro_para2 = Explore o busque información sobre las personas, departamentos, cursos, becas y publicaciones.
intro_searchvivo = Buscar VIVO
intro_filtersearch = búsqueda Filtrar
#Items Vetted by Pedro
#
menu_logout = Terminar
identity_admin = Administrador

BIN
themes/wilma/i18n/images/select_locale_en_AU.GIF Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

0
themes/wilma/i18n/images/select_locale_en.GIF → themes/wilma/i18n/images/select_locale_en_US.GIF
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

0
themes/wilma/i18n/images/select_locale_es.GIF → themes/wilma/i18n/images/select_locale_es_ES.GIF
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before After
Before After

BIN
themes/wilma/i18n/images/select_locale_es_MX.GIF Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
themes/wilma/i18n/images/select_locale_fr.GIF
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

14
themes/wilma/templates/footer.ftl
View file

@ -7,25 +7,25 @@
<#if copyright??>
<small>&copy;${copyright.year?c}
<#if copyright.url??>
<a href="${copyright.url}" title="copyright">${copyright.text}</a>
<a href="${copyright.url}" title="${i18n().menu_copyright}">${copyright.text}</a>
<#else>
${copyright.text}
</#if>
| <a class="terms" href="${urls.termsOfUse}" title="terms of use">Terms of Use</a></small> |
| <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> |
</#if>
Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="powered by VIVO"><strong>VIVO</strong></a>
${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO</strong></a>
<#if user.hasRevisionInfoAccess>
| Version <a href="${version.moreInfoUrl}" title="version">${version.label}</a>
| ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="${i18n().menu_version}">${version.label}</a>
</#if>
</p>
<nav role="navigation">
<ul id="footer-nav" role="list">
<li role="listitem"><a href="${urls.about}" title="about">About</a></li>
<li role="listitem"><a href="${urls.about}" title="${i18n().menu_about}">${i18n().menu_about}</a></li>
<#if urls.contact??>
<li role="listitem"><a href="${urls.contact}" title="contact us">Contact Us</a></li>
<li role="listitem"><a href="${urls.contact}" title="${i18n().menu_contactus}">${i18n().menu_contactus}</a></li>
</#if>
<li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="support">Support</a></li>
<li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().menu_support}">${i18n().menu_support}</a></li>
</ul>
</nav>
</footer>

19
themes/wilma/templates/identity.ftl
View file

@ -1,7 +1,8 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<header id="branding" role="banner">
<h1 class="vivo-logo"><a title="VIVO | enabling national networking of scientists" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
<h1 class="vivo-logo"><a title="${i18n().identity_title}" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
<#-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
<#if siteTagline?has_content>
<em>${siteTagline}</em>
@ -10,30 +11,30 @@
<nav role="navigation">
<ul id="header-nav" role="list">
<#include "languageSelector.ftl">
<li role="listitem"><a href="${urls.index}" title="index">Index</a></li>
<li role="listitem"><a href="${urls.index}" title="${i18n().identity_index}">${i18n().identity_index}</a></li>
<#if user.loggedIn>
<#-- COMMENTING OUT THE EDIT PAGE LINK FOR RELEASE 1.5. WE NEED TO IMPLEMENT THIS IN A MORE
USER FRIENDLY WAY. PERHAPS INCLUDE A LINK ON THE PAGES THEMSELVES AND DISPLAY IF THE
USER IS A SITE ADMIN. tlw72
<#if (page??) && (page?is_hash || page?is_hash_ex) && (page.URLToEditPage??) >
<li role="listitem"><a href="${page.URLToEditPage}" title="edit page">Edit Page</a></li>
<li role="listitem"><a href="${page.URLToEditPage}" title="${i18n().identity_edit}">${i18n().identity_edit}</a></li>
</#if>
-->
<#if user.hasSiteAdminAccess>
<li role="listitem"><a href="${urls.siteAdmin}" title="site admin">Site Admin</a></li>
<li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().identity_admin}">${i18n().identity_admin}</a></li>
</#if>
<li>
<ul class="dropdown">
<li id="user-menu"><a href="#" title="user">${user.loginName}</a>
<li id="user-menu"><a href="#" title="${i18n().identity_user}">${user.loginName}</a>
<ul class="sub_menu">
<#if user.hasProfile>
<li role="listitem"><a href="${user.profileUrl}" title="my profile">My profile</a></li>
<li role="listitem"><a href="${user.profileUrl}" title="${i18n().identity_myprofile}">${i18n().identity_myprofile}</a></li>
</#if>
<#if urls.myAccount??>
<li role="listitem"><a href="${urls.myAccount}" title="my account">My account</a></li>
<li role="listitem"><a href="${urls.myAccount}" title="${i18n().identity_myaccount}">${i18n().identity_myaccount}</a></li>
</#if>
<li role="listitem"><a href="${urls.logout}" title="log out">Log out</a></li>
<li role="listitem"><a href="${urls.logout}" title="${i18n().menu_logout}">${i18n().menu_logout}</a></li>
</ul>
</li>
</ul>
@ -44,7 +45,7 @@
${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
<#else>
<li role="listitem"><a class="log-out" title="log in to manage this site" href="${urls.login}">Log in</a></li>
<li role="listitem"><a class="log-out" title="${i18n().menu_loginfull}" href="${urls.login}">${i18n().menu_login}</a></li>
</#if>
</ul>

4
themes/wilma/templates/individual--foaf-person.ftl
View file

@ -50,8 +50,8 @@
<header>
<#if relatedSubject??>
<h2>${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}</h2>
<p><a href="${relatedSubject.url}" title="return to">&larr; return to ${relatedSubject.name}</a></p>
<h2>${relatedSubject.relatingPredicateDomainPublic} ${i18n.indiv_foafperson_for} ${relatedSubject.name}</h2>
<p><a href="${relatedSubject.url}" title="${i18n.indiv_foafperson_return}">&larr; ${i18n.indiv_foafperson_return} ${relatedSubject.name}</a></p>
<#else>
<h1 class="vcard foaf-person">
<#-- Label -->

4
themes/wilma/templates/menu.ftl
View file

@ -5,14 +5,14 @@
<nav role="navigation">
<ul id="main-nav" role="list">
<#list menu.items as item>
<li role="listitem"><a href="${item.url}" title="${item.linkText} menu item" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
<li role="listitem"><a href="${item.url}" title="${item.linkText} ${i18n().menu_item}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
</#list>
</ul>
</nav>
<div id="wrapper-content" role="main">
<#if flash?has_content>
<#if flash?starts_with("Welcome") >
<#if flash?starts_with(i18n().menu_welcomestart) >
<section id="welcome-msg-container" role="container">
<section id="welcome-message" role="alert">${flash}</section>
</section>

12
themes/wilma/templates/page-home.ftl
View file

@ -32,13 +32,13 @@
<#include "menu.ftl">
<section id="intro" role="region">
<h2>Welcome to VIVO</h2>
<h2>${i18n().intro_title}</h2>
<p>VIVO is a research-focused discovery tool that enables collaboration among scientists across all disciplines.</p>
<p>Browse or search information on people, departments, courses, grants, and publications.</p>
<p>${i18n().intro_para1}</p>
<p>${i18n().intro_para2}Browse or search information on people, departments, courses, grants, and publications.</p>
<section id="search-home" role="region">
<h3>Search VIVO <span class="search-filter-selected">filteredSearch</span></h3>
<h3>${i18n().intro_searchvivo} <span class="search-filter-selected">filteredSearch</span></h3>
<fieldset>
<legend>Search form</legend>
@ -49,8 +49,8 @@
<input type="hidden" name="classgroup" class="search-homepage" value="" autocapitalize="off" />
</div>
<a class="filter-search filter-default" href="#" title="Filter search">
<span class="displace">filter search</span>
<a class="filter-search filter-default" href="#" title="${i18n().intro_filtersearch}">
<span class="displace">${i18n().intro_filtersearch}</span>
</a>
<ul id="filter-search-nav">