changeset 305:f5a3d57f3d90 cannam-pre-20110113-merge

Merge from branch "feature_115"
author Chris Cannam
date Mon, 28 Mar 2011 17:33:10 +0100
parents 6c56a595dc1c (current diff) 6508e99869a2 (diff)
children e6994440b64f
files config/locales/en.yml
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/config/locales/en.yml	Mon Mar 28 17:32:56 2011 +0100
+++ b/config/locales/en.yml	Mon Mar 28 17:33:10 2011 +0100
@@ -934,7 +934,7 @@
   text_settings_repo_is_internal: Currently the repository hosted at this site is the primary repository for this project.
   text_settings_repo_is_external: Currently the repository hosted at this site is a read-only copy of an external repository.
   text_settings_repo_need_help: Please <a href="/projects/soundsoftware-site/wiki/Help">contact us</a> if you need help deciding how best to set this up.<br>We can also import complete revision history from other systems into a new primary repository for you if you wish.
-
+  text_repository_external: "The primary repository for this project is hosted at <code>{{location}}</code><br>This repository is a read-only copy which is updated automatically."
 
  
   default_role_manager: Manager
--- a/vendor/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.rhtml	Mon Mar 28 17:32:56 2011 +0100
+++ b/vendor/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.rhtml	Mon Mar 28 17:33:10 2011 +0100
@@ -26,6 +26,10 @@
     <% end %>
   </div>
   <% end%>
+  <% if repository.is_external? %>
+    <div class="bottomline"></div>
+    <p><%= l(:text_repository_external, :location => repository.external_url) %></p>
+  <% end %>
 </div>
 <div style="clear: left"></div>
 
@@ -33,4 +37,4 @@
   <%= stylesheet_link_tag 'checkout', :plugin => 'redmine_checkout' %>
   <%= javascript_include_tag 'checkout', :plugin => 'redmine_checkout' %>
   <%= (javascript_include_tag 'ZeroClipboard', :plugin => 'redmine_checkout') if Setting.checkout_use_zero_clipboard? %>
-<% end %>
\ No newline at end of file
+<% end %>