Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu ...

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/controllers/orbit_backend_controller.rb
	app/controllers/orbit_widget_controller.rb
	app/models/module_app.rb
	app/views/admin/page_parts/_module_widget.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb

2013-01-08 14:17:21 +08:00

..

_drop_down_menu.html.erb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

_guest_orbit_menu.erb

Translation changes

2012-12-03 23:00:04 +08:00

_lang_menu.html.erb

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

2011-04-13 18:19:51 +08:00

_member_orbit_menu.erb

Translation changes

2012-12-03 23:00:04 +08:00

_orbit_bar.html.erb

fixed search_bar placeholder

2012-12-27 12:20:42 +08:00

_side_bar_content.html.erb

sidebar rewrited

2012-12-24 16:39:53 +08:00

_side_bar.html.erb

first version of confined sidebar render

2012-12-24 16:17:00 +08:00

_users_checkbox_ary.html.erb

fix for not working cache

2012-07-13 18:32:17 +08:00

admin.html.erb

new code for attribute fields and values for new member interface

2012-10-26 11:19:55 +08:00

application.html.erb

Merge server and rails_3_1

2011-08-18 13:43:33 +08:00

desktop.html.erb

Desktop Commit

2012-04-06 17:47:02 +08:00

devise.html.erb

Changes for IE9 with html5

2012-03-21 15:51:55 +08:00

mobile.mobile.erb

Add mobile but remove news in it

2013-01-07 03:03:38 +08:00

module_widget.html.erb

Changes for widgets

2012-05-13 21:55:39 +08:00

new_admin.html.erb

first version of confined sidebar render

2012-12-24 16:17:00 +08:00

page_layout.html.erb

Error popup only shows on flash[:error]

2012-08-15 15:55:29 +08:00

site_editor.html.erb

Changes for structure

2012-05-22 14:45:49 +08:00