sufia 0.0.1.pre2 → 0.0.1

data/app/views/_add_assets_links.html.erb

@@ -15,5 +15,5 @@ limitations under the License.
 %>
 
 <div class="">
-  <%= link_to "Upload", new_generic_file_path %>
+  <%= link_to "Upload", sufia.new_generic_file_path %>
 </div>

data/app/views/_user_util_links.html.erb

@@ -15,10 +15,10 @@ limitations under the License.
 %>
 <% if current_user %>
    <%= render :partial => 'users/notify_link' %>
-  <a href="<%= sufia.profile_path(current_user.to_s) %>" class="btn btn-small " title="click for User Profile"><i class="icon-user">&nbsp;</i><%= current_user.name %></a>
+  <a href="<%= sufia.profile_path(URI.escape(current_user.to_s, '@.')) %>" class="btn btn-small " title="click for User Profile"><i class="icon-user">&nbsp;</i><%= current_user.name %></a>
   <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down" title="click for additional menu options"></span></a>
   <ul class="dropdown-menu">
-      <li><%= link_to raw('<i class="icon-dashboard"></i> my dashboard'), sufia.dashboard_path, :id => 'dashboard_nav_link'  %></li>
+      <li><%= link_to raw('<i class="icon-dashboard"></i> my dashboard'), sufia.dashboard_index_path, :id => 'dashboard_nav_link'  %></li>
       <li><%= link_to raw('<i class="icon-upload-alt"></i> upload'), sufia.new_generic_file_path, :id => 'upload_nav_link'  %></li>
       <li><%= link_to raw('<i class="icon-cog"></i> edit profile'), sufia.edit_profile_path(current_user.user_key), :id => 'upload_nav_link'  %></li>
       <li class="divider"></li>

data/app/views/batch/_metadata.html.erb

@@ -26,7 +26,7 @@ limitations under the License.
           <%= f.label :title, "<span class='error'>*</span> Title #{index+1}".html_safe, :class=>"control-label" %> 
           <div class="controls" id="additional_title_clone">
             <%= f.text_field :title, :name=>"title[#{gen_f.id}][]", :value=>gen_f.label, :required=> true %>  
-            <a href="#" id="generic_file_title_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_title"] %>" data-original-title="Title"><i class="icon-question-sign icon-large"></i></a>
+            <a href="#" id="generic_file_title_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_title"] %>" data-original-title="Title"><i class="icon-question-sign icon-large"></i></a>
           </div>
         </div>
       <% end %>
@@ -47,8 +47,8 @@ limitations under the License.
         <%= 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 to all files<p>
-          <%= f.select "resource_type", ScholarSphere::Application::config.resource_types, {}, {:multiple=>true, :size=>7} %>
-          <a href="#" id="generic_file_resource_type_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_resource_type"] %>" data-original-title="Resource Type"><i class="icon-question-sign icon-large"></i></a>
+          <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, {:multiple=>true, :size=>7} %>
+          <a href="#" id="generic_file_resource_type_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_resource_type"] %>" data-original-title="Resource Type"><i class="icon-question-sign icon-large"></i></a>
       </div>
     </div>
 
@@ -58,7 +58,7 @@ limitations under the License.
           <%= f.text_field :tag, :name=>"generic_file[tag][]", :value=>"", :required=> true  %> 
           <button class="adder btn" name="additional_tag" id="additional_tag_submit">+<span class="accessible-hidden">add another Tag</span></button>
           &nbsp;
-          <a href="#" id="generic_file_tag_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_tag"] %>" data-original-title="Keyword"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_tag_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_tag"] %>" data-original-title="Keyword"><i class="icon-question-sign icon-large"></i></a>
       </div>
       <div id="additional_tag_elements"></div>
     </div>
@@ -69,7 +69,7 @@ limitations under the License.
         <%= f.text_field :creator, :name=>"generic_file[creator][]", :value=>"", :required=> true %>
           <button class="adder btn" name="additional_creator" id="additional_creator_submit">+<span class="accessible-hidden">add another Creator</span></button>
           &nbsp;
-          <a href="#" id="generic_file_creator_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_creator"] %>" data-original-title="Creator"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_creator_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_creator"] %>" data-original-title="Creator"><i class="icon-question-sign icon-large"></i></a>
       </div>
       <div id="additional_creator_elements"></div>
     </div>
