allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [07/12] allura git commit: [#3593] make Welcome admin page easy to get to; nicer notifications
Date Tue, 12 Jul 2016 14:04:32 GMT
[#3593] make Welcome admin page easy to get to; nicer notifications


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6215ab3e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6215ab3e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6215ab3e

Branch: refs/heads/db/3593
Commit: 6215ab3ec101850f3ff2b73fcb8cba17b1b829b7
Parents: ac793fe
Author: Dave Brondsema <dave@brondsema.net>
Authored: Wed Jul 6 14:47:59 2016 -0400
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Tue Jul 12 10:00:17 2016 -0400

----------------------------------------------------------------------
 Allura/allura/controllers/project.py        | 4 ++--
 Allura/allura/ext/admin/admin_main.py       | 5 ++++-
 Allura/allura/public/nf/js/jquery.notify.js | 4 ++++
 ForgeImporters/forgeimporters/base.py       | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/6215ab3e/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index ee0927b..9d24dac 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -236,9 +236,9 @@ class NeighborhoodController(object):
                 if (tool.lower() not in anchored_tools.keys()) and (c.project.app_instance(tool)
is None):
                     install_params.append(dict(ep_name=tool, ordinal=i + offset))
             c.project.install_apps(install_params)
-        flash('Welcome to the %s Project System! '
+        flash('Welcome to your new project on %s!'
               'To get started, fill out some information about your project.' % config['site_name'])
-        redirect(c.project.script_name + 'admin/overview')
+        redirect(c.project.script_name + 'admin/')
 
     @expose()
     def icon(self, **kw):

http://git-wip-us.apache.org/repos/asf/allura/blob/6215ab3e/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 322fb15..e751dc8 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -139,7 +139,10 @@ class AdminApp(Application):
                 SitemapEntry('Overview', nbhd_admin_url + 'overview'),
                 SitemapEntry('Awards', nbhd_admin_url + 'accolades')]
         else:
-            links += [SitemapEntry('Metadata', admin_url + 'overview'), ]
+            links += [
+                SitemapEntry('Welcome', admin_url),
+                SitemapEntry('Metadata', admin_url + 'overview'),
+            ]
             if c.project.neighborhood.name != "Users":
                 links += [
                     SitemapEntry('Screenshots', admin_url + 'screenshots'),

http://git-wip-us.apache.org/repos/asf/allura/blob/6215ab3e/Allura/allura/public/nf/js/jquery.notify.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/jquery.notify.js b/Allura/allura/public/nf/js/jquery.notify.js
index 52a2484..8478dc0 100644
--- a/Allura/allura/public/nf/js/jquery.notify.js
+++ b/Allura/allura/public/nf/js/jquery.notify.js
@@ -123,6 +123,10 @@
         if (opts.status === 'success') {
             opts.status = 'confirm';
         }
+        // For compatibility with the TG default of "ok"
+        if (opts.status === 'ok') {
+            opts.status = 'info';
+        }
         return $(this).each(function() {
             if (opts.message) {
                 var o = $.metadata ? $.extend(opts, $(this).metadata()) : opts;

http://git-wip-us.apache.org/repos/asf/allura/blob/6215ab3e/ForgeImporters/forgeimporters/base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index 32be2bd..22bd27c 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -310,7 +310,7 @@ class ProjectImporter(BaseController):
             ToolImporter.by_name(importer_name).post(**kw)
         M.AuditLog.log('import project from %s' % self.source)
 
-        flash('Welcome to the %s Project System! '
+        flash('Welcome to your new project on %s! '
               'Your project data will be imported and should show up here shortly.' % config['site_name'])
         redirect(c.project.script_name + 'admin/overview')
 


Mime
View raw message