You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2017/08/04 13:44:36 UTC
allura git commit: Stronger delete tool messaging (since some people
may use it while on an individual thread page)
Repository: allura
Updated Branches:
refs/heads/master 359b36597 -> 02abc76d2
Stronger delete tool messaging (since some people may use it while on an individual thread page)
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/02abc76d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/02abc76d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/02abc76d
Branch: refs/heads/master
Commit: 02abc76d2e7ada295c76ab0da8c50e0b01f9cd0a
Parents: 359b365
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Jul 28 12:02:34 2017 -0400
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Fri Aug 4 13:27:52 2017 +0000
----------------------------------------------------------------------
Allura/allura/app.py | 2 +-
Allura/allura/templates/app_admin_delete.html | 2 +-
Allura/allura/tests/functional/test_home.py | 2 +-
ForgeWiki/forgewiki/tests/functional/test_root.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/02abc76d/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 04b4676..6c97169 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -655,7 +655,7 @@ class Application(object):
anchored = self.tool_label.lower() in anchored_tools.keys()
if self.uninstallable and not anchored:
return SitemapEntry(
- label='Delete',
+ label='Delete Everything',
url=self.admin_url + 'delete',
className='admin_modal',
)
http://git-wip-us.apache.org/repos/asf/allura/blob/02abc76d/Allura/allura/templates/app_admin_delete.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_delete.html b/Allura/allura/templates/app_admin_delete.html
index 953a35d..1f66697 100644
--- a/Allura/allura/templates/app_admin_delete.html
+++ b/Allura/allura/templates/app_admin_delete.html
@@ -19,7 +19,7 @@
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
<form method="POST" action="{{c.project.url()}}admin/update_mounts">
-<p>Warning: This will destroy all data in the '{{ app.config.options.mount_point }}' tool and is irreversible!</p>
+<p>Warning: This will destroy ALL DATA in the '{{ app.config.options.mount_point }}' tool and is irreversible!</p>
<hr>
<p>
<input type="submit" value="Delete" class="delete-tool">
http://git-wip-us.apache.org/repos/asf/allura/blob/02abc76d/Allura/allura/tests/functional/test_home.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_home.py b/Allura/allura/tests/functional/test_home.py
index 641fe1c..9798f8c 100644
--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -71,7 +71,7 @@ class TestProjectHome(TestController):
'href': '/p/test/admin/wiki/permissions',
}, m['admin_options'])
assert_in({'className': 'admin_modal',
- 'text': 'Delete',
+ 'text': 'Delete Everything',
'href': '/p/test/admin/wiki/delete',
}, m['admin_options'])
break
http://git-wip-us.apache.org/repos/asf/allura/blob/02abc76d/ForgeWiki/forgewiki/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index a220def..c4590c7 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -863,7 +863,7 @@ class TestRootController(TestController):
menu = [li.find('span').getText() for li in menu.findAll('li')]
assert_equal(
menu,
- ['Set Home', 'Permissions', 'Options', 'Rename', 'Delete'])
+ ['Set Home', 'Permissions', 'Options', 'Rename', 'Delete Everything'])
def test_sidebar_admin_menu_is_expanded(self):
r = self.app.get('/p/test/admin/wiki/permissions')