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

template updates for internationalization, including updated all.properties

Browse source
This commit is contained in:
tworrall 2013-05-20 15:36:37 -04:00
parent dbcc75dc20
commit 639f0450ac
86 changed files with 917 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webapp/web/templates/freemarker/widgets/widget-browse.ftl
View file

@ -12,12 +12,12 @@
<#macro allClassGroups>
<section id="browse" role="region">
<h4>Browse</h4>
<h4>${i18n().browse_capitalized}</h4>
<ul id="browse-classgroups" role="list">
<#list vclassGroupList as group>
<#if (group.individualCount > 0)>
<li role="listitem"><a href="${urls.currentPage}?classgroupUri=${group.uri?url}" title="group name">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
<li role="listitem"><a href="${urls.currentPage}?classgroupUri=${group.uri?url}" title="${i18n().group_name}">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
</#if>
</#list>
</ul>
@ -28,14 +28,14 @@
<#macro classGroup>
<section id="browse" role="region">
<h4>Browse</h4>
<h4>${i18n().browse_capitalized}</h4>
<section id="browse-classes" role="navigation">
<nav>
<ul id="classes-in-classgroup" role="list">
<#list classes as class>
<#if (class.individualCount > 0)>
<li role="listitem"><a href="${urls.currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}" title="class name">${class.name} <span class="count-individuals"> (${class.individualCount})</span></a></li>
<li role="listitem"><a href="${urls.currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}" title="${i18n().class_name}">${class.name} <span class="count-individuals"> (${class.individualCount})</span></a></li>
</#if>
</#list>
</ul>
@ -46,7 +46,7 @@
<#macro vclass>
<section id="browse" role="region">
<h4>Browse</h4>
<h4>${i18n().browse_capitalized}</h4>
<div>
vclass ${class.name} from ${classGroup.displayName}
This has classGroup, classes, individualsInClass and class.
@ -54,14 +54,14 @@
<ul>
<#list individualsInClass as ind>
<li><a href="${urls.base}/individual?uri=${ind.uri?url}" title="individual name">${ind.name}</a></li>
<li><a href="${urls.base}/individual?uri=${ind.uri?url}" title="${i18n().individual_nam}">${ind.name}</a></li>
</#list>
</section>
</#macro>
<#macro vclassAlpha>
<section id="browse" role="region">
<h4>Browse</h4>
<div>vclassAlpha is not yet implemented.</div>
<h4>${i18n().browse_capitalized}</h4>
<div>${i18n().vclassAlpha_not_implemented}</div>
</section>
</#macro>

40
webapp/web/templates/freemarker/widgets/widget-login.ftl
View file

