Mercurial > hg > soundsoftware-site
changeset 102:dc252f2ddef5 luisf
- Removed Wiki Toolbar from DEscription input box
- Added the Institution dropdown to the registration view
| author | luisf |
|---|---|
| date | Thu, 16 Dec 2010 17:42:00 +0000 |
| parents | 596803cb34fc |
| children | d206f38ae405 |
| files | app/views/account/register.rhtml config/locales/en-GB.yml config/locales/en.yml |
| diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/account/register.rhtml Thu Dec 16 14:55:37 2010 +0000 +++ b/app/views/account/register.rhtml Thu Dec 16 17:42:00 2010 +0000 @@ -35,11 +35,15 @@ <% fields_for :ssamr_user_details, :builder => TabularFormBuilder, :lang => current_language do |ssamr_user_detail| %> <p> - <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit' %> - <%= wikitoolbar_for 'ssamr_user_details_description' %> + <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit' %> <em> <%=l(:text_user_ssamr_description_info)%></em> </p> + + <p> + <label for="ssamr_user_institution"><%=l(:label_ssamr_institution)%></label> + <%= collection_select(:ssamr_user_detail, :institution_id, Institution.all, :id, :name, {:prompt => true}) %> + </p> <% end %>
--- a/config/locales/en-GB.yml Thu Dec 16 14:55:37 2010 +0000 +++ b/config/locales/en-GB.yml Thu Dec 16 17:42:00 2010 +0000 @@ -414,7 +414,7 @@ label_notifications: Important Message label_ssamr_description: Research description label_ssamr_details: Other Details - + label_ssamr_institution: Institution label_user: User label_user_plural: Users label_user_new: New user
--- a/config/locales/en.yml Thu Dec 16 14:55:37 2010 +0000 +++ b/config/locales/en.yml Thu Dec 16 17:42:00 2010 +0000 @@ -426,9 +426,9 @@ project_module_boards: Boards project_module_calendar: Calendar project_module_gantt: Gantt - label_tipoftheday: Tip of the day label_ssamr_details: Other Details + label_ssamr_institution: Institution label_user: User label_user_plural: Users label_user_new: New user