curate 0.6.5 → 0.6.6

data/app/views/curation_concern/documents/_attributes.html.erb

@@ -19,5 +19,6 @@
     </td>
   </tr>
   <%= curation_concern_attribute_to_html(curation_concern, :embargo_release_date, "Embargo Release Date") %>
+  <%= curation_concern_attribute_to_html(curation_concern, :rights, "Content License") %>
   </tbody>
 </table>

data/app/views/curation_concern/etds/_attributes.html.erb

@@ -16,5 +16,6 @@
     </td>
   </tr>
   <%= curation_concern_attribute_to_html(curation_concern, :embargo_release_date, "Embargo Release Date") %>
+  <%= curation_concern_attribute_to_html(curation_concern, :rights, "Content License") %>
   </tbody>
 </table>

data/app/views/curation_concern/etds/_form_descriptive_fields.erb

@@ -23,6 +23,8 @@
 
     <div class="span6">
       <%= render partial: 'linked_contributors', locals: {f: f, label: 'Creator'} %>
+      <%= render partial: 'linked_editors', locals: {f: f, curation_concern: curation_concern, label: 'Editor'} %>
+      <%= render partial: 'linked_groups', locals: {f: f, curation_concern: curation_concern, label: "Editor Group"} %>
 
       <%= f.input :subject,
         as: :multi_value,

data/app/views/curation_concern/generic_works/_attributes.html.erb

@@ -18,5 +18,6 @@
     </td>
   </tr>
   <%= curation_concern_attribute_to_html(curation_concern, :embargo_release_date, "Embargo Release Date") %>
+  <%= curation_concern_attribute_to_html(curation_concern, :rights, "Content License") %>
   </tbody>
 </table>

data/app/views/{curate/organizations/_organization.html.erb → curation_concern/hydramata/groups/_group.html.erb}

@@ -1,24 +1,24 @@
 <tr>
   <td>
-    <%= link_to organization.title, organization_path(organization) %>
+    <%= link_to group.title, hydramata_group_path(group) %>
   </td>
   <td>
-    <% if can? :edit, organization %>
+    <% if can? :edit, group %>
 
         <%= button_to(
                 "Delete",
                 {
                     action: :destroy,
-                    controller: :organizations,
-                    id: organization.id
+                    controller: "hydramata/groups",
+                    id: group.id
                 },
-                data: {confirm: 'Are you sure you want to delete this organization?'},
+                data: {confirm: 'Are you sure you want to delete this group?'},
                 class: 'btn',
                 form_class: 'button-to pull-right',
                 method: :delete
             )%>
 
-      <%= link_to "Edit", edit_organization_path(organization), class: 'btn pull-right' %>
+      <%= link_to "Edit", edit_hydramata_group_path(group), class: 'btn pull-right' %>
     <% end %>
   </td>
 </tr>

data/app/views/curation_concern/images/_attributes.html.erb

@@ -17,5 +17,6 @@
     </td>
   </tr>
   <%= curation_concern_attribute_to_html(curation_concern, :embargo_release_date, "Embargo Release Date") %>
+  <%= curation_concern_attribute_to_html(curation_concern, :rights, "Content License") %>
   </tbody>
 </table>

data/app/views/curation_concern/images/_form_descriptive_fields.erb

@@ -9,6 +9,8 @@
         %>
 
         <%= render partial: 'linked_contributors', locals: {f: f, label: 'Creator'} %>
+        <%= render partial: 'linked_editors', locals: {f: f, curation_concern: curation_concern, label: 'Editor'} %>
+        <%= render partial: 'linked_groups', locals: {f: f, curation_concern: curation_concern, label: "Editor Group"} %>
 
         <%= f.input :date_created,
           as: :multi_value

data/app/views/hydramata/groups/_button_create_group.html.erb

@@ -0,0 +1 @@
+<%= button_to label, new_hydramata_group_path, :method=>:get, :class=>"btn btn-primary collection-add submits-batches", 'data-behavior'=>'hydra-collections', :id=>'hydra-organization-add' %>

data/app/views/{curate/organizations → hydramata/groups}/_form.html.erb

@@ -1,12 +1,22 @@
 <div class="container">
 <%-# This syntax [collections, @collection] tells form_for to use the routes from the engine named collections %>
-<%= form_for @organization do |f| %>
-  <% if @organization.errors.any? %>
+<% if @group_membership %>
+  <div id="error_explanation">
+    <h2><%= pluralize(@group_membership.errors.count, "error") %> prohibited this topic from being saved:</h2>
+    <ul>
+      <% @group_membership.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+<%= form_for @group do |f| %>
+  <% if @group.errors.any? %>
     <div id="error_explanation">
