# HG changeset patch
# User Chris Cannam
# Date 1292517860 0
# Node ID 2248a45897a03363a6946ca0a7802500074dc624
# Parent  98b2834d136b3339d186b0c491cd2658e110275d# Parent  1412841d48a3e70cf3c305550fb8f57ee21a1391
Merge from branch "cannam"

diff -r 98b2834d136b -r 2248a45897a0 app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb	Thu Dec 16 13:29:23 2010 +0000
+++ b/app/helpers/projects_helper.rb	Thu Dec 16 16:44:20 2010 +0000
@@ -148,8 +148,12 @@
   # The given collection may be a subset of the whole project tree
   # (eg. some intermediate nodes are private and can not be seen)
   def render_other_project_hierarchy(projects)
+    a = ''
     s = ''
 
+    # True if user has any projects (affects the heading used)
+    t = FALSE
+
     if projects.any?
       ancestors = []
       original_project = @project
@@ -177,6 +181,8 @@
           s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank?
           s << "</div>\n"
           ancestors << project          
+        else
+          t = TRUE
         end
        end
 
@@ -184,8 +190,19 @@
       @project = original_project
     end
 
+    if t == TRUE
+      a << "<h2>"
+      a <<  l("label_other_project_plural")
+      a << "</h2>"
+      a << s
+    else
+      a << "<h2>"
+      a << l("label_project_all")
+      a << "</h2>"
+      a << s
+    end
 
-    s
+    a
   end
 
 
diff -r 98b2834d136b -r 2248a45897a0 app/views/projects/index.rhtml
--- a/app/views/projects/index.rhtml	Thu Dec 16 13:29:23 2010 +0000
+++ b/app/views/projects/index.rhtml	Thu Dec 16 16:44:20 2010 +0000
@@ -3,17 +3,15 @@
 <% end %>
 
 <div class="contextual">
-    <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
-    <%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
-    <%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
     <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
+    <%= '| ' + link_to(l(:label_issue_view_all), { :controller => 'issues' }) if User.current.allowed_to?(:view_issues, nil, :global => true) %>
+    <%= '| ' + 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>
 
 <% if User.current.logged? %>
   
   <%= render_my_project_hierarchy(@projects)%>
 
-  <h2><%=l(:label_other_project_plural)%></h2>
   <%= render_other_project_hierarchy(@projects)%>
 
 <% else %>
@@ -24,13 +22,6 @@
 
 
 
-<% if User.current.logged? %>
-<p style="text-align:right;">
-<span class="my-project"><%= l(:label_my_projects) %></span>
-</p>
-<% end %>
-
-
 <% other_formats_links do |f| %>
 	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
 <% end %>
diff -r 98b2834d136b -r 2248a45897a0 config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Thu Dec 16 13:29:23 2010 +0000
+++ b/config/locales/en-GB.yml	Thu Dec 16 16:44:20 2010 +0000
@@ -422,6 +422,8 @@
   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
@@ -700,7 +702,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
@@ -841,7 +843,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.'
+  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_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 98b2834d136b -r 2248a45897a0 config/locales/en.yml
--- a/config/locales/en.yml	Thu Dec 16 13:29:23 2010 +0000
+++ b/config/locales/en.yml	Thu Dec 16 16:44:20 2010 +0000
@@ -437,7 +437,7 @@
   label_project_new: New project
   label_project_plural: Projects
   label_my_project_plural: My Projects
-  label_other_project_plural: Other Projects
+  label_other_project_plural: "Everyone Else's 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.'
+  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_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 98b2834d136b -r 2248a45897a0 public/stylesheets/application.css
--- a/public/stylesheets/application.css	Thu Dec 16 13:29:23 2010 +0000
+++ b/public/stylesheets/application.css	Thu Dec 16 16:44:20 2010 +0000
@@ -348,7 +348,7 @@
 ul.projects li.root { list-style-type:none; margin-bottom: 1em; }
 ul.projects li.child { list-style-type:none; margin-top: 1em;}
 ul.projects div.root a.project { /* font-family: "Trebuchet MS", Verdana, sans-serif; */ font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
-.my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
+/* .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; } */
 
 #tracker_project_ids ul { margin: 0;  padding-left: 1em; }
 #tracker_project_ids li { list-style-type:none; } 
diff -r 98b2834d136b -r 2248a45897a0 vendor/plugins/redmine_checkout/config/locales/en-GB.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vendor/plugins/redmine_checkout/config/locales/en-GB.yml	Thu Dec 16 16:44:20 2010 +0000
@@ -0,0 +1,39 @@
+en:
+  label_checkout: "Checkout"
+
+  setting_checkout_display_checkout_info: "Display checkout information"
+  setting_checkout_fixed_url: "Checkout URL"
+  setting_checkout_url_regex: "Regular expression"
+  setting_checkout_url_regex_replacement: "Replacement text"
+  setting_checkout_display_login: "Display Login"
+  setting_checkout_command: "Checkout command"
+  setting_checkout_use_zero_clipboard: "Display clipboard helper"
+
+  setting_checkout_overwrite_description: "Overwrite default description"
+  field_checkout_overwrite: "Overwrite default settings for checkout protocols"
+  field_checkout_display_command: "Display checkout command"
+
+  label_protocol_plural: "Protocols"
+  button_add_protocol: "Add Protocol"
+
+  label_access_type: 'This URL has <span id="checkout_access">{{type}}</span> access.'
+  label_access_read_only: 'Read-Only'
+  label_access_read_write: "Read+Write"
+  label_access_permission: "Depending on user's permissions"
+
+  label_append_path: "Append path"
+
+  label_display_login_none: "Do not show login or password"
+  label_display_login_username: "Show login but no password"
+  label_display_login_password: "Show login and password"
+
+  label_copy_to_clipboard: "Copy to clipboard"
+
+  help_checkout_protocols: |
+    The URLs in protocols are generated from applying the regular expression
+    and the replacement text to the original URL. The replacement text
+    supports back-references to braced expressions using the \1 notation.
+  help_repository_checkout_protocols: |
+    Leave the Checkout URL field empty to use the defined repository URL.
+  help_moved_settings: "The settings page has been moved to {{link}}."
+  label_settings_location: "Administration -> Settings -> Checkout"