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
|
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 |
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
|
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
|
2762c24593
|
Fix wrong variable names in translations
|
2012-05-02 16:22:06 +08:00 |
|
Christophe Vilayphiou
|
b8f52fa1ec
|
Separate announcement and news
|
2012-04-30 06:31:46 +08:00 |
|
Matthew K. Fu JuYuan
|
a46a8898d7
|
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
|
2012-04-30 00:24:11 +08:00 |
|
Christophe Vilayphiou
|
851dc72f42
|
Ray's changes in css and html
|
2012-04-30 00:17:18 +08:00 |
|
Christophe Vilayphiou
|
3beb035101
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-27 11:11:56 +08:00 |
|
Christophe Vilayphiou
|
5aca3db95f
|
Ray's changes for structure and web_links
|
2012-04-27 11:02:56 +08:00 |
|
Matthew K. Fu JuYuan
|
4af2068c1f
|
Fix ad_banner sec and msec
|
2012-04-26 17:11:06 +08:00 |
|
Matthew K. Fu JuYuan
|
faace9893a
|
dehumanize ad banner
|
2012-04-26 17:11:05 +08:00 |
|
Matthew K. Fu JuYuan
|
9a5ce5f512
|
Remove unless sidebar links.
|
2012-04-26 17:11:05 +08:00 |
|
Christophe Vilayphiou
|
3d293f6419
|
Fix for quick edit file and link in announcement
Change submit_button into ajax_for_submit
|
2012-04-26 16:42:28 +08:00 |
|
Christophe Vilayphiou
|
6bf4c60d45
|
Changes for js and ccs load for site's pages
|
2012-04-26 01:49:02 +08:00 |
|
Christophe Vilayphiou
|
6f1eb97ace
|
Fix for structure js and css
|
2012-04-25 18:41:38 +08:00 |
|
Christophe Vilayphiou
|
876036dd20
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
|
2012-04-25 16:39:26 +08:00 |
|
Christophe Vilayphiou
|
44ded537b3
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-25 16:28:34 +08:00 |
|
Christophe Vilayphiou
|
65a6f9c416
|
Ray's css fix for quick edit
|
2012-04-25 16:26:27 +08:00 |
|
Matthew K. Fu JuYuan
|
a3a109fb8b
|
Remove JS debug msg.
|
2012-04-25 16:10:11 +08:00 |
|
Matthew K. Fu JuYuan
|
7f285f4719
|
Change ad_banner preview from using title to id
|
2012-04-25 16:10:11 +08:00 |
|
Christophe Vilayphiou
|
3ec8bb7be6
|
Fix assets bug: when having a '.' in the name, the extension must be specified
|
2012-04-25 15:10:28 +08:00 |
|
Matthew K. Fu JuYuan
|
e7bb9ea86b
|
Fix ad image date selector
|
2012-04-24 14:37:06 +08:00 |
|
Matthew K. Fu JuYuan
|
c57ba305e9
|
Fix ad_banner
|
2012-04-24 14:37:06 +08:00 |
|
Christophe Vilayphiou
|
c856b4cdce
|
Fix for upload image component in announcement
|
2012-04-24 12:41:28 +08:00 |
|
Christophe Vilayphiou
|
42aeaead93
|
Ray's changes, put the js for upload image component in a separate file
|
2012-04-24 12:15:32 +08:00 |
|
Christophe Vilayphiou
|
b80339d704
|
Ray's changes for image upload component and sign-in page
|
2012-04-24 11:35:50 +08:00 |
|
Christophe Vilayphiou
|
6831a3dbbb
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-24 02:44:39 +08:00 |
|
Christophe Vilayphiou
|
0c4328987a
|
Ray's changes for css files, sort headers in announcement and pagination
|
2012-04-24 02:37:51 +08:00 |
|
Christophe Vilayphiou
|
a5b13e680f
|
Add sub_menu in r_tags
|
2012-04-24 02:30:40 +08:00 |
|
Matthew K. Fu JuYuan
|
67ba2389a2
|
fix js
|
2012-04-23 14:07:14 +08:00 |
|
Matthew K. Fu JuYuan
|
8eedbc951e
|
add i18n vars
|
2012-04-23 14:07:14 +08:00 |