saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,512 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

1180 Commits

Author SHA1 Message Date
chris 92d2af13f2 changes for ad_banner 2013-10-19 19:17:04 +08:00
chris 68a379f8a4 Some fixes for tags: authorization, translation… 
can_use now takes all the open_for into account
 2013-10-19 19:14:31 +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
chris f694134150 Remove useless code 
Add data-title
 2013-10-19 19:14:07 +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 32c1defba0 Updated Site Preferences Templates 2013-10-18 20:03:58 +08:00
Spen 14d2b0cc76 fix new ui member account privilege 2013-10-18 19:52:36 +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
Manson Wang a67be030c5 Fix JS Path 2013-10-17 11:21:46 +08:00
saurabhbhatia d2459f42c0 Added Favicon and default image for orbitbar 2013-10-16 18:50:22 +08:00
saurabhbhatia 155039ac16 Updated fixes for site info - desktop openess, title always displayed 2013-10-16 18:33:57 +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
Harry Bomrah df5cda7a98 new feature added for not loading submenus inside api for desktop 2013-10-16 09:37:39 +08:00
Harry Bomrah fbea249782 jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5 2013-10-16 09:37:33 +08:00
Manson Wang 11b880752d Fix Ad_Banner backend refresh page after edit banner 2013-10-15 19:50:01 +08:00
Manson Wang 76ba7087b2 Fix Ad_Banner frontend for IE8 
Fix backend bug in editing banner
Translation Added
 2013-10-15 19:37:12 +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 4120be6f8e fixes in sitemap, site preference 2013-10-14 16:48:50 +08:00
saurabhbhatia 55fa1cef4f Added Enable and disable terms of use, sitemap 2013-10-11 13:14:37 +00:00
saurabhbhatia 5c8a57e700 Fixed Sitemap Toggle 2013-10-09 09:06:21 +00:00
chris 315a24556c Fix parser common to skip not found module_app 
Do not show default widget if there's no data
 2013-10-08 16:42:20 +08:00
chris cf7f7aa29c Fix tag page slide issues 2013-10-08 12:47:31 +08:00
chris 21db2a2cba Drag and drop to reorder users 2013-10-07 15:53:54 +08:00
saurabhbhatia 1194bdd9b4 Updated Sitemap with UI fixes - checkbox tag pending 2013-10-07 15:05:50 +08:00
saurabhbhatia 940a915125 Updated Sitemap with new UI 2013-10-07 09:43:47 +08:00
Manson Wang 792785f7ba Fix relation for Ad_banner and Ad_image 
Update site.rake for New UI
 2013-10-04 19:20:04 +08:00
saurabhbhatia ba8da9b6bb Updated button class in template form 2013-10-04 14:41:48 +08:00
saurabhbhatia ff93670949 Updated template editing 2013-10-04 14:41:31 +08:00
saurabhbhatia 08907aa8c1 Search Engine Preferences complete 2013-10-02 15:23:12 +08:00
chris 433c8d5da6 Fix link in category for authorization, fix update of auth users 2013-10-02 12:18:20 +08:00
saurabhbhatia 9bdb633157 Updated with UI Changes 2013-10-01 17:39:21 +08:00
Harry Bomrah 0a9fd6a4b5 some needed changes in api for desktop 2013-09-30 16:59:50 +08:00
Spen 9186978551 new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
chris 622534e5db Fix user order: 
- gender color
 - add cancel button for input
 2013-09-26 20:18:34 +08:00
Harry Bomrah 52c896d8c5 some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules. 2013-09-26 20:11:45 +08:00
chris f81894af90 User ordering 
Run the task new_ui:save_users
 2013-09-26 19:00:13 +08:00
