# HG changeset patch
# User Luis Figueira <luis.figueira@eecs.qmul.ac.uk>
# Date 1292521561 0
# Node ID d206f38ae405c3c5d3e3c15f7fea6a4c6bd8be97
# Parent  dc252f2ddef5c0873d427b2c0356185b70f957da# Parent  2248a45897a03363a6946ca0a7802500074dc624
Merge from branch "live"

diff -r 2248a45897a0 -r d206f38ae405 app/models/institution.rb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/models/institution.rb	Thu Dec 16 17:46:01 2010 +0000
@@ -0,0 +1,2 @@
+class Institution < ActiveRecord::Base
+end
diff -r 2248a45897a0 -r d206f38ae405 app/views/account/register.rhtml
--- a/app/views/account/register.rhtml	Thu Dec 16 16:44:20 2010 +0000
+++ b/app/views/account/register.rhtml	Thu Dec 16 17:46:01 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 %>
           
 
diff -r 2248a45897a0 -r d206f38ae405 config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Thu Dec 16 16:44:20 2010 +0000
+++ b/config/locales/en-GB.yml	Thu Dec 16 17:46:01 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
@@ -422,8 +422,6 @@
   label_project: Project
   label_project_new: New project
   label_project_plural: Projects
-  label_my_project_plural: My Projects
-  label_other_project_plural: "Everyone Else's Projects"
   label_x_projects:
     zero:  no projects
     one:   1 project
@@ -702,7 +700,7 @@
   label_week: Week
   label_date_from: From
   label_date_to: To
-  label_language_based: "Based on user's language"
+  label_language_based: Based on user's language
   label_sort_by: "Sort by {{value}}"
   label_send_test_email: Send a test email
   label_feeds_access_key: RSS access key
@@ -843,7 +841,7 @@
   text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.<br /> This will be used in all project-related URLs, and as the repository name. Once saved, the identifier <b>can not</b> be changed.'
   text_project_name_info: "This will be the name of your project throughout this site.<br /> You can change your project's name at any time, in the project's settings."
   text_project_visibility_info: "If your project is not public, it will only be visible to users that you have added as project members."
-  text_user_ssamr_description_info: 'Please describe your current research or development interests, within the fields of audio and music.<br/>This information is publicly visible in your profile and you can edit it at any time.<br/>It may also be used to establish eligibility for your initial registration.'
+  text_user_ssamr_description_info: 'Please describe your current research or development interests, within the fields of audio and music.<br/>This information is publicly visible in your profile and you can edit it at any time.'
   text_issue_parent_issue_info: 'If this is a subtask, please insert its parent task number or write the main task name.'
   text_caracters_maximum: "{{count}} characters maximum."
   text_caracters_minimum: "Must be at least {{count}} characters long."
diff -r 2248a45897a0 -r d206f38ae405 config/locales/en.yml
--- a/config/locales/en.yml	Thu Dec 16 16:44:20 2010 +0000
+++ b/config/locales/en.yml	Thu Dec 16 17:46:01 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
@@ -437,7 +437,7 @@
   label_project_new: New project
   label_project_plural: Projects
   label_my_project_plural: My Projects
-  label_other_project_plural: "Everyone Else's Projects"
+  label_other_project_plural: Other Projects
   label_x_projects:
     zero:  no projects
     one:   1 project
@@ -870,7 +870,7 @@
   text_project_name_info: "This will be the name of your project throughout this site.<br /> You can change your project's name at any time, in the project's settings."
   text_project_visibility_info: "If your project is not public, it will only be visible to users that you have added as project members."
   text_project_homepage_info: 'Link to an external project page.'
-  text_user_ssamr_description_info: 'Please describe your current research or development interests, within the fields of audio and music.<br/>This information is publicly visible in your profile and you can edit it at any time.<br/>It may also be used to establish eligibility for your initial registration.'
+  text_user_ssamr_description_info: 'Please describe your current research or development interests, within the fields of audio and music.<br/>This information is publicly visible in your profile and you can edit it at any time.'
   text_issue_parent_issue_info: 'If this is a subtask, please insert its parent task number or write the main task name.'
   text_caracters_maximum: "{{count}} characters maximum."
   text_caracters_minimum: "Must be at least {{count}} characters long."
