# HG changeset patch
# User Chris Cannam
# Date 1328093298 0
# Node ID 6f5c0ac92d726349c15d22a93eb1c64cad5fe90a
# Parent  67cbdbfbd741e4198cbff3f560d320287c13beed# Parent  793a52eb8d322289ce767b560718ee92aec28cee
Merge from branch "cannam"

diff -r 67cbdbfbd741 -r 6f5c0ac92d72 app/controllers/projects_controller.rb
--- a/app/controllers/projects_controller.rb	Mon Dec 05 20:52:29 2011 +0000
+++ b/app/controllers/projects_controller.rb	Wed Feb 01 10:48:18 2012 +0000
@@ -89,6 +89,16 @@
     @project = Project.new
     @project.safe_attributes = params[:project]
 
+
+    # todo: luisf: this should be removed from here...
+    if params && params[:project] && !params[:project][:tag_list].nil?
+      new_tags = params[:project][:tag_list].to_s.downcase
+
+      @project.tag_list = ActionController::Base.helpers.strip_tags(new_tags)
+    end
+    # end of code to be removed
+
+
     if validate_parent_id && @project.save
       @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
       # Add current user as a project member if he is not admin
diff -r 67cbdbfbd741 -r 6f5c0ac92d72 app/views/my/page.rhtml
--- a/app/views/my/page.rhtml	Mon Dec 05 20:52:29 2011 +0000
+++ b/app/views/my/page.rhtml	Wed Feb 01 10:48:18 2012 +0000
@@ -1,5 +1,6 @@
 <div class="contextual">
     <%= link_to l(:label_personalize_page), :action => 'page_layout' %>
+    <%= '| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
 </div>
 
 <h2><%=l(:label_my_page)%></h2>
diff -r 67cbdbfbd741 -r 6f5c0ac92d72 app/views/projects/_form.rhtml
--- a/app/views/projects/_form.rhtml	Mon Dec 05 20:52:29 2011 +0000
+++ b/app/views/projects/_form.rhtml	Wed Feb 01 10:48:18 2012 +0000
@@ -15,7 +15,7 @@
 <p><%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen? %>
 <% unless @project.identifier_frozen? %>
   <br />
-  <em><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info) %></em>
+  <em><%= l(:text_project_identifier_info) %></em>
 <% end %></p>
 <p><%= f.text_field :homepage, :size => 60 %>
 <br />
@@ -46,7 +46,12 @@
 </fieldset>
 <% end %>
 
-<% if @project.new_record? || @project.module_enabled?('issue_tracking') %>
+<% if @project.new_record? %>
+<% @trackers.each do |tracker| %>
+    <%= hidden_field_tag 'project[tracker_ids][]', tracker.id %>
+<% end %>
+<%= hidden_field_tag 'project[tracker_ids][]', '' %>
+<% elsif @project.module_enabled?('issue_tracking') %>
 <% unless @trackers.empty? %>
 <fieldset class="box" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
 <% @trackers.each do |tracker| %>
diff -r 67cbdbfbd741 -r 6f5c0ac92d72 config/locales/en.yml
--- a/config/locales/en.yml	Mon Dec 05 20:52:29 2011 +0000
+++ b/config/locales/en.yml	Wed Feb 01 10:48:18 2012 +0000
@@ -941,13 +941,13 @@
   text_tip_issue_begin_day: task beginning this day
   text_tip_issue_end_day: task ending this day
   text_tip_issue_begin_end_day: task beginning and ending this day
-  text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.<br />Once saved, the identifier cannot be changed.'
-  text_project_homepage_info: 'Link to an external project page.'
+  text_project_identifier_info: 'The system identifier that will form the unique part of the URL for your project.<br/>Only lower case letters (a-z), numbers and dashes are allowed.<br />Once saved, the identifier cannot be changed.'
+  text_project_homepage_info: 'Optional link to an external project page.'
   text_caracters_maximum: "%{count} characters maximum."
   text_caracters_minimum: "Must be at least %{count} characters long."
   text_length_between: "Length between %{min} and %{max} characters."
-  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_name_info: "This will be the name of your project as it appears throughout this site.<br /> You can change it at any time, in the project's settings."
+  text_project_visibility_info: "If your project is not public, it will be visible only to you and to users that you have added as project members.<br/>You can change this later if you wish."
   text_user_ssamr_description_info: 'Please describe your current research or development interests.<br/>This information will be used at registration to determine that you are a real person &ndash; so please be descriptive, or your application may be delayed or rejected.<br/>After registration, the description 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.'
 
diff -r 67cbdbfbd741 -r 6f5c0ac92d72 unis.txt
--- a/unis.txt	Mon Dec 05 20:52:29 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-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