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

Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Browse source
This commit is contained in:
brianjlowe 2013-05-21 16:19:07 -04:00
commit 067deb48d5
7 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
View file

@ -178,7 +178,7 @@ public abstract class UserAccountsMyAccountPageStrategy extends
FreemarkerEmailMessage email = FreemarkerEmailFactory FreemarkerEmailMessage email = FreemarkerEmailFactory
.createNewMessage(vreq); .createNewMessage(vreq);
email.addRecipient(TO, page.getUserAccount().getEmailAddress()); email.addRecipient(TO, page.getUserAccount().getEmailAddress());
email.setSubject(i18n.text("email_changed_subject")); email.setSubject(i18n.text("email_changed_subject", getSiteName()));
email.setTemplate(EMAIL_TEMPLATE); email.setTemplate(EMAIL_TEMPLATE);
email.setBodyMap(body); email.setBodyMap(body);
email.processTemplate(); email.processTemplate();

6
webapp/themes/vitro/templates/footer.ftl
View file

@ -11,11 +11,11 @@
<#else> <#else>
${copyright.text} ${copyright.text}
</#if> </#if>
| <a class="terms" href="${urls.termsOfUse}" title="${i18n().terms_of_use}">Terms of Use</a></small> | | <a class="terms" href="${urls.termsOfUse}" title="${i18n().terms_of_use}">${i18n().terms_of_use}</a></small> |
</#if> </#if>
Powered by <a class="powered-by-vitro" href="http://vitro.sourceforge.net"><strong>Vitro</strong></a> ${i18n().powered_by} <a class="powered-by-vitro" href="http://vitro.sourceforge.net"><strong>Vitro</strong></a>
<#if user.hasRevisionInfoAccess> <#if user.hasRevisionInfoAccess>
| Version <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a> | ${i18n().version} <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
</#if> </#if>
</p> </p>

2
webapp/themes/vitro/templates/page-home.ftl
View file

@ -31,7 +31,7 @@
<h3>${i18n().search_vitro} <span class="search-filter-selected">filteredSearch</span></h3> <h3>${i18n().search_vitro} <span class="search-filter-selected">filteredSearch</span></h3>
<fieldset> <fieldset>
<legend>Search form</legend> <legend>${i18n().search_form}</legend>
<form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" > <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" >
<div id="search-home-field"> <div id="search-home-field">
<input type="text" name="querytext" class="search-homepage" value="${querytext!}" autocapitalize="off" /> <input type="text" name="querytext" class="search-homepage" value="${querytext!}" autocapitalize="off" />

21
webapp/web/i18n/all.properties
View file

@ -125,7 +125,7 @@ initial_password = Initial password
submit_add_new_account = Add new account submit_add_new_account = Add new account
account_created = Your {0} account has been created. account_created = Your {0} account has been created.
account_created_subject Your {0} account has been created. account_created_subject = Your {0} account has been created.
account_created_email_html = @@file files/accountCreatedEmail.html account_created_email_html = @@file files/accountCreatedEmail.html
account_created_email_text = @@file files/accountCreatedEmail.txt account_created_email_text = @@file files/accountCreatedEmail.txt
account_created_external_email_html = @@file files/accountCreatedExternalOnlyEmail.html account_created_external_email_html = @@file files/accountCreatedExternalOnlyEmail.html
@ -168,7 +168,7 @@ reset_your_password = Reset your Password
first_time_login = First time log in first_time_login = First time log in
create_account = Create account create_account = Create account
cant_activate_while_logged_in = You may not activate the account for {0} while you are logged in as {1}. cant_activate_while_logged_in = You may not activate the account for {0} while you are logged in as {1}. \
Please log out and try again. Please log out and try again.
account_already_activated = The account for {0} has already been activated. account_already_activated = The account for {0} has already been activated.
@ -192,7 +192,7 @@ myAccount_heading = My account
myAccount_confirm_changes = Your changes have been saved. myAccount_confirm_changes = Your changes have been saved.
myAccount_confirm_changes_plus_note = Your changes have been saved. A confirmation email has been sent to {0}. myAccount_confirm_changes_plus_note = Your changes have been saved. A confirmation email has been sent to {0}.
email_change_will_be_confirmed = Note: if email changes, a confirmation email will be sent to the new email address entered above. email_change_will_be_confirmed = Note: if email changes, a confirmation email will be sent to the new email address entered above.
email_changed_subject = "Your VIVO email account has been changed."); #email_changed_subject = "Your VIVO email account has been changed.");
who_can_edit_profile = Who can edit my profile who_can_edit_profile = Who can edit my profile
add_profile_editor = Add profile editor add_profile_editor = Add profile editor
@ -353,8 +353,6 @@ password_mismatch = Passwords do not match.
new_pwd_matches_existing = Your new password must be different from your existing password. new_pwd_matches_existing = Your new password must be different from your existing password.
enter_email_password = Enter the email address and password for your internal Vitro account. enter_email_password = Enter the email address and password for your internal Vitro account.
change_password = You must change your password to log in. change_password = You must change your password to log in.
new_password = New Password
confirm_password = Confirm Password
email_capitalized = Email email_capitalized = Email
password_capitalized = Password password_capitalized = Password
login_button = Log in login_button = Log in
@ -451,7 +449,7 @@ associate_classes_with_group = and associate classes with the group created.
refresh_content = Refresh Content refresh_content = Refresh Content
rebuild_search_index = Rebuild search index rebuild_search_index = Rebuild search index
rebuild_vis_cache = Rebuild visualization cache rebuild_vis_cache = Rebuild visualization cache
recompute_inferences = Recompute inferences recompute_inferences_mixed_caps = Recompute inferences
site_administration = Site Administration site_administration = Site Administration
@ -480,8 +478,8 @@ site_config = Site Configuration
internal_class = Institutional internal class internal_class = Institutional internal class
manage_profile_editing = Manage profile editing manage_profile_editing = Manage profile editing
page_management = Page management page_management = Page management
menu_ordering = Menu ordering menu_ordering_mixed_caps = Menu ordering
restrict_logins = Restrict Logins restrict_logins_mixed_caps = Restrict logins
site_information = Site information site_information = Site information
user_accounts = User accounts user_accounts = User accounts
@ -572,7 +570,6 @@ no_results_returned = No results were returned.
# #
# manage proxies templates ( /templates/freemarker/body/manageproxies ) # manage proxies templates ( /templates/freemarker/body/manageproxies )
# #
manage_profile_editing = Manage profile editing
operation_successful = The operation was successful. operation_successful = The operation was successful.
operation_unsuccessful = The operation was unsuccessful. Full details can be found in the system log. operation_unsuccessful = The operation was unsuccessful. Full details can be found in the system log.
relate_editors_profiles = Relate profile editors and profiles relate_editors_profiles = Relate profile editors and profiles
@ -582,7 +579,6 @@ select_editors = Select editors
select_last_name = Select an existing last name select_last_name = Select an existing last name
processing_indicator = processing time indicator processing_indicator = processing time indicator
type_more_chars = type more character type_more_chars = type more character
remove_selection = Remove selection
select_profiles = Select profiles select_profiles = Select profiles
profile_editors = Profile editors profile_editors = Profile editors
search_button = Search search_button = Search
@ -691,7 +687,7 @@ confirm_menu_item_delete = Are you sure you want to remove
pretty_url = Pretty URL pretty_url = Pretty URL
start_with_leading_slash = Must begin with a leading forward slash: / (e.g., /people) start_with_leading_slash = Must begin with a leading forward slash: / (e.g., /people)
default = Default default = Default
custom_template = Custom template custom_template_mixed_caps = Custom template
change_content_type = Change content type change_content_type = Change content type
select_page_content_type = Select content type for the associated page select_page_content_type = Select content type for the associated page
select_content_display = Select content to display select_content_display = Select content to display
@ -730,6 +726,7 @@ no_classes_to_select = There are no Classes in the system from which to select.
# #
# vitro theme templates ( /themes/vitro/templates ) # vitro theme templates ( /themes/vitro/templates )
# #
powered_by = Powered by
javascript_ie_alert_text = This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser. javascript_ie_alert_text = This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser.
what_is_vitro = What is VITRO? what_is_vitro = What is VITRO?
@ -740,4 +737,4 @@ vitro_bullet_two = Edit instances and relationships
vitro_bullet_three = Build a public web site to display your data vitro_bullet_three = Build a public web site to display your data
vitro_bullet_four = Search your data vitro_bullet_four = Search your data
search_vitro = Search VITRO search_vitro = Search VITRO
filter_search filter search filter_search = filter search

2
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
View file

@ -16,7 +16,7 @@
</#if> </#if>
<#if indexCacheRebuild.recomputeInferences?has_content> <#if indexCacheRebuild.recomputeInferences?has_content>
<li role="listitem"><a href="${indexCacheRebuild.recomputeInferences}" title="${i18n().recompute_inferences}">${i18n().recompute_inferences}</a></li> <li role="listitem"><a href="${indexCacheRebuild.recomputeInferences}" title="${i18n().recompute_inferences}">${i18n().recompute_inferences_mixed_caps}</a></li>
</#if> </#if>
</ul> </ul>
</section> </section>

4
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
View file

@ -20,11 +20,11 @@
</#if> </#if>
<#if siteConfig.menuManagement?has_content> <#if siteConfig.menuManagement?has_content>
<li role="listitem"><a href="${siteConfig.menuManagement}" title="${i18n().menu_ordering}">${i18n().menu_ordering}</a></li> <li role="listitem"><a href="${siteConfig.menuManagement}" title="${i18n().menu_ordering}">${i18n().menu_ordering_mixed_caps}</a></li>
</#if> </#if>
<#if siteConfig.restrictLogins?has_content> <#if siteConfig.restrictLogins?has_content>
<li role="listitem"><a href="${siteConfig.restrictLogins}" title="${i18n().restrict_logins}">${i18n().restrict_logins}</a></li> <li role="listitem"><a href="${siteConfig.restrictLogins}" title="${i18n().restrict_logins}">${i18n().restrict_logins_mixed_caps}</a></li>
</#if> </#if>
<#if siteConfig.siteInfo?has_content> <#if siteConfig.siteInfo?has_content>

2
webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
View file

@ -36,7 +36,7 @@
<label class="inline" for="default"> ${i18n().default}</label> <label class="inline" for="default"> ${i18n().default}</label>
<br /> <br />
<input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked</#if> role="input" /> <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked</#if> role="input" />
<label class="inline" for="custom"> ${i18n().custom_template}</label> <label class="inline" for="custom"> ${i18n().custom_template_mixed_caps}</label>
<section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region"> <section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region">
<input type="text" name="customTemplate" value="${customTemplate!}" size="40" role="input" /><span class="requiredHint"> *</span> <input type="text" name="customTemplate" value="${customTemplate!}" size="40" role="input" /><span class="requiredHint"> *</span>