Ticket #1735: 1735-helper_banner_highlight_v2.diff
File 1735-helper_banner_highlight_v2.diff, 4.9 KB (added by kick1, at 2012-09-07T04:39:37Z) |
---|
-
src/allmydata/test/test_web.py
diff --git src/allmydata/test/test_web.py src/allmydata/test/test_web.py index 2483236..826d44a 100644
class FakeNodeMaker(NodeMaker): 79 79 80 80 class FakeUploader(service.Service): 81 81 name = "uploader" 82 helper_furl = None 83 helper_connected = False 82 84 def upload(self, uploadable): 83 85 d = uploadable.get_size() 84 86 d.addCallback(lambda size: uploadable.read(size)) … … class FakeUploader(service.Service): 100 102 d.addCallback(_got_data) 101 103 return d 102 104 def get_helper_info(self): 103 return ( None, False)105 return (self.helper_furl, self.helper_connected) 104 106 105 107 def build_one_ds(): 106 108 ds = DownloadStatus("storage_index", 1234) … … class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi 535 537 fileutil.make_dirs("web/test_welcome/private") 536 538 return self.GET("/") 537 539 d.addCallback(_check) 540 541 #set furl not connected, furl is string 'None' 542 def _checkPreHelperNotConfigured1(res): 543 self.s.uploader.helper_furl = 'None' 544 return self.GET("/") 545 def _checkHelperNotConfigured1(res): 546 self.failUnlessIn('Connected to helper?: <span>not configured</span>',res); 547 548 d.addCallback(_checkPreHelperNotConfigured1) 549 d.addCallback(_checkHelperNotConfigured1) 550 551 #set furl not connected, furl is obj None 552 def _checkPreHelperNotConfigured2(res): 553 self.s.uploader.helper_furl = None 554 return self.GET("/") 555 def _checkHelperNotConfigured2(res): 556 self.failUnlessIn('Connected to helper?: <span>not configured</span>',res); 557 558 d.addCallback(_checkPreHelperNotConfigured2) 559 d.addCallback(_checkHelperNotConfigured2) 560 561 562 563 #enable helper, not connected 564 def _checkPreHelperNotConnected(res): 565 self.s.uploader.helper_furl = "someHelperFurl" 566 self.s.uploader.helper_connected = False 567 return self.GET("/") 568 def _checkHelperNotConnected(res): 569 self.failUnlessIn('Connected to helper?: <span>no</span>',res); 570 571 d.addCallback(_checkPreHelperNotConnected) 572 d.addCallback(_checkHelperNotConnected) 573 574 575 #enable helper, connected 576 def _checkPreHelperConnected(res): 577 self.s.uploader.helper_furl = "someHelperFurl" 578 self.s.uploader.helper_connected = True 579 return self.GET("/") 580 def _checkHelperConnected(res): 581 self.failUnlessIn('Connected to helper?: <span>yes</span>',res); 582 583 d.addCallback(_checkPreHelperConnected) 584 d.addCallback(_checkHelperConnected) 585 538 586 return d 539 587 588 540 589 def test_status(self): 541 590 h = self.s.get_history() 542 591 dl_num = h.list_all_download_statuses()[0].get_counter() -
src/allmydata/web/root.py
diff --git src/allmydata/web/root.py src/allmydata/web/root.py index 2cd315d..1796d40 100644
class Root(rend.Page): 212 212 return None 213 213 furl, connected = uploader.get_helper_info() 214 214 return furl 215 216 217 def data_connected_to_helper_description(self,ctx,data): 218 val = self.data_connected_to_helper(ctx,data) 219 if val == "not-configured": 220 return "not configured" 221 return val 222 215 223 def data_connected_to_helper(self, ctx, data): 216 224 try: 217 225 uploader = self.client.getServiceNamed("uploader") 218 226 except KeyError: 219 227 return "no" # we don't even have an Uploader 220 228 furl, connected = uploader.get_helper_info() 229 230 if furl == 'None' or furl is None: 231 return "not-configured" 221 232 if connected: 222 233 return "yes" 223 234 return "no" -
src/allmydata/web/static/tahoe.css
diff --git src/allmydata/web/static/tahoe.css src/allmydata/web/static/tahoe.css index 297bbe4..4157c61 100644
legend { 52 52 border: 1px solid #F00; 53 53 background-color: #FBB; 54 54 } 55 .connected-not-configured { 56 background-color: #FFF; 57 } 55 58 56 59 .encoded, .nodeid { 57 60 font-family: monospace; -
src/allmydata/web/welcome.xhtml
diff --git src/allmydata/web/welcome.xhtml src/allmydata/web/welcome.xhtml index 16f2cb7..464a46b 100644
47 47 <div> 48 48 <n:attr name="class">connected-<n:invisible n:render="string" n:data="connected_to_helper" /></n:attr> 49 49 <div>Helper: <span n:render="string" n:data="helper_furl" /></div> 50 <div>Connected to helper?: <span n:render="string" n:data="connected_to_helper " /></div>50 <div>Connected to helper?: <span n:render="string" n:data="connected_to_helper_description" /></div> 51 51 </div> 52 52 53 53 <p>Connected to <span n:render="string" n:data="connected_storage_servers" />