@@ -77,10 +77,10 @@ limitations under the License.
     <div class="control-group">
       <%= f.label :rights, '<span class="error">*</span> Rights'.html_safe, :class=>"control-label" %>
       <div class="controls" id="additional_rights_clone">
-        <%= f.select "rights", options_for_select(ScholarSphere::Application::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), :required => true %>
+        <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), :required => true %>
           <button class="adder btn" name="additional_rights" id="additional_rights_submit">+<span class="accessible-hidden">add another Rights</span></button>
         &nbsp;
-        <a href="#" id="generic_file_rights_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_rights"] %>" data-original-title="Rights"><i class="icon-question-sign icon-large"></i></a>
+        <a href="#" id="generic_file_rights_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_rights"] %>" data-original-title="Rights"><i class="icon-question-sign icon-large"></i></a>
         <%= render :partial => "generic_files/rights_modal" %>
         
       </div>
@@ -99,7 +99,7 @@ limitations under the License.
           <%= f.text_field :related_url, :name=>"generic_file[related_url][]", :value=>""  %> 
           <button class="adder btn" name="additional_related_url" id="additional_related_url_submit">+<span class="accessible-hidden">add another Related URL</span></button>
           &nbsp;
-          <a href="#" id="generic_file_related_url_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_related_url"] %>" data-original-title="Related URL"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_related_url_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_related_url"] %>" data-original-title="Related URL"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_related_url_elements"></div>
       </div>
@@ -110,7 +110,7 @@ limitations under the License.
         <%= f.text_field :based_near, :name=>"generic_file[based_near][]", :value=>""  %> 
         <button class="adder btn" name="additional_based_near" id="additional_based_near_submit">+<span class="accessible-hidden">add another Location</span></button>
         &nbsp;
-          <a href="#" id="generic_file_based_near_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_based_near"] %>" data-original-title="Location"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_based_near_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_based_near"] %>" data-original-title="Location"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_based_near_elements"></div>
       </div>
@@ -121,7 +121,7 @@ limitations under the License.
           <%= f.text_field :contributor, :name=>"generic_file[contributor][]", :value=>gf.contributor[0]  %> 
           <button class="adder btn" name="additional_contributor" id="additional_contributor_submit">+<span class="accessible-hidden">add another Contributor</span></button>
             &nbsp;
-          <a href="#" id="generic_file_contributor_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_contributor"] %>" data-original-title="Contributor"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_contributor_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_contributor"] %>" data-original-title="Contributor"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_contributor_elements"></div>
       </div>
@@ -132,7 +132,7 @@ limitations under the License.
           <%= f.text_field :date_created, :name=>"generic_file[date_created][]", :value=>""  %> 
           <button class="adder btn" name="additional_date_created" id="additional_date_created_submit">+<span class="accessible-hidden">add another Date Created</span></button>
             &nbsp;
-          <a href="#" id="generic_file_date_created_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_date_created"] %>" data-original-title="Date Created"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_date_created_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_date_created"] %>" data-original-title="Date Created"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_date_created_elements"></div>
       </div>
@@ -143,7 +143,7 @@ limitations under the License.
           <%= f.text_area :description, :name=>"generic_file[description][]", :value=>""  %> 
           <button class="adder btn" name="additional_description" id="additional_description_submit">+<span class="accessible-hidden">add another Abstract or Summary</span></button>
             &nbsp;
-          <a href="#" id="generic_file_description_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_description"] %>" data-original-title="Abstract or Summary"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_description_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_description"] %>" data-original-title="Abstract or Summary"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_description_elements"></div>
       </div>
@@ -154,7 +154,7 @@ limitations under the License.
           <%= f.text_field :identifier, :name=>"generic_file[identifier][]", :value=>""  %> 
           <button class="adder btn" name="additional_identifier" id="additional_identifier_submit">+<span class="accessible-hidden">add another Identifier</span></button>
             &nbsp;
-          <a href="#" id="generic_file_identifier_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_identifier"] %>" data-original-title="Identifier"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_identifier_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_identifier"] %>" data-original-title="Identifier"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_identifier_elements"></div>
       </div>
@@ -165,7 +165,7 @@ limitations under the License.
           <%= f.text_field :language, :name=>"generic_file[language][]", :value=>""  %> 
           <button class="adder btn" name="additional_language" id="additional_language_submit">+<span class="accessible-hidden">add another Language</span></button>
             &nbsp;
