Updated AdBanner index page and Ad Image index page, and edit pages

Conflicts:
	vendor/built_in_modules/ad_banner/config/locales/en.yml
	vendor/built_in_modules/ad_banner/init.rb
This commit is contained in:
saurabhbhatia committed 2013-08-09 15:22:06 +08:00
1 parent e14cb3c74c
commit 7c64e8c637
14 files changed
+180 -156

No files matched your search

+6 -2
View File
@@ -1,4 +1,8 @@
en:
module_name:
ad_banner: Ad Banner
ad_banner:
ad_banner: Ad Banner
banner: Banner
all: All
categories: Categories
add: Add
+6 -2
View File
@@ -1,4 +1,8 @@
zh_tw:
module_name:
ad_banner: 廣告輪播
ad_banner:
ad_banner: 廣告輪播
banner: 橫幅
all: 全部
categories: 類別
add: 新增
+13 -12
View File
@@ -42,23 +42,24 @@ module AdBanner
head_link_path "admin_ad_banners_path"
context_link 'ad_banner.banner',
:link_path=>"admin_ad_banners_path" ,
context_link 'ad_banner.all',
:link_path=>"admin_ad_images_path" ,
:priority=>1,
:active_for_action=>{'admin/ad_banners'=>:index},
:available_for => [:manager]
context_link 'tags',
:link_path=>"admin_module_tags_path(module_app_id: get_module_app)" ,
:priority=>4,
:active_for_tag => 'Announcement',
context_link 'ad_banner.add',
:link_path=>"new_admin_ad_image_path" ,
:priority=>1,
:active_for_action=>{'admin/ad_banners'=>:index},
:available_for => [:manager]
context_link 'module_authorization',
:link_path=>"admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: 'AdBanner'}))",
:priority=>6,
:active_for_app_auth => 'ad_banners',
:available_for => [:admin]
context_link 'ad_banner.banner',
:link_path=>"admin_ad_banners_path" ,
:priority=>3,
:active_for_action=>{'admin/ad_banners'=>:index},
:available_for => [:manager]
end
end
end