allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [4/6] allura git commit: [#3593] insert pre-step
Date Wed, 13 Jul 2016 20:47:07 GMT
[#3593] insert pre-step


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

Branch: refs/heads/master
Commit: fb632ade8f4ca87adfb1b6388b915f8be6a9ddbc
Parents: e60a450
Author: Dave Brondsema <dave@brondsema.net>
Authored: Mon Jul 11 17:15:25 2016 -0400
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Wed Jul 13 16:38:21 2016 -0400

----------------------------------------------------------------------
 Allura/allura/controllers/project.py                 |  4 +---
 Allura/allura/ext/admin/templates/project_admin.html | 11 ++++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/fb632ade/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 9d24dac..5e9a510 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -236,9 +236,7 @@ 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 your new project on %s!'
-              'To get started, fill out some information about your project.' % config['site_name'])
-        redirect(c.project.script_name + 'admin/')
+        redirect(c.project.script_name + 'admin/?first-visit')
 
     @expose()
     def icon(self, **kw):

http://git-wip-us.apache.org/repos/asf/allura/blob/fb632ade/Allura/allura/ext/admin/templates/project_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_admin.html b/Allura/allura/ext/admin/templates/project_admin.html
index 2d42a68..1a55c48 100644
--- a/Allura/allura/ext/admin/templates/project_admin.html
+++ b/Allura/allura/ext/admin/templates/project_admin.html
@@ -23,7 +23,7 @@
 
 {% block title %}{{c.project.name}} / Admin Welcome{% endblock %}
 
-{% block header %}Welcome to your {{config.site_name}} project!{% endblock %}
+{% block header %}Welcome to your {{config.site_name}} project!<span class="title-end"></span>{%
endblock %}
 
 {% set tour = {
     "id": "admin-welcome",
@@ -69,6 +69,15 @@
         },
     ]
 } %}
+{% if 'first-visit' in request.params %}
+    {% do tour['steps'].insert(0, {
+        "title": "Welcome to your new project!",
+        "content": "Here's a quick tour to show you around.",
+        "target": "h2.title .title-end",
+        "placement": "right",
+        "yOffset": -26,
+    }) %}
+{% endif %}
 
 
 {% block content %}


Mime
View raw message