Manson Wang 16c26e3273 Fix path of jquery.cycle.all.latest.js 2013-09-26 16:11:08 +08:00
Harry Bomrah 1d0ea6718f brief added to desktop for all plugins 2013-09-25 18:23:44 +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
chris 8456a91968 Fix structure edit 2013-09-14 17:26:16 +08:00
Harry Bomrah 789e02e313 ad_banner banner load fixed for test site 2013-09-13 14:23:44 +08:00
Harry Bomrah 8c98645a69 small bug fix for inserting and delete button. 2013-09-11 14:03:19 +08:00
Harry Bomrah 9e10a3c944 editing for the assets are done with replacable files and description 2013-09-11 14:03:13 +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
saurabhbhatia 865be29b37 Updated Preference Page 2013-09-09 11:29:46 +08:00
saurabhbhatia 0eeb7db1a8 Updated preference UI 2013-09-09 11:02:58 +08:00
saurabhbhatia 7216676c40 Updated Sidebar and Preferences 2013-09-09 10:18:14 +08:00
saurabhbhatia fa857cfeea Default Locale 2013-09-06 18:00:36 +08:00
saurabhbhatia a3f1b8d54a Updated Preferences in Site Info 2013-09-06 18:00:30 +08:00
saurabhbhatia e9d6fa8787 Preference Page 2013-09-06 18:00:28 +08:00
saurabhbhatia 6e032a8757 Add Preference and search engine 2013-09-06 18:00:23 +08:00
saurabhbhatia 1558cfdb4e Updated Sitebar with Search Engine 2013-09-06 18:00:21 +08:00
saurabhbhatia 9e4686a565 Fixed Site Info completely and added search engine page 2013-09-06 18:00:18 +08:00
saurabhbhatia fef7cc4ed2 Updated Site info 2013-09-06 18:00:10 +08:00
saurabhbhatia 7f0821ea84 Updated Site info page to new ui 2013-09-06 17:59:56 +08:00
saurabhbhatia 2c0761aafb Updated Sitemap to New UI 2013-09-06 17:59:54 +08:00
saurabhbhatia 1e5ad750cd Updated Site bar with correct links 2013-09-06 17:59:43 +08:00
Matt K. Fu 00ddd94314 fix design index 2013-09-03 15:20:48 +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 e75873273c Updated Gallery with authorizations 2013-08-22 16:25:11 +08:00
Spen 4078d426a6 new ui personal front_end page(member app) & users_new_interface show sub_roles fix 2013-08-21 14:13:36 +08:00
chris c474fa063f New authorization 2013-08-21 13:42:29 +08:00
saurabhbhatia 21a7b5da5c Icons for sidebar 2013-08-19 17:13:36 +08:00
Harry Bomrah b004121187 minimize bar updated to new style and more flexible. 2013-08-19 12:59:57 +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
saurabhbhatia 7c64e8c637 Updated AdBanner index page and Ad Image index page, and edit pages 
Conflicts:
	vendor/built_in_modules/ad_banner/config/locales/en.yml
	vendor/built_in_modules/ad_banner/init.rb
 2013-08-09 15:22:06 +08:00
saurabhbhatia e14cb3c74c Updated adimage home page 2013-08-09 15:22:00 +08:00
saurabhbhatia a2e9aa2e0b Updated ADBanner with fixes on index page, ADImage with fixes 
Conflicts:
	app/views/admin/ad_banners/index.html.erb
	app/views/admin/ad_images/_form.html.erb
	vendor/built_in_modules/ad_banner/init.rb
 2013-08-09 15:21:51 +08:00
Harry Bomrah c2f223b82c new plugins added for desktop 2013-08-06 17:52:39 +08:00
Harry Bomrah 42615f02ea new feature in desktop for uploading wallpapers or putting url link 2013-08-02 19:32:41 +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 b1755bdc80 Added Stock Backgrounds, Fixed production issue with desktop css 2013-07-30 18:37:36 +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
Harry Bomrah f7dbbf1bca new themes added to desktop plus theme uploader created 2013-07-30 16:43:32 +08:00
Harry Bomrah 6d89eab98a desktop final fix 2013-07-30 16:43:28 +08:00
Harry Bomrah 5f9190db39 few updates with fb integration and some other changes in user and supports data to android 
Conflicts:
	vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
 2013-07-30 16:43:11 +08:00
devin chen ac58b993c2 simple component update 
minor update
 2013-07-30 16:43:09 +08:00
devin chen 2b12a4775c Various view update and change #thmbackground tag 2013-07-30 16:43:02 +08:00
Harry Bomrah ed22a4d303 apps update -- app upload and activation 2013-07-30 16:42:50 +08:00
devin chen f2ada14b7a app manager's view update 2013-07-30 16:42:46 +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
devin chen 4ae1fe68cd app manager view update 2013-07-30 16:42:33 +08:00
Harry Bomrah 2d616ab7a8 solved desktop conflict during cherry pick 2013-07-30 16:42:26 +08:00
devin chen 874819266d minor update 2013-07-30 16:42:23 +08:00
devin chen 3ded19016a apps setting view 2013-07-30 16:42:20 +08:00
Harry Bomrah 9478bb13e2 search fixed again according to devin requirements 2013-07-30 16:42:14 +08:00
Harry Bomrah cff77fbee5 new search for app manager and few javascript fixes 2013-07-30 16:42:11 +08:00
Harry Bomrah b70310c6fe tiny scrollbar update 2013-07-30 16:41:25 +08:00
devin chen 4215ed5538 minor update 2013-07-30 16:41:16 +08:00
chris 74b2bbf4b7 Fix link in structure when the item is a link 
Add internal links creation
 2013-07-30 11:49:28 +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 fe10cc62d9 Fix structure title (page slide) 2013-07-29 14:59:02 +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 0be8a74fa8 Fix missing condition in index auth 2013-07-25 17:45:39 +08:00
