refinerycms 0.9.6.34 → 0.9.7

data/vendor/plugins/model_translations/test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'active_support'
+require 'active_support/test_case'

data/vendor/plugins/pages/app/controllers/admin/page_dialogs_controller.rb

@@ -11,6 +11,35 @@ class Admin::PageDialogsController < Admin::DialogsController
                              :per_page => Page.per_page(dialog=true)
 
     @resources = Resource.paginate :page => params[:resource_page], :order => 'created_at DESC', :per_page => Resource.per_page(dialog=true)
+
+    # web address link
+    @web_address_text = "http://"
+    @web_address_text = params[:current_link] if params[:current_link].present? and params[:current_link] =~ /^http:\/\//
+    @web_address_target_blank = (params[:target_blank] == "true")
+
+    # mailto link
+    if params[:current_link].present?
+      if params[:current_link] =~ /^mailto:/
+        @email_address_text = params[:current_link].split("mailto:")[1].split('?')[0]
+      end
+      @email_default_subject_text = params[:current_link].split('?subject=')[1] || params[:subject]
+      @email_default_body_text = params[:current_link].split('?body=')[1] || params[:body]
+    end
+
+    # resource link
+    if params[:current_link].present?
+      is_resource_link = params[:current_link].include?("/system/resources")
+    end
+
+    if params[:paginating].present?
+      @page_area_selected = (params[:paginating] == "your_page")
+      @resource_area_selected = (params[:paginating] == "resource_file")
+    else
+      @page_area_selected = (!is_resource_link and @web_address_text == "http://" and @email_address_text.blank?)
+      @web_address_area_selected = (@web_address_text != "http://")
+      @email_address_area_selected = @email_address_text.present?
+      @resource_area_selected = is_resource_link
+    end
   end
 
   def test_url

data/vendor/plugins/pages/app/controllers/admin/page_parts_controller.rb

@@ -10,7 +10,9 @@ class Admin::PagePartsController < Admin::BaseController
 
   def destroy
     part = PagePart.find(params[:id])
+    page = part.page
     if part.destroy
+      page.reposition_parts!
       render :text => "'#{part.title}' deleted."
     else
       render :text => "'#{part.title}' not deleted."

data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb

@@ -1,19 +1,36 @@
 class Admin::PagesController < Admin::BaseController
 
-  crudify :page, :conditions => "parent_id IS NULL", :order => "position ASC", :include => [:parts, :slugs, :children], :paging => false
+  crudify :page,
+          :conditions => "parent_id IS NULL",
+          :order => "position ASC",
+          :include => [:parts, :slugs, :children],
+          :paging => false
+
   before_filter :find_pages_for_parents_list, :only => [:new, :create, :edit, :update]
-  after_filter :expire_menu_fragment_caching, :only => [:create, :update, :destroy, :update_positions]
+  after_filter :expire_caching, :only => [:create, :update, :destroy, :update_positions]
+
+  rescue_from FriendlyId::ReservedError, :with => :show_errors_for_reserved_slug
 
   def new
     @page = Page.new
-    RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each do |page_part|
-      @page.parts << PagePart.new(:title => page_part)
+    RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each_with_index do |page_part, index|
+      @page.parts << PagePart.new(:title => page_part, :position => index)
     end
   end
 
 protected
+  def expire_caching
+    expire_menu_fragment_caching
+    expire_action_caching
+  end
+
   def expire_menu_fragment_caching
