You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/01/08 20:30:55 UTC
[50/50] [abbrv] allura git commit: [#7919] link to new Tools page
describing moved functionality; keep old Tools page hidden for now
[#7919] link to new Tools page describing moved functionality; keep old Tools page hidden for now
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/25c7d96e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/25c7d96e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/25c7d96e
Branch: refs/heads/master
Commit: 25c7d96e20ae02ccd4c5c4d3d47c7d92fad059b7
Parents: 363ba77
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Jan 4 17:34:52 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jan 8 14:06:19 2016 -0500
----------------------------------------------------------------------
Allura/allura/ext/admin/admin_main.py | 6 +++-
.../admin/templates/project_tools_moved.html | 33 ++++++++++++++++++++
Allura/allura/tests/functional/test_admin.py | 2 +-
3 files changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/25c7d96e/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index b734e1b..d1c04d3 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -146,7 +146,7 @@ class AdminApp(Application):
SitemapEntry('Screenshots', admin_url + 'screenshots'),
SitemapEntry('Categorization', admin_url + 'trove')
]
- links.append(SitemapEntry('Tools', admin_url + 'tools'))
+ links.append(SitemapEntry('Tools', admin_url + 'tools_moved'))
if asbool(config.get('bulk_export_enabled', True)):
links.append(SitemapEntry('Export', admin_url + 'export'))
if c.project.is_root and has_access(c.project, 'admin')():
@@ -261,6 +261,10 @@ class ProjectAdminController(BaseController):
trove_parent_id=0, shortname='license')
return dict(base_troves=base_troves, license_trove=license_trove, topic_trove=topic_trove)
+ @expose('jinja:allura.ext.admin:templates/project_tools_moved.html')
+ def tools_moved(self, **kw):
+ return {}
+
@without_trailing_slash
@expose('jinja:allura.ext.admin:templates/project_tools.html')
def tools(self, page=None, limit=200, **kw):
http://git-wip-us.apache.org/repos/asf/allura/blob/25c7d96e/Allura/allura/ext/admin/templates/project_tools_moved.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_tools_moved.html b/Allura/allura/ext/admin/templates/project_tools_moved.html
new file mode 100644
index 0000000..11a940b
--- /dev/null
+++ b/Allura/allura/ext/admin/templates/project_tools_moved.html
@@ -0,0 +1,33 @@
+{#-
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-#}
+{% extends g.theme.master %}
+
+{% block title %}{{c.project.name}} / Tools{% endblock %}
+
+{% block header %}Tools{% endblock %}
+
+{% block content %}
+<h2>Tool installation and management has moved.</h2>
+
+<p>To add a tool, use the "Add New" link in the menu above.</p>
+
+<p>To change settings or remove a tool, click the <i class="fa fa-lock"></i> icon above to unlock the project menu.
+Then click the <i class="fa fa-cog"></i> icon of any tool, to access its settings.
+</p>
+{% endblock %}
http://git-wip-us.apache.org/repos/asf/allura/blob/25c7d96e/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 4604c8c..cff3c70 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -73,7 +73,7 @@ class TestProjectAdmin(TestController):
assert 'Test Subproject' not in r
assert 'Milkshakes are for crazy monkeys' in r
sidebar = r.html.find(id='sidebar')
- assert sidebar.find('a', href='/p/test/admin/tools'), sidebar
+ assert sidebar.find('a', href='/p/test/admin/overview'), sidebar
# Add a subproject
with audits('create subproject test-subproject'):