]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
projects / tahoe-lafs / tahoe-lafs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 705c47f)
properly describe saving incident reports. closes #1974 43/head
authorLeif Ryge <leif@synthesize.us>
Sun, 19 May 2013 07:31:43 +0000 (07:31 +0000)
committerLeif Ryge <leif@synthesize.us>
Sun, 19 May 2013 07:31:43 +0000 (07:31 +0000)
src/allmydata/test/test_web.py patch | blob | history
src/allmydata/web/root.py patch | blob | history
src/allmydata/web/welcome.xhtml patch | blob | history

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 3b12549ca2babf2568258d28dacd11a085e3a1f8..9db671c62c0e21f415a25282ba1fad512c0f9165 100644 (file)
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -4377,7 +4377,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
         d = self.POST("/report_incident", details="eek")
         def _done(res):
             self.failIfIn("<html>", res)
-            self.failUnlessIn("Thank you for your report!", res)
+            self.failUnlessIn("An incident report has been saved", res)
         d.addCallback(_done)
         return d
 
diff --git a/src/allmydata/web/root.py b/src/allmydata/web/root.py
index b4b7a85c508f1224cdf3148f5cd07bdb0fadbc54..03ff87f0927d46edf52c838af2c0ca28b822d266 100644 (file)
--- a/src/allmydata/web/root.py
+++ b/src/allmydata/web/root.py
@@ -123,7 +123,7 @@ class IncidentReporter(RenderMixin, rend.Page):
                 details=get_arg(req, "details", ""),
                 level=log.WEIRD, umid="LkD9Pw")
         req.setHeader("content-type", "text/plain")
-        return "Thank you for your report!"
+        return "An incident report has been saved to logs/incidents/ in the node directory."
 
 SPACE = u"\u00A0"*2
 
@@ -383,6 +383,6 @@ class Root(rend.Page):
             T.input(type="hidden", name="t", value="report-incident"),
             "What went wrong?"+SPACE,
             T.input(type="text", name="details"), SPACE,
-            T.input(type="submit", value=u"Report \u00BB"),
+            T.input(type="submit", value=u"Save \u00BB"),
             ]]
         return T.div[form]
diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
index 9e1228e7011b675e8baa4778bbcf0180e09a86a5..0b796b2282a5154c7a22dbf0dbd4b63c456cbee8 100644 (file)
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -121,7 +121,7 @@
             <hr/>
             <div class="nav-header">
               <ul class="nav nav-list">
-                <li class="nav-header">Report an Incident</li>
+                <li class="nav-header">Save incident report</li>
                 <li><div n:render="incident_button" /></li>
               </ul>
             </div>
Unnamed repository; edit this file 'description' to name the repository.