sufia 1.3.0 → 2.0.0

data/app/models/contact_form.rb

@@ -35,8 +35,8 @@ class ContactForm < MailForm::Base
   def headers
     {
       :subject => "Contact Form:#{subject}",
-      :to => Sufia::Engine.config.contact_email, 
-      :from => Sufia::Engine.config.from_email
+      :to => Sufia.config.contact_email, 
+      :from => Sufia.config.from_email
     }
   end
 end

data/app/views/_ga.html.erb

@@ -15,8 +15,8 @@ limitations under the License.
 %>
 
 <%
-if Sufia::Engine.config.respond_to? :google_analytics_id
-tracking_id = Sufia::Engine.config.google_analytics_id
+if Sufia.config.respond_to? :google_analytics_id
+tracking_id = Sufia.config.google_analytics_id
 %>
 <script type="text/javascript">
   var _gaq = _gaq || [];

data/app/views/batch_edits/_batch_edits_actions.html.erb

@@ -0,0 +1 @@
+<li data-behavior="batch-edit-select-abc" data-state="on"><a href="#"><i class="icon-ok"></i> Select ABC</a></li>

data/app/views/batch_edits/_check_all.html.erb

@@ -3,8 +3,7 @@
       <%= check_box_tag 'check_all', 'yes', @all_checked, :disabled => ((@batch_size_on_other_page + @document_list.count) > @max_batch_size) %>
       <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="icon-cog" title="click for selection options"></span></a>
       <ul class="dropdown-menu">
-        <li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="icon-ok"></i> Select None</a></li>
-        <li data-behavior="batch-edit-select-page" data-state="off"><a href="#"><i class=""></i> Select Current Page</a></li>
+        <%= render partial:'batch_edits_actions' %>
       </ul>
     </div>
   <% end %>

data/app/views/catalog/_sort_and_per_page.html.erb

@@ -9,7 +9,7 @@
         <strong>Show</strong> <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => "Number of results to display per page", :class => "input-small")  %> per page
         <% end %>
       <%= search_as_hidden_fields(:omit_keys => [:per_page, :sort]) %>
-      <button class="btn btn-primary"><i class="icon-refresh"></i> Update</button>
+      <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
 
   </div>
     <% end %>

data/app/views/dashboard/_batch_edits_actions.html.erb

@@ -0,0 +1,2 @@
+<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="icon-ok"></i> Select None</a></li>
+<li data-behavior="batch-edit-select-page" data-state="off"><a href="#"><i class=""></i> Select Current Page</a></li>

data/app/views/dashboard/_sort_and_per_page.html.erb

@@ -28,7 +28,7 @@ limitations under the License.
         <% end %>
         <%= search_as_hidden_fields(:omit_keys => [:per_page, :sort]) %>
         &nbsp;&nbsp;&nbsp;
-        <button class="btn btn-primary"><i class="icon-refresh"></i> Update</button>
+        <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
 		<% end unless sort_fields.empty? %>
   <% end %>
 </div>

data/app/views/generic_files/_breadcrumbs.html.erb

@@ -13,6 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 %>
+
+<%# convert class variable to a local variable if the local hasn't been set %>
+<% generic_file = @generic_file unless generic_file  %>
+
 <div class="breadcrumbs">
   <%
      include_file = true if include_file.blank?
@@ -28,7 +32,7 @@ limitations under the License.
        crumbs << link_to('Back to search results', request.referer)
      end
 
-     crumbs << @generic_file.title.first if include_file
+     crumbs << generic_file.title.first if include_file
 
      crumbs.each do |crumb| %>
        <% if crumb == crumbs.last %>

data/app/views/generic_files/_descriptions.html.erb

@@ -14,15 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
+<%# convert class variable to a local variable if the local hasn't been set %>
+<% generic_file = @generic_file unless generic_file  %>
+
 <div id="descriptions_display" class="tab-pane active">
-  <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
+  <%= form_for generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
     <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
       <div class="well">
 
