Ticket #1585: staticstruct.diff

File staticstruct.diff, 16.2 KB (added by marcusw, at 2011-11-17T02:11:56Z)

  • src/allmydata/test/test_web.py 

    diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index dc7ab9e..efa89c0 100644
    a b class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi 
    12761276        return d
    12771277
    12781278    def test_CSS_FILE(self):
    1279         d = self.GET("/tahoe_css", followRedirect=True)
     1279        d = self.GET("/tahoe.css", followRedirect=True)
    12801280        def _check(res):
    12811281            CSS_STYLE=re.compile('toolbar\s{.+text-align:\scenter.+toolbar-item.+display:\sinline',re.DOTALL)
    12821282            self.failUnless(CSS_STYLE.search(res), res)

  • src/allmydata/web/check-and-repair-results.xhtml 

    diff --git a/src/allmydata/web/check-and-repair-results.xhtml b/src/allmydata/web/check-and-repair-results.xhtml
index 6d27af6..c847619 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Check Results</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/check-results.xhtml 

    diff --git a/src/allmydata/web/check-results.xhtml b/src/allmydata/web/check-results.xhtml
index 06e527d..9d9c53b 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Check Results</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/deep-check-and-repair-results.xhtml 

    diff --git a/src/allmydata/web/deep-check-and-repair-results.xhtml b/src/allmydata/web/deep-check-and-repair-results.xhtml
index 7dd1793..e52a06e 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Deep Check Results</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76    <meta n:render="refresh" />
    87  </head>

  • src/allmydata/web/deep-check-results.xhtml 

    diff --git a/src/allmydata/web/deep-check-results.xhtml b/src/allmydata/web/deep-check-results.xhtml
index 6b0f81b..91f8622 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Deep Check Results</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76    <meta n:render="refresh" />
    87  </head>

  • src/allmydata/web/directory.xhtml 

    diff --git a/src/allmydata/web/directory.xhtml b/src/allmydata/web/directory.xhtml
index 4875738..4bcee9a 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
    22  <title n:render="title"></title>
    3   <link href="/webform_css" rel="stylesheet" type="text/css"/>
    4   <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
     3  <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    54  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    65</head><body class="tahoe-directory-page">
    76

  • src/allmydata/web/download-status-timeline.xhtml 

    diff --git a/src/allmydata/web/download-status-timeline.xhtml b/src/allmydata/web/download-status-timeline.xhtml
index 0a7002c..1f36d21 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>AllMyData - Tahoe - File Download Status Timeline</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76    <script type="text/javascript" src="/jquery-1.6.1.min.js"></script>
    87    <script type="text/javascript" src="/d3-2.4.6.min.js"></script>

  • src/allmydata/web/download-status.xhtml 

    diff --git a/src/allmydata/web/download-status.xhtml b/src/allmydata/web/download-status.xhtml
index b3560ed..5ee3c8b 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - File Download Status</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/helper.xhtml 

    diff --git a/src/allmydata/web/helper.xhtml b/src/allmydata/web/helper.xhtml
index 05f185e..b3c6c26 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Helper Status</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/info.xhtml 

    diff --git a/src/allmydata/web/info.xhtml b/src/allmydata/web/info.xhtml
index 0c82064..dcc8b39 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
    22  <title n:render="title"></title>
    3   <link href="/webform_css" rel="stylesheet" type="text/css"/>
    4   <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
     3  <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    54  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    65
    76</head><body>

  • src/allmydata/web/literal-check-results.xhtml 

    diff --git a/src/allmydata/web/literal-check-results.xhtml b/src/allmydata/web/literal-check-results.xhtml
index aa11798..ee990df 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Check Results</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/manifest.xhtml 

    diff --git a/src/allmydata/web/manifest.xhtml b/src/allmydata/web/manifest.xhtml
index ecc6e0c..5c53360 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title n:render="title"></title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    55    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    66    <meta n:render="refresh" />
    77  </head>

  • src/allmydata/web/map-update-status.xhtml 

    diff --git a/src/allmydata/web/map-update-status.xhtml b/src/allmydata/web/map-update-status.xhtml
index a4c1a7d..29661f6 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Mutable File Servermap Update Status</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/provisioning.xhtml 

    diff --git a/src/allmydata/web/provisioning.xhtml b/src/allmydata/web/provisioning.xhtml
index 1217bf9..d28c4e2 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Provisioning Tool</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/publish-status.xhtml 

    diff --git a/src/allmydata/web/publish-status.xhtml b/src/allmydata/web/publish-status.xhtml
