changeset 322:eabb08b4afc3 live

Merge from branch "bug_70"

--- a/config/locales/en.yml	Mon Mar 28 18:08:24 2011 +0100
+++ b/config/locales/en.yml	Tue Mar 29 10:50:32 2011 +0100
@@ -942,7 +942,6 @@
   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 18:08:24 2011 +0100
+++ b/vendor/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.rhtml	Tue Mar 29 10:50:32 2011 +0100
@@ -17,8 +17,15 @@
        <div id="clipboard_button"><%= image_tag 'paste.png', :plugin => 'redmine_checkout' %></div>
     </div>
     <% end -%>
-    <% if default_protocol %><p><%=l :label_access_type, :type => l(default_protocol.access_label(User.current)) %></p><% end %>
-  
+
+    <p>
+    <% if User.current.logged? %>
+      <% if default_protocol %><%=l :label_access_type, :type => l(default_protocol.access_label(User.current)) %><% end %>
+    <% else %>
+      &nbsp;
+    <% end %>
+    </p>
+
     <% javascript_tag do %>
       var checkout_access   = $H({<%= protocols.inject([]){|r,p| r << "'checkout_protocol_#{p.protocol.to_s.underscore}': '#{l(p.access_label(User.current))}'"}.join(', ') %>});
       var checkout_commands = $H({<%= protocols.inject([]){|r,p| r << "'checkout_protocol_#{p.protocol.to_s.underscore}': '#{escape_javascript(p.full_command(checkout_path))}'"}.join(', ') %>});
@@ -27,8 +34,9 @@
   </div>
   <% end%>
   <% if repository.is_external? %>
-    <div class="bottomline"></div>
-    <p><%= l(:text_repository_external, :location => repository.external_url) %></p>
+    <div style="clear: left">
+    </div>
+    <p class="topline" style="padding-top: 1em"><%= l(:text_repository_external, :location => repository.external_url) %></p>
   <% end %>
 </div>
 <div style="clear: left"></div>

--- a/vendor/plugins/redmine_checkout/assets/stylesheets/checkout.css	Mon Mar 28 18:08:24 2011 +0100
+++ b/vendor/plugins/redmine_checkout/assets/stylesheets/checkout.css	Tue Mar 29 10:50:32 2011 +0100
@@ -20,6 +20,10 @@
   border-bottom: 1px solid #ccc;
 }
 
+.topline {
+  border-top: 1px solid #ccc;
+}
+
 #checkout_box {
   margin: 10px 0;
 }
@@ -159,4 +163,4 @@
 
 #clipboard_button img {
   padding-top: 2px;
-}
\ No newline at end of file
+}

--- a/vendor/plugins/redmine_checkout/config/locales/en-GB.yml	Mon Mar 28 18:08:24 2011 +0100
+++ b/vendor/plugins/redmine_checkout/config/locales/en-GB.yml	Tue Mar 29 10:50:32 2011 +0100
@@ -16,9 +16,9 @@
   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_type: 'You have <span id="checkout_access">{{type}}</span> access to this URL.'
+  label_access_read_only: 'Read Only'
+  label_access_read_write: "Read and Write"
   label_access_permission: "Depending on user's permissions"
 
   label_append_path: "Append path"
@@ -37,3 +37,5 @@
     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"
+
+  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."

--- a/vendor/plugins/redmine_checkout/config/locales/en.yml	Mon Mar 28 18:08:24 2011 +0100
+++ b/vendor/plugins/redmine_checkout/config/locales/en.yml	Tue Mar 29 10:50:32 2011 +0100
@@ -16,9 +16,9 @@
   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_type: 'You have <span id="checkout_access">{{type}}</span> access to this URL.'
+  label_access_read_only: 'Read Only'
+  label_access_read_write: "Read and Write"
   label_access_permission: "Depending on user's permissions"
 
   label_append_path: "Append path"
@@ -37,3 +37,6 @@
     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"
+
+  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."
+