Merge pull request getredash#134 from EverythingMe/feature_roles

Feature: control the system name
hailocab · Mar 12, 2014 · 3b34b1c · 3b34b1c
2 parents f07428a + ae3151d
commit 3b34b1c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/rd_ui/app/index.html b/rd_ui/app/index.html
@@ -4,7 +4,7 @@
 <!--[if IE 8]>         <html class="no-js lt-ie9" ng-app="redash" ng-controller='MainCtrl'> <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" ng-app="redash" ng-controller='MainCtrl'> <!--<![endif]-->
 <head>
-    <title ng-bind="'re:dash | ' + pageTitle"></title>
+    <title ng-bind="'{{name}} | ' + pageTitle"></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
@@ -29,7 +29,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/"><strong>re:dash</strong></a>
+        <a class="navbar-brand" href="/"><strong>{{name}}</strong></a>
     </div>
     {% raw %}
     <div class="collapse navbar-collapse navbar-ex1-collapse">

diff --git a/rd_ui/app/login.html b/rd_ui/app/login.html
@@ -4,7 +4,7 @@
 <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
 <head>
-    <title>re:dash Login</title>
+    <title>{{name}} Login</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
@@ -26,7 +26,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/"><strong>re:dash</strong></a>
+        <a class="navbar-brand" href="/"><strong>{{name}}</strong></a>
     </div>
     </div>
 </nav>

diff --git a/redash/controllers.py b/redash/controllers.py
@@ -50,7 +50,8 @@ def index(**kwargs):
         'permissions': current_user.permissions
     }
 
-    return render_template("index.html", user=json.dumps(user), analytics=settings.ANALYTICS)
+    return render_template("index.html", user=json.dumps(user), name=settings.NAME,
+                           analytics=settings.ANALYTICS)
 
 
 @app.route('/login', methods=['GET', 'POST'])
@@ -70,6 +71,7 @@ def login():
             return redirect(request.args.get('next') or '/')
 
     return render_template("login.html",
+                           name=settings.NAME,
                            analytics=settings.ANALYTICS,
                            next=request.args.get('next'),
                            username=request.form.get('username', ''),

diff --git a/redash/settings.py b/redash/settings.py
@@ -44,6 +44,8 @@ def parse_boolean(str):
 STATSD_PORT = int(os.environ.get('REDASH_STATSD_PORT', "8125"))
 STATSD_PREFIX = os.environ.get('REDASH_STATSD_PREFIX', "redash")
 
+NAME = os.environ.get('REDASH_NAME', 're:dash')
+
 # "pg", "graphite" or "mysql"
 CONNECTION_ADAPTER = os.environ.get("REDASH_CONNECTION_ADAPTER", "pg")
 # Connection string for the database that is used to run queries against. Examples: