From a86480e6b76b88b2ce7c7c3a77604e7e1eecd502 Mon Sep 17 00:00:00 2001 From: ryounes Date: Wed, 18 May 2011 20:42:23 +0000 Subject: [PATCH 1/6] NIHVIVO-2459 Untokenized, unstemmed autocomplete (e.g., in addAuthors form). Added commented-out configuration for Solr Suggester in solrconfig.xml. --- solr/exampleSolr/conf/schema.xml | 51 +++++++------- solr/exampleSolr/conf/solrconfig.xml | 46 ++++++++++++- .../SolrAutocompleteController.java | 69 ++++++++++--------- 3 files changed, 106 insertions(+), 60 deletions(-) diff --git a/solr/exampleSolr/conf/schema.xml b/solr/exampleSolr/conf/schema.xml index 7a220a86b..8b70e5ca1 100644 --- a/solr/exampleSolr/conf/schema.xml +++ b/solr/exampleSolr/conf/schema.xml @@ -470,32 +470,33 @@ when adding a document. --> - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + - 1024 + --> + + 50000 + + + + + + + + +<#-- Template for adding a user account --> + +

Add new account

+ + <#if errorEmailIsEmpty??> + <#assign errorMessage = "You must supply an email address." /> + + + <#if errorEmailInUse??> + <#assign errorMessage = "An account with that email address already exists." /> + + + <#if errorFirstNameIsEmpty??> + <#assign errorMessage = "You must supply a first name." /> + + + <#if errorLastNameIsEmpty??> + <#assign errorMessage = "You must supply a last name." /> + + + <#if errorNoRoleSelected??> + <#assign errorMessage = "You must select a role." /> + + + <#if errorMessage?has_content> + + + +
+ Email address * +
+ +
+ First name * +
+ +
+ Last name * +
+ +
+
+ Roles * +
+ <#list roles as role> + selected />${role.label} +
+ +
+ Associate a profile with this account +
+ checked />Yes +
+ checked />No +
+ +

+ Note: An email will be sent to the address entered above + notifying that an account has been created. + It will include instructions for activating the account and creating a password. +

+ + + or Cancel +
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl new file mode 100644 index 000000000..95dc4a47f --- /dev/null +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl @@ -0,0 +1,6 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Template for editing a user account --> + +

Edit user account

+ diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl index e6264302d..d4cc2cc31 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl @@ -2,7 +2,7 @@ <#-- Template for displaying list of user accounts --> -
+ <#--current page:
--> @@ -38,12 +38,28 @@ -->
-

Account |

- +
+

Account |

+
- +<#if newUserAccount?? > + + + +<#if deletedAccountCount?? > + +
-
- - - -
+
+
+ + + +
+
-
- - + -