index 38e6dac..f8b2b1c 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Mutable File Publish Status</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/reliability.xhtml 

    diff --git a/src/allmydata/web/reliability.xhtml b/src/allmydata/web/reliability.xhtml
index 795bf62..bc06805 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Reliability Tool</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/rename-form.xhtml 

    diff --git a/src/allmydata/web/rename-form.xhtml b/src/allmydata/web/rename-form.xhtml
index 55399a3..b29b06c 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title n:render="title"></title>
    4     <link href="/webform_css" rel="stylesheet" type="text/css"/>
    5     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87

  • src/allmydata/web/retrieve-status.xhtml 

    diff --git a/src/allmydata/web/retrieve-status.xhtml b/src/allmydata/web/retrieve-status.xhtml
index 4e457f4..48e9d75 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Mutable File Retrieve Status</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/root.py 

    diff --git a/src/allmydata/web/root.py b/src/allmydata/web/root.py
index 3fbe5b8..6481289 100644
    a b  
    1 import time
     1import time, os
    22
    33from twisted.internet import address
    44from twisted.web import http
    … … class Root(rend.Page): 
    168168        self.child_named = FileHandler(client)
    169169        self.child_status = status.Status(client.get_history())
    170170        self.child_statistics = status.Statistics(client.stats_provider)
    171         def f(name):
    172             return nevow_File(resource_filename('allmydata.web', name))
    173         self.putChild("download_status_timeline.js", f("download_status_timeline.js"))
    174         self.putChild("jquery-1.6.1.min.js", f("jquery-1.6.1.min.js"))
    175         self.putChild("d3-2.4.6.min.js", f("d3-2.4.6.min.js"))
    176         self.putChild("d3-2.4.6.time.min.js", f("d3-2.4.6.time.min.js"))
     171        static_dir = resource_filename("allmydata.web", "static")
     172        for filen in os.listdir(static_dir):
     173            self.putChild(filen, nevow_File(os.path.join(static_dir, filen)))
    177174
    178175    def child_helper_status(self, ctx):
    179176        # the Helper isn't attached until after the Tub starts, so this child
    180177        # needs to created on each request
    181178        return status.HelperStatus(self.client.helper)
    182179
    183     child_webform_css = webform.defaultCSS
    184     child_tahoe_css = nevow_File(resource_filename('allmydata.web', 'tahoe.css'))
    185 
    186180    child_provisioning = provisioning.ProvisioningTool()
    187181    if reliability.is_available():
    188182        child_reliability = reliability.ReliabilityTool()

  • src/allmydata/web/statistics.xhtml 

    diff --git a/src/allmydata/web/statistics.xhtml b/src/allmydata/web/statistics.xhtml
index b10d679..f038ee1 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Stats</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body n:data="get_stats">

  • src/allmydata/web/status.xhtml 

    diff --git a/src/allmydata/web/status.xhtml b/src/allmydata/web/status.xhtml
index d891e0d..fef0e80 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Current Uploads/Downloads</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    55    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    66  </head>
    77  <body>

  • src/allmydata/web/storage_status.xhtml 

    diff --git a/src/allmydata/web/storage_status.xhtml b/src/allmydata/web/storage_status.xhtml
index 3133a70..3ab0ee6 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - Storage Server Status</title>
    4     <link href="/webform_css" rel="stylesheet" type="text/css"/>
    54    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    65  </head>
    76<body>

  • src/allmydata/web/upload-results.xhtml 

    diff --git a/src/allmydata/web/upload-results.xhtml b/src/allmydata/web/upload-results.xhtml
index 2886fc3..f9ff3f7 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - File Uploaded</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/upload-status.xhtml 

    diff --git a/src/allmydata/web/upload-status.xhtml b/src/allmydata/web/upload-status.xhtml
index 7c5633f..0ea9d08 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1">
    22  <head>
    33    <title>Tahoe-LAFS - File Upload Status</title>
    4     <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
    5     <link href="/webform_css" rel="stylesheet" type="text/css"/>
     4    <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    65    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    76  </head>
    87  <body>

  • src/allmydata/web/welcome.xhtml 

    diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
index c2b1d17..8abb312 100644
    a b  
    11<html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
    22  <title>Tahoe-LAFS - Welcome</title>
    3   <link href="/webform_css" rel="stylesheet" type="text/css"/>
    4   <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
     3  <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
    54  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    65</head><body>
    76