@ -22,14 +22,14 @@
<#if currentServlet != 'home'>
<noscript>
<section id="error-alert">
<img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
<p>In order to edit content, you'll need to enable JavaScript. Here are the <a href="http://www.enable-javascript.com" title="java script instructions">instructions for enabling JavaScript in your web browser</a>.</p>
<img src="${urls.images}/iconAlertBig.png" alt="${i18n().alert_icon}"/>
<p>${i18n().javascript_require_to_edit} <a href="http://www.enable-javascript.com" title="${i18n().javascript_instructions}">${i18n().to_enable_javascript}</a>.</p>
</section>
</noscript>
</#if>
<section id="login" class="hidden">
<h2>Log in</h2>
<h2>${i18n().login_button}</h2>
<#if infoMessage??>
<h3>${infoMessage}</h3>
@ -38,7 +38,7 @@
<#if errorMessage??>
<#assign infoClassShow = ' id="vivoAccountError"'/>
<section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alert="Error alert icon" />
<section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alt="${i18n().error_alert_icon}" />
<p class="login-alert">${errorMessage}</p>
</section>
</#if>
@ -47,29 +47,29 @@
<#if externalAuthUrl??>
<#assign infoClassHide = 'class="vivoAccount"'/>
<p class="external-auth"><a class="blue button" href="${externalAuthUrl}" title="external authentication name">${externalAuthName}</a></p>
<p class="external-auth"><a class="blue button" href="${externalAuthUrl}" title="${i18n().external_auth_name}">${externalAuthName}</a></p>
<!--<p class="or-auth">or</p>-->
<h3 class="internal-auth"><!--Log in using your--> <b>or</b> ${siteName} account</h3>
<h3 class="internal-auth"><!--Log in using your--> <b>${i18n().or}</b> ${siteName} ${i18n().account}</h3>
</#if>
<div ${infoClassHide} ${infoClassShow}>
<label for="loginName">Email</label>
<label for="loginName">${i18n().email_capitalized}</label>
<input id="loginName" name="loginName" class="text-field focus" type="text" value="${loginName!}" autocapitalize="off" required autofocus />
<label for="loginPassword">Password</label>
<label for="loginPassword">${i18n().password_capitalized}</label>
<input id="loginPassword" name="loginPassword" class="text-field" type="password" required />
<p class="submit"><input name="loginForm" class="green button" type="submit" value="Log in"/></p>
<p class="submit"><input name="loginForm" class="green button" type="submit" value="${i18n().login_button}"/></p>
<#-- NC: remember me won't be ready for r1.2
<input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
<label class="label-remember-me" for="remember-me">Remember me</label> -->
<#-- mb863: forgot password and request an account won't be part of VIVO r1.2
<p class="forgot-password"><a href="#" title="forgot password">Forgot your password?</a></p>
<p class="request-account"><a class="blue button" href="#" title="request an account">Request an account</a> </p> -->
<p class="request-account"><a class="blue button" href="#" title="request an account">Request an account</a> </p>
-->
</div>
</form>
@ -78,33 +78,33 @@
<#macro forcePasswordChange>
<section id="login">
<h2>Change Password to Log in</h2>
<h2>${i18n().change_password_to_login}</h2>
<#if errorMessage??>
<div id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
<div id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}"/>
<p>${errorMessage}</p>
</div>
</#if>
<form role="form" id="login-form" action="${formAction}" method="post" name="login-form" />
<label for="newPassword">New Password</label>
<label for="newPassword">${i18n().new_password_capitalized}</label>
<input id="newPassword" name="newPassword" class="text-field focus" type="password" required autofocus/>
<p class="password-note">Minimum of 6 characters in length.</p>
<p class="password-note">${i18n().minimum_six_chars}</p>
<label for="confirmPassword">Confirm Password</label>
<label for="confirmPassword">${i18n().confirm_password_capitalized}</label>
<input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />
<p class="submit-password"><input name="passwordChangeForm" class="green button" type="submit" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}" title="cancel">Cancel</a></span></p>
<p class="submit-password"><input name="passwordChangeForm" class="green button" type="submit" value="${i18n().login_button}"/> <span class="or">or <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span></p>
</form>
</section>
</#macro>
<#macro alreadyLoggedIn>
<h2>Log in</h2>
<p>You are already logged in.</p>
<h2>${i18n().login_button}</h2>
<p>${i18n().already_logged_in}</p>
</#macro>
<#macro error>
<p>There was an error in the system.</p>
<p>${i18n().we_have_an_error}</p>
</#macro>

8
webapp/web/templates/freemarker/widgets/widget-test.ftl
View file

@ -10,14 +10,14 @@
<#macro loggedIn>
<div class="testWidget">
<h4>This is the test widget for logged-in users.</h4>
<p>Login status: ${status}.</p>
<h4>${i18n().test_for_logged_in_users}</h4>
<p>${i18n().login_status} ${status}.</p>
</div>
</#macro>
<#macro notLoggedIn>
<div class="testWidget">
<h4>This is the test widget for non-logged-in users.</h4>
<p>Login status: ${status}.</p>
<h4>${i18n().test_for_nonlogged_in_users}</h4>
<p>${i18n().login_status} ${status}.</p>
</div>
</#macro>