From ce3230f21aba8e1ad73ca537c5008651955f8eeb Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 6 Feb 2017 15:54:26 +0800 Subject: [PATCH] added progress --- app/assets/javascripts/registered_site_progress.js | 1 + app/assets/stylesheets/registered_site_progress.css.scss | 3 +++ app/controllers/admin/registered_sites_controller.rb | 3 +++ app/views/admin/registered_sites/_index.html.erb | 1 + app/views/admin/registered_sites/progress.html.erb | 8 ++++++++ config/locales/en.yml | 1 + config/locales/zh_tw.yml | 1 + config/routes.rb | 6 +++++- 8 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/registered_site_progress.js create mode 100644 app/assets/stylesheets/registered_site_progress.css.scss create mode 100644 app/views/admin/registered_sites/progress.html.erb diff --git a/app/assets/javascripts/registered_site_progress.js b/app/assets/javascripts/registered_site_progress.js new file mode 100644 index 0000000..6d772dd --- /dev/null +++ b/app/assets/javascripts/registered_site_progress.js @@ -0,0 +1 @@ +// site progress javascript is here \ No newline at end of file diff --git a/app/assets/stylesheets/registered_site_progress.css.scss b/app/assets/stylesheets/registered_site_progress.css.scss new file mode 100644 index 0000000..df4eb5a --- /dev/null +++ b/app/assets/stylesheets/registered_site_progress.css.scss @@ -0,0 +1,3 @@ +body { + background-color: red; +} \ No newline at end of file diff --git a/app/controllers/admin/registered_sites_controller.rb b/app/controllers/admin/registered_sites_controller.rb index 3e0a2f1..73a6b9b 100644 --- a/app/controllers/admin/registered_sites_controller.rb +++ b/app/controllers/admin/registered_sites_controller.rb @@ -24,6 +24,9 @@ class Admin::RegisteredSitesController < OrbitAdminController end end + def progress + end + def update uid = params[:id].split('-').last registered_site = RegisteredSite.find_by(:uid => uid) diff --git a/app/views/admin/registered_sites/_index.html.erb b/app/views/admin/registered_sites/_index.html.erb index 50a9a59..4a5d048 100644 --- a/app/views/admin/registered_sites/_index.html.erb +++ b/app/views/admin/registered_sites/_index.html.erb @@ -17,6 +17,7 @@ <% if can_edit_or_delete?(site) %>
  • <%= t(:edit) %>
  • <% end %> +
  • <%= t("registered_sites.progress") %>
  • diff --git a/app/views/admin/registered_sites/progress.html.erb b/app/views/admin/registered_sites/progress.html.erb new file mode 100644 index 0000000..0c1d92e --- /dev/null +++ b/app/views/admin/registered_sites/progress.html.erb @@ -0,0 +1,8 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "registered_site_progress" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "registered_site_progress" %> +<% end %> + +Please replace this with actual content. \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index e410ef7..6300bb4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -11,4 +11,5 @@ en: site_permission_revoked: Site permission revoked. site_active: Active site_inactive: Inactive + progress: Progress diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 7e07b54..c0d307f 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -10,3 +10,4 @@ zh_tw: email_not_confirmed: Email not confirmed. site_permission_revoked: Site permission revoked. site_active: Site Active + progress: Progress diff --git a/config/routes.rb b/config/routes.rb index d0cd881..8358216 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,11 @@ Rails.application.routes.draw do post "/xhr/site/re_register_url", to: 'admin/register_api#re_register_url' namespace :admin do get "/registered_site/change_access/:uid" => "registered_sites#change_access_status" - resources :registered_sites + resources :registered_sites do + member do + get "progress" + end + end resources :customization_logs do member do get "get_log" => "customization_logs#get_log"