# HG changeset patch
# User luisf
# Date 1295620289 0
# Node ID 0460c75392bce7d585e8233949978b25e26c305b
# Parent  e6ed6c7a2ce9882b8c4e2163baee0079247b9ca6
development commit: terms and conditions

diff -r e6ed6c7a2ce9 -r 0460c75392bc app/views/account/terms.rhtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/account/terms.rhtml	Fri Jan 21 14:31:29 2011 +0000
@@ -0,0 +1,17 @@
+<h2><%=l(:label_terms_and_conditions)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h2>
+
+<% form_tag({:action => 'register'}, :class => "tabular") do %>
+<%= error_messages_for 'user' %>
+
+
+  <textarea name="myTextArea" cols="100" rows="20" readonly=readonly>
+
+  </textarea>
+
+  <br />
+
+  
+  <%= label_tag(:label_accept_terms_and_conditions, l(:label_accept_terms_and_conditions)) %>
+  <%= check_box_tag(:pet_dog) %>
+
+  <% end %>
\ No newline at end of file
diff -r e6ed6c7a2ce9 -r 0460c75392bc config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Thu Jan 20 14:06:23 2011 +0000
+++ b/config/locales/en-GB.yml	Fri Jan 21 14:31:29 2011 +0000
@@ -465,6 +465,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
diff -r e6ed6c7a2ce9 -r 0460c75392bc config/locales/en.yml
--- a/config/locales/en.yml	Thu Jan 20 14:06:23 2011 +0000
+++ b/config/locales/en.yml	Fri Jan 21 14:31:29 2011 +0000
@@ -481,6 +481,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
diff -r e6ed6c7a2ce9 -r 0460c75392bc db/seed_data/terms_and_conditions.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/seed_data/terms_and_conditions.txt	Fri Jan 21 14:31:29 2011 +0000
@@ -0,0 +1,20 @@
+As a registered user,
+
+  you are expected to be an active researcher in audio and music in the UK, or to be working with active researchers in audio and music in the UK who are registered users of the site
+  you undertake to ensure that copyright law is respected in, and attributions are properly maintained for, work you store on or publish through this site
+  you take responsibility for ensuring that your own institution's terms and conditions are followed with regard to rights in the work you store on this site
+  you undertake not to use this site for any illegal purpose or for the encouragement of illegal activity
+  you undertake not to harass or cause a nuisance for any other users, or for anyone else through your use of this site
+  you undertake not to use the site to promote any commercial activity outside of your normal research work
+  you accept that any account details you enter will be publicly visible, except for your email address if you choose to to hide it
+  you accept that any activity associated with your account may be publicly visible
+  you accept that any account details you enter will be visible to SoundSoftware.ac.uk administrators and may be used to determine whether they have a legitimate reason to use the site or not
+  The SoundSoftware.ac.uk administrators
+
+  claim no rights in material stored here by users (all copyright holders retain their copyright in work stored here)
+  accept no liability for ensuring that material stored or published here by users is in accordance with copyright law
+  aim to keep the site available and to ensure that data is secure and backed up, but offer no guarantee to that effect
+  reserve the right to carry out administrative tasks as necessary, including administrative work that relates to private projects set up by users
+  declare that we will not permit users' private projects to be seen or used by employees or students of Queen Mary University of London, except in the case of administrative officials for reasons concerned solely with the daily running of the site
+  undertake that all content will be made available to the users who own it even if for any reason this site can no longer be maintained and run
+  SoundSoftware.ac.uk and Queen Mary, University of London accept no liability for any loss or damage incurred through the use of this site.
\ No newline at end of file