chris da1d70efcb Change authorization to accept other than category 2013-07-25 17:36:55 +08:00
chris fe82427baa Ray's changes for css and js 2013-07-22 16:31:44 +08:00
rulingcom 408bebaa4b Ray's changes in structure 2013-07-22 14:06:58 +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
Matt K. Fu e20df41db5 add user log link at site page 2013-06-14 15:24:04 +08:00
chris e68793afc3 Fix tag delete 2013-06-14 15:23:45 +08:00
iCross 8c1e65994a Merge branch 'clean_development' into lukas/picked_ques 2013-06-06 19:08:59 +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 6b8b749b0f fix chris tag cloud 2013-06-06 17:18:42 +08:00
chris 253cca06cc New widget for tag cloud 2013-06-06 17:17:45 +08:00
Matt K. Fu 30824d1620 add search to archive 2013-06-05 18:03:09 +08:00
Matt K. Fu 06fd305bf9 default widget show search 2013-06-05 13:00:21 +08:00
Matt K. Fu 3e0b7d81ae clean 403 404 500 2013-05-27 16:46:49 +08:00
Matt K. Fu 54a35b30be fix design index bug when start start from blank DB. 
add delay impressionist.
add several i18n vars
 2013-05-23 12:07:43 +08:00
Matt K. Fu 37aa950028 user action 2013-05-23 11:55:57 +08:00
Matt K. Fu 3e6c2b1ec2 fix member error with blank database 2013-05-14 11:48:13 +08:00
Matt K. Fu ef2c732d2e make blank site working better 2013-05-14 11:26:35 +08:00
Matt K. Fu 7d077a92a5 system preference 2013-04-29 15:23:15 +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
Matthew K. Fu JuYuan d047a3d62a chris tags update 2013-04-26 11:26:10 +08:00
Spen 697944a029 user id set & user fields set & role set & member frontend list & user translation & create new member bug fix 2013-04-25 19:59:59 +08:00
Matt K. Fu b198b1a17b system preference 2013-04-24 19:21:11 +08:00
Matt K. Fu 62fa589e8a add msg when user session expired at page admin 2013-04-24 11:58:48 +08:00
Matt K. Fu 5ff7dfbac6 fronted open switch and backend openness 2013-04-23 18:48:18 +08:00
devin chen 989e5aa974 minor update 2013-04-17 14:29:56 +08:00
devin chen 055d758769 Page Loading Effect 
tinyscrollbar has problem
 2013-04-17 14:27:18 +08:00
Matt K. Fu 3de4591413 fix frontend ajax respond 404 due to javascript overwritten after assets precompile 2013-04-17 14:19:32 +08:00
Harry Bomrah c6868bf2e0 small fix in select2.js 2013-04-17 14:18:49 +08:00
Matt K. Fu 425a320c02 fix widget and fronted setting interface. checked with Spen 2013-04-17 14:16:24 +08:00
Matt K. Fu 0781779ac0 solved conflicts 2013-04-17 14:14:24 +08:00
devin e7bffe4c0f devin's new branch 2013-04-17 14:14:24 +08:00
Harry Bomrah 793d739726 features and widgets added 
Conflicts:
	app/assets/javascripts/orbitdesktop.js
 2013-04-17 14:14:23 +08:00
devin c8aa50ee87 Lots of Update 
1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
 2013-04-17 14:14:23 +08:00
Matt K. Fu 0f6f5aafce fix for both part and page part settings 
Conflicts:
	app/helpers/admin/page_parts_helper.rb
	app/views/admin/pages/reload_front_end_setting.js.erb
	app/views/admin/pages/reload_frontend_pages.js.erb
 2013-04-17 14:12:52 +08:00
Fu Matthew f6b600df59 deliver API 2013-04-17 14:09:01 +08:00
Harry Bomrah dae3f069ff app manager changed plus some changes 2013-04-17 11:09:56 +08:00
Harry Bomrah b1d7d5345e section page fixed.. 2013-04-17 11:08:58 +08:00
devin 0d5ab20efa add browser compatibility page 2013-04-17 11:07:45 +08:00
Fu Matthew 9815950083 now default options can be chosen by developer at init 2013-04-17 11:07:45 +08:00
Harry Bomrah b8ee2fd559 compatibility page added and tinyscrollbar drag event fixed.. 2013-04-17 11:07:20 +08:00
Fu Matthew 69a49a69aa style for front end 2013-04-17 11:05:57 +08:00
Harry Bomrah 1d06bcaae7 Major tinyscrollbar update 2013-04-17 10:54:38 +08:00
Fu Matthew 8e98cb3ec9 put add admin pages using orbit back end controller 2013-04-17 10:54:38 +08:00