blacklight-spotlight 0.0.2 → 0.0.3

data/app/views/spotlight/pages/index.html.erb

@@ -1,30 +1,4 @@
 <%= render 'spotlight/shared/curation_sidebar' %>
 <div id="content" class="col-md-9">
-  <% @page_title = t :"spotlight.curation.#{page_collection_name}.header" %>
-  <%= bootstrap_form_for @exhibit, url: polymorphic_path([:update_all, @exhibit, page_collection_name]), style: :horizontal, right: "col-sm-10" do |f| %>
-    <h1><%= t :'spotlight.curation.header' %></h1>
-    <div class="col-xs-2 pull-right">
-      <%= button_tag(t(:"spotlight.curation.#{page_collection_name}.update"), class: "btn btn-default", disabled: @pages.empty?) %>
-    </div>
-    <h2 class="text-muted clearfix"><%= t :"spotlight.curation.#{page_collection_name}.header" %></h2>
-
-    <%= render partial: 'header' %>
-    <h3>Defined Pages</h3>
-    <p>Select the pages you want to be shown. Drag and drop pages to change the order in which they are displayed in the sidebar.</p>
-    <div class="panel-group dd <%= page_model %>_admin" id="nested-pages">
-      <ol class="dd-list">
-        <%= f.fields_for page_collection_name do |p| %>
-          <%- if p.object.about_page? || p.object.top_level_page? -%>
-            <%= render partial: 'page', locals: {f: p, parent_form: f} %>
-          <%- end -%>
-        <% end %>
-      </ol>
-    </div>
-  <%- end -%>
-  <div>
-    <%= form_for "spotlight/#{page_model}".classify.constantize.new, url: spotlight.polymorphic_path([@exhibit, page_collection_name]) do |f|%>
-      <%= f.hidden_field(:title) %>
-      <%= f.submit t(:'helpers.submit.new', model: "Page"), class: "btn btn-primary" %>
-    <%- end -%>
-  </div>
+  <%= render 'order_pages' %>
 </div>

data/app/views/spotlight/pages/new.html.erb

@@ -1,5 +1,5 @@
-<h1>New page</h1>
+<%= curation_page_title %>
 
 <%= render 'form' %>
 
-<%= link_to t('spotlight.curation.dashboard'), [spotlight, @page.exhibit, :catalog, :index] %>
+<%= link_to t('spotlight.dashboards.show.header'), spotlight.exhibit_dashboard_path(@page.exhibit) %>

data/app/views/spotlight/pages/show.html.erb

@@ -1,12 +1,14 @@
 <%= render 'sidebar' if @page.display_sidebar? %>
 
 <div class="<%= 'col-md-9' if @page.display_sidebar? %>">
-<%= link_to t('helpers.submit.edit'), spotlight.polymorphic_path([:edit, @page]), :class => 'btn btn-primary pull-right' if can? :edit, @page %>
-  <h1>
-    <%= @page.title %>
-  </h1>
-
+  <% if @page.title %>
+    <h1 class="page-title">
+      <%= @page.title %>
+    </h1>
+  <% end %>
   <div>
     <%= render_sir_trevor(@page.content) unless @page.content.blank? %>
   </div>
-</div>
+</div>
+
+<%= render "curation_mode_toggle", object: @page %>

data/app/views/spotlight/roles/_edit_fields.html.erb

@@ -1,6 +1,6 @@
         <tr data-edit-for="<%= f.object.new_record? ? 'new' : f.object.id %>">
           <td><%= f.text_field :user_key, hide_label: true %></td>
-          <td><%= f.select :role, {'Admin'=>'admin', 'Curator'=>'curator'}, {}, {hide_label: true} %></td>
+          <td><%= f.select :role, roles_for_select, {}, {hide_label: true} %></td>
           <td></td>
         </tr>
 

data/app/views/spotlight/roles/index.html.erb

@@ -1,17 +1,13 @@
 <%= render 'spotlight/shared/curation_sidebar' %>
 <div id="content" class="col-md-9">
