Revision 834:6f5c0ac92d72

View differences:

app/controllers/projects_controller.rb
89 89
    @project = Project.new
90 90
    @project.safe_attributes = params[:project]
91 91

  
92

  
93
    # todo: luisf: this should be removed from here...
94
    if params && params[:project] && !params[:project][:tag_list].nil?
95
      new_tags = params[:project][:tag_list].to_s.downcase
96

  
97
      @project.tag_list = ActionController::Base.helpers.strip_tags(new_tags)
98
    end
99
    # end of code to be removed
100

  
101

  
92 102
    if validate_parent_id && @project.save
93 103
      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
94 104
      # Add current user as a project member if he is not admin
app/views/my/page.rhtml
1 1
<div class="contextual">
2 2
    <%= link_to l(:label_personalize_page), :action => 'page_layout' %>
3
    <%= '| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
3 4
</div>
4 5

  
5 6
<h2><%=l(:label_my_page)%></h2>
app/views/projects/_form.rhtml
15 15
<p><%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen? %>
16 16
<% unless @project.identifier_frozen? %>
17 17
  <br />
18
  <em><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info) %></em>
18
  <em><%= l(:text_project_identifier_info) %></em>
19 19
<% end %></p>
20 20
<p><%= f.text_field :homepage, :size => 60 %>
21 21
<br />
......
46 46
</fieldset>
47 47
<% end %>
48 48

  
49
<% if @project.new_record? || @project.module_enabled?('issue_tracking') %>
49
<% if @project.new_record? %>
50
<% @trackers.each do |tracker| %>
51
    <%= hidden_field_tag 'project[tracker_ids][]', tracker.id %>
52
<% end %>
53
<%= hidden_field_tag 'project[tracker_ids][]', '' %>
54
<% elsif @project.module_enabled?('issue_tracking') %>
50 55
<% unless @trackers.empty? %>
51 56
<fieldset class="box" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
52 57
<% @trackers.each do |tracker| %>
config/locales/en.yml
941 941
  text_tip_issue_begin_day: task beginning this day
942 942
  text_tip_issue_end_day: task ending this day
943 943
  text_tip_issue_begin_end_day: task beginning and ending this day
944
  text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.<br />Once saved, the identifier cannot be changed.'
945
  text_project_homepage_info: 'Link to an external project page.'
944
  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.'
945
  text_project_homepage_info: 'Optional link to an external project page.'
946 946
  text_caracters_maximum: "%{count} characters maximum."
947 947
  text_caracters_minimum: "Must be at least %{count} characters long."
948 948
  text_length_between: "Length between %{min} and %{max} characters."
949
  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."
950
  text_project_visibility_info: "If your project is not public, it will only be visible to users that you have added as project members."
949
  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."
950
  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."
951 951
  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.'
952 952
  text_issue_parent_issue_info: 'If this is a subtask, please insert its parent task number or write the main task name.'
953 953

  
unis.txt
1
University of Aberdeen
2
University of Abertay Dundee
3
Aberystwyth University
4
Anglia Ruskin University
5
University of the Arts London
6
Aston University
7
Bangor University
8
University of Bath
9
Bath Spa University
10
University of Bedfordshire
11
Birkbeck, University of London
12
University of Birmingham
13
Birmingham City University
14
Birmingham Conservatoire
15
University Centre at Blackburn College
16
University of Bolton
17
Bournemouth University
18
University of Bradford
19
University of Brighton
20
University of Bristol
21
Brunel University
22
University of Buckingham
23
Buckinghamshire New University
24
University of Cambridge
25
Institute of Cancer Research, University of London
26
Canterbury Christ Church University
27
Cardiff University
28
University of Central Lancashire
29
Central School of Speech and Drama, University of London
30
University of Chester
31
University of Chichester
32
City University London
33
Courtauld Institute of Art
34
Coventry University
35
Cranfield University
36
University for the Creative Arts
37
University of Cumbria
38
De Montfort University
39
University of Derby
40
University of Dundee
41
Durham University
42
University of East Anglia
43
University of East London
44
Edge Hill University
45
University of Edinburgh
46
Edinburgh Napier University
47
Institute of Education, University of London
48
University of Essex
49
University of Exeter
50
University of Glamorgan
51
University of Glasgow
52
Glasgow Caledonian University
53
University of Gloucestershire
54
Goldsmiths, University of London
55
University of Greenwich
56
Glynd&#373;r University
57
Heriot-Watt University
58
University of Hertfordshire
59
Heythrop College
60
University of Huddersfield
61
University of Hull
62
Hull York Medical School
63
Imperial College London
64
Keele University
65
University of Kent
66
King's College London
67
Kingston University
68
Lancaster University
69
University of Leeds
70
Leeds Metropolitan University
71
University of Leicester
72
University of Lincoln
73
University of Liverpool
74
Liverpool Hope University
75
Liverpool John Moores University
76
London Business School
77
London College of Music
78
London Metropolitan University
79
London School of Economics and Political Science
80
London School of Hygiene and Tropical Medicine
81
London South Bank University
82
Loughborough University
83
University of Manchester
84
Manchester Metropolitan University
85
Middlesex University
86
Newcastle University
87
University of Northampton
88
Northumbria University
89
University of Nottingham
90
Nottingham Trent University
91
The Open University
92
University of Oxford
93
Oxford Brookes University
94
Peninsula College of Medicine and Dentistry
95
University of Plymouth
96
University of Portsmouth
97
Queen's University Belfast
98
Queen Margaret University
99
Queen Mary, University of London
100
University of Reading
101
The Robert Gordon University, Aberdeen
102
Roehampton University
103
Royal Academy of Music
104
Royal College of Art
105
Royal Holloway, University of London
106
Royal Veterinary College
107
University of St Andrews
108
St George's, University of London
109
University of Salford
110
School of Advanced Study, University of London
111
School of Oriental and African Studies
112
School of Pharmacy, University of London
113
University of Sheffield
114
Sheffield Hallam University
115
University of Southampton
116
Southampton Solent University
117
Staffordshire University
118
University of Stirling
119
University of Strathclyde
120
University of Sunderland
121
University of Surrey
122
University of Sussex
123
Swansea Metropolitan University
124
Swansea University
125
University of Teesside
126
Thames Valley University
127
University of Ulster
128
University College London
129
University of Wales
130
University of Wales Institute, Cardiff
131
University of Wales, Newport
132
University of Wales, Trinity Saint David
133
University of Warwick
134
University of Westminster
135
University of the West of England
136
University of the West of Scotland
137
University of Winchester
138
University of Wolverhampton
139
University of Worcester
140
University of York
141
York St John University

Also available in: Unified diff