hydra-head 3.0.0pre3 → 3.0.0pre4

data/app/views/mods_assets/_edit_journal.html.erb

@@ -1,72 +1,57 @@
 <% journal = edit_journal %>
 <% journal_counter = edit_journal_counter %>
 <% base_id = "journal_#{journal_counter}" %>
-<li>
-	<fieldset id="citation_fieldset">
-  	<legend>Article Citation</legend>
-	<ul>
-		<li id="pbJournalTitle">
-		<fieldset id="journal_title_fieldset">		
-	    <legend>Journal Title<small>Required</small></legend>
-	    <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter}, :title_info, :main_title], :multiple=>false).html_safe %>	
-		</fieldset>
-	</li>
 
-	<li id="pbCitation">
-		<fieldset id="citation_details_fieldset">	
-		<dl class="journal citation" id="<%= base_id %>">
-		  <dd class="multi_inline citation">
-		    <ul>
-		      <li class="citation_volume">
-		        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:volume], "Volume").html_safe %>
-		        <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:volume], :multiple=>false).html_safe %>
-		      </li>
-		      <li class="citation_issue">
-		        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:level], "(Issue)").html_safe %>
-		        <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:level], :multiple=>false).html_safe %>
-		      </li>
-		      <li class="start_page">
-		        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:start_page], "Start Page").html_safe %>
-		        <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:start_page], :multiple=>false).html_safe %>
-		      </li>
-		      <li class="end_page">
-		        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:end_page], "End Page").html_safe %>
-		        <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:end_page], :multiple=>false).html_safe %>
-		      </li>
-		    </ul>
-		  </dd>
-		</dl>
-		</fieldset>
-	</li>			
-			
-	<li id="pbPublisher">
-		<fieldset id="publisher_fieldset">
-	  	<legend>Publisher</legend>
-	  <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:origin_info, :publisher], :multiple=>false).html_safe %>
-		</fieldset>
-	</li>
+  <fieldset id="citation_fields">
+  	<legend>Article Citation</legend>
+  	
+		<p id="journal_title_field" class="fedora-text-field">		
+	    <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:title_info,:main_title], "Journal Title<span class=\"required-note\">required</span>".html_safe) %>
+	    <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter}, :title_info, :main_title], :multiple=>false, :required=>true ) %>		    
+		</p>
+		
+		<fieldset id="citation_info">
+		  
+      <p id="citation_volume_field" class="fedora-text-field">
+        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:volume], "Volume") %>
+        <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:volume], :multiple=>false, :required=>false ) %>
+      </p>
+      
+      <p id="citation_issue_field" class="fedora-text-field">
+        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:level], "Issue") %>
+        <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:level], :multiple=>false, :required=>false ) %>
+      </p>
+      
+      <p id="citation_start_page_field" class="fedora-text-field">
+        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:start_page], "Start Page") %>
+        <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:start_page], :multiple=>false, :required=>false ) %>
+      </p>
+      
+      <p id="citation_end_page_field" class="fedora-text-field">
+        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:end_page], "End Page") %>
+        <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:end_page], :multiple=>false, :required=>false ) %>
+      </p>
+    </fieldset>
 
-	<li id="pbISBN">
-		<fieldset id="isbn_fieldset">
-	  	<legend>ISSN</legend>
-	  	<%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter}, :issn], :multiple=>false).html_safe %>
-		</fieldset>
-	</li>
+		<p id="publisher_field" class="fedora-text-field">
+	  	<%= fedora_field_label("descMetadata", [{:journal => journal_counter},:origin_info,:publisher], "Publisher") %>
+      <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:origin_info, :publisher], :multiple=>false, :required=>false ) %>
+		</p>
 
+	  <p id="isbn_field" class="fedora-text-field">
+	  	<%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issn], "ISSN") %>
+	  	<%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter}, :issn], :multiple=>false, :required=>false ) %>
+	  </p>
 
-	<li id="pbPublicationDate">
-		<fieldset id="publication_date_fieldset">
-		<legend>Publication Date</legend>
-<%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:publication_date], :multiple=>false).html_safe %>
-		</fieldset>
-	</li>
+		<p id="publication_date_field" class="fedora-text-field">
+		  <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:publication_date], "Publication Date") %>
+      <%= fedora_text_field(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:publication_date], :multiple=>false, :required=>false ) %>
+		</p>
 	