-        <%= render :partial=>'generic_files/edit_fields/type', :locals => {f:f} %>
-        <% (@generic_file.terms_for_editing - [:resource_type]).each do |term| %>
-          <%= render :partial => "generic_files/field_form", :locals => { :generic_file => @generic_file, :f =>f, :render_req => true, :key => term } %>
+        <% (generic_file.terms_for_editing).each do |term| %>
+          <%= render :partial => "generic_files/field_form", :locals => { generic_file: generic_file, f: f, render_req: true, key: term } %>
         <% end %>
    
       </div><!-- /well -->

data/app/views/generic_files/_dropbox_import.html.erb

@@ -0,0 +1,3 @@
+<%= render partial: 'generic_files/upload/agreement' %>
+<%= render partial: 'generic_files/upload/alerts' %>
+<%= render partial: 'generic_files/upload/dropbox_chooser' %>

data/app/views/generic_files/_field_display.html.erb

@@ -0,0 +1,12 @@
+  <% vals =  Array(generic_file[key]) %>
+  <tr>
+    <th><%= get_label(key) %></th>
+    <td>
+      <% vals.each do |v| %>
+        <span itemprop="name">
+          <%= v %>
+        </span>
+        <br />
+      <% end %>
+    </td>
+  </tr>

data/app/views/generic_files/_field_form.html.erb

@@ -9,6 +9,6 @@
   <% end %>
 
   <% vals.to_ary.each_with_index do |v, index| %>
-    <%= render_edit_field_partial(key, f:f,  v: v, index: index, render_req: render_req) %>
+    <%= render_edit_field_partial(key, record: generic_file, f:f,  v: v, index: index, render_req: render_req) %>
   <% end %>
  </div><!-- /control-group -->

data/app/views/generic_files/_multiple_upload.html.erb

