# 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 dc252f2ddef5 -r d206f38ae405 app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb	Thu Dec 16 17:42:00 2010 +0000
+++ b/app/helpers/projects_helper.rb	Thu Dec 16 17:46:01 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 dc252f2ddef5 -r d206f38ae405 app/views/projects/index.rhtml
--- a/app/views/projects/index.rhtml	Thu Dec 16 17:42:00 2010 +0000
+++ b/app/views/projects/index.rhtml	Thu Dec 16 17:46:01 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 dc252f2ddef5 -r d206f38ae405 public/stylesheets/application.css
--- a/public/stylesheets/application.css	Thu Dec 16 17:42:00 2010 +0000
+++ b/public/stylesheets/application.css	Thu Dec 16 17:46:01 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 dc252f2ddef5 -r d206f38ae405 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 17:46:01 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"