-          <a href="#" id="generic_file_language_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_language"] %>" data-original-title="Language"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_language_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_language"] %>" data-original-title="Language"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_language_elements"></div>
       </div>
@@ -176,7 +176,7 @@ limitations under the License.
           <%= f.text_field :publisher, :name=>"generic_file[publisher][]", :value=>""  %> 
           <button class="adder btn" name="additional_publisher" id="additional_publisher_submit">+<span class="accessible-hidden">add another Publisher</span></button>
             &nbsp;
-          <a href="#" id="generic_file_publisher_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_publisher"] %>" data-original-title="Publisher"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_publisher_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_publisher"] %>" data-original-title="Publisher"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_publisher_elements"></div>
       </div>
@@ -187,7 +187,7 @@ limitations under the License.
           <%= f.text_field :subject, :name=>"generic_file[subject][]", :value=>"" %>  
           <button class="adder btn" name="additional_subject" id="additional_subject_submit">+<span class="accessible-hidden">add another Subject</span></button>
           &nbsp;
-          <a href="#" id="generic_file_subject_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_subject"] %>" data-original-title="Subject"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_subject_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_subject"] %>" data-original-title="Subject"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_subject_elements"></div>
       </div>

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

@@ -14,17 +14,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-<% javascript 'bootstrap-tooltip.js' %>
-<% javascript 'bootstrap-popover.js' %>
-<% javascript 'bootstrap-modal.js'%>
-<% javascript 'batch.js' %>
 
-<% javascript 'jquery.validate.js' %>
 
-<style type="text/css">
-label.error { float: left; color: red; padding-left: .5em; vertical-align: top; }
+<% content_for :head do %>
+  <% javascript_include_tag 'bootstrap-tooltip.js'%>
+  <% javascript_include_tag 'bootstrap-popover.js'%>
+  <% javascript_include_tag 'bootstrap-modal.js'%>
+
+  <% javascript_include_tag 'batch.js' %>
+
+  <% javascript_include_tag 'jquery.validate.js' %>
+  <style type="text/css">
+  label.error { float: left; color: red; padding-left: .5em; vertical-align: top; }
+
+  </style>
+<% end %> 
+
 
-</style>
   
 
 <% content_for :local_js do %>
@@ -53,10 +59,10 @@ function confirmExit(){
 <br />
 <div class="alert">The information you provide for Title will be applied to the corresponding file only; however all other 
   information you provide will be applied <em>to the entire batch of files</em> you have just deposited into ScholarSphere.  
-  You may edit individual files from <%= link_to '<i class="icon-dashboard"></i> my dashboard'.html_safe, dashboard_path %> once
+  You may edit individual files from <%= link_to '<i class="icon-dashboard"></i> my dashboard'.html_safe, sufia.dashboard_index_path %> once
   this step is finished.
 </div>
-<%= form_for([@batch, @generic_file], :url => batch_generic_files_path, :html => {:multipart => true, :class => 'form-horizontal'}) do |f| %>
+<%= form_for([@batch, @generic_file], :url => sufia.batch_generic_files_path, :html => {:multipart => true, :class => 'form-horizontal'}) do |f| %>
 
 <%= render :partial => 'metadata', :formats => [:html], :locals => {:f => f, :gf => @generic_file} %>
 

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

@@ -10,7 +10,7 @@
           <%= f.label :title, "<span class='error'>*</span> Title #{index+1}".html_safe, :class=>"control-label" %> 
           <div class="controls" id="additional_title_clone">
             <%= f.text_field :title, :name=>"title[#{gen_f.id}][]", :value=>gen_f.label, :required=> true %>  
-            <a href="#" id="generic_file_title_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_title"] %>" data-original-title="Title"><i class="icon-question-sign icon-large"></i></a>
+            <a href="#" id="generic_file_title_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_title"] %>" data-original-title="Title"><i class="icon-question-sign icon-large"></i></a>
           </div>
         </div>
       <% end %>
@@ -31,8 +31,8 @@
         <%= 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 to all files<p>
