Commit Graph

25 Commits

Author SHA1 Message Date
saurabhbhatia bc2d7e165b made settings localized in orbit backend 2013-12-24 12:48:44 +08:00
saurabhbhatia 58dadb07b1 Breadcrumb for site settings 2013-12-23 18:33:40 +08:00
saurabhbhatia 635f82db2f Updated Approvable to work for submanager role also 2013-11-13 10:35:03 +08:00
chris 7353b48212 Finalize ad_banner changes: front-end, back-end, mobile 2013-10-19 19:17:59 +08:00
chris fea86ba3a9 Page slide does not reload from server for ad_banner 2013-10-19 19:17:24 +08:00
chris 92d2af13f2 changes for ad_banner 2013-10-19 19:17:04 +08:00
chris 279ac774d4 Migrate form old ui to new ui (categories, tags and authorizations) 2013-10-15 23:38:44 +08:00
chris c474fa063f New authorization 2013-08-21 13:42:29 +08:00
chris d632439f80 Add class for Ray's check-box
Fix some typos
Change the default index for auth
Add some hard code in object_auth.rb to handle page_context
A user cannot select himself in authorisation
2013-07-31 00:08:15 +08:00
chris d190a50046 Breadcrumb for dashboard (tags and categories cannot link to original module index) 2013-07-29 17:34:03 +08:00
chris d434b878a7 Add default delete modal usage:
- <%= render 'layouts/delete_modal', delete_options: {title: '', warning: '', cancel: '', submit: '' } %>
 - in default index, just set title, warning, cancel and submit in quick_edit if needed
2013-07-29 14:29:37 +08:00
chris da1d70efcb Change authorization to accept other than category 2013-07-25 17:36:55 +08:00
chris 1dc7884ec0 Changes for default index:
- remove approvable and filterable
 - add display_option
 - change params
Update web link and gallery index
2013-07-25 11:32:25 +08:00
chris 1c4b66f1cb Fix approval in index 2013-07-10 16:42:25 +08:00
chris 856898016b New UI changes(tags, categories, authorisations, module index…)
To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
2013-07-02 16:46:44 +08:00
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
Christophe Vilayphiou bdd5a1a047 Changes for i18n yml 2012-09-24 09:02:45 +08:00
OrbitServer ee51240102 Ray's changes for new backend 2012-09-14 02:38:56 +08:00
Christophe Vilayphiou c32b0dd4b4 Move delete checkboxes to js 2012-08-14 00:59:01 +08:00
Matthew K. Fu JuYuan c5fdff764e orbit disable object for categories 2012-07-05 16:00:45 +08:00
Christophe Vilayphiou f190ce18ee Put sorting in web_link, page_context and design 2012-05-05 21:20:20 +08:00
Matthew K. Fu JuYuan 05ded8de03 Fix for NCCU 0430 all functions ok with two submanagers but different behavors 2012-05-04 15:38:18 +08:00
Christophe Vilayphiou b8f52fa1ec Separate announcement and news 2012-04-30 06:31:46 +08:00
Christophe Vilayphiou 63ee8eaca9 Remove url from sorting
Add sorting_options to params in filters
2012-04-30 06:30:52 +08:00
Christophe Vilayphiou 32faef0c70 DRY code for sorting 2012-04-30 06:30:52 +08:00