changeset 229:344f68e4b103 live

Merge from branch "luisf".  This merges the label change from Files to Downloads

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/account/terms.rhtml	Thu Feb 17 16:43:40 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

--- a/config/locales/en-GB.yml	Tue Feb 08 13:14:07 2011 +0000
+++ b/config/locales/en-GB.yml	Thu Feb 17 16:43:40 2011 +0000
@@ -384,8 +384,8 @@
   permission_comment_news: Comment news
   permission_manage_documents: Manage documents
   permission_view_documents: View documents
-  permission_manage_files: Manage files
-  permission_view_files: View files
+  permission_manage_files: Manage downloads
+  permission_view_files: View downloads
   permission_manage_wiki: Manage wiki
   permission_rename_wiki_pages: Rename wiki pages
   permission_delete_wiki_pages: Delete wiki pages
@@ -411,7 +411,7 @@
   project_module_time_tracking: Time tracking
   project_module_news: News
   project_module_documents: Documents
-  project_module_files: Files
+  project_module_files: Downloads
   project_module_wiki: Wiki
   project_module_repository: Repository
   project_module_boards: Boards
@@ -476,6 +476,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
@@ -522,7 +523,7 @@
   label_attachment: File
   label_attachment_new: New file
   label_attachment_delete: Delete file
-  label_attachment_plural: Files
+  label_attachment_plural: Downloads
   label_file_added: File added
   label_report: Report
   label_report_plural: Reports
@@ -722,7 +723,7 @@
   label_updated_time_by: "Updated by {{author}} {{age}} ago"
   label_updated_time: "Updated {{value}} ago"
   label_jump_to_a_project: Jump to a project...
-  label_file_plural: Files
+  label_file_plural: Downloads
   label_changeset_plural: Changesets
   label_default_columns: Default columns
   label_no_change_option: (No change)

--- a/config/locales/en.yml	Tue Feb 08 13:14:07 2011 +0000
+++ b/config/locales/en.yml	Thu Feb 17 16:43:40 2011 +0000
@@ -399,8 +399,8 @@
   permission_comment_news: Comment news
   permission_manage_documents: Manage documents
   permission_view_documents: View documents
-  permission_manage_files: Manage files
-  permission_view_files: View files
+  permission_manage_files: Manage Downloads
+  permission_view_files: View Downloads
   permission_manage_wiki: Manage wiki
   permission_rename_wiki_pages: Rename wiki pages
   permission_delete_wiki_pages: Delete wiki pages
@@ -427,7 +427,7 @@
   project_module_time_tracking: Time tracking
   project_module_news: News
   project_module_documents: Documents
-  project_module_files: Files
+  project_module_files: Downloads
   project_module_wiki: Wiki
   project_module_repository: Repository
   project_module_boards: Boards
@@ -489,6 +489,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
@@ -536,7 +538,7 @@
   label_attachment: File
   label_attachment_new: New file
   label_attachment_delete: Delete file
-  label_attachment_plural: Files
+  label_attachment_plural: Downloads
   label_file_added: File added
   label_report: Report
   label_report_plural: Reports
@@ -737,7 +739,7 @@
   label_updated_time_by: "Updated by {{author}} {{age}} ago"
   label_updated_time: "Updated {{value}} ago"
   label_jump_to_a_project: Jump to a project...
-  label_file_plural: Files
+  label_file_plural: Downloads
   label_changeset_plural: Changesets
   label_default_columns: Default columns
   label_no_change_option: (No change)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/seed_data/terms_and_conditions.txt	Thu Feb 17 16:43:40 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