@@ -1,135 +1,4 @@
-<div class="alert">
-  <strong>Note:</strong> You must agree to <a href='/agreement/' target="_blank"><%= t('sufia.deposit_agreement') %></a> before starting your upload.
-</div>
-
-<div class="alert alert-info hide" id="redirect-loc" type="text/x-jquery-tmpl">
-  <%=sufia.batch_edit_path(@batch_noid)%>
-</div>
-
-<div id="upload_tooltip"><%= t('sufia.upload_tooltip') %></div>
-
-<div class="alert alert-info hide" id="success">
-  You have successfully uploaded some of your files.  Either continue to upload or edit use the links below to abandon the rest of your added files.
-  <p>
-  <%= link_to 'Add Descriptions', sufia.batch_edit_path(@batch_noid), :class=>'btn' %>
-  </p>
-</div>
-
-<div class="alert hide" id="fail">
-  There was a problem during upload. Please click the &quot;Start Upload&quot; button or <%= link_to 'start over', sufia.new_generic_file_path %>
-</div>
-
-<div class="alert hide" id="partial_fail">
-  One or more files did not upload successfully. To continue using the files uploaded use one of the links below.<br />
-  <%= link_to 'Add Descriptions', sufia.batch_edit_path(@batch_noid), :class=>'btn' %>
-</div>
-
-<div class="alert hide" id="errmsg"> </div>
-
-    <!-- The file upload form used as target for the file upload widget -->
-    <%= form_for(@generic_file, :url => sufia.generic_files_path, :html => {:multipart => true, :class => 'form-horizontal well', :id => 'fileupload'}) do |f| %>
-      <%= hidden_field_tag(:total_upload_size, 0) %>
-      <%= hidden_field_tag(:relative_path) %>
-      <%= hidden_field_tag(:batch_id, @batch_noid) %>
-      <label class="checkbox">
-      <%= check_box_tag 'terms_of_service' %> I have read and do agree
-      to <%= link_to t('sufia.deposit_agreement'),
-        '/agreement/', :target => "_blank" %>.
-    </label>
-        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-        <div class="row fileupload-buttonbar">
-            <div class="span70">
-                <!-- The fileinput-button span is used to style the file input field as button -->
-                <span class="btn btn-success fileinput-button">
-                    <i class="icon-plus icon-white"></i>
-                    <span>Select files...</span>
-                    <input type="file" name="files[]" multiple />
-                </span>
-                <% ua = request.env['HTTP_USER_AGENT'] %>
-                <% if !!(ua =~ /Chrome/) %>
-                <span class="btn btn-success fileinput-button">
-                    <i class="icon-plus icon-white"></i>
-                    <span>Select folder...</span>
-                    <input type="file" name="files[]" directory webkitdirectory mozdirectory />
-                </span>
-                <% end %>
-                <span id="main_upload_start_span">
-                <button type="submit" class="btn btn-primary start" id='main_upload_start'>
-                    <i class="icon-upload icon-white"></i>
-                    <span>Start upload</span>
-                </button>
-                </span>
-                <button type="reset" class="btn btn-warning cancel">
-                    <i class="icon-ban-circle icon-white"></i>
-                    <span>Cancel upload</span>
-                </button>
-            </div>
-            <div class="span50">
-                <!-- The global progress bar -->
-                <div class="progress progress-success progress-striped active fade">
-                    <div class="bar" style="width:0%;"></div>
-                </div>
-            </div>
-        </div>
-        <!-- The loading indicator is shown during image processing -->
-        <div class="fileupload-loading"></div>
-        <br />
-        <!-- The table listing the files available for upload/download -->
-        <table id="file-table" class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
-  <% end %>
-
-<!-- The template to display files available for upload -->
-<script id="template-upload" type="text/x-jquery-tmpl">
- {% for (var i=0, file; file=o.files[i]; i++) { %}
-
-    <tr class="template-upload fade">
-        <td class="preview"><span class="fade"></span></td>
-        <td class="name"><span>{%=file.name%}</span></td>
-        <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-        {% if (file.error) { %}
-            <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
-        {% } else if (o.files.valid && !i) { %}
-            <td>
-                <div class="progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>
-            </td>
-            <td class="start">{% if (!o.options.autoUpload) { %}
-              <button class="btn btn-primary hide">
-                    <i class="icon-upload icon-white"></i>
-                    <span>{%=locale.fileupload.start%}</span>
-              </button>
-            {% } %}</td>
-        {% } else { %}
-            <td colspan="2"></td>
-        {% } %}
-        <td class="cancel">{% if (!i) { %}
-            <button class="btn btn-warning">
-                <i class="icon-ban-circle icon-white"></i>
-                <span>{%=locale.fileupload.cancel%}</span>
-            </button>
-        {% } %}</td>
-    </tr>
-{% } %}
-</script>
-<!-- The template to display files available for download -->
-<script id="template-download" type="text/x-jquery-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-download fade">
-        {% if (file.error) { %}
-            <td><span></span></td>
-            <td class="name"><span>{%=file.name%}</span></td>
-            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-            <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
-        {% } else { %}
-            <td class="preview">
-              {% if (file.thumbnail_url) { %} <span class="label label-success">Success</span> {% } %}
-            </td>
-            <td class="name">
-                {%=file.name%}
-                <!--a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}" target="_blank">{%=file.name%}</a-->
-            </td>
-            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-            <td colspan="2"></td>
-        {% } %}
-    </tr>
-{% } %}
-</script>
+<%= render partial: 'generic_files/upload/agreement' %>
+<%= render partial: 'generic_files/upload/alerts' %>
+<%= render partial: 'generic_files/upload/form' %>
+<%= render partial: 'generic_files/upload/script_templates' %>

data/app/views/generic_files/_permission_form.html.erb

@@ -78,7 +78,7 @@
       <div class="input-append">
         <p class="help-block">Enter <%=t('sufia.account_label') %> (one at a time)</p>
         <%= text_field_tag 'new_user_name_skel', nil, :class => "span29" %><span class="add-on"><%=t('sufia.directory.suffix') %></span>
-        <%= select_tag 'new_user_permission_skel', options_for_select(Sufia::Engine.config.permission_levels), :class=> 'span17' %>
+        <%= select_tag 'new_user_permission_skel', options_for_select(Sufia.config.permission_levels), :class=> 'span17' %>
         <button class="btn btn-mini btn-inverse" id="add_new_user_skel"><i class="icon-plus-sign"></i> Add</button>
         <br /> <span id="directory_user_result"></span> 
       </div>