-          <%= f.select "resource_type", ScholarSphere::Application::config.resource_types, {}, {:multiple=>true, :size=>7} %>
-          <a href="#" id="generic_file_resource_type_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_resource_type"] %>" data-original-title="Resource Type"><i class="icon-question-sign icon-large"></i></a>
+          <%= f.select "resource_type", Sufia::Engine::config.resource_types, {}, {:multiple=>true, :size=>7} %>
+          <a href="#" id="generic_file_resource_type_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_resource_type"] %>" data-original-title="Resource Type"><i class="icon-question-sign icon-large"></i></a>
       </div>
     </div>
 
@@ -42,7 +42,7 @@
           <%= f.text_field :tag, :name=>"generic_file[tag][]", :value=>"", :required=> true  %> 
           <button class="adder btn" name="additional_tag" id="additional_tag_submit">+<span class="accessible-hidden">add another Tag</span></button>
           &nbsp;
-          <a href="#" id="generic_file_tag_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_tag"] %>" data-original-title="Keyword"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_tag_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_tag"] %>" data-original-title="Keyword"><i class="icon-question-sign icon-large"></i></a>
       </div>
       <div id="additional_tag_elements"></div>
     </div>
@@ -53,7 +53,7 @@
         <%= f.text_field :creator, :name=>"generic_file[creator][]", :value=>"", :required=> true %>
           <button class="adder btn" name="additional_creator" id="additional_creator_submit">+<span class="accessible-hidden">add another Creator</span></button>
           &nbsp;
-          <a href="#" id="generic_file_creator_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_creator"] %>" data-original-title="Creator"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_creator_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_creator"] %>" data-original-title="Creator"><i class="icon-question-sign icon-large"></i></a>
       </div>
       <div id="additional_creator_elements"></div>
     </div>
@@ -61,10 +61,10 @@
     <div class="control-group">
       <%= f.label :rights, '<span class="error">*</span> Rights'.html_safe, :class=>"control-label" %>
       <div class="controls" id="additional_rights_clone">
-        <%= f.select "rights", options_for_select(ScholarSphere::Application::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), :required => true %>
+        <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), :required => true %>
           <button class="adder btn" name="additional_rights" id="additional_rights_submit">+<span class="accessible-hidden">add another Rights</span></button>
         &nbsp;
-        <a href="#" id="generic_file_rights_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_rights"] %>" data-original-title="Rights"><i class="icon-question-sign icon-large"></i></a>
+        <a href="#" id="generic_file_rights_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_rights"] %>" data-original-title="Rights"><i class="icon-question-sign icon-large"></i></a>
         <%= render :partial => "generic_files/rights_modal" %>
         
       </div>
@@ -83,7 +83,7 @@
           <%= f.text_field :related_url, :name=>"generic_file[related_url][]", :value=>""  %> 
           <button class="adder btn" name="additional_related_url" id="additional_related_url_submit">+<span class="accessible-hidden">add another Related URL</span></button>
           &nbsp;
-          <a href="#" id="generic_file_related_url_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_related_url"] %>" data-original-title="Related URL"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_related_url_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_related_url"] %>" data-original-title="Related URL"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_related_url_elements"></div>
       </div>
@@ -94,7 +94,7 @@
         <%= f.text_field :based_near, :name=>"generic_file[based_near][]", :value=>""  %> 
         <button class="adder btn" name="additional_based_near" id="additional_based_near_submit">+<span class="accessible-hidden">add another Location</span></button>
         &nbsp;
-          <a href="#" id="generic_file_based_near_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_based_near"] %>" data-original-title="Location"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_based_near_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_based_near"] %>" data-original-title="Location"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_based_near_elements"></div>
       </div>
@@ -105,7 +105,7 @@
           <%= f.text_field :contributor, :name=>"generic_file[contributor][]", :value=>gf.contributor[0]  %> 
           <button class="adder btn" name="additional_contributor" id="additional_contributor_submit">+<span class="accessible-hidden">add another Contributor</span></button>
             &nbsp;
-          <a href="#" id="generic_file_contributor_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_contributor"] %>" data-original-title="Contributor"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_contributor_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_contributor"] %>" data-original-title="Contributor"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_contributor_elements"></div>
       </div>
@@ -116,7 +116,7 @@
           <%= f.text_field :date_created, :name=>"generic_file[date_created][]", :value=>""  %> 
           <button class="adder btn" name="additional_date_created" id="additional_date_created_submit">+<span class="accessible-hidden">add another Date Created</span></button>
             &nbsp;