-	<li id="pbPublicationURL">
-		<fieldset id="publication_url_fieldset">
-		<legend>Publication URL</legend>
-		<label>Provide the full URL to any published version of the work.</label>		
-		<%= fedora_text_field(@document_fedora,"descMetadata", [:location, :url], :multiple=>false).html_safe %>
-		</fieldset>
-	</li>
-</ul>
-</li>
+		<p id="publication_url_field" class="fedora-text-field">
+		  <%= fedora_field_label("descMetadata", [:location, :url], "Publication URL") %>
+  		<span class="field-caption">Provide the full URL to any published version of the work.</span>		
+      <%= fedora_text_field(@document_fedora,"descMetadata", [:location, :url], :multiple=>false, :required=>false ) %>
+		</p>
+		
+</fieldset>

data/app/views/mods_assets/_publication_form.html.erb

@@ -0,0 +1,13 @@
+<%= form_tag(url_for(:controller=>"assets", :action=>"update", :id=>params[:id]), :class => "step") do -%>
+  <%= hidden_field_tag("_method","put") %>
+  <p id="title_field" class="fedora-text-field">
+    <%= fedora_field_label("descMetadata", [:title_info,:main_title], "Title<span class=\"required-note\">Required</span>".html_safe) %>
+    <%= fedora_text_field(@document_fedora,"descMetadata", [:title_info, :main_title], :multiple=>false, :required=>true) %>
+  </p>
+  <%= render :partial=>"mods_assets/edit_journal", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:journal) %>
+  <%= hidden_field_tag(:wf_step, params[:wf_step], :id => "publisher_wf_step") %>
+  <%= hidden_field_tag(:new_asset, true, :id => "publisher_new_asset") if params[:new_asset] %>
+  <%= hidden_field_tag(:content_type,"mods_asset", :id => "publisher_content_type") %>
+  <%= submit_tag(submit_name, :name=>"continue", :class=>"save-submit") %>
+  <%= submit_tag("Save and Finish", :name=>"finish", :class=>"save-submit") unless params[:new_asset] %>
+<%- end -%>

data/app/views/mods_assets/_show.html.erb

@@ -1,7 +1,6 @@
-
 <div class="document_viewer" id="cover_container">
 
-	<h1>
+	<h1 class="document-heading">
 		<% unless get_values_from_datastream(@document_fedora,"descMetadata", [:title_info, :main_title]).first.empty? %>
 	      <%= get_values_from_datastream(@document_fedora,"descMetadata", [:title_info, :main_title]).first %>
 		<% else %>
@@ -9,36 +8,32 @@
 		 <% end %>
 	</h1>
 
+  <h2 class="section-title">Description</h2>
+  <div class="description">
     <%= render :partial => 'mods_assets/show_description' %>
-
-
+  </div>
+  <%# copied to show_file_assets %>
 	<% unless @document_fedora.file_objects(:response_format=>:solr).hits.empty? %>
-		<fieldset><legend>Files</legend>
-	    <div class="uploads" id="<%= format_pid(params[:id]) %>">	
-		  <table id="file_assets" class="multipleEdit">
+    <h2 class="section-title">Files</h2>
+    <div class="uploads" id="uploads_<%= format_pid(params[:id]) %>">	
+      <table id="file_assets" class="multipleEdit">
 		    <tr>
 		      <th>File Name</th>
 		      <th>Size</th>
 		      <th>Uploaded</th>
 		    </tr>
-		
 			<% @document_fedora.file_objects(:response_format=>:solr).each do |result| %>
-			<tr class="file_asset" >
-			  <td>
-			    <%= link_to result[solr_name("title", :text)], file_asset_path(result["id"]) %>
-			  </td>
-			  <td>
-			    <%= result[solr_name("extent", :text)] %>
-			  </td>
-			  <td>
-			    <% dt = DateTime.parse(result[ solr_name("system_create", :date)] ) %>
-			    <%= format_date dt %>
-			  </td>
-			</tr>
+  			<tr class="file_asset" >
+  			  <td><%= link_to result[solr_name("title", :text)], file_asset_path(result["id"]) %></td>
+  			  <td><%= result[solr_name("extent", :text)] %></td>
+  			  <td>
+  			    <% dt = DateTime.parse(result[ solr_name("system_create", :date)] ) -%>
+  			    <%= format_date dt %>
+  			  </td>
+  			</tr>
 			<% end %>		
-		  </table>	
-			</div>
- 		</fieldset>
+		  </table>
+  	</div>
 	<% end %>
 
 </div>

data/app/views/mods_assets/_show_additional_info.html.erb

