diff --git a/app/helpers/chart_helper.rb b/app/helpers/chart_helper.rb index 9f610e1..738078d 100644 --- a/app/helpers/chart_helper.rb +++ b/app/helpers/chart_helper.rb @@ -1,15 +1,15 @@ module ChartHelper - def baas_chart(id, chart_options) + def archiving_chart(id, chart_options) html = <<-HTML HTML html.html_safe end end diff --git a/app/views/admin/clients/_client_graphs.html.erb b/app/views/admin/clients/_client_graphs.html.erb index 87999e2..b821d31 100644 --- a/app/views/admin/clients/_client_graphs.html.erb +++ b/app/views/admin/clients/_client_graphs.html.erb @@ -1,18 +1,18 @@
<%= bootstrap_form_tag(url: path, method: :post, layout: :inline) do |f| %> <%= f.select(:days_back, [['1 week', 7], ['2 weeks', 14], ['1 month', 30]]) %> <%= f.submit 'See Stats', class: "btn btn-primary" %> <% end %>
-<%= baas_chart('jobs_status', @job_status) %> -<%= baas_chart('jobs_stats', @job_stats) %> +<%= archiving_chart('jobs_status', @job_status) %> +<%= archiving_chart('jobs_stats', @job_stats) %> diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb index be1cc05..b6ad4f1 100644 --- a/app/views/admin/index.html.erb +++ b/app/views/admin/index.html.erb @@ -1,3 +1,3 @@ -

BaaS

+

Archiving

<%= render partial: 'clients/client_graphs', locals: { path: admin_path } %> diff --git a/app/views/clients/_client_graphs.html.erb b/app/views/clients/_client_graphs.html.erb index a84a14b..1d9fda8 100644 --- a/app/views/clients/_client_graphs.html.erb +++ b/app/views/clients/_client_graphs.html.erb @@ -1,18 +1,18 @@
<%= bootstrap_form_tag(url: path, method: :post, layout: :inline) do |f| %> <%= f.select(:days_back, [['1 week', 7], ['2 weeks', 14], ['1 month', 30]], selected: params[:days_back]) %> <%= f.submit 'See Stats', class: "btn btn-primary" %> <% end %>
-<%= baas_chart('jobs_status', @job_status) %> -<%= baas_chart('jobs_stats', @job_stats) %> +<%= archiving_chart('jobs_status', @job_status) %> +<%= archiving_chart('jobs_stats', @job_stats) %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cd4be5e..0f367aa 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,29 +1,29 @@ - Baas + Archiving <%= stylesheet_link_tag 'application', media: 'all' %> <%= javascript_include_tag 'application' %> <%= csrf_meta_tags %> <%= render "shared/nav" %>
<%= flash_messages %> <%= yield %>
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index 76baa0a..4ba6cef 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -1,7 +1,7 @@ namespace :db do desc 'Create schema migrations on local database' task :generate_migrations => :environment do - ActiveRecord::Base.establish_connection(Baas::settings[:local_db]). + ActiveRecord::Base.establish_connection(Archiving::settings[:local_db]). connection.execute("CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL, UNIQUE KEY `unique_schema_migrations` (`version`));") end end diff --git a/lib/tasks/user.rake b/lib/tasks/user.rake index 8c10052..61c8826 100644 --- a/lib/tasks/user.rake +++ b/lib/tasks/user.rake @@ -1,11 +1,11 @@ namespace :user do desc 'Create a temp user for development reasons' task :generate_user => :environment do |t| u = User.new - u.username = 'baas_dev' - u.email = 'baas_dev@example.com' + u.username = 'archiving_dev' + u.email = 'archiving_dev@example.com' u.user_type = :admin u.save end end