Changeset 250:ef4aab45811b

Timestamp:

2007-08-12 16:58:51 (1 year ago)

Author:

Stefan Schwarzer <sschwarzer@sschwarzer.net>

branch:

default

Message:

Change semantics when clicking on a directory link. This no longer
opens a two-pane frameset for the clicked directory. Instead, the
directories are displayed in the left frame with a dir level so that
the contained items in the clicked directory are visible.

If the user selects to see "all" directory levels, Websourcebrowser
now determines the actual dir levels setting and sets the
corresponding query parameter accordingly. The intended side effect is
that the user can decrease the nesting level one by one since the
actual level (and one less) is displayed in the options header.

Files:

• browser.py (modified) (3 diffs)
• converter.py (modified) (3 diffs)
• websourcebrowser.css (modified) (1 diff)

browser.py

@@ -180 +180 @@
-            #  avoiding information disclosure (double dot attack)
-            self.emit_data(http_status=httplib.BAD_REQUEST)
+        # defaults
-        use_header_and_footer = True
+        h1_class = "File"
-        if not os.path.exists(path):
-            self.emit_data(http_status=httplib.NOT_FOUND)
@@ -202 +204 @@
-                # emit the frame
-                html = converter.dir_to_html(path, params)
+                h1_class = "Dir"
-        elif self.is_image_path(path):
-            html = converter.image_to_html(url)
@@ -217 +220 @@
-        title = urllib.unquote(title)
-        self.emit_data(html, title=title, mtime=os.path.getmtime(path),
+                       h1_class=h1_class,
-                       use_header_and_footer=use_header_and_footer)
-

converter.py

@@ -189 +189 @@
-    path = os.path.normpath(path)
-    start_level = dir_level(path)
+    items = list(itertools.ifilterfalse(_ignore_item,
+                 walk(path, params['dir_levels'])))
+    actual_dir_level = max([dir_level(item) for item in items]) - start_level
+    params['dir_levels'] = actual_dir_level
-    html_parts = []
-    add_html = html_parts.append
@@ -200 +204 @@
-        add_html(u'<tr><td><span class="Options">'
-          u'<a href="%s" target="_top">up</a></span></td></tr>' % parent_url)
-
-
+
-        # HTML for spacing
-        spacing = (u'<span class="Indent">' +
@@ -212 +215 @@
-        link_text = cgi.escape(coding.decode(os.path.basename(item)))
-        if os.access(item, os.R_OK):
-            url = urlpath.to_url(config.root, item)
-            if os.path.isdir(item):
-
+
+
+
+
-                url = session.default_session.add_to_url(url, params)
-
+
+
+
+
-            else:
-                params['frames'] = "no"
+                url = urlpath.to_url(config.root, item)
+                url = session.default_session.add_to_url(url, params)
-                target = config.SOURCE_WINDOW_TARGET
-            link = u'<a href="%s" target="%s">%s</a>' % (url, target, link_text)
+            # add an anchor in order to jump to directories
+            if os.path.isdir(item):
+                link = u'<a name="%s">%s</a>' % (anchor, link)
-        else:
-            # not really a link

websourcebrowser.css

@@ -2 +2 @@
-h1 { margin: 0px; display: block; padding: 5px; font-size: 120%;
-     position: fixed; top: 0px; left: 0px; width: 100%; z-index: 2; }
-
+
+
+
-h1.Other { background-color: #90ff90; }
-h1.Error, .Error { background-color: #ff9090; }
-.Main { margin: 0.8em; padding-bottom: 1ex;
-        position: absolute; top: 2.5em; z-index: 1; }