# HG changeset patch # User luisf # Date 1328094995 0 # Node ID 1b3e19345cf5bbea7e165305a7766ea782156942 # Parent cbd0b45601057116a24ae8eabe4d76b7cef850cf# Parent c7ef5a1ed2d30cbe8e409ce4d7cb1433513f4b20 Merge from branch "cannam" diff -r cbd0b4560105 -r 1b3e19345cf5 app/views/my/page.rhtml --- a/app/views/my/page.rhtml Tue Jan 31 16:09:41 2012 +0000 +++ b/app/views/my/page.rhtml Wed Feb 01 11:16:35 2012 +0000 @@ -1,5 +1,6 @@
<%= 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) %>

<%=l(:label_my_page)%>

diff -r cbd0b4560105 -r 1b3e19345cf5 app/views/projects/_form.rhtml --- a/app/views/projects/_form.rhtml Tue Jan 31 16:09:41 2012 +0000 +++ b/app/views/projects/_form.rhtml Wed Feb 01 11:16:35 2012 +0000 @@ -15,7 +15,7 @@

<%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen? %> <% unless @project.identifier_frozen? %>
- <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info) %> + <%= l(:text_project_identifier_info) %> <% end %>

<%= f.text_field :homepage, :size => 60 %>
@@ -46,7 +46,12 @@ <% 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? %>

<%=l(:label_tracker_plural)%> <% @trackers.each do |tracker| %> diff -r cbd0b4560105 -r 1b3e19345cf5 config/locales/en.yml --- a/config/locales/en.yml Tue Jan 31 16:09:41 2012 +0000 +++ b/config/locales/en.yml Wed Feb 01 11:16:35 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.
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.
Only lower case letters (a-z), numbers and dashes are allowed.
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.
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.
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.
You can change this later if you wish." text_user_ssamr_description_info: 'Please describe your current research or development interests.
This information will be used at registration to determine that you are a real person – so please be descriptive, or your application may be delayed or rejected.
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 cbd0b4560105 -r 1b3e19345cf5 public/themes/soundsoftware/stylesheets/application.css --- a/public/themes/soundsoftware/stylesheets/application.css Tue Jan 31 16:09:41 2012 +0000 +++ b/public/themes/soundsoftware/stylesheets/application.css Wed Feb 01 11:16:35 2012 +0000 @@ -110,9 +110,9 @@ #header h1 { color: #525a38; margin-top: 25px; font-size: 3em; font-weight: normal; margin-left: 10px; } #header #project-title a, #header #project-title a:hover { color: #525a38; text-decoration: none; } .header-general h1 { - background: url('soundsoftware-logo-title-only-transparent-beta.png') no-repeat 0 0; + background: url('soundsoftware-logo-code-title-only-transparent.png') no-repeat 0 0; text-indent: -9999px; - width: 500px; + width: 537px; height: 34px; } diff -r cbd0b4560105 -r 1b3e19345cf5 public/themes/soundsoftware/stylesheets/soundsoftware-logo-code-title-only-transparent.png Binary file public/themes/soundsoftware/stylesheets/soundsoftware-logo-code-title-only-transparent.png has changed diff -r cbd0b4560105 -r 1b3e19345cf5 public/themes/soundsoftware/stylesheets/soundsoftware-logo-code-title-only-transparent.xcf Binary file public/themes/soundsoftware/stylesheets/soundsoftware-logo-code-title-only-transparent.xcf has changed diff -r cbd0b4560105 -r 1b3e19345cf5 unis.txt --- a/unis.txt Tue Jan 31 16:09:41 2012 +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ŵ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 cbd0b4560105 -r 1b3e19345cf5 vendor/plugins/redmine_bibliography/config/locales/en.yml --- a/vendor/plugins/redmine_bibliography/config/locales/en.yml Tue Jan 31 16:09:41 2012 +0000 +++ b/vendor/plugins/redmine_bibliography/config/locales/en.yml Wed Feb 01 11:16:35 2012 +0000 @@ -1,6 +1,6 @@ # English strings go here for Rails i18n en: - project_module_redmine_bibliography: Bibliography + project_module_redmine_bibliography: Publications title: "Title" authors: "Authors" diff -r cbd0b4560105 -r 1b3e19345cf5 vendor/plugins/redmine_bibliography/init.rb --- a/vendor/plugins/redmine_bibliography/init.rb Tue Jan 31 16:09:41 2012 +0000 +++ b/vendor/plugins/redmine_bibliography/init.rb Wed Feb 01 11:16:35 2012 +0000 @@ -34,7 +34,7 @@ url 'http://example.com/path/to/plugin' author_url 'http://example.com/about' - settings :default => { 'menu' => 'Bibliography' }, :partial => 'settings/bibliography' + settings :default => { 'menu' => 'Publications' }, :partial => 'settings/bibliography' project_module :redmine_bibliography do permission :publications, { :publications => :index }, :public => true