diff -r 2248a45897a0 -r d206f38ae405 console/db/seeds.rb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/console/db/seeds.rb	Thu Dec 16 17:46:01 2010 +0000
@@ -0,0 +1,9 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#   
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Major.create(:name => 'Daley', :city => cities.first)
+
+puts "this is a test"
\ No newline at end of file
diff -r 2248a45897a0 -r d206f38ae405 db/migrate/20101216140621_create_institutions.rb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/migrate/20101216140621_create_institutions.rb	Thu Dec 16 17:46:01 2010 +0000
@@ -0,0 +1,13 @@
+class CreateInstitutions < ActiveRecord::Migration
+  def self.up
+    create_table :institutions do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :institutions
+  end
+end
diff -r 2248a45897a0 -r d206f38ae405 db/seed_data/institutions.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/seed_data/institutions.txt	Thu Dec 16 17:46:01 2010 +0000
@@ -0,0 +1,141 @@
+University of Aberdeen
+University of Abertay Dundee
+Aberystwyth University
+Anglia Ruskin University
+University of the Arts London
+Aston University
+Bangor University
+University of Bath
+Bath Spa University
+University of Bedfordshire
+Birkbeck, University of London
+University of Birmingham
+Birmingham City University
+Birmingham Conservatoire
+University Centre at Blackburn College
+University of Bolton
+Bournemouth University
+University of Bradford
+University of Brighton
+University of Bristol
+Brunel University
+University of Buckingham
+Buckinghamshire New University
+University of Cambridge
+Institute of Cancer Research, University of London
+Canterbury Christ Church University
+Cardiff University
+University of Central Lancashire
+Central School of Speech and Drama, University of London
+University of Chester
+University of Chichester
+City University London
+Courtauld Institute of Art
+Coventry University
+Cranfield University
+University for the Creative Arts
+University of Cumbria
+De Montfort University
+University of Derby
+University of Dundee
+Durham University
+University of East Anglia
+University of East London
+Edge Hill University
+University of Edinburgh
+Edinburgh Napier University
+Institute of Education, University of London
+University of Essex
+University of Exeter
+University of Glamorgan
+University of Glasgow
+Glasgow Caledonian University
+University of Gloucestershire
+Goldsmiths, University of London
+University of Greenwich
+Glynd&#373;r University
+Heriot-Watt University
+University of Hertfordshire
+Heythrop College
+University of Huddersfield
+University of Hull
+Hull York Medical School
+Imperial College London
+Keele University
+University of Kent
+King's College London
+Kingston University
+Lancaster University
+University of Leeds
+Leeds Metropolitan University
+University of Leicester
+University of Lincoln
+University of Liverpool
+Liverpool Hope University
+Liverpool John Moores University
+London Business School
+London College of Music
+London Metropolitan University
+London School of Economics and Political Science
+London School of Hygiene and Tropical Medicine
+London South Bank University
+Loughborough University
+University of Manchester
+Manchester Metropolitan University
+Middlesex University
+Newcastle University
+University of Northampton
+Northumbria University
+University of Nottingham
+Nottingham Trent University
+The Open University
+University of Oxford
+Oxford Brookes University
+Peninsula College of Medicine and Dentistry
+University of Plymouth
+University of Portsmouth
+Queen's University Belfast
+Queen Margaret University
+Queen Mary, University of London
+University of Reading
+The Robert Gordon University, Aberdeen
+Roehampton University
+Royal Academy of Music
+Royal College of Art
+Royal Holloway, University of London
+Royal Veterinary College
+University of St Andrews
+St George's, University of London
+University of Salford
+School of Advanced Study, University of London
+School of Oriental and African Studies
+School of Pharmacy, University of London
+University of Sheffield
+Sheffield Hallam University
+University of Southampton
+Southampton Solent University
+Staffordshire University
+University of Stirling
+University of Strathclyde
+University of Sunderland
+University of Surrey
+University of Sussex
+Swansea Metropolitan University
+Swansea University
+University of Teesside
+Thames Valley University
+University of Ulster
+University College London
+University of Wales
+University of Wales Institute, Cardiff
+University of Wales, Newport
+University of Wales, Trinity Saint David
+University of Warwick
+University of Westminster
+University of the West of England
+University of the West of Scotland
+University of Winchester
+University of Wolverhampton
+University of Worcester
+University of York
+York St John University
diff -r 2248a45897a0 -r d206f38ae405 db/seeds.rb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/seeds.rb	Thu Dec 16 17:46:01 2010 +0000
@@ -0,0 +1,15 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#   
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Major.create(:name => 'Daley', :city => cities.first)
+
+Institution.delete_all
+
+open("db/seed_data/institutions.txt") do |institutions|
+  institutions.read.each_line do |institution|
+    Institution.create(:name => institution.chomp)
+  end
+end
\ No newline at end of file
diff -r 2248a45897a0 -r d206f38ae405 test/fixtures/institutions.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/fixtures/institutions.yml	Thu Dec 16 17:46:01 2010 +0000
@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  name: MyString
+
+two:
+  name: MyString
diff -r 2248a45897a0 -r d206f38ae405 test/unit/institution_test.rb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/unit/institution_test.rb	Thu Dec 16 17:46:01 2010 +0000
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class InstitutionTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end