jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-25 01:03:20 -05:00
Code Issues Projects Releases Wiki Activity

Make signed out layout more modular

Browse Source
This commit is contained in:
Arik Fraimovich
2016-03-20 10:07:10 +02:00
parent ea57175bfa
commit fbb81b62d6
10 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/settings.rst
View File

@@ -29,7 +29,6 @@ The follow is a list of settings and what they control:
- **REDASH_JOB_EXPIRY_TIME**: *default 3600 * 6*
- **REDASH_COOKIE_SECRET**: *default "c292a0a3aa32397cdb050e233733900f"*
- **REDASH_LOG_LEVEL**: *default "INFO"*
- **REDASH_ANALYTICS**: *default ""*
- **REDASH_MAIL_SERVER**: *default "localhost"*
- **REDASH_MAIL_PORT**: *default 25*
- **REDASH_MAIL_USE_TLS**: *default "false"*

3
rd_ui/app/app_layout.html
View File

@@ -105,9 +105,6 @@
};
currentUser.isAdmin = currentUser.hasPermission('admin');
{{ analytics|safe }}
</script>
{% include '_includes/tail.html' %}

2
rd_ui/app/embed.html
View File

@@ -74,8 +74,6 @@
var clientConfig = {{ client_config|safe }};
var visualization = {{ visualization|safe }};
var query_result = {{ query_result|safe }};
{{ analytics|safe }}
</script>
</body>

12
rd_ui/app/signed_out_layout.html
View File

@@ -20,13 +20,7 @@
</head>
<body>
<nav class="navbar navbar-default navbar-trans navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="/"><img src="/images/logo_white.png"/></a>
</div>
</div>
</nav>
{% include '_includes/signed_out_navbar.html' %}
<div class="container content">
{% block content %}
@@ -37,9 +31,7 @@
<script src="/bower_components/jquery/jquery.js"></script>
<!-- endbuild -->
<script>
{{ analytics|safe }}
</script>
{% include '_includes/signed_out_tail.html' %}
</body>
</html>

1
redash/handlers/authentication.py
View File

@@ -110,7 +110,6 @@ def login(org_slug=None):
return render_template("login.html",
name=settings.NAME,
analytics=settings.ANALYTICS,
org_slug=org_slug,
next=next_path,
username=request.form.get('username', ''),

6
redash/handlers/embed.py
View File

@@ -45,8 +45,7 @@ def embed(query_id, visualization_id, org_slug=None):
base_href=base_href(),
client_config=json_dumps(client_config),
visualization=json_dumps(vis),
query_result=json_dumps(qr),
analytics=settings.ANALYTICS)
query_result=json_dumps(qr))
@routes.route(org_scoped_rule('/public/dashboards/<token>'), methods=['GET'])
@@ -76,7 +75,6 @@ def public_dashboard(token, org_slug=None):
}),
base_href=base_href(),
name=settings.NAME,
client_config=json.dumps(settings.COMMON_CLIENT_CONFIG),
analytics=settings.ANALYTICS)
client_config=json.dumps(settings.COMMON_CLIENT_CONFIG))
return response, 200, headers

3
redash/handlers/static.py
View File

@@ -60,8 +60,7 @@ def index(**kwargs):
base_href=base_href(),
name=settings.NAME,
org_slug=current_org.slug,
client_config=json.dumps(client_config),
analytics=settings.ANALYTICS)
client_config=json.dumps(client_config))
return response, 200, headers

1
redash/settings.py
View File

@@ -97,7 +97,6 @@ STATIC_ASSETS_PATHS = [fix_assets_path(path) for path in os.environ.get("REDASH_
JOB_EXPIRY_TIME = int(os.environ.get("REDASH_JOB_EXPIRY_TIME", 3600 * 6))
COOKIE_SECRET = os.environ.get("REDASH_COOKIE_SECRET", "c292a0a3aa32397cdb050e233733900f")
LOG_LEVEL = os.environ.get("REDASH_LOG_LEVEL", "INFO")
ANALYTICS = os.environ.get("REDASH_ANALYTICS", "")
# Mail settings:
MAIL_SERVER = os.environ.get('REDASH_MAIL_SERVER', 'localhost')

7
redash/templates/_includes/signed_out_navbar.html Normal file
View File

@@ -0,0 +1,7 @@
<nav class="navbar navbar-default navbar-trans navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="/"><img src="/images/logo_white.png"/></a>
</div>
</div>
</nav>

0
redash/templates/_includes/signed_out_tail.html Normal file
View File