-  <% @page_title = t(:'spotlight.administration.users.title') %>
-
-  <h1><%= t :'spotlight.administration.header' %></h1>
-  <h2 class="text-muted"><%= t :'spotlight.administration.users.header' %></h2>
+  <%= administration_page_title %>
   <%= bootstrap_form_for @exhibit, url: spotlight.update_all_exhibit_roles_path(@exhibit) do |f| %>
-    <%= button_tag t(:'spotlight.administration.users.new'), class: 'btn btn-default', data: {behavior: 'new-user'} %>
 
     <table class="table table-striped">
       <thead>
-        <th>Name</th>
-        <th>Role</th>
-        <th>Actions</th>
+        <th><%= t '.name' %></th>
+        <th><%= t '.role' %></th>
+        <th><%= t '.actions' %></th>
       </thead>
       <tbody>
       <%= f.fields_for :roles do |r| %>
@@ -20,8 +16,10 @@
           <tr data-edit-for="new">
             <td></td>
             <td colspan=2>
-              <%= button_tag t(:'spotlight.administration.users.cancel'), class: 'btn btn-text', data: {behavior: 'cancel-edit' } %>
-              <%=f.submit t(:'spotlight.administration.users.update'), class: 'btn btn-primary'%>
+              <div class="pull-right">
+                <%= cancel_link r.object, '#', class: 'btn btn-text', data: {behavior: 'cancel-edit' } %>
+                <%=f.submit nil, class: 'btn btn-primary'%>
+              </div>
             </td>
           </tr>
         <% else %>
@@ -34,17 +32,23 @@
           </tr>
           <%= render partial: 'edit_fields', locals: {f: r} %>
           <tr data-edit-for="<%= r.object.id %>">
-            <td><%= f.submit t(:'spotlight.administration.users.remove'), class: 'btn btn-danger', data: { behavior: 'destroy-user', target: r.object.id} %>
+            <td><%= f.submit action_label(r.object, :destroy), class: 'btn btn-danger', data: { behavior: 'destroy-user', target: r.object.id} %>
             <%= r.hidden_field :_destroy, data: {'destroy-for' => r.object.id} %>
             </td>
             <td colspan=2>
-              <%= button_tag t(:'spotlight.administration.users.cancel'), class: 'btn btn-text', data: {behavior: 'cancel-edit' } %>
-              <%=f.submit t(:'spotlight.administration.users.update'), class: 'btn btn-primary'%>
+              <div class="pull-right">
+                <%= cancel_link r.object, '#', class: 'btn btn-text', data: {behavior: 'cancel-edit' } %>
+                <%=f.submit nil, class: 'btn btn-primary'%>
+              </div>
             </td>
           </tr>
         <% end %>
       <% end %>
       </tbody>
     </table>
+
+    <div class="pull-right">
+      <%= exhibit_create_link Spotlight::Role.new, '#', class: 'btn btn-default', data: {behavior: 'new-user'} %>
+    </div>
   <% end %>
 </div>

data/app/views/spotlight/searches/_search.html.erb

@@ -1,6 +1,6 @@
 <% search = f.object %>
 <li class="dd-item dd3-item" data-id="<%= search.id %>">
-  <div class="dd-handle dd3-handle">Drag</div>
+  <div class="dd-handle dd3-handle"><%= t :drag %></div>
   <div class="dd3-content panel panel-default">
     <div class="panel-heading search">
       <%= f.check_box :on_landing_page, label: '' %>
@@ -8,8 +8,8 @@
       <div class="pic thumbnail"><%= image_tag(search.featured_image) if search.featured_image %></div>
       <div class="main">
         <div class="title"><%= search.title %></div>
-        <div class="count"><%= t 'spotlight.browse.item_count', count: search.count %></div>
-        <div class="actions"><%=link_to "Edit", edit_search_path(search) %> &bull; <%=link_to "Delete", search_path(search), method: :delete, data: {confirm: "Are you sure you want to delete this saved search?"} %></div>
+        <div class="count"><%= t :'.item_count', count: search.count %></div>
+        <div class="actions"><%= edit_link(search) %> &bull; <%= delete_link(search) %></div>
         <%= f.hidden_field :id %>
         <%= f.hidden_field :weight, data: {property: "weight"} %>
       </div>
