- <%= form_for :tag, url: nil, remote: true do |f| %>
-
- <%= render :partial => "form", :locals => { :f => f } %>
-
diff --git a/app/views/admin/tags/index.js.erb b/app/views/admin/tags/index.js.erb
index ac7e2ee..379573b 100644
--- a/app/views/admin/tags/index.js.erb
+++ b/app/views/admin/tags/index.js.erb
@@ -1,9 +1,10 @@
$("#delete_tags").modal('hide');
$("#tags-merger").modal('hide');
+$("#remove_defaults").modal('hide');
$("#tags_index").html("<%= j render 'index' %>")
$.pageslide.close();
openSlide();
$('.card').cardCheck({
item: $('.card input[type="checkbox"]'),
});
-checkedLength()
\ No newline at end of file
+checkedLength();
\ No newline at end of file
diff --git a/app/views/admin/tags/new.html.erb b/app/views/admin/tags/new.html.erb
deleted file mode 100644
index 41230ac..0000000
--- a/app/views/admin/tags/new.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render 'new' %>
diff --git a/config/environment.rb b/config/environment.rb
index 40bba31..015b484 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -20,7 +20,26 @@ if Page.count == 0
end
if User.count==0
+ group = Workgroup.new
+ group.title = "Administrator"
+ group.key = 'admin'
+ group.save
+
+ role = Role.new
+ role.key = 'admin'
+ role.title_translations = {:en=>'Administrator', :zh_tw=>'Administrator'}
+ role.save
+
+ profile = MemberProfile.new
+ profile.first_name_translations = {:en=>'Digital', :zh_tw=>'Digital'}
+ profile.last_name_translations = {:en=>'Ruling', :zh_tw=>'Ruling'}
+ profile.save
+
+ role.member_profiles << profile
+
user = User.new
+ user.workgroup = group
+ user.member_profile = profile
user.user_name = "rulingcom"
user.password = "bjo4xjp6"
user.email = "orbit@rulingcom.com"
diff --git a/config/initializers/orbit_category.rb b/config/initializers/orbit_category.rb
new file mode 100644
index 0000000..22988c7
--- /dev/null
+++ b/config/initializers/orbit_category.rb
@@ -0,0 +1,21 @@
+ OrbitApp.registration "Category", type: 'ModuleApp' do
+ module_label 'module_name.category'
+ base_url File.expand_path File.dirname(__FILE__)
+
+ authorizable
+
+ side_bar do
+ head_label_i18n 'module_name.category', icon_class: "icons-flow-cascade"
+ head_link_path "admin_categories_path"
+ active_for_controllers (['admin/categories'])
+
+ # available_for [:admin, :manager]
+
+ # context_link 'all',
+ # link_path: "admin_categorys_path",
+ # priority: 1,
+ # active_for_action: {categorys: :index},
+ # available_for: [:admin, :manager]
+
+ end
+ end
diff --git a/config/initializers/orbit_tag.rb b/config/initializers/orbit_tag.rb
index 13475b5..4a23af1 100644
--- a/config/initializers/orbit_tag.rb
+++ b/config/initializers/orbit_tag.rb
@@ -7,7 +7,7 @@
side_bar do
head_label_i18n 'module_name.tag', icon_class: "icons-tag"
head_link_path "admin_tags_path"
- active_for_controllers ({public: ['admin/tags']})
+ active_for_controllers (['admin/tags'])
# available_for [:admin, :manager]
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 69e7d5e..06720a0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -667,6 +667,7 @@ en:
module_name:
tag: Tag
+ category: Category
datetime_picker:
date:
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 0984455..c06ab0a 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -1,5 +1,7 @@
zh_tw:
_locale: 中文
+ en: 英文
+ zh_tw: 中文
more: "更多"
site_: 網站
site_info: 基本資訊
@@ -7,8 +9,10 @@ zh_tw:
site_structure: 網站架構
sitemap: 網站地圖
site_name: 網站名稱
+ submit: 送出
mobile_settings: 行動設定
modules: 網站模組
+ name: 名稱
search_engine: 搜尋引擎
templates: 網站模版
preference: 系統偏好
@@ -17,8 +21,10 @@ zh_tw:
locale: 位置
login: 登入
logout: 登出
+ cancel: 取消
dashboard_: 儀表版
desktop: 桌面
+ disable: 停用
password: 密碼
all: 全部
add: 新增
@@ -60,4 +66,5 @@ zh_tw:
register: 註冊
registered: 已註冊
-
+ module_name:
+ category: 類別
diff --git a/config/routes.rb b/config/routes.rb
index c148ad6..b2f1368 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -51,15 +51,41 @@ Orbit::Application.routes.draw do
post 'toggle'
end
- resources :module_apps
+ resources :module_apps do
+ resources :categories do
+ collection do
+ post 'create_in_form'
+ end
+ member do
+ post 'toggle'
+ end
+ end
+ resources :tags do
+ collection do
+ post 'add_to_default'
+ post 'add_from_default'
+ post 'create_in_form'
+ post 'delete_tags'
+ post 'merge'
+ post 'remove_default'
+ post 'update_included_default'
+ end
+ end
+ end
get 'authorizations(/:module(/:type(/:id)))' => 'authorizations#index', :as => :authorizations
resources :authorizations
resources :items
+ resources :categories do
+ member do
+ post 'toggle'
+ end
+ end
resources :tags do
collection do
post 'add_to_default'
+ post 'add_from_default'
post 'delete_tags'
post 'merge'
post 'remove_default'
diff --git a/lib/orbit_app/helper/context_link_renderer.rb b/lib/orbit_app/helper/context_link_renderer.rb
index c4aa62c..f578875 100644
--- a/lib/orbit_app/helper/context_link_renderer.rb
+++ b/lib/orbit_app/helper/context_link_renderer.rb
@@ -7,7 +7,7 @@ module ContextLinkRenderer
@request = request
@params = params
@current_user = current_user
- content_tag :li, link_to(content_tag(:span, I18n.t(@label_i18n)), Rails.application.routes.url_helpers.send(@path)), :class => ( active_actions[controller] == action ? 'active' : nil)
+ content_tag :li, link_to(content_tag(:span, I18n.t(@label_i18n)), Rails.application.routes.url_helpers.send(@path, @arg)), :class => ( active_actions[controller] == action ? 'active' : nil)
end
end
\ No newline at end of file
diff --git a/lib/orbit_app/module/side_bar.rb b/lib/orbit_app/module/side_bar.rb
index 5ee4ee6..ecfb5d9 100644
--- a/lib/orbit_app/module/side_bar.rb
+++ b/lib/orbit_app/module/side_bar.rb
@@ -142,6 +142,7 @@ module OrbitApp
@label_i18n = label_i18n
@priority = options[:priority] || 0
@path = options[:link_path] || ""
+ @arg = options[:link_arg] || ""
set_available_for_avoiding_sensitive_links(options[:available_for] )
@active_for_action = options[:active_for_action] || []
@active_for_app_auth = options[:active_for_app_auth] || []
diff --git a/public/assets/bulletin_file/file/535f7fd06d616e3889220000/thumb_Ruling_Digital-LOGO.jpg b/public/assets/bulletin_file/file/535f7fd06d616e3889220000/thumb_Ruling_Digital-LOGO.jpg
deleted file mode 100644
index 56b5f49..0000000
Binary files a/public/assets/bulletin_file/file/535f7fd06d616e3889220000/thumb_Ruling_Digital-LOGO.jpg and /dev/null differ
diff --git a/test/controllers/admin/categories_controller_test.rb b/test/controllers/admin/categories_controller_test.rb
new file mode 100644
index 0000000..1f3df16
--- /dev/null
+++ b/test/controllers/admin/categories_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class Admin::CategoriesControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/helpers/admin/categories_helper_test.rb b/test/helpers/admin/categories_helper_test.rb
new file mode 100644
index 0000000..3b21c35
--- /dev/null
+++ b/test/helpers/admin/categories_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class Admin::CategoriesHelperTest < ActionView::TestCase
+end