anchor.diff:  
   	<%# #### ADDITIONAL IMAGES #### %>
   	<% if @page.template_config.value(:images) %>
  -		<% content_tab "Additional images" do %>
  -			<p>
  -				<%= button_to_function "Upload images", "showAdditionalImageModal();" %>
  -			</p>
  -			<% unless @page.images.empty? %>
  +		<% content_tab "Images" do %>
  +			<% if @page.page_images.any? %>
   				<table class="list images_list">
   					<tr>
   						<th>Image</th>
   						<!--<th>Title</th>-->
   						<th>Caption</th>
  +						<th>Primary</th>
   						<th></th>
   					</tr>
  -					<% @page.images.each do |image| %><tr>
  -						<td class="thumbnail"><%= editable_dynamic_image_tag image, :size => '100x100' %></td>
  -						<!--<td><strong><%= image.name %></strong></td>-->
  +					<% @page.page_images.each do |pi| %><tr>
  +						<td class="thumbnail"><%= editable_dynamic_image_tag pi.image, :size => '100x100' %></td>
  +						<!--<td><strong><%= pi.image.name %></strong></td>-->
   						<td>
  -							<div id="image-caption-<%= image.id %>"><%= ( image.byline? ) ? image.byline : "<em>No caption</em>" %></div>
  -							<script type="text/javascript">
  -								new Ajax.InPlaceEditor(
  -									'image-caption-'+<%= image.id %>, 
  -									"<%= url_for(:controller => 'admin/pages', :action => 'update_image_caption', :id => @page) %>",
  -									{
  -										callback: function(form, value) { return 'image_id='+<%= image.id %>+'&caption=' + encodeURIComponent(value) }
  -									}
  -								);
  -							</script>
  +							<div id="image-caption-<%= pi.image.id %>"><%= ( pi.image.byline? ) ? pi.image.byline : "<em>No caption</em>" %></div>
   						</td>
   						<td>
  -							<%= link_to "Delete", delete_image_admin_page_path( :id => @page, :image_id => image, :language => @language, :show_tab => 'additional images' ), :class => :delete, :confirm => 'Are you sure?' %>
  +							<%= check_box_tag "page-image-primary-#{pi.id}", '1', pi.primary?, :disabled => true %>
  +						</td>
  +						<td>
  +							<%# link_to "Delete", delete_image_admin_page_path( :id => @page, :image_id => image, :language => @language, :show_tab => 'additional images' ), :class => :delete, :confirm => 'Are you sure?' %>
   						</td>
   					</tr><% end %>
   				</table>
  -				<p>
  -					Click on the caption text to edit it.
  -				</p>
   			<% else %>
   				<p>No images added yet.</p>
   			<% end %>
  
positive.code: 		<% end %>
  	</div>
  <% end %>
  
negative.code: 
  <% end %>
  
  <%# #### UPLOAD FILE #### %>
  <% if @page.template_config.value(:files) %>
  	<div id="new-file" class="page_new_file">
  