1 files changed, 35 insertions, 27 deletions

diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb
index 1b20e6d..878e8e4 100644
--- a/app/helpers/link_helper.rb
+++ b/app/helpers/link_helper.rb
@@ -1,54 +1,62 @@
 module LinkHelper
-  
+
   def content_path_helper path_array
     url_for(
       :controller => :content,
       :action => :render_page,
-      :locale => params[:locale] || I18n.locale,
+      :locale => (params[:locale] || I18n.locale).to_sym == I18n.default_locale ? nil : (params[:locale] || I18n.locale),
       :page_path => path_array
     )
   end
-  
+
   def content_url_helper path_array
     request.protocol + request.host_with_port + content_path_helper(path_array)
   end
-  
+
   def link_to_path title, path, html_options = {}
+    return "" if path.nil?
+
     if params[:page_path]
-      active = (params[:page_path].join("/") == path.sub(/^\//, ""))
+      page_path = params[:page_path].is_a?(Array) ? params[:page_path].join("/") : params[:page_path]
+      active = (page_path == path.sub(/^\//, ""))
     end
-    
+
     active_class = active ? {:class => 'active'} : {:class => 'inactive'}
-    
     html_options = html_options.merge(active_class)
-    
-    params[:locale] ||= I18n.locale
-    
-    link_to( 
-      title, {
-        :controller => :content,
-        :action => :render_page,
-        :locale => params[:locale],
-        :page_path => (path.sub(/^\//, "").split("/") rescue "")
-      },
+    locale = (params[:locale] || I18n.locale).to_sym == I18n.default_locale ? nil : (params[:locale] || I18n.locale)
+
+    link_to(
+      title,
+      content_path(path.sub(/^\//, ""), :locale => locale),
       html_options
     )
   end
-  
+
   def selected? controller_name
     if params[:controller] == controller_name
       return :class => "selected"
     end
   end
-  
+
   def unlock_link
-    message = "Are you sure you want to unlock?\n" +
-              "Locked by #{@node.lock_owner.login}\n" +
-              "Last modified #{@page.updated_at.to_s(:db)}"
-    
-    link_to(
-      'Unlock', unlock_node_path(@node), :method => :put, :confirm => message
+    message = "Are you sure you want to unlock?\n" \
+      "Locked by #{@node.lock_owner.login}\n" \
+      "Last modified #{@page.updated_at.to_fs(:db)}"
+    button_to 'Unlock', unlock_node_path(@node),
+      method: :put,
+      form: { data: { confirm: message } }
+  end
+
+  def content_path(page_path = nil, options = {})
+    if page_path.is_a?(Hash)
+      options = page_path
+      page_path = options.delete(:page_path)
+    end
+    locale = options[:locale] || params[:locale] || I18n.locale
+    options[:locale] = (locale.to_sym == I18n.default_locale) ? nil : locale
+    Rails.application.routes.url_helpers.content_path(
+      Array(page_path).join("/").sub(/^\//, ""),
+      options
     )
   end
-  
-end
\ No newline at end of file
+end