@@ -18,7 +18,7 @@
         <% if search.short_description.present? %>
           <%=search.short_description %>
         <% else %>
-          <span class="missing-description"><%= link_to "Edit this Saved Search", edit_search_path(search) %> to add a description.</span>
+          <span class="missing-description"><%= t(:'.missing_description_html', link: (link_to action_label(search, :edit_long), [spotlight, :edit, search])) %></span>
         <% end %>
       </div>
 

data/app/views/spotlight/searches/edit.html.erb

@@ -1,16 +1,15 @@
 <%= render 'spotlight/shared/curation_sidebar' %>
 <div id="content" class="col-md-9">
+  <%= curation_page_title %>
   <%= bootstrap_form_for @search, style: :horizontal, right: "col-sm-5", html: {id: 'edit-search'} do |f| %>
-  <h1><%= t :'spotlight.curation.header' %></h1>
-  <h2 class="text-muted"><%= t :'spotlight.curation.browse.edit.header' %></h2>
   <div class="row">
     <%= f.text_field :title %>
     <%= f.select :featured_image, f.object.images, {}, prepend: "<img id=\"preview\"></img>".html_safe %>
     <%= f.text_area :short_description %>
     <%= f.text_area :long_description %>
     <div class="col-md-4 col-md-offset-4">
-      <%= link_to t(:'spotlight.curation.browse.edit.cancel'), exhibit_searches_path(@exhibit), class: 'btn btn-default' %>
-      <%= f.submit t :'spotlight.curation.browse.update' %>
+      <%= cancel_link @search,exhibit_searches_path(@exhibit), class: 'btn btn-default' %>
+      <%= f.submit nil %>
     </div>
   </div>
 <% end %>

data/app/views/spotlight/searches/index.html.erb

@@ -1,18 +1,14 @@
 <%= render 'spotlight/shared/curation_sidebar' %>
 <div id="content" class="col-md-9">
-  <% @page_title = t(:'spotlight.curation.browse.title') %>
-
+  <%= curation_page_title %>
+  <h3><%= header_with_count(t(:'.categories_header'), @searches.count) %></h3>
+  
+  <% if @searches.empty? %>
+    <%= t :'.no_saved_searches' %>
+  <% else %>
   <%= bootstrap_form_for @exhibit, url: update_all_exhibit_searches_path(@exhibit), style: :horizontal, right: "col-sm-10" do |f| %>
 
-    <h1><%= t :'spotlight.curation.header' %></h1>
-    <h2 class="text-muted"><%= t :'spotlight.curation.browse.header' %></h2>
-
-    <div class="pull-right">
-      <%= submit_tag t(:'spotlight.curation.browse.update'), class: "btn btn-default", disabled: @searches.empty? %>
-    </div>
-
-    <h4 class="clearfix">Browse Categories <span class="label label-default"><%=@searches.count%></span></h4>
-    <p class="instuctions">Select the categories you want to be displayed on the browse landing page. Drag and drop categories to change the order in which they appear on that page.</p>
+    <p class="instructions"><%= t(:'.instructions') %></p>
     <div class="panel-group dd search_admin" id="nested-pages">
       <ol class="dd-list">
       <%= f.fields_for :searches do |p| %>
@@ -20,5 +16,10 @@
       <% end %>
       </ol>
     </div>
+
+    <div class="pull-right">
+      <%= submit_tag t(:'helpers.action.update_all'), class: "btn btn-default" %>
+    </div>
+  <% end %>
   <% end %>
 </div>

data/app/views/spotlight/shared/_admin_sidebar.html.erb

@@ -1,6 +1,5 @@
   <h4><%=t(:'spotlight.administration.sidebar.header') %></h4>
   <ul class="nav sidenav">
-    <li class="disabled"><%= link_to t(:'spotlight.administration.sidebar.dashboard'), "#" %></li>
     <li><%= link_to t(:'spotlight.administration.sidebar.settings'), spotlight.edit_exhibit_path(@exhibit) %></li>
     <li><%= link_to t(:'spotlight.administration.sidebar.users'), spotlight.exhibit_roles_path(@exhibit) %></li>
   </ul>

