From 1eba30cd14205577bf209baefdb73a09dee90387 Mon Sep 17 00:00:00 2001 From: Brian Warner <warner@lothar.com> Date: Fri, 15 Jun 2007 01:32:20 -0700 Subject: [PATCH] webish.py: put the URI in a narrower auto-scrolling box (with CSS) --- setup.py | 2 +- src/allmydata/web/directory.xhtml | 3 ++- src/allmydata/web/tahoe.css | 8 ++++++++ src/allmydata/webish.py | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/allmydata/web/tahoe.css diff --git a/setup.py b/setup.py index 7596a5b8..5036b8e4 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ majority of the nodes are no longer available.""", "allmydata.filetree", "allmydata.scripts",], package_dir={ "allmydata": "src/allmydata",}, scripts = ["bin/allmydata-tahoe"], - package_data={ 'allmydata': ['web/*.xhtml'] }, + package_data={ 'allmydata': ['web/*.xhtml', 'web/*.css'] }, classifiers=trove_classifiers, test_suite="allmydata.test", ) diff --git a/src/allmydata/web/directory.xhtml b/src/allmydata/web/directory.xhtml index 6ee528f3..430223cd 100644 --- a/src/allmydata/web/directory.xhtml +++ b/src/allmydata/web/directory.xhtml @@ -4,6 +4,7 @@ <!-- <link href="http://www.allmydata.com/common/css/styles.css" rel="stylesheet" type="text/css"/> --> <link href="/webform_css" rel="stylesheet" type="text/css"/> + <link href="/tahoe_css" rel="stylesheet" type="text/css"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> </head> <body> @@ -25,7 +26,7 @@ <td><n:slot name="filename"/></td> <td><n:slot name="type"/></td> <td><n:slot name="size"/></td> - <td><n:slot name="uri"/></td> + <td><pre class="overflow"><n:slot name="uri"/></pre></td> <td><n:slot name="delete"/></td> </tr> diff --git a/src/allmydata/web/tahoe.css b/src/allmydata/web/tahoe.css new file mode 100644 index 00000000..78e8db6d --- /dev/null +++ b/src/allmydata/web/tahoe.css @@ -0,0 +1,8 @@ + +pre.overflow { + background: #f7f7f7; + border: 1px solid #d7d7d7; + margin: 1em 1.75em; + padding: .25em; + overflow: auto; + } \ No newline at end of file diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py index b2728df7..023406e3 100644 --- a/src/allmydata/webish.py +++ b/src/allmydata/webish.py @@ -3,6 +3,7 @@ from twisted.application import service, strports from twisted.web import static, resource, server, html from twisted.python import util, log from nevow import inevow, rend, loaders, appserver, url, tags as T +from nevow.static import File as nevow_File # TODO: merge with static.File? from allmydata.util import idlib from allmydata.uri import unpack_uri from allmydata.interfaces import IDownloadTarget @@ -333,6 +334,7 @@ class Root(rend.Page): return rend.Page.locateChild(self, ctx, segments) child_webform_css = webform.defaultCSS + child_tahoe_css = nevow_File(util.sibpath(__file__, "web/tahoe.css")) child_welcome = Welcome() -- 2.45.2