-          <a href="#" id="generic_file_date_created_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_date_created"] %>" data-original-title="Date Created"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_date_created_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_date_created"] %>" data-original-title="Date Created"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_date_created_elements"></div>
       </div>
@@ -127,7 +127,7 @@
           <%= f.text_area :description, :name=>"generic_file[description][]", :value=>""  %> 
           <button class="adder btn" name="additional_description" id="additional_description_submit">+<span class="accessible-hidden">add another Abstract or Summary</span></button>
             &nbsp;
-          <a href="#" id="generic_file_description_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_description"] %>" data-original-title="Abstract or Summary"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_description_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_description"] %>" data-original-title="Abstract or Summary"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_description_elements"></div>
       </div>
@@ -138,7 +138,7 @@
           <%= f.text_field :identifier, :name=>"generic_file[identifier][]", :value=>""  %> 
           <button class="adder btn" name="additional_identifier" id="additional_identifier_submit">+<span class="accessible-hidden">add another Identifier</span></button>
             &nbsp;
-          <a href="#" id="generic_file_identifier_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_identifier"] %>" data-original-title="Identifier"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_identifier_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_identifier"] %>" data-original-title="Identifier"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_identifier_elements"></div>
       </div>
@@ -149,7 +149,7 @@
           <%= f.text_field :language, :name=>"generic_file[language][]", :value=>""  %> 
           <button class="adder btn" name="additional_language" id="additional_language_submit">+<span class="accessible-hidden">add another Language</span></button>
             &nbsp;
-          <a href="#" id="generic_file_language_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_language"] %>" data-original-title="Language"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_language_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_language"] %>" data-original-title="Language"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_language_elements"></div>
       </div>
@@ -160,7 +160,7 @@
           <%= f.text_field :publisher, :name=>"generic_file[publisher][]", :value=>""  %> 
           <button class="adder btn" name="additional_publisher" id="additional_publisher_submit">+<span class="accessible-hidden">add another Publisher</span></button>
             &nbsp;
-          <a href="#" id="generic_file_publisher_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_publisher"] %>" data-original-title="Publisher"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_publisher_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_publisher"] %>" data-original-title="Publisher"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_publisher_elements"></div>
       </div>
@@ -171,7 +171,7 @@
           <%= f.text_field :subject, :name=>"generic_file[subject][]", :value=>"" %>  
           <button class="adder btn" name="additional_subject" id="additional_subject_submit">+<span class="accessible-hidden">add another Subject</span></button>
           &nbsp;
-          <a href="#" id="generic_file_subject_help" rel="popover" data-content="<%= ScholarSphere::Application.config.metadata_help["generic_file_subject"] %>" data-original-title="Subject"><i class="icon-question-sign icon-large"></i></a>
+          <a href="#" id="generic_file_subject_help" rel="popover" data-content="<%= Sufia::Engine.config.metadata_help["generic_file_subject"] %>" data-original-title="Subject"><i class="icon-question-sign icon-large"></i></a>
         </div>
         <div id="additional_subject_elements"></div>
       </div>

data/app/views/catalog/_index_partials/_list_files.html.erb

@@ -2,8 +2,8 @@
 <%# logger.info document[:generic_file__creator_t].inspect %>
 <li>
   <h2>
-    <%= link_to render_document_show_field_value(:document=>document, :field=>document.title_or_label), generic_file_path(document[:noid_s].first) %>
-    <small>[<%= link_to 'Download', download_path(document[:noid_s].first), :target => '_new' %>]</small>
+    <%= link_to render_document_show_field_value(:document=>document, :field=>document.title_or_label), sufia.generic_file_path(document[:noid_s].first) %>
+    <small>[<%= link_to 'Download', sufia.download_path(document[:noid_s].first), :target => '_new' %>]</small>
   </h2>
   <table class="table">
     <tr>

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

@@ -3,6 +3,11 @@
     $.ui.dialog.prototype.options["height"]=window.innerHeight  *0.75
 <% end %>
 
+<!--div id="sidebar" class="span3">
+ <%#= render :partial=>'facets' %>
+</div--><!--/well -->
+
+
 <% unless has_search_parameters? %>
 	<%# if there are no input/search related params, display the "home" partial -%>
 	<%= render 'home' %>

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

@@ -30,6 +30,6 @@ limitations under the License.
   <% end %>
 
   <% if(paginator.has_next?)  %>