data/app/views/spotlight/shared/_curation_sidebar.html.erb

@@ -1,8 +1,10 @@
 <div id="sidebar" class="col-md-3" role="complementary">
+  <ul class="nav sidenav">
+    <li class="dashboard"><%= link_to t(:'spotlight.curation.sidebar.dashboard'), spotlight.exhibit_dashboard_path(@exhibit) %></li>
+  </ul>
   <%= render 'spotlight/shared/admin_sidebar' if can? :update, current_exhibit %>
   <h4><%=t(:'spotlight.curation.sidebar.header') %></h4>
   <ul class="nav sidenav">
-    <li class="disabled"><%= link_to t(:'spotlight.curation.sidebar.dashboard'), "#" %></li>
     <li><%= link_to t(:'spotlight.curation.sidebar.items'), spotlight.admin_exhibit_catalog_index_path(@exhibit) %></li>
     <li><%= link_to t(:'spotlight.curation.sidebar.metadata'), spotlight.exhibit_edit_metadata_path(@exhibit) %></li>
     <li><%= link_to t(:'spotlight.curation.sidebar.tags'), spotlight.exhibit_tags_path(@exhibit) %></li>

data/app/views/spotlight/tags/index.html.erb

@@ -1,28 +1,26 @@
 <%= render 'spotlight/shared/curation_sidebar' %>
 <div id="content" class="col-md-9">
-  <% @page_title = t(:'spotlight.curation.tags.title') %>
-
-  <h1><%= t :'spotlight.curation.header' %></h1>
-  <h4 class="text-muted">
-    <%= t :'spotlight.curation.tags.header' %>
-    <span class="label label-default"><%= @tags.length %></span>
-  </h4>
+  <%= curation_page_title(header_with_count(@tags.length)) %>
 
+  <% if @tags.empty? %>
+    <p><%= t :'.no_tags' %></p>
+  <% else %>
   <table class="table table-striped">
     <thead>
-      <th>Name</th>
-      <th>Items tagged</th>
+      <th><%= t '.name' %></th>
+      <th><%= t '.taggings.count' %></th>
       <%# TODO last used? %>
-      <th>Actions</th>
+      <th><%= t '.actions' %></th>
     </thead>
     <tbody>
     <% @tags.each do |tag| %>
       <tr>
-        <td><%=tag.name %></td>
+        <td><%= link_to tag.name, url_to_tag_facet(tag.name) %></td>
         <td><%= tag.taggings.count %></td>
-        <td><%= link_to "Delete tag", exhibit_tag_path(@exhibit, tag), method: 'delete', class: 'btn btn-danger' %></td>
+        <td><%= delete_link(tag, exhibit_tag_path(current_exhibit, tag), class: 'btn btn-danger btn-xs') %></td>
       </tr>
     <% end %>
     </tbody>
   </table>
+  <% end %>
 </div>

data/config/locales/spotlight.en.yml

@@ -1,40 +1,52 @@
 en:
   cancel: "Cancel"
+  drag: "Drag"
+  toggle_nav: "Toggle navigation"
   helpers:
-    submit:
-      new: Add new %{model}
+    action:
+      new: Add a new %{model}
       view: View
       edit: Edit
+      edit_long: "Edit this %{model}"
       destroy: Delete
-      destroy_are_you_sure: "Are you sure?"
-      exhibit:
-        submit: "Save"
-        update: "Save changes"
-      search:
-        create: "Save"
-        submit: "Save"
-      contact_form:
-        create: "Send"
-      feature_page:
-        create: "Save"
-        submit: "Save changes"
-        update: "Save changes"
-      about_page:
-        create: "Save"
-        submit: "Save changes"
-        update: "Save changes"
-      home_page:
-        create: "Save"
-        submit: "Save changes"
-        update: "Save changes"
-      blacklight_configuration:
+      cancel: Cancel
+      destroy_are_you_sure: "Are you sure you want to delete this %{model}?"
+      update_all: "Save changes"
+      spotlight/search:
+        destroy: "Delete"
+        edit_long: "Edit this saved search"
+      acts_as_taggable_on/tag:
+        destroy: "Delete tag"
+      spotlight/role:
+        create: "Add a new user"
+        destroy: "Remove from site"
+      spotlight/custom_field:
+        create: "Add new field"
+      spotlight/contact:
+        create: "Add contact"
+    submit:
+      spotlight_default: &spotlight_default
         create: "Save"
         submit: "Save changes"
         update: "Save changes"
