# HG changeset patch
# User Chris Cannam
# Date 1297171491 0
# Node ID ff5112f823e565ca3dde51c22ea671e7242051e8
# Parent  30203ffaa6122101593e338ab6af88d50f4b0cd4# Parent  bb7cac2ac146e3a79bf15e16d789329fb44a324c
Merge from branch "feature_72", to provide just enough of the site support for external repos to permit testing while developing the conversion code

diff -r 30203ffaa612 -r ff5112f823e5 app/views/projects/settings/_repository.rhtml
--- a/app/views/projects/settings/_repository.rhtml	Tue Feb 08 12:20:31 2011 +0000
+++ b/app/views/projects/settings/_repository.rhtml	Tue Feb 08 13:24:51 2011 +0000
@@ -11,6 +11,22 @@
 <% end %>
 <p><%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %></p>
 <%= repository_field_tags(f, @repository) if @repository %>
+
+
+<p>
+	<%= label_tag('repository_is_external', l(:label_is_external_repository)) %>
+	<%= check_box :repository, :is_external %> 
+	<%= l(:setting_external_repository) %>
+</p>
+
+
+<p>
+	<%= label_tag('repository_external_url', l(:label_repository_external_url)) %>
+	<%= text_field :repository, :external_url %> 
+	<%= l(:setting_external_repository_url) %>
+</p>
+
+
 </div>
 
 <div class="contextual">
diff -r 30203ffaa612 -r ff5112f823e5 app/views/users/edit.rhtml
--- a/app/views/users/edit.rhtml	Tue Feb 08 12:20:31 2011 +0000
+++ b/app/views/users/edit.rhtml	Tue Feb 08 13:24:51 2011 +0000
@@ -8,3 +8,4 @@
 <%= render_tabs user_settings_tabs %>
 
 <% html_title(l(:label_user), @user.login, l(:label_administration)) -%>
+
diff -r 30203ffaa612 -r ff5112f823e5 config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Tue Feb 08 12:20:31 2011 +0000
+++ b/config/locales/en-GB.yml	Tue Feb 08 13:24:51 2011 +0000
@@ -296,6 +296,9 @@
   field_group_by: Group results by
   field_sharing: Sharing
   
+  setting_external_repository: "In the case you wish to follow an external repository"
+  setting_external_repository_url: "The external repository URL"
+  label_repository_external_url: "External rep URL"
   setting_app_title: Application title
   setting_app_subtitle: Application subtitle
   setting_welcome_text: Welcome text
@@ -474,6 +477,7 @@
   label_information_plural: Information
   label_please_login: Please log in
   label_register: Register
+  label_terms_and_conditions: Terms & Conditions for use of code.soundsoftware.ac.uk
   label_login_with_open_id_option: or login with OpenID
   label_password_lost: Lost password
   label_home: Home
@@ -614,6 +618,7 @@
   label_not_contains: doesn't contain
   label_day_plural: days
   label_repository: Repository
+  label_is_external_repository: External?
   label_repository_plural: Repositories
   label_browse: Browse
   label_modification: "{{count}} change"
diff -r 30203ffaa612 -r ff5112f823e5 config/locales/en.yml
--- a/config/locales/en.yml	Tue Feb 08 12:20:31 2011 +0000
+++ b/config/locales/en.yml	Tue Feb 08 13:24:51 2011 +0000
@@ -305,7 +305,10 @@
   field_assigned_to_role: "Assignee's role"
   field_text: Text field
   field_visible: Visible
-  
+ 
+  setting_external_repository: "In the case you wish to follow an external repository"
+  setting_external_repository_url: "The external repository URL"
+  label_repository_external_url: "External rep URL"
   setting_tipoftheday_text: Tip of the Day
   setting_notifications_text: Notifications
   field_terms_and_conditions: 'Terms and Conditions:'
@@ -489,6 +492,8 @@
   label_information_plural: Information
   label_please_login: Please log in
   label_register: Register
+  label_terms_and_conditions: Terms & Conditions for use of code.soundsoftware.ac.uk
+  label_accept_terms_and_conditions: I have read the terms and conditions and fully accept them
   label_login_with_open_id_option: or login with OpenID
   label_password_lost: Lost password
   label_home: Home
@@ -630,6 +635,7 @@
   label_not_contains: doesn't contain
   label_day_plural: days
   label_repository: Repository
+  label_is_external_repository: External?
   label_repository_plural: Repositories
   label_browse: Browse
   label_modification: "{{count}} change"
diff -r 30203ffaa612 -r ff5112f823e5 db/migrate/20110207142856_add_ext_rep_to_repositories.rb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/migrate/20110207142856_add_ext_rep_to_repositories.rb	Tue Feb 08 13:24:51 2011 +0000
@@ -0,0 +1,11 @@
+class AddExtRepToRepositories < ActiveRecord::Migration
+  def self.up
+    add_column :repositories, :is_external, :bool
+    add_column :repositories, :external_url, :string
+  end
+
+  def self.down
+    remove_column :repositories, :is_external
+    remove_column :repositories, :external_url
+  end
+end