-      <h2><%= pluralize(@organization.errors.count, "error") %> prohibited this topic from being saved:</h2>
+      <h2><%= pluralize(@group.errors.count, "error") %> prohibited this topic from being saved:</h2>
 
       <ul>
-      <% @organization.errors.full_messages.each do |msg| %>
+      <% @group.errors.full_messages.each do |msg| %>
         <li><%= msg %></li>
       <% end %>
       </ul>
@@ -17,10 +27,10 @@
     NOTE: We're just making it _look_ like we're using simple_form here. Refactor at will.
     ALSO: Title isn't _actually_ required. The form is lying (but it means well and is probably right).
   %>
-  <div class="control-group string required organization_title">
+  <div class="control-group string required group_title">
     <span class="control-label">
-      <label class="string required" for="organization_title">
-        <abbr title="" data-original-title="required">*</abbr> Title
+      <label class="string required" for="group_title">
+        <abbr title="" data-original-title="required">*</abbr>Group Name
       </label>
     </span>
     <div class="controls">
@@ -28,7 +38,7 @@
     </div>
   </div>
 
-  <div class="control-group string required collection_description">
+  <div class="control-group string required group_description">
     <span class="control-label">
       <%= f.label :description %>
     </span>
@@ -37,10 +47,18 @@
     </div>
   </div>
 
+    <div class="row">
+      <div class="span6" >
+        <fieldset >
+          <%= render partial: 'linked_members', locals: {f: f} %>
+        </fieldset>
+      </div>
+    </div>
+
   <div class="form-actions">
     <%= f.submit class: 'btn btn-primary' %>
-    <%- if @organization.persisted? -%>
-      <%= link_to 'Cancel', organization_path(@organization), class: 'btn btn-link' %>
+    <%- if @group.persisted? -%>
+      <%= link_to 'Cancel', hydramata_group_path(@group), class: 'btn btn-link' %>
     <% else %>
       <%= link_to 'Cancel', root_path, class: 'btn btn-link' %>
     <% end %>

data/app/views/hydramata/groups/_group.html.erb

@@ -0,0 +1,24 @@
+<tr>
+  <td>
+    <%= link_to group.title, hydramata_group_path(group) %>
+  </td>
+  <td>
+    <% if can? :edit, group %>
+
+        <%= button_to(
+                "Delete",
+                {
+                    action: :destroy,
+                    controller: "hydramata/groups",
+                    id: group.id
+                },
+                data: {confirm: 'Are you sure you want to delete this group?'},
+                class: 'btn',
+                form_class: 'button-to pull-right',
+                method: :delete
+            )%>
+
+      <%= link_to "Edit", edit_hydramata_group_path(group), class: 'btn pull-right' %>
+    <% end %>
+  </td>
+</tr>

data/app/views/hydramata/groups/_linked_members.html.erb