-      solr_document:
+      contact:
         create: "Save"
+        update: "Save"
+      page: &spotlight_page
+        create: "Add new page"
         submit: "Save changes"
         update: "Save changes"
+      exhibit: *spotlight_default
+      search: *spotlight_default
+      contact_form:
+        create: "Send"
+      feature_page: *spotlight_page
+      about_page: *spotlight_page
+      home_page: *spotlight_page
+      blacklight_configuration: *spotlight_default
+      solr_document: *spotlight_default
+      users: *spotlight_default
+      custom_field: *spotlight_default
     label:
       solr_document:
         exhibit_tag_list: "Tags"
@@ -43,18 +55,7 @@ en:
       spotlight:
         page: Page
   spotlight:
-    items:
-      curation_mode: "You are in curation mode."
-      end_user_mode: "You are in end-user mode."
-      show_link: "Turn off."
-      edit_link: "Enter curation mode."
-    browse:
-      heading: "Browse Exhibit"
-      item_count:
-        one: "%{count} item"
-        other: "%{count} items"
-    contact_form:
-      header: "Report a Problem"
+    html_admin_title: "%{section} - %{title}  --  %{application_name}"
     administration:
       sidebar:
         header: Administration
@@ -66,14 +67,13 @@ en:
       settings:
         header: "Settings"
       show_sidebar: "Show sidebar"
-      users:
-        header: Users
-        title: Site Administration - Users
-        remove: "Remove from site"
-        new: "Add a new user"
-        update: "Save"
-        cancel: "Cancel"
     curation:
+      mode:
+        curation: "You are in curation mode."
+        end_user: "You are in end-user mode."
+      link:
+        show: "Turn off."
+        edit: "Enter curation mode."
       sidebar:
         header: Curation
         dashboard: Dashboard
@@ -84,36 +84,14 @@ en:
         browse: Browse
         feature_pages: Feature pages
         about_pages: About pages
-      dashboard: "Curation dashboard"
-      home:
-        nav_link: "Home"
-        nav_catalog_link: "Home"
-      items:
-        header: "Items"
-        title: "Curation - Items"
-        date_added: "Date Added"
-      browse:
-        header: "Browse"
-        title: "Curation - Browse"
-        update: "Save changes"
-        edit:
-          header: "Edit Browse Category"
-          cancel: "Cancel"
-      custom_fields:
-        header: "Custom Field"
+      nav:
+        home: "Home"
       header: "Curation"
-      metadata_fields:
-        header: "Metadata"
-        order_header: "Display and Order Metadata Fields"
-        exhibit_specific_header: "Exhibit-Specific Fields"
-        new_custom_field: "Add new field"
-        destroy_are_you_sure: "Are you sure you want to delete this exhibit-specific field? All existing values entered for this field will be deleted."
-        label: "Field name"
-        view:
-          show: "Item Details"
-      facet_fields:
+    blacklight_configurations:
+      edit_facet_fields:
         header: "Search Facets"
-        options:
+        options: "Options"
+        field:
           label: "Display Label"
         items_count: 
           one: "%{count} item"
@@ -121,21 +99,154 @@ en:
         values_count:
           one: "%{count} unique value"
           other: "%{count} unique values"