@@ -0,0 +1,17 @@
+<% unless get_values_from_datastream(@document_fedora,"descMetadata", [:subject, :topic]).first.empty? %>
+  <fieldset>
+    <legend>Keywords</legend>
+  	<div class="browse_value">
+  	  <%= get_values_from_datastream(@document_fedora,"descMetadata", [:subject, :topic]).join(', ') %>
+  	</div>
+  </fieldset>
+<% end %>
+
+<% unless get_values_from_datastream(@document_fedora,"descMetadata", [:abstract]).first.empty? %>
+  <fieldset>
+    <legend>Abstract</legend>
+    <div id="abstract" class="browse_value">
+      <%= Sanitize.clean( RedCloth.new(get_values_from_datastream(@document_fedora,"descMetadata", [:abstract]).first, [:sanitize_html]).to_html, Sanitize::Config::BASIC).html_safe %>    	
+    </div>
+  </fieldset>
+<% end %>

data/app/views/mods_assets/_show_contributors.html.erb

@@ -0,0 +1,7 @@
+<div id="contributors_list">
+  <ol> 
+  	<%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:person) %>
+  	<%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:organization) %>
+  	<%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:conference) %>
+  </ol>
+</div>

data/app/views/mods_assets/_show_description.html.erb

@@ -1,3 +1,4 @@
+<%# copied div below to show_contributor partial %>
 <div id="contributors_list">
 <ol> 
 	<%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:person) %>
@@ -6,6 +7,7 @@
 </ol>
 </div>
 
+<%# copied fieldset to show_publication partial %>
 <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => 0}, :title_info, :main_title]).first.empty? %>
 	<fieldset><legend>Published</legend>
 	<div id="journal" class="browse_value">
@@ -14,6 +16,7 @@
 	</fieldset>
 	<% end %>
 
+<%# copied fieldsets to show_additional_info partial %>
 <% unless get_values_from_datastream(@document_fedora,"descMetadata", [:subject, :topic]).first.empty? %>
 <fieldset><legend>Keywords</legend>
 	<div class="browse_value">
@@ -29,16 +32,3 @@
 </div>
 </fieldset>
 <% end %>
-
-<% unless get_values_from_datastream(@document_fedora,"descMetadata", [:subject, :topic]).first.empty? %>
-<fieldset><legend>License</legend>
-	<div class="browse_value">
-		<ol>
-      <%# unless get_values_from_datastream(@document_fedora, "rightsMetadata", [:copyright, :uvalicense]).first.match('no') %> 
-				<li>UVA Libra Contributor's License</li> 
-      <%# end %>  
-		</ol>
-	</div>
-</fieldset>
-<% end %>
-

data/app/views/mods_assets/_show_file_assets.html.erb

@@ -0,0 +1,22 @@
+<% unless @document_fedora.file_objects(:response_format=>:solr).hits.empty? %>
+  <h2 class="section-title">Files</h2>
+  <div class="uploads" id="uploads_<%= format_pid(params[:id]) %>">	
+    <table id="file_assets" class="multipleEdit">
+	    <tr>
+	      <th>File Name</th>
+	      <th>Size</th>
+	      <th>Uploaded</th>
+	    </tr>
+		<% @document_fedora.file_objects(:response_format=>:solr).each do |result| %>
+			<tr class="file_asset" >
+			  <td><%= link_to result[solr_name("title", :text)], file_asset_path(result["id"]) %></td>
+			  <td><%= result[solr_name("extent", :text)] %></td>
+			  <td>
+			    <% dt = DateTime.parse(result[ solr_name("system_create", :date)] ) -%>
+			    <%= format_date dt %>
+			  </td>
+			</tr>
+		<% end %>		
+	  </table>
+	</div>
+<% end %>

data/app/views/mods_assets/_show_journal.html.erb

@@ -18,14 +18,14 @@
 
   <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter}, :issn]).first.empty? %>
     <div class="issn">
-	  <%= fedora_field_label("descMetadata", [{:journal => journal_counter}, :issn], "ISSN:") %>
+	  <%#= fedora_field_label("descMetadata", [{:journal => journal_counter}, :issn], "ISSN:") %>
       <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter}, :issn]) %>
     </div>
   <% end %>
 
     <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:start_page]).first.empty? %>
 	<div class="citation">
-        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:start_page], "Pages:") %>
+        <%#= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:start_page], "Pages:") %>
         <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:start_page]) %>
 	    <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:end_page]).first.empty? %>
 	        - <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:end_page]) %>
@@ -35,7 +35,7 @@
     <% journal_issue_values =  get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:level]).inspect %>
     <% unless journal_issue_values.empty? || journal_issue_values.first.empty? %>
 	<div class="issue">
-        <%= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:level], "Issue:") %>
+        <%#= fedora_field_label("descMetadata", [{:journal => journal_counter},:issue,:level], "Issue:") %>
         <%= get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => journal_counter},:issue,:level]) %>
 	</div>
     <% end %>

data/app/views/mods_assets/_show_permissions.html.erb

@@ -1,3 +1,4 @@
+<%- document ||= @document -%>
 <div>
   <dl class="defList">
     <% if editor? %>

data/app/views/mods_assets/_show_publication.html.erb

@@ -0,0 +1,8 @@
+<% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => 0}, :title_info, :main_title]).first.empty? %>
+	<fieldset>
+	  <legend>Published</legend>
+  	<div id="journal" class="browse_value">
+  	  <%= render :partial=>"mods_assets/show_journal", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:journal) %>
+  	</div>
+	</fieldset>
+<% end %>

data/app/views/permissions/_edit_person_permissions.html.erb

@@ -14,22 +14,17 @@
 	<% choices = [{"No Access" => "none"},{"Discover" => "discover"}, {"Read & Download" => "read"}, {"Edit & Upload" => "edit"}] %>
 	<% current_permissions = @document_fedora.datastreams_in_memory["rightsMetadata"].permissions({"person"=>person_id}) %>
 	
-	<dt>
-  	<label for="<%= field_name %>">
-  		<%= person_id %>
-  	</label>
-	</dt>
-	<dd>
+	<p class="permission-submit">
+  	<label for="<%= field_name %>"><%= person_id %></label>
   	<select id="<%= field_name %>" name="permission[person][<%=h person_id %>]">
     	<% choices.each do |choice| %>
   	  	<% choice_label = choice.keys.first.html_safe %>
   	  	<% choice_name = choice.values.first %>
 	  	
-  			<option value="<%= choice_name %>" selected="<%= current_permissions == choice_name %>">
+  			<option value="<%= choice_name %>" <%= "selected" if current_permissions == choice_name %>>
   	    	<%= choice_label %>
     		</option>
     	<% end %>
   	</select>
-	</dd>
-	
+	</p>
 <% end %>

data/app/views/permissions/_index.html.erb

@@ -1,11 +1,11 @@
 <% unless defined?(asset_id) %>
   <% asset_id = params[:asset_id] %>
 <% end %>
-<%= form_tag url_for(:asset_id=>@document_fedora.pid,:action=>"update", :controller=>"permissions"), :id=>"permissions_metadata", :method=>"post", "accept-charset"=>"utf-8" do %>
   <input type="hidden" name="_method" value="put"/>
+  
   <fieldset class="slider">
     <legend>Group Permissions</legend>
-    <dl>
+
     <% choices = [{"No Access"=>"none"},{"Discover" => "discover"}, {"Read &amp; Download" => "read"}, {"Edit &amp; Upload" => "edit"}] %>
     <% roles = RoleMapper.role_names %>
     <%# This next line should be conditional upon a person having Publish permissions on the object's collection %>
@@ -13,34 +13,29 @@
     <% roles.each do |role| %>
       <% role_permissions = @document_fedora.datastreams_in_memory["rightsMetadata"].permissions({"group"=>role}) %>
       <% field_name = "#{role}_group_access" %>
-      <dt class="permissions">
-        <label for="<%=h field_name %>">
-          <%= role.capitalize %>
-        </label>
-      </dt>
-      <dd id="<%=h "#{field_name}-container" %>" class="permissions">
+      <p id="<%=h "#{field_name}-container" %>" class="permissions">
+        <label for="<%=h field_name %>"><%= role.capitalize %></label>
         <select id="<%=h field_name %>" name="permission[group][<%=h role %>]">
           <% choices.each do |choice| %>
-            <% choice_label = choice.keys.first.html_safe %>
+            <% choice_label = choice.keys.first %>
             <% choice_name = choice.values.first %>
             <% if role_permissions == choice_name %>
               <option value="<%=h choice_name %>" selected="selected">
-                 <%= choice_label %>
+                 <%= choice_label.html_safe %>
               </option>
             <% else %>
               <option value="<%=h choice_name %>">
-                 <%= choice_label %>
+                 <%= choice_label.html_safe %>
               </option>
             <% end %>
           <% end %>
         </select>
-      </dd>
+      </p>
     <% end %> 
-    </dl>
   </fieldset>
+  
   <fieldset id="individual_permissions" class="slider">
       <legend>Individual Permissions</legend>
-      <dl>
         <% choices = [{"Discover" => "discover"}, {"Read &amp; Download" => "read"}, {"Edit &amp; Upload" => "edit"}] %>
         <% individual_permissions = {} %>
         <% choices.each do |choice| %>