-    expire_fragment(%r{#{RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")}})
+    Rails.cache.delete("#{Refinery.base_cache_key}_menu_pages")
+    expire_fragment %r{#{RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")}}
+  end
+
+  def expire_action_caching
+    expire_fragment %r{.*/pages/.*}
   end
 
   # This finds all of the pages that could possibly be assigned as the current page's parent.
@@ -24,12 +41,11 @@ protected
       @pages_for_parents_list += add_pages_branch_to_parents_list(page)
     end
     @pages_for_parents_list.flatten.compact!
+
     # We need to remove all references to the current page or any of its decendants or we get a nightmare.
-    unless @page.nil? or @page.new_record?
-      @pages_for_parents_list.reject! do |page|
-        page.id == @page.id or @page.descendants.include?(page)
-      end
-    end
+    @pages_for_parents_list.reject! do |page|
+      page.id == @page.id or @page.descendants.include?(page)
+    end unless @page.nil? or @page.new_record?
   end
 
   def add_pages_branch_to_parents_list(page)
@@ -41,4 +57,15 @@ protected
     list
   end
 
+  def show_errors_for_reserved_slug(exception)
+    flash[:error] = "Sorry, but that title is a reserved system word."
+    if params[:action] == 'update'
+      find_page
+      render :edit
+    else
+      @page = Page.new(params[:page])
+      render :new
+    end
+  end
+
 end

data/vendor/plugins/pages/app/controllers/pages_controller.rb

@@ -1,13 +1,35 @@
 class PagesController < ApplicationController
 
+  caches_action :home, :show,
+                :cache_path => Proc.new { |c| "#{c.request.host_with_port}/views/pages/#{c.params[:path]}" },
+                :if => Proc.new { |c|
+                  c.send(:logged_in?) == false and
+                  (!RefinerySetting.table_exists? ||
+                    RefinerySetting.find_or_set(:page_caching_enabled, true, :scoping => 'pages'))
+                }
+
   def home
     error_404 unless (@page = Page.find_by_link_url("/", :include => [:parts, :slugs])).present?
   end
 
+  # This action can be accessed normally, or as nested pages.
+  # Assuming a page named "mission" that is a child of "about",
+  # you can access the pages with the following URLs:
+  #
+  #   GET /pages/about
+  #   GET /about
+  #
+  #   GET /pages/mission
+  #   GET /about/mission
+  #
   def show
-    @page = Page.find(params[:id], :include => [:parts, :slugs])
+    @page = if params[:path]
+      Page.find(params[:path].last, :include => [:parts, :slugs])
+    else
+      Page.find(params[:id], :include => [:parts, :slugs])
+    end
 
-    if @page.live? or (logged_in? and current_user.authorized_plugins.include?("Pages"))
+    if @page.try(:live?) or (logged_in? and current_user.authorized_plugins.include?("Pages"))
       # if the admin wants this to be a "placeholder" page which goes to its first child, go to that instead.
       if @page.skip_to_first_child
         first_live_child = @page.children.find_by_draft(false, :order => "position ASC")

data/vendor/plugins/pages/app/models/page.rb

@@ -1,20 +1,22 @@
 class Page < ActiveRecord::Base
-
   validates_presence_of :title
 
   acts_as_tree :order => "position ASC", :include => [:children, :slugs]
 
   # Docs for friendly_id http://github.com/norman/friendly_id
-  has_friendly_id :title, :use_slug => true
+  has_friendly_id :title, :use_slug => true,
+    :reserved_words => %w(index new session login logout users refinery admin images wymiframe)
 
-  has_many :parts, :class_name => "PagePart", :order => "position ASC"
+  has_many :parts, :class_name => "PagePart", :order => "position ASC", :inverse_of => :page
   accepts_nested_attributes_for :parts, :allow_destroy => true
 
   # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
-  acts_as_indexed :fields => [:title, :meta_keywords, :meta_description, :custom_title, :browser_title, :all_page_part_content],
-                  :index_file => [Rails.root.to_s, "tmp", "index"]
+  acts_as_indexed :fields => [:title, :meta_keywords, :meta_description, :custom_title, :browser_title, :all_page_part_content]
 
   before_destroy :deletable?
+  after_save :reposition_parts!
+
+  after_save :invalidate_child_cached_url
 
   # when a dialog pops up to link to a page, how many pages per page should there be
   PAGES_PER_DIALOG = 14
@@ -32,6 +34,14 @@ class Page < ActiveRecord::Base
     self.deletable && self.link_url.blank? and self.menu_match.blank?
   end
 
+  # Repositions the child page_parts that belong to this page.
+  # This ensures that they are in the correct 0,1,2,3,4... etc order.
+  def reposition_parts!
+    self.parts.each_with_index do |part, index|
+      part.update_attribute(:position, index)
+    end
+  end
+
   # Before destroying a page we check to see if it's a deletable page or not
   # Refinery system pages are not deletable.
   def destroy
@@ -52,11 +62,10 @@ class Page < ActiveRecord::Base
 
   # If you want to destroy a page that is set to be not deletable this is the way to do it.
   def destroy!
-    self.update_attributes({
-      :menu_match => nil,
-      :link_url => nil,
-      :deletable => true
-    })
+    self.menu_match = nil
+    self.link_url = nil
+    self.deletable = true
+
     self.destroy
   end
 
@@ -80,17 +89,59 @@ class Page < ActiveRecord::Base
   # If a custom "link_url" is set, it uses that otherwise it defaults to a normal page URL.
   # The "link_url" is often used to link to a plugin rather than a page.
   #
-  # For example if I had a "Contact Us" page I don't want it to just render a contact us page
+  # For example if I had a "Contact" page I don't want it to just render a contact us page
   # I want it to show the Inquiries form so I can collect inquiries. So I would set the "link_url"
-  # to "/inquiries/new"
+  # to "/contact"
   def url
     if self.link_url.present?
       self.link_url =~ /^\// ? {:controller => self.link_url} : self.link_url
+    elsif use_marketable_urls?
+      url_marketable
     elsif self.to_param.present?
-      {:controller => "/pages", :action => "show", :id => self.to_param}
+      url_normal
     end
   end
 
+  def url_marketable
+    {:controller => "/pages", :action => "show", :path => self.nested_url}
+  end
+
+  def url_normal
+    {:controller => "/pages", :action => "show", :id => self.to_param}
+  end
+
+  # Returns an array with all ancestors to_param, allow with its own
+  # Ex: with an About page and a Mission underneath,
+  # Page.find('mission').nested_url would return:
+  #
+  #   ['about', 'mission']
+  #
+  def nested_url
+    Rails.cache.fetch(url_cache_key) { uncached_nested_url }
+  end
+
+  def uncached_nested_url
+    self.parent ? [parent.nested_url, self.to_param].flatten : [self.to_param]
+  end
+
+  # Returns the string version of nested_url, i.e., the path that should be generated
+  # by the router
+  def nested_path
+    @nested_path ||= "/#{nested_url.join('/')}"
+  end
+
+  def url_cache_key
+    "#{cache_key}#nested_url"
+  end
+
+  def cache_key
+    "#{Refinery.base_cache_key}/#{super}"
+  end
+
+  def use_marketable_urls?
+    RefinerySetting.find_or_set(:use_marketable_urls, true, :scoping => 'pages')
+  end
+
   # Returns true if this page is "published"
   def live?
     not self.draft?
@@ -100,7 +151,7 @@ class Page < ActiveRecord::Base
   # If it's a draft or is set to not show in the menu it will return false.
   # If any of the page's ancestors aren't to be shown in the menu then this page is not either.
   def in_menu?
-    self.live? && self.show_in_menu? && !self.ancestors.any? { |a| !a.in_menu? }
+    self.live? && self.show_in_menu? && self.ancestors.all? { |a| a.in_menu? }
   end
 
   # Returns true if this page is the home page or links to it.
@@ -118,7 +169,10 @@ class Page < ActiveRecord::Base
     include_associations = [:parts]
     include_associations.push(:slugs) if self.class.methods.include? "find_one_with_friendly"
     include_associations.push(:children) if include_children
-    find_all_by_parent_id(nil,:conditions => {:show_in_menu => true, :draft => false}, :order => "position ASC", :include => include_associations)
+    find_all_by_parent_id(nil,
+                          :conditions => {:show_in_menu => true, :draft => false},
+                          :order => "position ASC",
+                          :include => include_associations)
   end
 
   # Accessor method to get a page part from a page.
@@ -159,4 +213,25 @@ class Page < ActiveRecord::Base
     dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
   end
 
+  ##
+  # Protects generated slugs from title if they are in the list of reserved words
+  # This applies mostly to plugin-generated pages.
+  #
+  # Returns the sluggified string
+  def normalize_friendly_id(slug_string)
+    sluggified = super
+    if use_marketable_urls? && self.class.friendly_id_config.reserved_words.include?(sluggified)
+      sluggified += "-page"
+    end
+    sluggified
+  end
+
+  private
+
+  def invalidate_child_cached_url
+    return true unless use_marketable_urls?
+    children.each do |child|
+      Rails.cache.delete(child.url_cache_key)
+    end
+  end
 end

data/vendor/plugins/pages/app/models/page_part.rb

@@ -6,7 +6,7 @@ class PagePart < ActiveRecord::Base
   alias_attribute :content, :body
 
   def to_param
-    "page_part_#{self.title.downcase.gsub(" ", "_")}"
+    "page_part_#{self.title.downcase.gsub(/\W/, '_')}"
   end
 
   before_save :normalise_text_fields

data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb

@@ -1,5 +1,5 @@
 <% linked = (url_for(page_link.url) == params[:current_link]) if params[:current_link].present? %>
 <li class='clearfix<%= " child#{child}" if child %><%= " linked" if linked%>' id="<%= dom_id(page_link) -%>">
-  <%= link_to page_link.title_with_meta, page_link.url, :title => 'Link to this Page', :rel => page_link.title, :class => 'page_link' %>
+  <%= link_to page_link.title_with_meta, page_link.url, :title => t('.link_to_this_page'), :rel => page_link.title, :class => 'page_link' %>
 </li>
 <%= render :partial => 'page_link', :collection => page_link.children, :locals => {:child => child ? (child+1) : 1} if page_link.children.any? %>

data/vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb

@@ -1,56 +1,26 @@
-<%
-  # web address link
-  web_address_text = "http://"
-  web_address_text = params[:current_link] if params[:current_link].present? and params[:current_link] =~ /^http:\/\//
-  web_address_target_blank = (params[:target_blank] == "true")
-
-  # mailto link
-  if params[:current_link].present?
-    if params[:current_link] =~ /^mailto:/
-      email_address_text = params[:current_link].split("mailto:")[1].split('?')[0]
-    end
-    email_default_subject_text = params[:current_link].split('?subject=')[1] || params[:subject]
-    email_default_body_text = params[:current_link].split('?body=')[1] || params[:body]
-  end
-
-  # resource link
-  if params[:current_link].present?
-    is_resource_link = params[:current_link].include?("/system/resources")
-  end
-
-  if params[:paginating].present?
-    page_area_selected = (params[:paginating] == "your_page")
-    resource_area_selected = (params[:paginating] == "resource_file")
-  else
-    page_area_selected = (!is_resource_link and web_address_text == "http://" and email_address_text.blank?)
-    web_address_area_selected = (web_address_text != "http://")
-    email_address_area_selected = !email_address_text.blank?
-    resource_area_selected = is_resource_link
-  end
-%>
 <div class='clearfix dialog_link_to'>
   <div id='dialog_menu_left'>
-    <span id='your_page_radio' class='radio<%= " selected_radio" if page_area_selected %>'>
-      <input type='radio' name='link_to' value='your_page' id='link_to_your_page' <%= "checked='true'" if page_area_selected %> />
-      <label for='link_to_your_page' class='stripped'>Your page</label>
+    <span id='your_page_radio' class='radio<%= " selected_radio" if @page_area_selected %>'>
+      <input type='radio' name='link_to' value='your_page' id='link_to_your_page' <%= "checked='true'" if @page_area_selected %> />
+      <label for='link_to_your_page' class='stripped'><%= t('.your_page.tab_name') %></label>
     </span>
-    <span id='web_address_radio' class='radio<%= " selected_radio" if web_address_area_selected %>'>
-      <input type='radio' name='link_to' value='web_address' id='link_to_web_address' <%= "checked='true'" if web_address_area_selected %> />
-      <label for='link_to_web_address' class='stripped'>Web address</label>
+    <span id='web_address_radio' class='radio<%= " selected_radio" if @web_address_area_selected %>'>
+      <input type='radio' name='link_to' value='web_address' id='link_to_web_address' <%= "checked='true'" if @web_address_area_selected %> />
+      <label for='link_to_web_address' class='stripped'><%= t('.web_address.tab_name') %></label>
     </span>
 
-    <span id='email_address_radio' class='radio<%= " selected_radio" if email_address_area_selected %>'>
-      <input type='radio' name='link_to' value='email_address' id='link_to_email_address' <%= "checked='true'" if email_address_area_selected %> />
-      <label for='link_to_email_address' class='stripped'>Email address</label>
+    <span id='email_address_radio' class='radio<%= " selected_radio" if @email_address_area_selected %>'>
+      <input type='radio' name='link_to' value='email_address' id='link_to_email_address' <%= "checked='true'" if @email_address_area_selected %> />
+      <label for='link_to_email_address' class='stripped'><%= t('.email_address.tab_name') %></label>
     </span>
-    <span id="resource_file_radio" class="radio<%= " selected_radio" if resource_area_selected %>">
-      <input type="radio" name="link_to" value="resource_file" id="link_to_resource_file" <%= "checked='true'" if resource_area_selected %> />
-      <label for="link_to_resource_file" class="stripped">Your resource</label>
+    <span id="resource_file_radio" class="radio<%= " selected_radio" if @resource_area_selected %>">
+      <input type="radio" name="link_to" value="resource_file" id="link_to_resource_file" <%= "checked='true'" if @resource_area_selected %> />
+      <label for="link_to_resource_file" class="stripped"><%= t('.your_resource.tab_name') %></label>
     </span>
   </div>
 
   <div id='dialog_main'>
-    <div id='your_page_area' class='dialog_area' <%= "style='display: none'" unless page_area_selected %>>
+    <div id='your_page_area' class='dialog_area' <%= "style='display: none'" unless @page_area_selected %>>
       <input type='hidden' name='selected_image' id='selected_image' />
       <div id='your_page_content' class='clearfix'>
         <div id='pages_list'>
@@ -59,82 +29,97 @@
           </ul>
         </div>
       </div>
-      <%= will_paginate @pages, :param_name => :page, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;',
-        :renderer => Refinery::LinkRenderer, :url => {:paginating => "your_page"} %>
+      <%= will_paginate @pages,
+                        :param_name => :page,
+                        :previous_label => '&laquo; Previous',
+                        :next_label => 'Next &raquo;',
+                        :renderer => Refinery::LinkRenderer,
+                        :url => {:paginating => "your_page"} %>
     </div>
-    <div id='web_address_area' <%= "style='display: none'" unless web_address_area_selected %> class='dialog_area'>
+    <div id='web_address_area' <%= "style='display: none'" unless @web_address_area_selected %> class='dialog_area'>
       <div id='web_address_content'>
-        <label for='web_address_text'>Location</label>
-        <%= text_field :web_address, :text, :value => web_address_text, :style => "width: 70%" %>
+        <label for='web_address_text'><%= t('.web_address.location') %></label>
+        <%= text_field :web_address, :text, :value => @web_address_text, :style => "width: 70%" %>
         <img id='web_address_test_loader' src='/images/refinery/ajax-loader.gif' alt='Testing...' style='display: none;'/>
         <span id='web_address_test_result'></span>
 
-        <label>New Window</label>
-        <input type='checkbox' name='web_address_target_blank' id='web_address_target_blank' <%= "checked='checked'" if web_address_target_blank %> />
-        <label for='web_address_target_blank' class='stripped'>Check this box to have the link open in a new browser window.</label>
+        <label><%=t('.web_address.new_window') %></label>
+        <input type='checkbox' name='web_address_target_blank' id='web_address_target_blank' <%= "checked='checked'" if @web_address_target_blank %> />
+        <label for='web_address_target_blank' class='stripped'><%=t('.web_address.new_window_label') %></label>
         <p>
-          <strong>Not sure what to put in the box above?</strong>
+          <strong><%=t('.web_address.not_sure')%></strong>
         </p>
         <ol>
-          <li>Find the page on the web you want to link to.</li>
-          <li>Copy the web address from your browser's address bar and paste it into the box above.</li>
+          <li><%=t('.web_address.step1')%></li>
+          <li><%=t('.web_address.step2')%></li>
         </ol>
       </div>
     </div>
-    <div id='email_address_area' <%= "style='display: none'" unless email_address_area_selected %> class='dialog_area'>
+    <div id='email_address_area' <%= "style='display: none'" unless @email_address_area_selected %> class='dialog_area'>
       <div id='email_address_content'>
         <div class='field'>
-          <label for='email_address_text'>Email Address</label>
-          <%= text_field :email_address, :text, :value => email_address_text, :style => "width: 70%"%>
+          <label for='email_address_text'><%=t('.email_address.tab_name')%></label>
+          <%= text_field :email_address, :text, :value => @email_address_text, :style => "width: 70%"%>
           <img id='email_address_test_loader' src='/images/refinery/ajax-loader.gif' alt='Testing...' style='display: none;'/>
           <span id='email_address_test_result'></span>
         </div>
 
         <div class='field'>
-          <label for='email_default_subject_text'>Subject Line (optional)</label>
-          <%= text_field :email_default_subject, :text, :value => email_default_subject_text, :style => "width: 70%" %>
+          <label for='email_default_subject_text'><%=t('.email_address.subject_line_optional')%></label>
+          <%= text_field :email_default_subject, :text, :value => @email_default_subject_text, :style => "width: 70%" %>
         </div>
 
         <div class='field'>
-          <label for='email_default_body_text'>Email Body (optional)</label>
-          <%= text_area :email_default_body, :text, :value => email_default_body_text, :style => "width: 70%", :rows => '' %>
+          <label for='email_default_body_text'><%=t('.email_address.body_optional')%></label>
+          <%= text_area :email_default_body, :text, :value => @email_default_body_text, :style => "width: 70%", :rows => '' %>
         </div>
 
         <p>
-          <strong>Not sure what to put in the boxes above?</strong>
+          <strong><%=t('.email_address.not_sure')%></strong>
         </p>
         <ol style='margin-top: 3px'>
           <li>
-            Write or copy and paste (e.g. from your address book) the email address to link
-            to into the '<strong>Email Address</strong>' box above.
+            <%=t('.email_address.step1')%>
           </li>
           <li>
-            Use the '<strong>Subject Line</strong>' box above if you want the message to
-            be composed with a <strong>pre-written subject line</strong>
+            <%=t('.email_address.step2')%>
           </li>
           <li>
-            Use the <strong>Email Body</strong> box above if you want the message to be
-            composed with a <strong>pre-written message</strong>.
+            <%=t('.email_address.step3')%>
           </li>
         </ol>
       </div>
     </div>
-    <div id="resource_file_area" <%= "style='display:none'" unless resource_area_selected %> class="dialog_area">
+    <div id="resource_file_area" <%= "style='display:none'" unless @resource_area_selected %> class="dialog_area">
       <div id='pages_list'>
         <ul class="link_list">
           <% @resources.each do |resource| -%>
             <% resource_linked = (resource.public_filename == params[:current_link]) unless params[:current_link].blank? %>
-            <li<%= " class='linked'" if resource_linked %>>
-              <%= link_to resource.title, resource.public_filename, :title => 'Link to this Resource',
-                          :rel => resource.title, :class => 'page_link' %>
+            <li<%= " class='linked'" if @resource_linked %>>
+              <%= link_to "#{resource.title}.#{resource.filename.split('.')[1]}", resource.public_filename,
+                          :title => t('.your_resource.link_to_this_resource'),
+                          :rel => resource.title, :class => "page_link #{resource.filename.split('.')[1]}" %>
             </li>
           <% end %>
         </ul>
-        <%= will_paginate @resources, :param_name => :resource_page, :previous_label => '&laquo;', :next_label => '&raquo;',
-          :renderer => Refinery::LinkRenderer, :url => {:paginating => "resource_file"} %>
+        <%= will_paginate @resources,
+                          :param_name => :resource_page,
+                          :previous_label => '&laquo;',
+                          :next_label => '&raquo;',
+                          :renderer => Refinery::LinkRenderer,
+                          :url => {:paginating => "resource_file"} %>
       </div>
     </div>
   </div>
+  <%= render :partial => "/shared/admin/form_actions",
+             :locals => {
+               :f => nil,
+               :cancel_url => '',
+               :submit_button_text => 'Insert',
+               :hide_cancel => false,
+               :cancel_title => '',
+               :hide_delete => true
+             } %>
 </div>
 
 <% content_for :head do %>