@@ -88,7 +88,7 @@
     <div id="new-group" >
       <div class="input-append">
         <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + groups), :class => 'span38' %>
-        <%= select_tag 'new_group_permission_skel', options_for_select(Sufia::Engine.config.permission_levels), :class => 'span17' %>
+        <%= select_tag 'new_group_permission_skel', options_for_select(Sufia.config.permission_levels), :class => 'span17' %>
         <button class="btn btn-mini btn-inverse" id="add_new_group_skel" ><i class="icon-plus-sign"></i> Add</button>
         <br /><span id="directory_group_result"></span>
       </div>
@@ -103,18 +103,18 @@
   <tr id="file_permissions">
     <td><%= label_tag :owner_access, "Depositor (<span id=\"file_owner\">#{link_to_profile depositor}</span>)".html_safe, :class=>"control-label" %></td>
     <td>
-    <%= Sufia::Engine.config.owner_permission_levels.keys[0] %>
+    <%= Sufia.config.owner_permission_levels.keys[0] %>
     </td>
   </tr>
   <% gf.permissions.each do |permission| %>
-    <%-# skip the public, penn state (aka registered), and depositor perms as they are displayed first at the top -%>
+    <%# skip the public, penn state (aka registered), and depositor perms as they are displayed first at the top %>
     <% next if permission[:name].downcase == 'public' %>
     <% next if permission[:name].downcase == 'registered' %>
     <% next if permission[:name].downcase == depositor %>
     <tr>
       <td><%= label_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", permission[:name], :class=>"control-label" %></td>
       <td>
-      <%= select_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", options_for_select(Sufia::Engine.config.permission_levels, permission[:access]), :class=>'span20 select_perm' %>
+      <%= select_tag "generic_file[permissions][#{permission[:type]}][#{permission[:name]}]", options_for_select(Sufia.config.permission_levels, permission[:access]), :class=>'span20 select_perm' %>
       <button class="btn close remove_perm">X</button>
       </td>
     </tr>

data/app/views/generic_files/_show_descriptions.html.erb

@@ -1,20 +1,12 @@
+<%# convert class variable to a local variable if the local hasn't been set %>
+<% generic_file = @generic_file unless generic_file  %>
+
     <h2 class="non lower">Descriptions</h2>
     <table class="table table-striped"><!-- class="verticalheadings"> -->
       <tbody>
-        <%= render :partial=>'generic_files/show_fields/title' %>
-        <%= render :partial=>'generic_files/show_fields/creator' %>
-        <%= render :partial=>'generic_files/show_fields/contributor' %>
-        <%= render :partial=>'generic_files/show_fields/related_url' %>
-        <%= render :partial=>'generic_files/show_fields/based_near' %>
-        <%= render :partial=>'generic_files/show_fields/description' %>
-        <%= render :partial=>'generic_files/show_fields/language' %>
-        <%= render :partial=>'generic_files/show_fields/resource_type' %>
-        <%= render :partial=>'generic_files/show_fields/publisher' %>
-        <%= render :partial=>'generic_files/show_fields/rights' %>
-        <%= render :partial=>'generic_files/show_fields/subject' %>
-        <%= render :partial=>'generic_files/show_fields/tag' %>
-        <%= render :partial=>'generic_files/show_fields/identifier' %>
-        <%= render :partial=>'generic_files/show_fields/date_created' %>
+        <% (generic_file.terms_for_display - [:resource_type]).each do |term| %>
+          <%= render_show_field_partial(term, generic_file: generic_file) %>
+        <% end %>
       </tbody>
     </table> <!-- /verticalheadings -->
 

data/app/views/generic_files/_show_details.html.erb

@@ -51,14 +51,14 @@
               <% label = label.humanize %>
               <% if values.is_a? Array %>
                 <% length = values.length %>
-                <% length = Sufia::Engine.config.fits_message_length-1  if term == :status_message && values.length > Sufia::Engine.config.fits_message_length-1  %>
+                <% length = Sufia.config.fits_message_length-1  if term == :status_message && values.length > Sufia.config.fits_message_length-1  %>
                 <% values[0..length].each_with_index do |value, idx| %>
                   <% next if value.empty? %>
                   <%= "#{label}: #{value.truncate(250)}" %>
                   <%= "<br />".html_safe unless idx == length %> 
                 <% end %>
                 <% if length != values.length %>