-      tags:
+      edit_metadata_fields:
+        field:
+          label: "Field name"
+        header: "Metadata"
+        order_header: "Display and Order Metadata Fields"
+        exhibit_specific:
+          header: "Exhibit-Specific Fields"
+          instructions:
+            "You can add metadata fields to supplement the metadata fields that are part of the repository item record."
+        view:
+          show: "Item Details"
+        instructions: Select metadata fields to display on each type of page. Click a field name to edit its display label. Drag and drop fields to specify the order they are displayed on the Item Details page.
+    catalog:
+      breadcrumb:
+        index: 'Search Results'
+      fields:
+        title: "Title"
+        date_added: "Date Added"
+        visibility: Public
+      document_visibility_control:
+        make_public:
+          label: ""
+          button: Make Public
+        make_private:
+          label: ""
+          button: Make Private
+        inprogress:
+          label: ""
+        private: "Private"
+      admin:
+        title: Curation - Items
+        header: Items
+    contact_form:
+      new:
+        header: "Report a Problem"
+    custom_fields:
+      edit:
+        header: Edit Exhibit-Specific Field
+      new:
+        header: Add Exhibit-Specific Field
+    dashboards:
+      show:
+        header: Dashboard
+      page_activity:
+        header: Recent Site Building Activity
+        new_feature_page: "Add new Feature page"
+        new_about_page: "Add new About page"
+        field:
+          title: Title
+          last_edited_by: User
+          updated_at: Last Edited
+      solr_document_activity:
+        header: Recently Updated Items
+    exhibits:
+      edit:
+        header: Settings
+        fields:
+          contact_emails:
+            help_block: Each contact email will receive Report a problem form submissions
+    pages:
+      order_pages:
+        pages_header: Defined Pages
+        instructions: Select the pages you want to be shown. Drag and drop pages to change the order in which they are displayed in the sidebar.
+      index:
+        home_pages:
+          title: Exhibit Home
+          header: Exhibit Home
+        feature_pages:
+          title: Feature Pages
+          header: Feature Pages
+          home_pages_header: Homepage
+        about_pages:
+          title: About Pages
+          header: About Pages
+      new:
+        header: New page
+      edit:
+        header: Edit page
+      form:
+        title_placeholder: "Title"
+    contacts:
+      edit:
+        header: "Edit Contact"
+      new:
+        header: "Add Exhibit Contact"
+      form:
+        name:
+          placeholder: First and last name
+        email:
+          placeholder: Valid email address
+        title:
+          placeholder: Job title most relevant to this exhibit
+        location:
+          placeholder: Name of library or other physical location
+    about_pages:
+      index:
+        contacts: Contacts
+        contact:
+          legend: Contact Details
+        instructions: Enter details for each librarian, curator or other contact person for this exhibit. Select the contacts you want to be show in the sidebar of the About Pages. Drag and drop contacts to specify the order in which they are shown in the sidebar.
+      nav_link: About
+      sidebar:
+        nav_link: About
+    feature_pages:
+      nav_link: Curated Features
+    roles:
+      index:
+        title: Site Administration - Users
+        header: Users
+        name: Username
+        role: "Role"
+        actions: "Actions"
+    searches: &search
+      nav_link: "Browse"
+      index:
+        header: "Browse"
+        title: "Curation - Browse" 
+        categories_header: "Browse Categories"
+        instructions: "Select the categories you want to be displayed on the browse landing page. Drag and drop categories to change the order in which they appear on that page."
+        no_saved_searches: "You can save search results while in curation mode to create browse categories, which will be displayed here."
+      edit:
+        header: "Edit Browse Category"
+        title: "Curation - Browse"
+      search:
+        item_count:
+          one: "%{count} item"
+          other: "%{count} items"
+        missing_description_html: "%{link} to add a description."
+    browse:
+      nav_link: "Browse"
+      index:
+        header: "Browse Exhibit"
+      search:
+        item_count:
+          one: "%{count} item"
+          other: "%{count} items"
+    tags:
+      index:
         title: "Curation - Tags"
         header: "Tags"
-      feature_pages:
-        nav_link: "Curated Features"
-        header: "Feature Pages"
-        options: "Options"
-        update: "Save changes"
-      about_pages:
-        nav_link: "About"
-        header: "About Pages"
-        update: "Save changes"
-      home_pages:
-        header: "Homepage"
-        page_title: "Exhibit Home"
+        name: "Name"
+        taggings:
+          count: "Items tagged"
+        actions: "Actions"
+        no_tags: "No items in this exhibit have been tagged. You can add tags to an item on the Item Details page while in curation mode."
+    role:
+      admin: "Admin"
+      curator: "Curator"
     header_links:
       login: "Sign in"
       logout: "Sign out"