Business intelligence made simple
Added navbar for consistent navigation
Andrew Kaned1b46ce2f128
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex a0498f1b..693fdf52 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,5 +1,6 @@## 2.3.0 (unreleased)+- Added navbar for consistent navigation- Added support for archiving queries- Added experimental support for uploadsdiff --git a/app/assets/stylesheets/blazer/application.css b/app/assets/stylesheets/blazer/application.cssindex 4cb57fe8..497d5618 100644--- a/app/assets/stylesheets/blazer/application.css+++ b/app/assets/stylesheets/blazer/application.css@@ -12,7 +12,6 @@ pre {}body {- padding-top: 15px;padding-bottom: 15px;}@@ -141,15 +140,8 @@ input.search:focus {color: #000;}-.topbar {- position: fixed;- top: 0;- left: 0;- right: 0;- height: 60px;- z-index: 1001;- border-bottom: solid 1px whitesmoke;- background-color: #fff;+.navbar-default {+ border: none;}.glyphicon-remove {diff --git a/app/assets/stylesheets/blazer/selectize.css b/app/assets/stylesheets/blazer/selectize.cssindex 2cdb1c24..44798c04 100644--- a/app/assets/stylesheets/blazer/selectize.css+++ b/app/assets/stylesheets/blazer/selectize.css@@ -134,7 +134,7 @@}.selectize-input {border: 1px solid #d0d0d0;- padding: 8px 8px;+ padding: 7px 8px;display: inline-block;width: 100%;overflow: hidden;diff --git a/app/views/blazer/_nav.html.erb b/app/views/blazer/_nav.html.erbdeleted file mode 100644index 7a558306..00000000--- a/app/views/blazer/_nav.html.erb+++ /dev/null@@ -1,15 +0,0 @@-<div class="btn-group" style="vertical-align: top; margin-right: 5px;">- <%= link_to "Home", root_path, class: "btn btn-primary" %>- <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <span class="caret"></span>- <span class="sr-only">Toggle Dropdown</span>- </button>- <ul class="dropdown-menu">- <li><%= link_to "Checks", checks_path %></li>- <li role="separator" class="divider"></li>- <li><%= link_to "New Query", new_query_path %></li>- <li><%= link_to "New Dashboard", new_dashboard_path %></li>- <% check_params = @query ? {query_id: @query.id} : {} %>- <li><%= link_to "New Check", new_check_path(check_params) %></li>- </ul>-</div>diff --git a/app/views/blazer/_variables.html.erb b/app/views/blazer/_variables.html.erbindex d594bcc6..178c9825 100644--- a/app/views/blazer/_variables.html.erb+++ b/app/views/blazer/_variables.html.erb@@ -58,7 +58,7 @@})()</script><% else %>- <%= text_field_tag var, params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !params[var], class: "form-control" %>+ <%= text_field_tag var, params[var], style: "width: 120px; margin-right: 20px; margin-left: 5px;", autofocus: i == 0 && !var.end_with?("_at") && !params[var], class: "form-control" %><% end %><% end %>diff --git a/app/views/blazer/checks/_form.html.erb b/app/views/blazer/checks/_form.html.erbindex ceaf4e44..692c8337 100644--- a/app/views/blazer/checks/_form.html.erb+++ b/app/views/blazer/checks/_form.html.erb@@ -74,6 +74,5 @@<%= link_to "Delete", check_path(@check), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %><% end %><%= f.submit "Save", class: "btn btn-success" %>- <%= link_to "Back", :back, class: "btn btn-link" %></p><% end %>diff --git a/app/views/blazer/checks/index.html.erb b/app/views/blazer/checks/index.html.erbindex 53eb7c6f..07e04f3e 100644--- a/app/views/blazer/checks/index.html.erb+++ b/app/views/blazer/checks/index.html.erb@@ -1,22 +1,6 @@<% blazer_title "Checks" %><div id="header">- <div class="pull-right" style="line-height: 34px;">- <div class="btn-group">- <%= link_to "New Check", new_check_path, class: "btn btn-info" %>- <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <span class="caret"></span>- <span class="sr-only">Toggle Dropdown</span>- </button>- <ul class="dropdown-menu">- <li><%= link_to "Home", root_path %></li>- <li role="separator" class="divider"></li>- <li><%= link_to "New Query", new_query_path %></li>- <li><%= link_to "New Dashboard", new_dashboard_path %></li>- </ul>- </div>- </div>-<input id="search" type="text" placeholder="Start typing a query or state" style="width: 300px; display: inline-block;" class="search form-control" /></div>diff --git a/app/views/blazer/dashboards/_form.html.erb b/app/views/blazer/dashboards/_form.html.erbindex a57d3031..3a22719b 100644--- a/app/views/blazer/dashboards/_form.html.erb+++ b/app/views/blazer/dashboards/_form.html.erb@@ -26,7 +26,6 @@<%= link_to "Delete", dashboard_path(@dashboard), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger"%><% end %><%= f.submit "Save", class: "btn btn-success" %>- <%= link_to "Back", :back, class: "btn btn-link" %></p><% end %>diff --git a/app/views/blazer/dashboards/show.html.erb b/app/views/blazer/dashboards/show.html.erbindex d35a5199..37340920 100644--- a/app/views/blazer/dashboards/show.html.erb+++ b/app/views/blazer/dashboards/show.html.erb@@ -1,23 +1,14 @@<% blazer_title @dashboard.name %>-<div class="topbar">- <div class="container">- <div class="row" style="padding-top: 13px;">- <div class="col-sm-9">- <%= render partial: "blazer/nav" %>- <h3 style="line-height: 34px; display: inline; margin-left: 5px;">- <%= @dashboard.name %>- </h3>- </div>- <div class="col-sm-3 text-right">- <%= link_to "Edit", edit_dashboard_path(@dashboard, variable_params(@dashboard)), class: "btn btn-info" %>- </div>- </div>+<div class="row" style="margin-bottom: 15px;">+ <div class="col-sm-9">+ <h3 style="margin-top: 0; margin-bottom: 0; line-height: 34px;"><%= @dashboard.name %></h3>+ </div>+ <div class="col-sm-3 text-right">+ <%= link_to "Edit", edit_dashboard_path(@dashboard, variable_params(@dashboard)), class: "btn btn-info" %></div></div>-<div style="margin-bottom: 60px;"></div>-<% if @data_sources.any? { |ds| ds.cache_mode != "off" } %><p class="text-muted" style="float: right;">Some queries may be cached@@ -25,6 +16,8 @@</p><% end %>+<hr style="margin-top: 0;" />+<% if @bind_vars.any? %><%= render partial: "blazer/variables", locals: {action: dashboard_path(@dashboard)} %><% else %>diff --git a/app/views/blazer/queries/_form.html.erb b/app/views/blazer/queries/_form.html.erbindex 7585a1dc..463481ee 100644--- a/app/views/blazer/queries/_form.html.erb+++ b/app/views/blazer/queries/_form.html.erb@@ -14,8 +14,7 @@</div><div class="form-group text-right" style="margin-bottom: 8px;"><div class="pull-left" style="margin-top: 8px;">- <%= link_to "Back", :back %>- <a :href="docsPath" target="_blank" style="margin-left: 40px;">Docs</a>+ <a :href="docsPath" target="_blank">Docs</a><a :href="schemaPath" target="_blank" style="margin-left: 40px;">Schema</a></div>diff --git a/app/views/blazer/queries/docs.html.erb b/app/views/blazer/queries/docs.html.erbindex 503c46a2..de6d35b8 100644--- a/app/views/blazer/queries/docs.html.erb+++ b/app/views/blazer/queries/docs.html.erb@@ -1,6 +1,6 @@<% blazer_title "Docs: #{@data_source.name}" %>-<h1>Docs: <%= @data_source.name %></h1>+<h1 style="line-height: 34px;">Docs: <%= @data_source.name %></h1><hr />diff --git a/app/views/blazer/queries/home.html.erb b/app/views/blazer/queries/home.html.erbindex 18f088c3..0049c38d 100644--- a/app/views/blazer/queries/home.html.erb+++ b/app/views/blazer/queries/home.html.erb@@ -8,25 +8,8 @@<%= link_to "Viewed", root_path(filter: "viewed"), class: params[:filter] == "viewed" ? "active" : nil, style: "margin-right: 40px;" %><% end %>- <%= link_to "Mine", root_path(filter: "mine"), class: params[:filter] == "mine" ? "active" : nil, style: "margin-right: 40px;" %>+ <%= link_to "Mine", root_path(filter: "mine"), class: params[:filter] == "mine" ? "active" : nil, style: "margin-right: 8px;" %><% end %>-- <div class="btn-group">- <%= link_to "New Query", new_query_path, class: "btn btn-info" %>- <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <span class="caret"></span>- <span class="sr-only">Toggle Dropdown</span>- </button>- <ul class="dropdown-menu">- <li><%= link_to "Checks", checks_path %></li>- <% if Blazer.uploads? %>- <li><%= link_to "Uploads", uploads_path %></li>- <% end %>- <li role="separator" class="divider"></li>- <li><%= link_to "New Dashboard", new_dashboard_path %></li>- <li><%= link_to "New Check", new_check_path %></li>- </ul>- </div></div><input type="text" v-model="searchTerm" placeholder="Start typing a query, dashboard, or person" style="width: 300px; display: inline-block;" v-focus class="search form-control" /></div>diff --git a/app/views/blazer/queries/schema.html.erb b/app/views/blazer/queries/schema.html.erbindex be3b2897..fe0bf7b2 100644--- a/app/views/blazer/queries/schema.html.erb+++ b/app/views/blazer/queries/schema.html.erb@@ -1,6 +1,6 @@<% blazer_title "Schema: #{@data_source.name}" %>-<h1>Schema: <%= @data_source.name %></h1>+<h1 style="line-height: 34px;">Schema: <%= @data_source.name %></h1><hr />diff --git a/app/views/blazer/queries/show.html.erb b/app/views/blazer/queries/show.html.erbindex afe42c31..c703333c 100644--- a/app/views/blazer/queries/show.html.erb+++ b/app/views/blazer/queries/show.html.erb@@ -1,28 +1,19 @@<% blazer_title @query.name %>-<div class="topbar">- <div class="container">- <div class="row" style="padding-top: 13px;">- <div class="col-sm-9">- <%= render partial: "blazer/nav" %>- <h3 style="line-height: 34px; display: inline; margin-left: 5px;">- <%= @query.name %>- </h3>- </div>- <div class="col-sm-3 text-right">- <%= link_to "Edit", edit_query_path(@query, variable_params(@query)), class: "btn btn-default", disabled: [email protected]?(blazer_user) %>- <%= link_to "Fork", new_query_path(variable_params(@query).merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info" %>+<div class="row" style="margin-bottom: 15px;">+ <div class="col-sm-9">+ <h3 style="margin-top: 0; margin-bottom: 0; line-height: 34px;"><%= @query.name %></h3>+ </div>+ <div class="col-sm-3 text-right">+ <%= link_to "Edit", edit_query_path(@query, variable_params(@query)), class: "btn btn-default", disabled: [email protected]?(blazer_user) %>+ <%= link_to "Fork", new_query_path(variable_params(@query).merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info" %>- <% if !@error && @success %>- <%= button_to "Download", run_queries_path(query_id: @query.id, format: "csv", forecast: params[:forecast]), params: {statement: @statement}, class: "btn btn-primary" %>- <% end %>- </div>- </div>+ <% if !@error && @success %>+ <%= button_to "Download", run_queries_path(query_id: @query.id, format: "csv", forecast: params[:forecast]), params: {statement: @statement}, class: "btn btn-primary" %>+ <% end %></div></div>-<div style="margin-bottom: 60px;"></div>-<% if @sql_errors.any? %><div class="alert alert-danger"><ul>@@ -37,6 +28,10 @@<p><%= @query.description %></p><% end %>+<% if @bind_vars.any? %>+ <hr style="margin-top: 0;" />+<% end %>+<%= render partial: "blazer/variables", locals: {action: query_path(@query)} %><pre id="code"><code><%= @statement %></code></pre>@@ -49,7 +44,7 @@<script>function showRun(data) {$("#results").html(data)- $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 60})+ $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 0})}function showError(message) {diff --git a/app/views/blazer/uploads/_form.html.erb b/app/views/blazer/uploads/_form.html.erbindex ddb4caa6..281cb635 100644--- a/app/views/blazer/uploads/_form.html.erb+++ b/app/views/blazer/uploads/_form.html.erb@@ -22,6 +22,5 @@<%= link_to "Delete", upload_path(@upload), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %><% end %><%= f.submit "Save", class: "btn btn-success" %>- <%= link_to "Back", :back, class: "btn btn-link" %></p><% end %>diff --git a/app/views/blazer/uploads/index.html.erb b/app/views/blazer/uploads/index.html.erbindex 48f4884a..2a739f7c 100644--- a/app/views/blazer/uploads/index.html.erb+++ b/app/views/blazer/uploads/index.html.erb@@ -1,23 +1,6 @@<% blazer_title "Uploads" %><div id="header">- <div class="pull-right" style="line-height: 34px;">- <div class="btn-group">- <%= link_to "New Upload", new_upload_path, class: "btn btn-info" %>- <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <span class="caret"></span>- <span class="sr-only">Toggle Dropdown</span>- </button>- <ul class="dropdown-menu">- <li><%= link_to "Home", root_path %></li>- <li role="separator" class="divider"></li>- <li><%= link_to "New Query", new_query_path %></li>- <li><%= link_to "New Dashboard", new_dashboard_path %></li>- <li><%= link_to "New Check", new_check_path %></li>- </ul>- </div>- </div>-<input id="search" type="text" placeholder="Start typing a table or person" style="width: 300px; display: inline-block;" class="search form-control" /></div>diff --git a/app/views/layouts/blazer/application.html.erb b/app/views/layouts/blazer/application.html.erbindex 52462e98..6ba29d95 100644--- a/app/views/layouts/blazer/application.html.erb+++ b/app/views/layouts/blazer/application.html.erb@@ -17,6 +17,29 @@<%= csrf_meta_tags %></head><body>+ <nav class="navbar navbar-default">+ <div class="container">+ <ul class="nav navbar-nav">+ <li><%= link_to "Blazer", root_path, class: "navbar-brand", style: "margin-left: 0;" %></li>+ <li class="dropdown">+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Create <span class="caret"></span></a>+ <ul class="dropdown-menu">+ <li><%= link_to "Query", new_query_path %></li>+ <li><%= link_to "Dashboard", new_dashboard_path %></li>+ <li><%= link_to "Check", new_check_path(query_id: @query.try(:id)) %></li>+ <% if Blazer.uploads? %>+ <li role="separator" class="divider"></li>+ <li><%= link_to "Upload", new_upload_path %></li>+ <% end %>+ </ul>+ </li>+ <li><%= link_to "Checks", checks_path %></li>+ <% if Blazer.uploads? %>+ <li><%= link_to "Uploads", uploads_path %></li>+ <% end %>+ </ul>+ </div>+ </nav><div class="container"><%= yield %></div>