Commit Graph

80 Commits

Author SHA1 Message Date
chris a9d25dcdec Orbit bar
Structure: page, link, edit and new, page view, edit page parts
Temporary disable authentication in items controller
2013-04-12 03:13:03 +08:00
Matt K. Fu fb800b488b widget link followed by setting 2013-04-03 19:03:16 +08:00
Fu Matthew dc3966be81 fix cates and tags 2013-03-05 18:34:41 +08:00
chris ee59228665 Fix error in parser for category 2013-02-19 17:50:43 +08:00
chris ec9c68f039 Remove breadcrumb when home 2013-02-19 17:49:22 +08:00
chris 25d9a3d9b9 Add home to breadcrum 2013-02-19 17:49:22 +08:00
chris 1f11293fbe Fix sitemap in page edit 2013-02-19 17:39:43 +08:00
chris f36bcb8801 Put missing changes for breadcrumb in page edit 2013-02-19 17:39:42 +08:00
Rueshyna bfad8467c8 breadcrumb widget of front-end has done
Conflicts:

	app/controllers/front_controller.rb
	lib/parsers/parser_common.rb
2013-02-19 17:39:42 +08:00
Rueshyna f3bfe67e68 breadcrumb widget of back-end has done, front-end has bug...
Conflicts:

	app/controllers/front_controller.rb
	app/views/front/show_breadcrumb.html.erb
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb
2013-02-19 17:39:41 +08:00
Rueshyna bca4478f68 front_end widget breadcrumb done 2013-02-19 17:24:23 +08:00
Rueshyna 2a61470f8b back_end widget breadcrumb finish 2013-02-19 17:24:19 +08:00
Fu Matthew 0cc616f988 page can use default widget 2013-01-21 16:56:37 +08:00
Fu Matthew 5793f0fe5d default widget link.
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
2013-01-07 17:20:37 +08:00
chris c6111460f5 Fix album widget options 2013-01-07 00:40:43 +08:00
chris 2d8400d1cc Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:34:24 +08:00
chris 61b0f94c04 Remove I18n.locale for announcement front-end
Fix counter in back-end edit
2012-12-28 15:34:04 +08:00
Fu Matthew 5587e83419 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:31:32 +08:00
Fu Matthew baf1240b76 gallery options 2012-12-28 15:30:46 +08:00
chris 37309a452d Fix site map and menu order 2012-12-28 11:37:37 +08:00
chris ec96a2e0e7 Add page counter 2012-12-28 10:36:18 +08:00
chris 751d3b1220 Announcement widget: remove I18n.locale
Add part_id in url
2012-12-27 16:52:58 +08:00
chris 269e5b033f Fix for page_part and widget back-end 2012-12-27 16:20:40 +08:00
chris fcbba6660b Only one parser for front end
Separate site map for i18n
2012-12-19 17:15:31 +08:00
chris 2d0e8b37b2 Fix:
- Widgets for announcement
  - Facebook link
  - AdBanner nav
2012-11-21 18:42:14 +08:00
chris 3beed406a7 Fix Nokogiri when '.first' returns nothing 2012-11-20 12:00:18 +08:00
Harry Bomrah 3749e919cb front ends updates 2012-09-12 02:12:15 +08:00
chris 7d5531bf01 Merge branch 'nccu_master' into demo_site
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
Christophe Vilayphiou 84ad9dd724 Fix ab_banner display 2012-08-15 16:34:00 +08:00
Christophe Vilayphiou 4e3dc7c438 Fix ab_banner display 2012-08-15 16:08:47 +08:00
Christophe Vilayphiou 39604d30ce Fix ab_banner display 2012-08-15 14:58:43 +08:00
Christophe Vilayphiou 905844f7bb Typo 2012-08-15 10:24:47 +08:00
Christophe Vilayphiou 18e18a4add Fix for banner on ie 2012-08-13 15:10:53 +08:00
Christophe Vilayphiou 2ea3193879 Fix for banner link 2012-08-13 11:03:11 +08:00
Christophe Vilayphiou 33fc96ac7c Changes for NCCU after email 2012-08-11 18:19:30 +08:00
Matthew K. Fu JuYuan e8317e0a4b 1.Remove category column when category is specified
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
Christophe Vilayphiou c4e12ff347 Add missing class to ad_banner for link 2012-08-03 13:55:22 +08:00
Matthew K. Fu JuYuan af4865ceb7 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-07-31 11:01:11 +08:00
Matthew K. Fu JuYuan 4dea025c8a fix for
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
2012-07-31 10:59:48 +08:00
Christophe Vilayphiou 39b63a970c Fix .class to .class.to_s 2012-07-30 18:34:54 +08:00
Christophe Vilayphiou 7440727acd Fix: "._type" to ".class" 2012-07-30 17:21:37 +08:00
Christophe Vilayphiou a8cc581279 Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
Christophe Vilayphiou 780386d7f1 Remove i18n_variable for parser 2012-07-27 19:13:39 +08:00
unknown c0cac812c5 demo site widget 2012-07-26 16:39:29 +08:00
unknown 10731dc211 demo widget 2012-07-18 18:07:45 +08:00
Matthew K. Fu JuYuan cb17fe0825 Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
Matt 6a022c90da Changes on nccu 2012-05-18 15:20:45 +08:00
Christophe Vilayphiou 8fcb8ef8de Change the way links are displayed in menus in front-end 2012-05-14 21:43:10 +08:00
Christophe Vilayphiou cf8d20dc84 Add category and tag to pages 2012-05-14 00:33:52 +08:00
Christophe Vilayphiou 62e9a772f6 Fix titles for widgets
Add translations
2012-05-13 23:09:48 +08:00