@@ -0,0 +1,96 @@
+<% label ||= 'Members' %>
+<div class="control-group required link-users" id="members">
+  <div class="row">
+    <div class="span4">
+      <span class="control-label">
+        <label class="required" for="<%=f.object_name.downcase%>_members_attributes_0_name">
+          <%= label %>
+        </label>
+      </span>
+    </div>
+    <div class="span2 text-center">
+      Can edit group
+    </div>
+  </div>
+  <div class="controls">
+    <% prefix = f.object_name.downcase %>
+
+    <script id="entry-template" type="text/x-handlebars-template">
+      <li class="field-wrapper input-append">
+        <div class="row">
+          <div class="span4">
+            <input class="input-xlarge autocomplete-users" data-url="/people" id="<%=prefix %>_members_attributes_{{index}}_name" name="<%=prefix %>[members_attributes][{{index}}][name]" type="text" value="" />
+            <span class="field-controls">
+              <button class="btn btn-success add">
+                <i class="icon-white icon-plus"></i>
+                <span>Add</span>
+              </button>
+            </span>
+          </div>
+          <div class="span2 text-center">
+            <label class="checkbox inline-checkbox"><%= check_box_tag "group_member[edit_users_ids][]", false %></label>
+            <input id="<%=prefix %>_members_attributes_{{index}}_id" name="<%=prefix %>[members_attributes][{{index}}][id]" type="hidden" value="" />
+          </div>
+        </div>
+      </li>
+    </script>
+    <script id="existing-user-template" type="text/x-handlebars-template">
+      <li class="field-wrapper input-append">
+        <div class="row">
+          <div class="span4">
+            <span class="linked-user">
+              <a href="/people/{{value}}" target="_new">{{label}}</a>
+            </span>
+            <input type="hidden" name="<%=prefix %>[members_attributes][{{index}}][id]" value="{{value}}">
+            <span class="field-controls">
+              <button class="btn btn-danger remove">
+                <i class="icon-white icon-minus"></i>
+                <span>Remove</span>
+              </button>
+            </span>
+          </div>
+          <div class="span2 text-center">
+            <label class="checkbox inline-checkbox"><%= check_box_tag "group_member[edit_users_ids][]", "{{value}}", @group.edit_users.include?("{{value}}") %></label>
+          </div>
+        </div>
+      </li>
+    </script>
+
+    <ul class="listing">
+      <% if !@group.nil? && @group.members != [] %>
+        <%= f.fields_for :members do |memberField| %>
+        <li class="field-wrapper input-append">
+          <div class="row">
+            <%= memberField.hidden_field :id %>
+            <%= memberField.hidden_field :_destroy %>
+            <div class="span4">
+              <% if memberField.object.persisted? %>
+                <% if (current_user.repository_id == memberField.object.id) %>
+                  <span class="linked-user current-user"><%=link_to memberField.object.name, memberField.object, target: '_new' %></span>
+                <% else %>
+                  <span class="linked-user"><%=link_to memberField.object.name, memberField.object, target: '_new' %></span>
+                <% end %>
+              <% else %>
+                <%= memberField.text_field :name, class: 'input-xlarge autocomplete-users', 'data-url' => people_path, required: memberField.index == 0  %>
+              <% end %>
+              <% if (current_user.repository_id != memberField.object.id) %>
+                <span class="field-controls"></span>
+              <% end %>
+            </div>
+            <div class="span2 text-center">
+              <label class="checkbox inline-checkbox">
+                <% if (current_user.repository_id == memberField.object.id) %>
+                  <%= check_box_tag "current_user_disabled", 'checked', true, disabled: true %>
+                  <%= hidden_field_tag "group_member[edit_users_ids][]", @group.edit_users.include?(memberField.object.depositor) %>
+                <% else %>
+                  <%= check_box_tag "group_member[edit_users_ids][]", memberField.object.id, @group.edit_users.include?(memberField.object.depositor) %>
+                <% end %>
+              </label>
+            </div>
+          </div>
+        </li>
+        <% end %>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/hydramata/groups/edit.html.erb

@@ -0,0 +1,4 @@
+<% content_for :page_header do %>
+  <h1><%= @group %> <span class="human_readable_type">(<%= @group.human_readable_type %>)</span></h1>
+<% end %>
+<%= render 'form' %>

data/app/views/hydramata/groups/index.html.erb

@@ -0,0 +1,11 @@
+<%- if has_any_group? %>
+  <%= render_document_index %>
+<%- else %>
+  <div class="span12 main-header">
+    <p>You have no groups yet.</p>
+  </div>
+<%- end %>
+
+<% if can? :create, Hydramata::Group %>
+  <%= button_for_create_new_group %>
+<% end %>

data/app/views/{curate/organizations → hydramata/groups}/new.html.erb

@@ -1,4 +1,4 @@
 <% content_for :page_header do %>
-  <h1>Create a New Organization</h1>
+  <h1>Create a New Group</h1>
 <% end %>
 <%= render 'form' %>

data/app/views/hydramata/groups/show.html.erb

@@ -0,0 +1,36 @@
+<% content_for :page_title, curation_concern_page_title(@group) %>
+<% content_for :page_header do %>
+  <h1> <%= @group.title %> </h1>
+<% end %>
+<% if can? :edit, @group %>
+  <% content_for :page_actions do %>
+
+  <%= button_to(
+    "Delete",
+    {
+      action: :destroy,
+      controller: "hydramata/groups",
+      id: @group.id
+    },
+    data: {confirm: 'Are you sure you want to delete this group?'},
+    class: 'btn',
+    form_class: 'button-to pull-right',
+    method: :delete
+  )%>
+
+    <%= link_to 'Edit', edit_hydramata_group_path(@group), class: 'btn' %>
+  <% end %>
+<% end %>
+<div class="group-description">
+  <%= @group.description %>
+</div>
+
+<h3> Members of this group: </h3>
+<div class="group-members">
+  <ul class="collection-listing">
+    <% @group.members.each do |member| %>
+      <li class='collection-member'><%= link_to member.name, person_path(member) %></li>
+    <% end %>
+  </ul>
+</div>
+

data/app/views/layouts/boilerplate.html.erb

