mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-19 04:57:54 +00:00
1585-webui.darcs.patch
This commit is contained in:
parent
1445953adc
commit
0ed6260a3c
@ -1276,7 +1276,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
|
||||
return d
|
||||
|
||||
def test_CSS_FILE(self):
|
||||
d = self.GET("/tahoe_css", followRedirect=True)
|
||||
d = self.GET("/tahoe.css", followRedirect=True)
|
||||
def _check(res):
|
||||
CSS_STYLE=re.compile('toolbar\s{.+text-align:\scenter.+toolbar-item.+display:\sinline',re.DOTALL)
|
||||
self.failUnless(CSS_STYLE.search(res), res)
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Check Results</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Check Results</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Deep Check Results</title>
|
||||
<link href="/tahoe_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" />
|
||||
<meta n:render="refresh" />
|
||||
</head>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Deep Check Results</title>
|
||||
<link href="/tahoe_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" />
|
||||
<meta n:render="refresh" />
|
||||
</head>
|
||||
|
@ -1,7 +1,6 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
|
||||
<title n:render="title"></title>
|
||||
<link href="/webform_css" rel="stylesheet" type="text/css"/>
|
||||
<link href="/tahoe_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 class="tahoe-directory-page">
|
||||
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>AllMyData - Tahoe - File Download Status Timeline</title>
|
||||
<link href="/tahoe_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" />
|
||||
<script type="text/javascript" src="/jquery-1.6.1.min.js"></script>
|
||||
<script type="text/javascript" src="/d3-2.4.6.min.js"></script>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - File Download Status</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Helper Status</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,7 +1,6 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
|
||||
<title n:render="title"></title>
|
||||
<link href="/webform_css" rel="stylesheet" type="text/css"/>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Check Results</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,7 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title n:render="title"></title>
|
||||
<link href="/tahoe_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" />
|
||||
<meta n:render="refresh" />
|
||||
</head>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Mutable File Servermap Update Status</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Provisioning Tool</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Mutable File Publish Status</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Reliability Tool</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title n:render="title"></title>
|
||||
<link href="/webform_css" rel="stylesheet" type="text/css"/>
|
||||
<link href="/tahoe_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>
|
||||
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Mutable File Retrieve Status</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,4 +1,4 @@
|
||||
import time
|
||||
import time, os
|
||||
|
||||
from twisted.internet import address
|
||||
from twisted.web import http
|
||||
@ -168,21 +168,15 @@ class Root(rend.Page):
|
||||
self.child_named = FileHandler(client)
|
||||
self.child_status = status.Status(client.get_history())
|
||||
self.child_statistics = status.Statistics(client.stats_provider)
|
||||
def f(name):
|
||||
return nevow_File(resource_filename('allmydata.web', name))
|
||||
self.putChild("download_status_timeline.js", f("download_status_timeline.js"))
|
||||
self.putChild("jquery-1.6.1.min.js", f("jquery-1.6.1.min.js"))
|
||||
self.putChild("d3-2.4.6.min.js", f("d3-2.4.6.min.js"))
|
||||
self.putChild("d3-2.4.6.time.min.js", f("d3-2.4.6.time.min.js"))
|
||||
static_dir = resource_filename("allmydata.web", "static")
|
||||
for filen in os.listdir(static_dir):
|
||||
self.putChild(filen, nevow_File(os.path.join(static_dir, filen)))
|
||||
|
||||
def child_helper_status(self, ctx):
|
||||
# the Helper isn't attached until after the Tub starts, so this child
|
||||
# needs to created on each request
|
||||
return status.HelperStatus(self.client.helper)
|
||||
|
||||
child_webform_css = webform.defaultCSS
|
||||
child_tahoe_css = nevow_File(resource_filename('allmydata.web', 'tahoe.css'))
|
||||
|
||||
child_provisioning = provisioning.ProvisioningTool()
|
||||
if reliability.is_available():
|
||||
child_reliability = reliability.ReliabilityTool()
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Stats</title>
|
||||
<link href="/tahoe_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 n:data="get_stats">
|
||||
|
@ -1,7 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Current Uploads/Downloads</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,7 +1,6 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - Storage Server Status</title>
|
||||
<link href="/webform_css" rel="stylesheet" type="text/css"/>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
</head>
|
||||
<body>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - File Uploaded</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,8 +1,7 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1">
|
||||
<head>
|
||||
<title>Tahoe-LAFS - File Upload Status</title>
|
||||
<link href="/tahoe_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>
|
||||
|
@ -1,7 +1,6 @@
|
||||
<html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
|
||||
<title>Tahoe-LAFS - Welcome</title>
|
||||
<link href="/webform_css" rel="stylesheet" type="text/css"/>
|
||||
<link href="/tahoe_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>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user