@@ -48,8 +43,4 @@
           <% individual_permissions[choice_name] = get_values_from_datastream(@document_fedora,"rightsMetadata", ["#{choice_name}_access".to_sym, :person]) %>
         <% end %>
         <%= render :partial=>"permissions/edit_person_permissions.html", :collection=>@document_fedora.datastreams_in_memory["rightsMetadata"].find_by_terms(:access, :person) %>
-      </dl>
   </fieldset>
-  <%= submit_tag 'Save Permissions', {:id => "submitPermissions"} %>
-<% end %>
-<%= render :partial=>"permissions/new.html", :locals=>{:asset_id=>asset_id} %>

data/app/views/permissions/_new.html.erb

@@ -1,18 +1,14 @@
-<% unless defined?(asset_id) %>
-  <% asset_id = params[:asset_id] %>
-<% end %>
-<div id="add_permissions" class="slider">
-  <h2>Add Individual Permissions</h2>
-  <%= form_tag url_for(:action=>"create", :controller=>"permissions", :asset_id=>asset_id), :id=>"new_permissions", :method=>"post" do %>
+  <fieldset id="permissions_fields">
+    <legend>Add Individual Permissions</legend>
     <input id="permission_actor_type" type="hidden" name="permission[actor_type]" value="person" />
-    <label for="permission_actor_id">User ID</label>
-    <input id="permission_actor_id" name="permission[actor_id]" />
-    <label for="permission_level">Permission Level</label>
-    <select id="permission_level" name="permission[access_level]">
-      <option value="discover">Discover</option>
-      <option value="read">Read &amp; Download</option>
-      <option value="edit">Edit &amp; Upload</option>
-    </select>
-    <input type="submit" value="Add Permissions" />
-  <% end %>
-</div>
+    <p class="permission-field"><label for="permission_actor_id">User ID</label>
+    <input id="permission_actor_id" name="permission[actor_id]" type="text" /></p>
+    <p class="permission-field">
+      <label for="permission_level">Permission Level</label>
+      <select id="permission_level" name="permission[access_level]">
+        <option value="discover">Discover</option>
+        <option value="read">Read &amp; Download</option>
+        <option value="edit">Edit &amp; Upload</option>
+      </select>
+    </p>
+  </fieldset>      

data/app/views/permissions/_permissions_form.html.erb

@@ -0,0 +1,24 @@
+<%- if params.has_key?(:add_permission) -%>
+  <%#= render :partial=>"permissions/new.html", :locals=>{:asset_id=>asset_id} %>
+  <%= form_tag({:controller=>"permissions", :action=> "create", :asset_id=>params[:id]}, :class => "step") do -%>
+    <%= render :partial=>"permissions/new.html" %>
+    <%= hidden_field_tag("id", params[:id], :id => "permissions_id") if params[:id] %>
+    <%= hidden_field_tag(:wf_step, params[:wf_step], :id => "permissions_wf_step") %>
+    <%= hidden_field_tag(:new_asset, true, :id => "permission_new_asset") if params[:new_asset] %>
+    <%= submit_tag("Add Additional Permissions", :name=>"add_permission") %>
+    <% unless session[:script] and !last_step? %>
+      <%= submit_tag(submit_name, :name=>"continue") %>
+      <%= submit_tag("Save and Finish", :name=>"finish") unless params[:new_asset] %>
+    <% end %>
+  <%- end -%>
+<%- else -%>
+  <%= form_tag({:controller=>"permissions", :action => "update"}, :id => "permissions_metadata", :class => "step") do -%>
+    <%= render :partial => "permissions/index" %>
+    <%= hidden_field_tag("id", params[:id], :id => "permissions_id") if params[:id] %>
+    <%= hidden_field_tag(:wf_step, params[:wf_step], :id => "permissions_wf_step") %>
+    <%= hidden_field_tag(:new_asset, true, :id => "permission_new_asset") if params[:new_asset] %>
+    <%= submit_tag("Add Additional Permissions", :name=>"add_permission")%>
+    <%= submit_tag(submit_name, :name=>"continue", :class=>"save-submit") %>
+    <%= submit_tag("Save and Finish", :name=>"finish", :class=>"save-submit") unless params[:new_asset] %>
+  <%- end -%>
+<%- end -%>

data/app/views/user_sessions/_login_form.html.erb

@@ -1,4 +1,4 @@
-<% form_for @user_session do |f| %>
+<%= form_for @user_session do |f| %>
   <div class="row"><%= f.label :login %> <%= f.text_field :login %></div>
   <div class="row"><%= f.label :password %> <%= f.password_field :password %></div>
   <% if @redirect_params %>