developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix sidebar icon for page. 

fix i18n on sidebar
make sidebar sortable by changing db value. Need interface
This commit is contained in:
Fu Matthew 2013-02-04 18:14:00 +08:00
parent 71d5abae2e
commit eed7a22dbe
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/orbit_app/module/side_bar.rb
View File

@ -24,6 +24,11 @@ module OrbitApp
def all def all
return @@side_bars return @@side_bars
end end
def all_get_ordered!
@@side_bars.sort! {|x,y| x.get_sidebar_order! <=> y.get_sidebar_order! }
end
end end
extend ClassMethods extend ClassMethods
@ -52,10 +57,16 @@ module OrbitApp
@app_base_path = '' @app_base_path = ''
@module_app_key = key @module_app_key = key
@get_module_app = get_module_app @get_module_app = get_module_app
@sidebar_order = 0
block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given? block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
# setup_module_app(module_app_key) # setup_module_app(module_app_key)
finalize! finalize!
SideBarRegisition.add(self) SideBarRegisition.add(self)
SideBarRegisition.all_get_ordered!
end
def get_sidebar_order!
@sidebar_order = get_module_app.sidebar_order
end end
def get_module_app def get_module_app

3
vendor/built_in_modules/calendar/config/locales/zh_tw.yml vendored
View File

@ -1,7 +1,8 @@
zh_tw: zh_tw:
calendar: calendar:
calendar_: 行事曆
calendar: 日曆 calendar: 日曆
calendars: Calendars categories: 類別
color: Color color: Color
name: Name name: Name
save: Save save: Save

6
vendor/built_in_modules/calendar/init.rb vendored
View File

@ -1,6 +1,6 @@
module Calendar module Calendar
OrbitApp.registration "Calendar",:type=> 'ModuleApp' do OrbitApp.registration "Calendar",:type=> 'ModuleApp' do
module_label 'miss_module_i18n.calendar' module_label 'calendar.calendar_'
base_url File.expand_path File.dirname(__FILE__) base_url File.expand_path File.dirname(__FILE__)
# personal_plugin :enable => true,:path=>"panel/calendar/plugin/profile",:i18n=>'admin.calendar' # personal_plugin :enable => true,:path=>"panel/calendar/plugin/profile",:i18n=>'admin.calendar'
@ -11,14 +11,14 @@ module Calendar
update_info 'some update_info' update_info 'some update_info'
side_bar do side_bar do
head_label_i18n 'miss_module_i18n.calendar',:icon_class=>"icons-calendar" head_label_i18n 'calendar.calendar_',:icon_class=>"icons-calendar"
available_for [:admin,:guest,:manager,:sub_manager] available_for [:admin,:guest,:manager,:sub_manager]
active_for_controllers ({:private=>['cals','calendar_categories'],:public=>['panel/calendar/back_end/tags']}) active_for_controllers ({:private=>['cals','calendar_categories'],:public=>['panel/calendar/back_end/tags']})
head_link_path "panel_calendar_back_end_cals_path" head_link_path "panel_calendar_back_end_cals_path"
context_link 'calendar.calendars', context_link 'calendar.categories',
:link_path=>"new_panel_calendar_back_end_cal_path" , :link_path=>"new_panel_calendar_back_end_cal_path" ,
:priority=>1, :priority=>1,
:active_for_action=>{:cals=>:new}, :active_for_action=>{:cals=>:new},

3
vendor/built_in_modules/miss_module/config/locales/zh_tw.yml vendored
View File

@ -4,10 +4,9 @@ zh_tw:
archive: 檔案室 archive: 檔案室
_archive: _archive:
all: 全部檔案 all: 全部檔案
calendar: 日曆模組
calendars: 日曆 calendars: 日曆
gallery: 相簿 gallery: 相簿
location: (未命名)Location location: 地標
ad_banner: 廣告輪播 ad_banner: 廣告輪播
miss_plugin_i18n: miss_plugin_i18n:

2
vendor/built_in_modules/page_content/init.rb vendored
View File

@ -16,7 +16,7 @@ module PageContent
end end
side_bar do side_bar do
head_label_i18n 'page',:icon_class=>"icons-page" head_label_i18n 'page',:icon_class=>"icons-newspaper"
available_for [:admin,:guest,:manager,:sub_manager] available_for [:admin,:guest,:manager,:sub_manager]
active_for_controllers ({:private=>['page_contexts']}) active_for_controllers ({:private=>['page_contexts']})
active_for_object_auth ['PageContext'] active_for_object_auth ['PageContext']