-                   <%= render :partial => "generic_files/extra_fields_modal", :locals=>{:name=>term, :values=> values, :start=>Sufia::Engine.config.fits_message_length}%>
+                   <%= render :partial => "generic_files/extra_fields_modal", :locals=>{:name=>term, :values=> values, :start=>Sufia.config.fits_message_length}%>
                 <% end %>
               <% else %>
                 <%= "#{label}: #{values.truncate(250)}" %><br />

data/app/views/generic_files/edit_fields/_resource_type.html.erb

@@ -0,0 +1,9 @@
+<%# convert class variable to a local variable if the local hasn't been set %>
+<% generic_file = @generic_file unless generic_file  %>
+
+        <div class="controls">
+          <p class="help-block">You may select multiple types to apply<p>
+          <%= f.select "resource_type", options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {}, {:multiple=>true, :size=>7} %>
+          <%= help_icon(:resource_type) %>
+        </div>
+

data/app/views/generic_files/edit_fields/_rights.html.erb

@@ -1,5 +1,5 @@
       <div class="controls" <% if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
-              <% choices = Sufia::Engine.config.cc_licenses %>
+              <% choices = Sufia.config.cc_licenses %>
               <% choices = {""=>""}.merge(choices) %>
               <%= f.select "rights", options_for_select(choices, v) %>
         <%= render :partial=>"generic_files/edit_fields/suffix", :locals=>{key: key, index: index} %>

data/app/views/generic_files/edit_fields/_type.html.erb

@@ -1,8 +1,11 @@
+<%# convert class variable to a local variable if the local hasn't been set %>
+<% generic_file = @generic_file unless generic_file  %>
+
       <div class="control-group">
         <%= f.label :resource_type, "Resource Types", :class=>"control-label", :for=>"resource_type" %>
         <div class="controls">
           <p class="help-block">You may select multiple types to apply<p>
-          <%= f.select "resource_type", options_for_select(Sufia::Engine.config.resource_types.keys, @generic_file.resource_type), {}, {:multiple=>true, :size=>7} %>
+          <%= f.select "resource_type", options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {}, {:multiple=>true, :size=>7} %>
           <%= help_icon(:resource_type) %>
         </div>
       </div><!-- /control-group -->

data/app/views/generic_files/new.html.erb

@@ -16,4 +16,21 @@ limitations under the License.
 
 <h2>Upload</h2>
 <%# using partials rather than inlining, so implementers can add or change stuff on this page without much duplication %>
-<%= render partial: 'multiple_upload' %>
+<ul class="nav nav-tabs">
+  <li class="active"><a href="#local" data-toggle="tab"><i class="icon-desktop"></i> My Computer</a></li>
+  <% if Sufia.config.dropbox_api_key %>
+    <li><a href="#dropbox" data-toggle="tab"><i class="icon-inbox"></i> Dropbox</a></li>
+  <% end %>
+</ul>
+
+<div class="tab-content">
+  <div class="tab-pane active" id="local">
+    <%= render partial: 'multiple_upload' %>
+  </div>
+
+  <% if Sufia.config.dropbox_api_key %>
+    <div class="tab-pane" id="dropbox">
+      <%= render partial: 'dropbox_import' %>
+    </div>
+  <% end %>
+</div>

data/app/views/generic_files/show_fields/_default.html.erb

@@ -0,0 +1,12 @@
+<% vals =  Array(generic_file[key]) %>
+<tr>
+  <th><%= get_label(key) %></th>
+  <td>
+    <% vals.each do |v| %>
+      <span itemprop="name">
+        <%= v %>
+      </span>
+      <br />
+    <% end %>
+  </td>
+</tr>

data/app/views/generic_files/upload/_agreement.html.erb

@@ -0,0 +1,5 @@
+<div class="alert">
+  <strong>Note:</strong> You must agree to <a href='/agreement/' target="_blank"><%= t('sufia.deposit_agreement') %></a> before starting your upload.
+</div>
+
+