Commit Graph

2087 Commits

Author SHA1 Message Date
Manson Wang 3bac21647e Fix user plugin front_end 2013-11-20 11:27:20 +08:00
saurabhbhatia 2325086776 Updated gallery data api 2013-11-19 22:18:25 +08:00
saurabhbhatia 9178ebd793 Rescue condition for model nil 2013-11-19 17:13:27 +08:00
saurabhbhatia c545c6f172 API for Locations 2013-11-19 16:24:15 +08:00
saurabhbhatia 44c93c2dde Updated with Mobile UI working 2013-11-19 11:33:19 +08:00
saurabhbhatia 82ffc7c3fd Fixed Mobile Site 2013-11-19 10:33:25 +08:00
Harry Bomrah 91d5ab6352 gallery versioning added.. and also the models changed for gallery now more R4 compatible. urls for gallery working fine now.. 2013-11-19 09:32:08 +08:00
Harry Bomrah 16b695200a gallery_album to album 2013-11-19 09:31:49 +08:00
Harry Bomrah 369bbe4d72 category click, event click and more button fix 2013-11-18 17:15:36 +08:00
Harry Bomrah 4888195566 more button works according to categories 2013-11-15 22:35:20 +08:00
saurabhbhatia a38cf6304e Fix for More link 2013-11-15 17:32:00 +08:00
Spen 20e2f07b26 add Member frontend page selection options and fix backend role filter page 2013-11-15 17:08:45 +08:00
Spen c291f15e23 add member-role.js 2013-11-15 17:00:41 +08:00
saurabhbhatia ce8e9c0a5f Revert "more button fix and also new way to select more page."
This reverts commit e129b25554.
2013-11-15 16:58:27 +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
Harry Bomrah e129b25554 more button fix and also new way to select more page. 2013-11-15 15:13:58 +08:00
saurabhbhatia 7028390248 Fixed Submenu 2013-11-15 14:48:15 +08:00
saurabhbhatia eeb7f72876 Updated Items.js as per ray's specifications 2013-11-13 16:40:37 +08:00
saurabhbhatia a49562e341 Fixed Reloading problem and generate div only if path argument present 2013-11-13 15:47:12 +08:00
saurabhbhatia 635f82db2f Updated Approvable to work for submanager role also 2013-11-13 10:35:03 +08:00
Manson Wang 182729a7fe Prevent reloading issue in kernel.js 2013-11-13 10:19:40 +08:00
Manson Wang a1840c86de Fix Peg_content,Annoucement authorization bug 2013-11-12 19:09:29 +08:00
saurabhbhatia 5f3f27fe9a Desktop Enabled in menu 2013-11-11 18:31:04 +08:00
saurabhbhatia c575dbd33a Fixed Desktop Openness 2013-11-11 17:40:51 +08:00
Harry Bomrah 405c2c5a12 small fix for banner pagination. 2013-11-11 17:23:18 +08:00
saurabhbhatia 5e0696890a Updated Remember me, and Homepage widget more link 2013-11-11 17:23:03 +08:00
Harry Bomrah afff07ec89 items.js modified for new page setting 2013-11-08 18:32:45 +08:00
Harry Bomrah ed569601c3 two major fix for site setting and bulletin controller 2013-11-08 16:38:17 +08:00
saurabhbhatia 2f61f55be2 Rays fixes 2013-11-08 12:55:04 +08:00
Harry Bomrah 0db28d9ab4 gallery theater url fix for theater 2013-11-07 22:11:40 +08:00
saurabhbhatia 4f3f074573 Fixed page node link 2013-11-07 19:46:50 +08:00
Harry Bomrah c51dd81d2b fixed page setting select all bug 2013-11-07 19:27:04 +08:00
Harry Bomrah d17953ab86 partial is rendered when editing a page part 2013-11-07 17:23:15 +08:00
Harry Bomrah 4353b481c7 changed the frontend loading to more rails specific. and also fixed the filter reload in thumbnali and summary view of members 2013-11-07 14:39:07 +08:00
saurabhbhatia 4e706fab0c Fixed gallery and video widgets 2013-11-07 11:00:10 +08:00
Harry Bomrah 49217d4705 fixed all button for page settings and also filter display after page refresh 2013-11-06 22:36:59 +08:00
saurabhbhatia 591a3e0bc4 Updated redirect path after saving a page 2013-11-06 17:20:40 +08:00
Manson Wang 3744e1c3e7 By Ray, Fix structure page editinh bug 2013-11-06 17:16:14 +08:00
Manson Wang 5df8ff2e52 By Ray, Fix structure page editing bug 2013-11-06 16:48:56 +08:00
saurabhbhatia 9760100b69 Removed the logger 2013-11-06 16:38:55 +08:00
Manson Wang ff6eb5d674 Fix annoucement preview image bug 2013-11-06 16:31:27 +08:00
saurabhbhatia 2d0fd1d2e4 Fixed select all checkboxes 2013-11-06 15:29:15 +08:00
saurabhbhatia ef67941ba5 Fix for widgets edit form 2013-11-06 15:11:09 +08:00
Manson Wang 18d0657321 Fix dashboard system usage refresh bug 2013-11-06 09:29:57 +08:00
Harry Bomrah 3c4f22234b fixed template updation from site preferences 2013-11-05 20:50:05 +08:00
Harry Bomrah bae1c0da7d now only approved announcement can be viewed when backend is open 2013-11-05 20:50:02 +08:00
Manson Wang 7401a6ae59 Update for dashboard and Fix site.rake,new_site.rake for missing "menu_enabled_for" 2013-11-05 19:38:47 +08:00
Harry Bomrah 9d7af2ccac fixed the edit link problem in site settings 2013-11-05 16:54:33 +08:00
rulingcom b1867dd47a new code logic for saving tree.. should work fine even if the node positions fail 2013-11-04 22:20:50 +08:00
Manson Wang 7ad05ef034 Dashboard with Google Chart 2013-11-04 17:48:51 +08:00
Harry Bomrah 2c8705ac3e fixed site structure and also member roles side bar problem. 2013-11-04 17:39:16 +08:00
saurabhbhatia 2b97d4ca22 Updated Theme in design 2013-11-04 16:31:09 +08:00
saurabhbhatia 3816314b5b Fixed Temaplte Module with Info and Images 2013-11-04 16:12:30 +08:00
saurabhbhatia 1f3f9831ad Fixed Openness Issue 2013-11-04 15:44:51 +08:00
Harry Bomrah eaa87b3dd8 new categories for calendar with colors inside.. plus changed the working of calendar. it has now categories like all other modules 2013-11-04 15:17:50 +08:00
saurabhbhatia 17f31d1e25 Fix for Site preference 2013-11-04 09:41:28 +08:00
saurabhbhatia d636248073 Updated Sidebar, Application Controllers 2013-11-01 16:42:39 +08:00
chris 8a4242aae9 Fix data count for page form in structure 2013-10-31 18:12:07 +08:00
chris c541e84254 Remove include of ParserBackEnd 2013-10-31 16:17:51 +08:00
chris 778f7c7863 Delete Archive folder in assets and useless files in lib 2013-10-31 14:13:24 +08:00
chris 68e12fd737 Add format validation to link.rb 2013-10-31 14:09:59 +08:00
chris 00010867a4 Fix link in structure 2013-10-30 18:53:23 +08:00
Manson Wang a885313e75 Dashboard with HighChart 2013-10-30 18:23:46 +08:00
chris 62c663d699 Fix for togglebox and menu_enabled_for 2013-10-30 17:26:31 +08:00
saurabhbhatia 3aac221c4e removed site restart after site preferences update 2013-10-30 14:18:03 +08:00
chris 36ddbf68e0 Fix menu_enabled_for 2013-10-29 14:39:23 +08:00
chris f2508e79cb Fix edit_title for nil module_app 2013-10-29 14:00:56 +08:00
chris 6bc00ce3a3 Use module_app label instead of title 2013-10-29 11:17:02 +08:00
chris 454e36b4ae iFrame ajaxStop 2013-10-29 11:09:20 +08:00
chris 16659d79cd Fix asset:precompile error and delete useless file 2013-10-28 17:04:36 +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 42d0afe65c Page form with front end style 2013-10-28 16:29:23 +08:00
chris f3b3c94b42 Item control iframe dom
Css for preview
2013-10-26 18:58:53 +08:00
Spen 254f926093 fix new ui announcement preview 2013-10-24 15:03:20 +08:00
chris 3a3f913ae6 Put back old js 2013-10-23 18:39:46 +08:00
chris 8ebfac2b99 Structure link with json 2013-10-23 18:39:40 +08:00
chris a4d1c68299 Structure page with json 2013-10-23 18:39:35 +08:00
chris 6d5f1a2f12 Fix in js and css for pageslide and ad_banner 2013-10-23 18:39:30 +08:00
chris 94c1d7d5a0 Fix homepage in structure, ajaxStop for structure edit, setForm in pageslide.js 2013-10-23 18:39:21 +08:00
Manson Wang 52fa11a429 Fix filemanager delete url path 2013-10-23 10:42:54 +08:00
saurabhbhatia 0a69bbb653 Updated Favicon display and wording 2013-10-22 10:34:10 +08:00
saurabhbhatia 11ef2a13d6 Updated Site preference with Remove Image functionality for orbit bar 2013-10-21 18:45:49 +08:00
saurabhbhatia cf89ed108a Fixed Site Preferences Language 2013-10-21 17:46:29 +08:00
saurabhbhatia e42cf8720e Updated Site Preferences with language fix 2013-10-21 16:53:11 +08:00
Spen c76adc1896 new ui member account privilege fix 2013-10-21 10:42:50 +08:00
chris f9f2232259 Add setForm and resetForm to pageslide.js
Category, AdBanner and Tag are using js to load the values in the form
2013-10-21 06:34:55 +08:00
chris 8e168b0fe1 Remove erro-cover on close and loadComplete 2013-10-20 21:16:17 +08:00
chris 606ac05563 Pageslide fix for error message and focused element 2013-10-20 20:54:23 +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 9f5bce9351 Review of the uploaders
Rake task to recreate version: uploader:recreate or uploader:recreate name1 name2 ...
2013-10-20 16:07:20 +08:00
chris 1d32552b51 Add missing effect to banner 2013-10-19 19:54:37 +08:00
chris 9e74d6d47b Add missing js and css for mobile and fix ad_banner 2013-10-19 19:35:33 +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 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
chris a76164465e Fix editing a tag module 2013-10-16 23:34:51 +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
chris 279ac774d4 Migrate form old ui to new ui (categories, tags and authorizations) 2013-10-15 23:38:44 +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 96c3be68f7 Fixed Enable and Disable, Sitemap and Terms of Use for header and footer 2013-10-15 10:37:49 +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 08a8d668ec Display de page contexts in the mobile version as set in structure 2013-10-08 18:11:29 +08: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 cce68beff1 Quick fix for front end reloading 2013-10-08 14:52:24 +08:00
chris cf7f7aa29c Fix tag page slide issues 2013-10-08 12:47:31 +08:00
chris 5328a26440 Fix structure position 2013-10-08 12:33:24 +08:00
chris fe1869199e Fix typo, it wasn't executing the filtering on tags 2013-10-07 19:01:59 +08:00
chris 061225f56c Override mongoid-tree callback condition for default position 2013-10-07 18:23:54 +08:00
saurabhbhatia b3e16ce23b Updated desktop widgets controller 2013-10-07 18:13:55 +08:00
saurabhbhatia fad191aefe Updated Desktop Inheritence class 2013-10-07 17:47:13 +08:00
chris 48aa7ed638 Update rake for resetting position
Fix codemirror css
2013-10-07 16:23:07 +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
Manson Wang 831bd722b8 Fix site preference openness problem 2013-10-07 14:37:52 +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
chris 43cf6b70b7 Fix structure reorder position 2013-10-04 15:07:24 +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
saurabhbhatia 31b55a0635 Revert "Updated Orbit js to latest version"
This reverts commit b18e61a6c0.
2013-10-02 12:32:45 +08:00
chris 433c8d5da6 Fix link in category for authorization, fix update of auth users 2013-10-02 12:18:20 +08:00
saurabhbhatia b18e61a6c0 Updated Orbit js to latest version 2013-10-02 12:09:44 +08:00
saurabhbhatia 4fe2e31f0e Updated Global css to fix the line height 2013-10-01 17:51:07 +08:00
saurabhbhatia 31e4fb9f39 Updated sidebar line height 2013-10-01 17:47:58 +08:00
saurabhbhatia 9bdb633157 Updated with UI Changes 2013-10-01 17:39:21 +08:00
Harry Bomrah caca264b50 isotope fixed for all plugins for list and form. 2013-10-01 15:06:49 +08:00