Commit Graph

338 Commits

Author SHA1 Message Date
rulingcom 4c85d62866 ray fix for css and filemanager 2013-12-12 15:39:20 +08:00
Spen 20e2f07b26 add Member frontend page selection options and fix backend role filter page 2013-11-15 17:08:45 +08:00
saurabhbhatia dc5ef21516 Revert "add Member frontend page selection options and fix backend role filter page"
This reverts commit ea3f9c8163.
2013-11-15 16:58:11 +08:00
Spen ea3f9c8163 add Member frontend page selection options and fix backend role filter page 2013-11-15 16:16:39 +08:00
saurabhbhatia 5f3f27fe9a Desktop Enabled in menu 2013-11-11 18:31:04 +08:00
saurabhbhatia 5e0696890a Updated Remember me, and Homepage widget more link 2013-11-11 17:23:03 +08:00
saurabhbhatia 1f3f9831ad Fixed Openness Issue 2013-11-04 15:44:51 +08:00
chris 454e36b4ae iFrame ajaxStop 2013-10-29 11:09:20 +08:00
chris a14d69211b PagePart widgets for "system widget"
Delete useless code
2013-10-28 16:29:23 +08:00
chris 218cb03641 PagePart widgets except "system widget" 2013-10-28 16:29:23 +08:00
chris 94c1d7d5a0 Fix homepage in structure, ajaxStop for structure edit, setForm in pageslide.js 2013-10-23 18:39:21 +08:00
saurabhbhatia 0a69bbb653 Updated Favicon display and wording 2013-10-22 10:34:10 +08:00
chris 4403ca3504 Add timeout before running script on window load 2013-10-20 19:13:20 +08:00
chris a9343e9a82 Fix new_ui:save_pages 2013-10-20 19:05:19 +08:00
chris 2530dace02 Change the parser_front_end to be used in the structure for page edit, new_ui:save_pages must be run 2013-10-20 18:44:04 +08:00
chris fea86ba3a9 Page slide does not reload from server for ad_banner 2013-10-19 19:17:24 +08:00
chris d2602a3a84 Change code for new page slide.js
Conflicts:
	app/views/admin/pages/_form.html.erb
2013-10-19 19:14:14 +08:00
Spen 00e9a5df5b new ui member settings account data
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
	config/locales/en.yml
	config/routes.rb
2013-10-18 22:28:27 +08:00
saurabhbhatia 3e491380cd Revert "new ui member settings account data"
This reverts commit e1f4ee464b.
2013-10-18 19:51:02 +08:00
Spen e1f4ee464b new ui member settings account data 2013-10-18 19:12:27 +08:00
saurabhbhatia 14fea3638f Updated with some locale fixes in site preferences 2013-10-18 15:26:41 +08:00
saurabhbhatia d2459f42c0 Added Favicon and default image for orbitbar 2013-10-16 18:50:22 +08:00
Manson Wang 2bcecc322e Update Ad_Banner for new jQuery
Removed loading module.js in module_widget.html.erb
2013-10-16 12:28:21 +08:00
saurabhbhatia 5fb3731430 Show Custom orbit bar icon only for frontend and desktop 2013-10-15 10:07:46 +08:00
saurabhbhatia fb34dc673f Changeable Orbitbar logo 2013-10-14 18:20:26 +08:00
saurabhbhatia 9bdb633157 Updated with UI Changes 2013-10-01 17:39:21 +08:00
Spen a067bcd304 Add Brief intro. for all personal plugins
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
2013-09-18 18:55:40 +08:00
Harry Bomrah f920a4f6ba filemanager and some update for file uploader . added file uploader to kernel 2013-09-11 14:03:06 +08:00
chris 8045a18230 Change modal delete to take an "remote" option 2013-09-03 15:04:05 +08:00
Spen 3123c5de0a new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
saurabhbhatia 7dfd5d7e00 Generate Breadcrumb for only for modules where module_apps are clearly defined 2013-08-19 09:39:45 +08:00
Spen 6c514770bc solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
chris 0f3a8414be Delete duplicate js and css
Close the form in search in orbit bar
2013-07-31 17:30:53 +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
saurabhbhatia 7e67d389b9 Added new orbit bar to compatibility page 2013-07-30 17:15:57 +08:00
saurabhbhatia e12b14311e Updated Desktop with new UI 2013-07-30 16:43:41 +08:00
Harry Bomrah 79c7f8e90f new orbit bar fixed..
Conflicts:
	app/assets/javascripts/orbit_js_1.0.1-front-end.js
	app/assets/stylesheets/basic/orbit_bar.css.erb
	app/assets/stylesheets/orbit_bar_bootstrap.css
	app/views/layouts/_left_menu.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_right_menu.html.erb
	app/views/layouts/desktop.html.erb
2013-07-30 16:43:35 +08:00
devin chen 9963395b05 'select2' minor update
Conflicts:
	app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak
2013-07-30 16:42:40 +08:00
chris c85629d3b3 Fix controller js and css loading error 2013-07-30 11:48:14 +08:00
chris af98f8efce Fix orbit bar language change 2013-07-29 19:49:07 +08:00
chris ff59feb2e7 Fix for structure 2013-07-29 18:46:38 +08:00
chris f332a3191a Fiix layout for safari 2013-07-29 17:34:29 +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 fe82427baa Ray's changes for css and js 2013-07-22 16:31:44 +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
Lukas adc15951bb questionnaire stuff
Conflicts:

	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
Matt K. Fu 3e0b7d81ae clean 403 404 500 2013-05-27 16:46:49 +08:00
Matt K. Fu 3e567223e3 fix for Spen's translation and Chris's tag error 2013-04-26 15:37:27 +08:00
Spen 79ef86f2c9 member translation fix 2013-04-26 11:26:11 +08:00