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

332 Commits

Author SHA1 Message Date
Christophe Vilayphiou ef2d416c70 Ray's changes for page_edit 2012-05-13 19:36:04 +08:00
Christophe Vilayphiou ef49df448d Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/helpers/admin/item_helper.rb
 2012-05-11 18:09:34 +08:00
Christophe Vilayphiou 076f5ad6ef Ray's changes for drag and drop in structure's side_bar 2012-05-11 17:54:33 +08:00
Christophe Vilayphiou 6a443f0976 Add mongoid-tree to Item 2012-05-11 16:16:09 +08:00
Christophe Vilayphiou fd52d00187 Add drag and drop to structure side_bar 2012-05-11 10:00:45 +08:00
Christophe Vilayphiou 63f904d3b0 Fix tinymce js load 
Change to full_name for page_context index
 2012-05-10 20:36:19 +08:00
Matthew K. Fu JuYuan b6aad17681 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. 2012-05-10 14:16:37 +08:00
Christophe Vilayphiou a43877323e Add tinymce to page_part edit for text 2012-05-10 10:34:13 +08:00
Christophe Vilayphiou bc5e975fab Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-10 00:29:22 +08:00
Christophe Vilayphiou 9161dc73b5 Translation for "or" 2012-05-10 00:27:12 +08:00
Christophe Vilayphiou 13587306bc Add list widgets for announcement, news and links with categories and tags 2012-05-10 00:25:30 +08:00
Christophe Vilayphiou ecd21338bc Matt's changes for side_bar 2012-05-10 00:23:42 +08:00
Christophe Vilayphiou 038378be9a Ray's changes for inccu in orbit_bar 2012-05-09 15:20:09 +08:00
Matthew K. Fu JuYuan 6c9944918a Fix i18 variable 2012-05-09 14:18:52 +08:00
Matthew K. Fu JuYuan 47bca643af hidding new ad_banner 2012-05-09 14:17:20 +08:00
Christophe Vilayphiou f9f7ddc8ee Hide some links in side_bar for site_settings 2012-05-09 12:53:42 +08:00
Christophe Vilayphiou 44a485611a Site_info and site_setting i18n 2012-05-09 12:29:46 +08:00
Christophe Vilayphiou 9216f29bc9 Ray's changes for mail settings 2012-05-09 12:19:32 +08:00
Christophe Vilayphiou 41c0c26330 Add mail_settings 2012-05-09 11:38:29 +08:00
Christophe Vilayphiou b3be210ff7 Small adjustment for dashboard 2012-05-09 05:55:47 +08:00
Christophe Vilayphiou 2b03263fb7 Dashboard partial implementation 2012-05-09 05:53:07 +08:00
Christophe Vilayphiou 8d70d87120 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-09 04:13:14 +08:00
Christophe Vilayphiou 26a50cc862 Add sub_menu to children 2012-05-09 04:15:45 +08:00
Christophe Vilayphiou a186ae08d8 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 21:47:03 +08:00
Christophe Vilayphiou 18c42a80a6 Put site_settings in the orbit_button 2012-05-08 20:06:56 +08:00
Christophe Vilayphiou 5c7cf1aef2 Add sub_menu to site_info 2012-05-08 17:27:02 +08:00
Christophe Vilayphiou d2e07f537a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 17:24:40 +08:00
Christophe Vilayphiou a3868cb785 Ray's changes for front-end banner 2012-05-08 17:21:26 +08:00
Christophe Vilayphiou caba8ce7a4 Add nccu icon 
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
 2012-05-08 15:27:43 +08:00
Christophe Vilayphiou ba4385e3fd Add module authorization for news 
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
 2012-05-08 10:50:09 +08:00
Christophe Vilayphiou 469f5c8267 Add always_display checkbox for title in site_info independent of i18n 2012-05-07 16:29:32 +08:00
Christophe Vilayphiou 9a5e7cc8fa Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/views/admin/sites/site_info.html.erb
 2012-05-07 16:08:05 +08:00
Christophe Vilayphiou f534e6ca7b Ray's changes for site_info 2012-05-07 15:55:45 +08:00
Christophe Vilayphiou 8a3f0b9bdc Add menu_enabled_for: the page can be shown even if there's no link in the menu 2012-05-07 15:47:14 +08:00
Christophe Vilayphiou 8b61314cc4 Add i18n for site_info. 
Add always display site title.
Changes for menu in front-end
 2012-05-07 15:11:43 +08:00
Christophe Vilayphiou 0246341aef Add footer to site_info 2012-05-07 11:25:33 +08:00
Christophe Vilayphiou 1fb6c20b86 Add site_info 2012-05-07 00:54:18 +08:00
Christophe Vilayphiou 48f8fbde7f Fix site_locale_default_head and active for current locale 2012-05-07 00:53:52 +08:00
Christophe Vilayphiou 51f87e7212 Add missing translation for enabled_for 2012-05-06 03:36:01 +08:00
Christophe Vilayphiou ce1fecaf93 Add position ordering and hiding page for i18n 2012-05-06 00:35:13 +08:00
Christophe Vilayphiou f190ce18ee Put sorting in web_link, page_context and design 2012-05-05 21:20:20 +08:00
Christophe Vilayphiou 555aa088d9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-04 19:23:45 +08:00
Christophe Vilayphiou e0a191162d Ray's changes 2012-05-04 19:11:28 +08:00
Matthew K. Fu JuYuan 453cb21066 Announcement preivew 2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan f6307abfbf fix broken ad_banner 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan bff3cefbc7 Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager. 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan f427c3803f clean up useless flash msgs. add i18n vars for app auth and object auth 2012-05-04 15:40:43 +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 b8cd7097b0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-02 16:27:09 +08:00
Christophe Vilayphiou 2762c24593 Fix wrong variable names in translations 2012-05-02 16:22:06 +08:00