Changeset 1068

Timestamp:

03/13/07 17:34:35 (3 years ago)

Author:

julians

Message:

Refactored flat file view by moving linked path assembly to browser_helper; made parent link and display of current level in navigation configurable and made no parent link and no current level the default; fixes #118

Files:

• trunk/app/helpers/browser_helper.rb (modified) (1 diff)
• trunk/app/views/browser/flat.rhtml (modified) (1 diff)

trunk/app/helpers/browser_helper.rb

@@ -1 +1 @@
-module BrowserHelper
+
+  LINKED_FILE_PATH_SHOW_PARENT_LINK = false
+  LINKED_FILE_PATH_SHOW_CURRENT     = false
+
+  def linked_file_path(file)
+    html = ""
+    if not @server
+      # On root level
+      html = "root::" if LINKED_FILE_PATH_SHOW_CURRENT
+      html += link_to(file.directory.server.name, 
+                      :overwrite_params => {:page => nil, 
+                                            :server => file.directory.server.name, 
+                                            :path => nil})
+      html += ":"
+    elsif @server and not @directory
+      # On server level
+      if LINKED_FILE_PATH_SHOW_PARENT_LINK
+        html = link_to("root", 
+                       :overwrite_params => {:page => nil, 
+                                             :path => nil, 
+                                             :server => nil})
+        html += "::"
+      end
+      if LINKED_FILE_PATH_SHOW_CURRENT
+        html += h(@server.name)
+        html += ":"
+      end
+    elsif @directory and not @directory.parent_id
+      # On top directory level
+      if LINKED_FILE_PATH_SHOW_PARENT_LINK
+        html = link_to("..", 
+                       :overwrite_params => {:page => nil, 
+                                             :path => nil})
+        html += ":"
+      end
+    else
+      # On deeper directory level
+      if LINKED_FILE_PATH_SHOW_PARENT_LINK
+        html = link_to("..", 
+                       :overwrite_params => {:page => nil, 
+                                             :path => @directory.parent.path})
+      end
+    end
+    self_and_ancestors_up_to(file.directory, @directory).reverse.each do |parent| 
+      if parent == @directory
+        if LINKED_FILE_PATH_SHOW_CURRENT
+          html += h(parent.name.gsub(/ /, " "))
+          html += "/<wbr/>"
+        end
+      else 
+        html += link_to(parent.name.gsub(/ /, "&nbsp;"), 
+                        :overwrite_params => {:page => nil, 
+                                              :server => file.directory.server.name,  
+                                              :path => parent.path})
+        html += "/<wbr/>"
+      end
+    end
+    html
+  end
-end

trunk/app/views/browser/flat.rhtml

@@ -68 +68 @@
-          </td>
-          <td class="path">
- <% if not @server %><%= link_to file.directory.server.name, :overwrite_params => {:page => nil, :server => file.directory.server.name, :path => nil} %>:<% else %><% if not (@directory.nil? or @directory.parent_id.nil?) %><%= link_to("..", :overwrite_params => {:page => nil, :path => @directory.parent.path}) %>/<% end %><% end %><% self_and_ancestors_up_to(file.directory, @directory).reverse.each do |parent| %><% if parent == @directory %><%= h parent.name.gsub(/ /, "&nbsp;") %><% else %><%= link_to(parent.name.gsub(/ /, "&nbsp;"), :overwrite_params => {:page => nil, :server => file.directory.server.name, :path => parent.path}) %><% end %>/<wbr/><% end
+<%= linked_file_path(file)
-          </td>
-          <td class="modified">