-    <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»', params.merge(:id => solr_field, :action=>"facet"), :class => "more_facets_link" %></li>
+    <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»', sufia.url_for(params.merge(:id => solr_field, :action=>"facet", :path_only=>true)), :class => "more_facets_link" %></li>
   <% end %>
 </ul> <!-- /slide-list -->

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

@@ -17,13 +17,13 @@ limitations under the License.
   <% if @pagination.has_previous? || @pagination.has_next? %>
     <div class="prev_next_links">
       <% if @pagination.has_previous? -%>        
-        <%= link_to('« Previous', catalog_facet_path( @pagination.params_for_previous_url( params) ) , :class=>:prev_page)  %>
+        <%= link_to('« Previous', sufia.catalog_facet_path( @pagination.params_for_previous_url( params) ) , :class=>:prev_page)  %>
       <% else -%>
         <span class="disabled ui-state-active prev_page">« Previous</span> 
       <% end -%>
       
       <% if @pagination.has_next? -%>
-        <%= link_to('Next »', catalog_facet_path( @pagination.params_for_next_url(params)), :class => :next_page ) %>
+        <%= link_to('Next »', sufia.catalog_facet_path( @pagination.params_for_next_url(params)), :class => :next_page ) %>
       <% else -%>
         <span class="disabled ui-state-active next_page">Next »</span> 
       <% end -%>
@@ -34,9 +34,9 @@ limitations under the License.
   <div class="sort_options">
     <% if @pagination.sort == 'index' -%>
       <span class="disabled az">A-Z Sort</span><%= link_to_unless(@pagination.sort == 'count', "Numerical Sort", 
-        @pagination.params_for_resort_url('count', params), :class => "sort_change numeric") %>
+        sufia.url_for(@pagination.params_for_resort_url('count', params)), :class => "sort_change numeric") %>
     <% elsif @pagination.sort == 'count' -%>