@@ -11,6 +11,7 @@
     <%= csrf_meta_tag %>
 
     <%= stylesheet_link_tag 'application' %>
+    <%= javascript_include_tag 'application' %>
     <%= javascript_include_tag 'modernizr' %>
     <%= render :partial => '/ga', :formats => [:html] -%>
   </head>
@@ -18,7 +19,6 @@
 
     <%= content_for?(:body) ? yield(:body) : yield %>
 
-    <%= javascript_include_tag 'application' %>
 
     <% unless Rails.env.production? %>
     <!-- Rendered through: <%= yield(:layout_name) %>boilerplate -->

data/app/views/registrations/_form_account_deactivation.html.erb

@@ -2,6 +2,6 @@
 
 <div class="row">
   <div class="span12 form-actions">
-    <%= button_to "Cancel My Account", cancel_registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger' %>
+    <%= button_to "Cancel Account", cancel_registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger' %>
   </div>
 </div>

data/app/views/registrations/_form_attributes.html.erb

@@ -4,9 +4,7 @@
     <legend>Personal Information</legend>
 
     <%= f.input :name %>
-    <%= f.input :date_of_birth %>
-    <%= f.input :gender %>
-    <%= f.input :title %>
+    <%= f.input :title, label: 'Job Title' %>
     <%= f.input :personal_webpage %>
     <%= f.input :blog %>
 
@@ -33,9 +31,9 @@
   <div class="span12">
     <fieldset class="required">
       <legend>
-        Attach your profile image
+        Attach <%= current_user.manager? ? User.find(params[:id]).name + "'s" : 'your' %> profile image
       </legend>
-      <%= f.input :files, as: :file, label: 'Upload your file' %>
+      <%= f.input :files, as: :file, label: 'Upload the file' %>
     </fieldset>
   </div>
 </div>

data/app/views/registrations/_form_password_management.html.erb

@@ -1,20 +1,22 @@
 <div class="row">
 
   <fieldset class="span12">
-    <legend>Change Your Password</legend>
+    <legend>Change <%= current_user.manager? ? User.find(params[:id]).name + "'s" : 'Your' %> Password</legend>
 
     <%= f.input :password, label: "New password", input_html: { autocomplete: "off" } %>
-    <%= f.input :password_confirmation, label: "Repeat your new password", input_html: { autocomplete: "off" } %>
+    <%= f.input :password_confirmation, label: "Repeat the new password", input_html: { autocomplete: "off" } %>
   </fieldset>
 
 </div>
 
-<div class="row">
-  <fieldset class="span12">
-    <legend>Authorize Your Changes</legend>
-    <p><em>Enter your current password to confirm your changes</em></p>
+<% unless current_user.manager? %>
+  <div class="row">
+    <fieldset class="span12">
+      <legend>Authorize Your Changes</legend>
+      <p><em>Enter your current password to confirm your changes</em></p>
 
-    <%= f.input :current_password, required: true %>
+      <%= f.input :current_password, required: true %>
 
-  </fieldset>
-</div>
+   </fieldset>
+  </div>
+<% end %>

data/app/views/registrations/edit.html.erb

@@ -3,24 +3,27 @@
 <% end %>
 
 <%= simple_form_for(resource, :as => resource_name, :url => user_registration_path, :html => { :method => :put }) do |f| %>
-  <% if f.error_notification -%> 
+
+  <%= f.hidden_field :id %>
+
+  <% if f.error_notification -%>
     <div class="alert alert-error fade in">
       <strong>Wait don't go!</strong> There was a problem with your submission. Please review the errors below:
       <a class="close" data-dismiss="alert" href="#">&times;</a>
     </div>
   <% end -%>
 
-  <%= render partial: 'form_attributes', locals: {f: f} %>
+  <%= render partial: 'registrations/form_attributes', locals: {f: f} %>
 
-  <%= render partial: 'form_password_management', locals: {f: f} %>
+  <%= render partial: 'registrations/form_password_management', locals: {f: f} %>
 
   <div class="row">
     <div class="span12 form-actions">
-      <%= f.submit class: 'btn btn-primary', value: 'Update My Account' %>
+      <%= f.submit class: 'btn btn-primary', value: 'Update Account' %>
       <%= link_to 'Cancel', person_path(current_user.person), class: 'btn btn-link' %>
     </div>
   </div>
 
 <% end %>
 
-<%= render partial: 'form_account_deactivation', locals: { resource_name: resource_name } %>
+<%= render partial: 'registrations/form_account_deactivation', locals: { resource_name: resource_name } %>