Changeset 1007

Timestamp:

02/24/07 17:46:12 (3 years ago)

Author:

julians

Message:

Sort flat file view by size instead of path; move path to a separate table column in flat file view; minor layout improvements to navigation and flat view; fixes #119

Files:

• trunk/app/controllers/browser_controller.rb (modified) (1 diff)
• trunk/app/helpers/application_helper.rb (modified) (1 diff)
• trunk/app/views/browser/flat.rhtml (modified) (2 diffs)
• trunk/app/views/browser/show.rhtml (modified) (3 diffs)
• trunk/public/stylesheets/base.css (modified) (4 diffs)

trunk/app/controllers/browser_controller.rb

@@ -17 +17 @@
-
-    joins = "JOIN directories ON files.directory_id = directories.id"
-path
+size desc
-    include_attributes = [ "name", "directory_id", "modified", "size", "uid" ]
-    select = include_attributes.map {|attr| "files.#{attr} as #{attr}" }.join(", ")

trunk/app/helpers/application_helper.rb

@@ -3 +3 @@
-
-  def self_and_ancestors_up_to(directory, parent_dir)
-
-
+
+
+
+
-    else
-directory.self_and_ancestors
+ directory.self_and_ancestors_up_to(parent_dir) + [ parent_dir ]
-    end
-  end

trunk/app/views/browser/flat.rhtml

@@ -53 +53 @@
-    <thead>
-      <tr>
+        <th class="name">Name</th>
-        <th class="path">Path</th>
-        <th class="modified">Modified</th>
@@ -63 +64 @@
-      <% @files.each do |file| %>
-        <tr class="<%= cycle 'even', 'odd' %>">
+          <td class="name">
+            <%= file.name %>
+          </td>
-          <td class="path">
-nd %><% self_and_ancestors_up_to(file.directory, @directory).reverse.each do |parent| %><%= link_to parent.name, :overwrite_params => {:page => nil, :server => file.directory.server.name, :path => parent.path} %>/<% end %><%= file.name
+lse %><% 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
-          </td>
-          <td class="modified">
-            <span title="<%=h file.modified %>"><%= distance_of_time_in_words_to_now(file.modified) %> ago</span>
-          </td>
-%=h file.user.name %
-%= ApplicationHelper.human_size_in(ApplicationHelper.human_units_of(file.size), file.size) %> <%= ApplicationHelper.human_units_of(file.size) %
+span><%=h file.user.name %></span
+span><%= ApplicationHelper.human_size_in(ApplicationHelper.human_units_of(file.size), file.size) %> <%= ApplicationHelper.human_units_of(file.size) %></span
-        </tr>
-      <% end %>

trunk/app/views/browser/show.rhtml

@@ -4 +4 @@
-      <tr>
-        <th class="icon"></th>
-
-
-
-
+
+
+
+
+
+
+
+
-        <th class="bar"></th>
-      </tr>
@@ -47 +51 @@
-        <tr class="<%= cycle 'even', 'odd' %>">
-          <td class="icon Server"><%= link_to "", :overwrite_params => {:server => server.name, :path => nil} %></td>
- colspan="3"><%= link_to server.name
-#{ApplicationHelper::human_size_in(units, size)} #{units}
+><%= link_to "<span>#{server.name}</span>"
+<span>#{ApplicationHelper::human_size_in(units, size)} #{units}</span>
-          <td class="bar Server"><%= link_to bar(size, max_size, :class => "bar"), :overwrite_params => {:server => server.name, :path => nil} %></td>
-        </tr>
@@ -77 +81 @@
-        <td class="icon Dir"><%= link_to "", :overwrite_params => {:path => directory.path} %></td>
-        <td class="name Dir" colspan="3"><%= link_to directory.name, :overwrite_params => {:path => directory.path} %></td>
-#{ApplicationHelper::human_size_in(units, size)} #{units}
+<span>#{ApplicationHelper::human_size_in(units, size)} #{units}</span>
-        <td class="bar Dir"><%= link_to bar(size, max_size, :class => "bar"), :overwrite_params => {:path => directory.path} %></td>
-      </tr>

trunk/public/stylesheets/base.css

@@ -354 +354 @@
-}
-
-d
+h
-  width: 75%;
-}
-
-
+
+
+
+
+
+
+
+
+
-  width: 5%;
-  background: yellow;
-}
-
-d
+h
-  width: 5%;
-  background: yellow;
-}
-
-d
+h
-  width: 15%;
-  background: yellow;
@@ -398 +406 @@
-#Content table#flat-browser th.size,
-#Content table#flat-browser td.size,
+#Content table#browser th.modified,
+#Content table#browser td.modified,
-#Content table#browser th.size,
-#Content table#browser td.size {
@@ -403 +413 @@
-}
-
-
-
-
-
-
-
+
+
-#Content table#browser td.owner_user span,
-
-
+
+
+
+
-  margin-left: 0.6em;
-  margin-right: 0.6em;
-}
-
+#Content table#browser td.owner_user span,
+#Content table#flat-browser td.owner_user span,
+#Content table#flat-browser td.size,
+#Content table#flat-browser td.modified,
+#Content table#flat-browser th.modified,
+#Content table#flat-browser th.size { 
+  margin-left: 1.2em;
+  margin-right: 1.2em;
+}
+
+#Content table#flat-browser th.path,
-#Content table#browser th.path,
-#Content table#browser td.path,
+#Content table#flat-browser th.name,
-#Content table#browser th.name,
-#Content table#browser td.name {
-  text-align: left !important;
-}
+
+#Content table#flat-browser td.path { 
+  white-space: normal !important;  
+  padding-left: 1em;
+  text-indent: -1em;
+}
+
+#Content table#flat-browser th.modified,
+#Content table#flat-browser td.modified { 
+  text-align: right;
+}
+
+#Content table#flat-browser td.owner_user { 
+  text-align: center;
+}
+
-
-#Content table#browser td.msg {
@@ -586 +622 @@
-  font-size: small;
-}
+