-      <%=  link_to("A-Z Sort", @pagination.params_for_resort_url('index', params), 
+      <%=  link_to("A-Z Sort", sufia.url_for(@pagination.params_for_resort_url('index', params)), 
           :class => "sort_change az") %><span class="disabled numeric">Numerical Sort</span>
     <% end -%>    
   </div>

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

@@ -20,7 +20,7 @@ limitations under the License.
     <% v.each do |selected_facet| %>
       <% link_options = remove_facet_params(k, selected_facet, params).merge!Hash["controller" => "dashboard", :action=> "index"] %>
       <div class="alert alert-warning">
-        <%= link_to 'X', url_for(link_options), {:class=>'close', :'data-dismiss' => "alert" } %>
+        <%= link_to 'X', sufia.url_for(link_options), {:class=>'close', :'data-dismiss' => "alert" } %>
         <i class="icon-ok icon-large"></i> <strong><%= selected_facet %></strong>
       </div>
     <% end %>

data/app/views/dashboard/_index_partials/_list_files.html.erb

@@ -30,32 +30,32 @@ on element ids -->
   <td width="37%">
     <a href="" title="Click for more details"><i id="expand_<%= noid.gsub(":", "_") %>" class="icon-plus icon-large fleft"></i></a>
     <%= render :partial => 'dashboard/_index_partials/thumbnail_display', :locals => {:document=>document} %>
-    <span class=center><%= link_to render_document_show_field_value(:document=>document, :field=>document.title_or_label), generic_file_path(noid), :id => "src_copy_link#{noid}" %> <br /></span>
+    <span class=center><%= link_to render_document_show_field_value(:document=>document, :field=>document.title_or_label), sufia.generic_file_path(noid), :id => "src_copy_link#{noid}" %> <br /></span>
   </td>
   <td width="17%"><%= document.fetch(:generic_file__date_uploaded_dt,'').to_time.strftime("%m/%d/%Y") unless document.fetch(:generic_file__date_uploaded_dt,'').blank? %> </td>
   <td width="5%" align="center">
     <% if !document[:read_access_group_t].blank? and document[:read_access_group_t].include?('registered') %>
-      <a href="<%= generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a> 
+      <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a> 
     <% elsif !document[:read_access_group_t].blank? and document[:read_access_group_t].include?('public') %>
-      <a href="<%= generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-success" title="Open Access">Open Access</span></a>
+      <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-success" title="Open Access">Open Access</span></a>
     <% else %>
-      <a href="<%= generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-important" title="Private">Private</span></a>
+      <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-important" title="Private">Private</span></a>
     <% end %>
   </td>
   <td width="23%" class="center">
     <span style="position: relative; display: inline-block">
      <%= link_to raw('<!--i class="icon-unlock under"></i--><i class="icon-link icon-large over"></i>'), '#', :class => 'copypaste itemicon itemcode', :title => 'Single Use Link to File', :id => "copy_link_#{noid}" %>
     </span>&nbsp;&nbsp;&nbsp;
-    <%= link_to raw('<i class="icon-pencil icon-large"></i>'), edit_generic_file_path(noid), :class=> 'itemicon itemedit', :title => 'Edit File'  %>&nbsp;&nbsp;&nbsp;
-    <%= link_to raw('<i class="icon-download-alt icon-large"></i>'), download_path(noid), :class=> 'itemicon itemdownload', :title => 'Download File', :target => '_new' %>&nbsp;&nbsp;&nbsp;
-    <%= link_to raw('<i class="icon-trash icon-large"></i>'), generic_file_path(noid), :class=> 'itemicon itemtrash', :title => 'Delete File', :method => :delete, :data => { :confirm => 'Deleting a file from ScholarSphere is permanent. Click OK to delete this file from ScholarSphere, or Cancel to cancel this operation'} %>&nbsp;&nbsp;&nbsp;
+    <%= link_to raw('<i class="icon-pencil icon-large"></i>'), sufia.edit_generic_file_path(noid), :class=> 'itemicon itemedit', :title => 'Edit File'  %>&nbsp;&nbsp;&nbsp;
+    <%= link_to raw('<i class="icon-download-alt icon-large"></i>'), sufia.download_path(noid), :class=> 'itemicon itemdownload', :title => 'Download File', :target => '_new' %>&nbsp;&nbsp;&nbsp;
+    <%= link_to raw('<i class="icon-trash icon-large"></i>'), sufia.generic_file_path(noid), :class=> 'itemicon itemtrash', :title => 'Delete File', :method => :delete, :data => { :confirm => 'Deleting a file from ScholarSphere is permanent. Click OK to delete this file from ScholarSphere, or Cancel to cancel this operation'} %>&nbsp;&nbsp;&nbsp;
   </td>
 </tr>
 <tr class="hide" id="detail_<%= noid.gsub(":", "_") %>"> <!--  document detail"> -->
   <td colspan="6">
     <table class="expanded-details">
       <tr>
-        <td><strong>File Name: </strong> <%= link_to render_document_show_field_value(:document=>document, :field=>"label_t"), generic_file_path(noid) %> </td>
+        <td><strong>File Name: </strong> <%= link_to render_document_show_field_value(:document=>document, :field=>"label_t"), sufia.generic_file_path(noid) %> </td>
         <td><strong>File Format: </strong> <%= render_document_show_field_value(:document=>document, :field=>"file_format_t") %> </td>
       </tr>
       <tr>

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

@@ -15,7 +15,7 @@ limitations under the License.
 %>
 
 <div style="float: right;" >
-    <%= form_tag sufia.dashboard_path, :method => :get, :class => "well form-search" do %>
+    <%= form_tag sufia.dashboard_index_path, :method => :get, :class => "well form-search" do %>
       <label class="accessible-hidden">Search My Dashboard</label>
       <%= text_field_tag :q, params[:q], :class => "q", :placeholder => "Search My Dashboard", :size => '30', :type => "search", :id => "dashboard_search" %>
       <%= hidden_field_tag :search_field, 'all_fields' %>

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

@@ -19,7 +19,7 @@ limitations under the License.
     <%=batch_delete%> <%=batch_edit_continue("Edit Selected") %>   
 	<% unless @response.response['numFound'] < 2 %>
 	  <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
-    <%= form_tag params[:controller] == "folder" ? folder_index_path : dashboard_path, :method=>:get, :class=>'per_page form-inline' do %>
+    <%= form_tag params[:controller] == "folder" ? sufia.folder_index_path : sufia.dashboard_index_path, :method=>:get, :class=>'per_page form-inline' do %>
       <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
       <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort])), :class => "span15") %>			      
       &nbsp;&nbsp;&nbsp;