2b03263fb7
Dashboard partial implementation
2012-05-09 05:53:07 +08:00
8d70d87120
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-09 04:13:14 +08:00
26a50cc862
Add sub_menu to children
2012-05-09 04:15:45 +08:00
a186ae08d8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 21:47:03 +08:00
18c42a80a6
Put site_settings in the orbit_button
2012-05-08 20:06:56 +08:00
5c7cf1aef2
Add sub_menu to site_info
2012-05-08 17:27:02 +08:00
d2e07f537a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 17:24:40 +08:00
a3868cb785
Ray's changes for front-end banner
2012-05-08 17:21:26 +08:00
2b9190a49e
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
469f5c8267
Add always_display checkbox for title in site_info independent of i18n
2012-05-07 16:29:32 +08:00
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
f534e6ca7b
Ray's changes for site_info
2012-05-07 15:55:45 +08:00
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
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
0246341aef
Add footer to site_info
2012-05-07 11:25:33 +08:00
1fb6c20b86
Add site_info
2012-05-07 00:54:18 +08:00
48f8fbde7f
Fix site_locale_default_head and active for current locale
2012-05-07 00:53:52 +08:00
51f87e7212
Add missing translation for enabled_for
2012-05-06 03:36:01 +08:00
ce1fecaf93
Add position ordering and hiding page for i18n
2012-05-06 00:35:13 +08:00
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
f6307abfbf
fix broken ad_banner
2012-05-04 15:40:43 +08:00
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +08:00
2762c24593
Fix wrong variable names in translations
2012-05-02 16:22:06 +08:00
20504b2205
Merge branch 'design_team' into ldap
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
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
851dc72f42
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
2362e1cfdd
Merge branch 'design_team' into ldap
2012-04-27 15:28:32 +08:00
3beb035101
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-27 11:11:56 +08:00
5aca3db95f
Ray's changes for structure and web_links
2012-04-27 11:02:56 +08:00
7d6b82d9dd
Merge branch 'ad_banner' into ldap
2012-04-26 17:15:44 +08:00
4af2068c1f
Fix ad_banner sec and msec
2012-04-26 17:11:06 +08:00
faace9893a
dehumanize ad banner
2012-04-26 17:11:05 +08:00
9a5ce5f512
Remove unless sidebar links.
2012-04-26 17:11:05 +08:00
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
6bf4c60d45
Changes for js and ccs load for site's pages
2012-04-26 01:49:02 +08:00
6f1eb97ace
Fix for structure js and css
2012-04-25 18:41:38 +08:00
1f4fe65430
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
2012-04-25 16:45:04 +08:00
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
44ded537b3
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-25 16:28:34 +08:00
65a6f9c416
Ray's css fix for quick edit
2012-04-25 16:26:27 +08:00
a3a109fb8b
Remove JS debug msg.
2012-04-25 16:10:11 +08:00
7f285f4719
Change ad_banner preview from using title to id
2012-04-25 16:10:11 +08:00
8adb9c6878
Merge branch 'design_team' into ldap
2012-04-25 15:10:50 +08:00
3ec8bb7be6
Fix assets bug: when having a '.' in the name, the extension must be specified
2012-04-25 15:10:28 +08:00
70f6c7b540
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-24 15:28:52 +08:00
e7bb9ea86b
Fix ad image date selector
2012-04-24 14:37:06 +08:00
c57ba305e9
Fix ad_banner
2012-04-24 14:37:06 +08:00
c856b4cdce
Fix for upload image component in announcement
2012-04-24 12:41:28 +08:00
42aeaead93
Ray's changes, put the js for upload image component in a separate file
2012-04-24 12:15:32 +08:00
b80339d704
Ray's changes for image upload component and sign-in page
2012-04-24 11:35:50 +08:00
308cfc7cf2
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
2012-04-24 02:46:06 +08:00
6831a3dbbb
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-04-24 02:44:39 +08:00
0c4328987a
Ray's changes for css files, sort headers in announcement and pagination
2012-04-24 02:37:51 +08:00
d4aea664e2
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
2012-04-24 02:37:03 +08:00
a5b13e680f
Add sub_menu in r_tags
2012-04-24 02:30:40 +08:00
2eeb530422
Merge branch 'master' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +08:00
67ba2389a2
fix js
2012-04-23 14:07:14 +08:00
8eedbc951e
add i18n vars
2012-04-23 14:07:14 +08:00
0c46b4da23
AdImage and AnBanner JS fixed
2012-04-23 14:07:13 +08:00
81b0046f42
Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.
2012-04-23 14:07:13 +08:00
e353afb5ac
fix i18n vars in ad_banner
2012-04-23 14:07:13 +08:00
1b70852ff7
realtime preview is working. but save to object when preview
2012-04-23 14:06:37 +08:00
30edc317b2
text area for ad_image
2012-04-23 14:06:36 +08:00
ff472714de
AdBanner i18n vars patch
2012-04-23 14:05:18 +08:00
ba0677a001
Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap
2012-04-19 14:09:37 +08:00
f55b3a4374
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:06:00 +08:00
72efdbd742
changes before Chirs and Ray's trip
2012-04-19 11:50:54 +08:00
430b0fd9ae
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
...
Conflicts:
app/views/admin/ad_banners/_ad_image_update.html.erb
2012-04-13 16:52:14 +08:00
4af73ecf6f
fix preview window size.
2012-04-13 16:46:16 +08:00
0fe5baf93f
fix for letting ad_banner display even when file in not uploaded
2012-04-13 16:14:43 +08:00
ca0fc4c767
Comment out code that bugged upload image in ad_banner
2012-04-13 15:53:25 +08:00
d646a9dff1
fix new ad_image data selector bug
2012-04-13 15:24:59 +08:00
fe59446c16
fix date selector value fill back problem
2012-04-13 12:47:57 +08:00
d2e77d6bf8
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
2012-04-09 12:45:27 +08:00
d2a3a4d26e
ad banner preview
2012-04-09 12:44:08 +08:00
1259d62249
Fix mainTablePosition in js -> remove the notable class
2012-04-05 14:55:41 +08:00
a9988a0d5c
Change for interface,form.
2012-04-02 11:00:51 +08:00
8f28d45379
The new AdBanner.
2012-04-02 03:04:38 +08:00
b17cd7570f
changing to new admin_layout
2012-04-02 02:58:02 +08:00
928c642840
change layout from old admin to new_admin. not complete code
2012-04-02 02:58:01 +08:00
503f71e554
Ray's changes in tags, css and js
2012-04-02 02:55:36 +08:00
32b7d95669
Fix parser_back_end & side_bar & meta
2012-03-30 15:51:29 +08:00
d02bbdbaa5
Nokogiri in parsers
2012-03-27 18:58:04 +08:00
d5a2de5476
LDAP with sync rake task
2012-03-06 16:41:06 +08:00
cceb785a8d
change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.
2012-02-29 18:58:33 +08:00
8932615f05
add "all_user" for app&object auth
2012-02-29 18:56:42 +08:00
2e58c63ff7
fix bugs with token
2012-02-29 18:56:42 +08:00
cc550c5745
First version for App and Object auth.Taking Announcement as experiment
2012-02-29 18:55:55 +08:00
3bcd7ea349
Exp with object_auth
2012-02-29 18:50:23 +08:00
18617850e5
Add categories for all the widgets
2012-02-28 22:00:05 +08:00
6a30b0a1e4
Add RSS event
2012-02-28 18:29:13 +08:00
fdf4cfad2d
Add category for announcement widget
2012-02-28 14:08:57 +08:00
f13ebc6c46
Fix bugs and changes for nccu
2012-02-27 18:50:56 +08:00
63d7810b35
Add isotope, categories for announcement page, sort for announcement
2012-02-23 15:52:58 +08:00
3ff2e7867e
Fix bug when editing home
2012-02-20 03:22:53 +08:00
0b71714d44
Improve code in items, pages, links
2012-02-17 14:54:11 +08:00
4389f0cf28
Add new created files to previous commit
2012-02-16 13:09:09 +08:00
e0accbecaa
Changes into page_part edition.
...
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
d0c2856a3a
Fix relations error in tags
2012-02-15 11:42:19 +08:00
3e70634add
Announcement modifications and tags
2012-02-15 00:34:22 +08:00
55ae7de01c
Orbit-bar in front-end and back-end, side-bar and drop-down menu
2012-02-15 00:34:22 +08:00
dcc6a53430
brief starting for dashboard,adds i18n vars
2012-02-15 00:34:21 +08:00
436f039c1b
build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link
2012-02-15 00:34:21 +08:00
e20739e32b
Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
...
1.Object.authed_for_user(user,title_of_object_auth). title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) . title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-15 00:34:21 +08:00
3ed9b81df9
first commit for object auth,will take new_blog for experiment
2012-02-15 00:34:21 +08:00
8b3b71ca58
fix js bugs,partial bugs
2012-02-06 16:17:07 +08:00
394099c388
Ad banner close complete,need validation
2012-02-04 09:37:23 +08:00
68cea1ea49
AdBanner is now working
2012-02-04 09:37:23 +08:00
f530eb7112
Revert "mistake commit"
...
This reverts commit 2608b72d65
2012-02-03 14:39:15 +08:00
2608b72d65
mistake commit
2012-02-03 14:28:08 +08:00
a980847eb3
Basic function for AdBanner
2012-02-01 14:27:51 +08:00
46db173e0b
Modifications in the Design code: the uploader works but the edit is broken
2012-01-26 12:05:25 +08:00
afbb9e266a
User role and sub_role simple interface complete
2012-01-24 12:28:33 +08:00
4ed8a2164c
First complete with manager and submanager
2012-01-24 12:28:32 +08:00
18a82d7f47
Manger and SubManager
2012-01-24 12:28:32 +08:00
9fcf8280fa
Change "_filename" to "_identifier" for carrierwave
2012-01-24 11:57:27 +08:00
5518ae362d
Ray's modification before redesign
2012-01-24 11:57:27 +08:00
1bbb197fba
Forgot to remove ":remote => true" for asset new
2012-01-24 11:56:08 +08:00
b04d845a5a
New rss.js from Harry and fix html form for assets
2012-01-24 11:56:08 +08:00
4be97f6ea6
Merge branch 'fix_it'
...
Conflicts:
app/assets/javascripts/page_edit.js
app/assets/javascripts/rss.js
app/assets/stylesheets/admin.css.erb
app/assets/stylesheets/admin_back_end.css.erb
app/controllers/admin/app_auths_controller.rb
app/controllers/admin/module_apps_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/models/app_auth.rb
app/models/user/user.rb
app/views/admin/app_auths/index.html.erb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_new.html.erb
app/views/admin/designs/new.html.erb
app/views/admin/infos/_form.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/module_apps/index.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/roles/_form.html.erb
app/views/admin/roles/_sub_role.html.erb
app/views/admin/users/_form.html.erb
app/views/admin/users/_show_sub_role.html.erb
app/views/admin/users/_sub_role.html.erb
app/views/admin/users/edit.html.erb
app/views/admin/users/index.html.erb
app/views/admin/users/new.html.erb
app/views/admin/users/show.html.erb
app/views/layouts/admin.html.erb
lib/fraisier/layout.html
lib/parsers/parser_back_end.rb
lib/parsers/parser_layout.rb
lib/tasks/dev.rake
spec/models/app_auth_basic.rb
vendor/built_in_modules/NewBlog/.gitignore
vendor/built_in_modules/NewBlog/Gemfile
vendor/built_in_modules/NewBlog/Gemfile.lock
vendor/built_in_modules/NewBlog/MIT-LICENSE
vendor/built_in_modules/NewBlog/NewBlog.gemspec
vendor/built_in_modules/NewBlog/README.rdoc
vendor/built_in_modules/NewBlog/Rakefile
vendor/built_in_modules/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/NewBlog/app/controllers/.gitkeep
vendor/built_in_modules/NewBlog/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/app/controllers/panel/blog/back_end/posts_controller.rb
vendor/built_in_modules/NewBlog/app/helpers/.gitkeep
vendor/built_in_modules/NewBlog/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/app/models/.gitkeep
vendor/built_in_modules/NewBlog/app/models/comment.rb
vendor/built_in_modules/NewBlog/app/models/post.rb
vendor/built_in_modules/NewBlog/app/views/.gitkeep
vendor/built_in_modules/NewBlog/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/NewBlog/app/views/layouts/production.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/_form.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/new.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/front_end/posts/show.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/index.html.erb
vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/NewBlog/config/locales/en.yml
vendor/built_in_modules/NewBlog/lib/NewBlog.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb
vendor/built_in_modules/NewBlog/lib/NewBlog/version.rb
vendor/built_in_modules/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/NewBlog/script/rails
vendor/built_in_modules/NewBlog/test/NewBlog_test.rb
vendor/built_in_modules/NewBlog/test/dummy/Rakefile
vendor/built_in_modules/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/NewBlog/test/dummy/config.ru
vendor/built_in_modules/NewBlog/test/dummy/config/application.rb
vendor/built_in_modules/NewBlog/test/dummy/config/boot.rb
vendor/built_in_modules/NewBlog/test/dummy/config/database.yml
vendor/built_in_modules/NewBlog/test/dummy/config/environment.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/development.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/production.rb
vendor/built_in_modules/NewBlog/test/dummy/config/environments/test.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/NewBlog/test/dummy/config/locales/en.yml
vendor/built_in_modules/NewBlog/test/dummy/config/mongoid.yml
vendor/built_in_modules/NewBlog/test/dummy/config/routes.rb
vendor/built_in_modules/NewBlog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/log/.gitkeep
vendor/built_in_modules/NewBlog/test/dummy/public/404.html
vendor/built_in_modules/NewBlog/test/dummy/public/422.html
vendor/built_in_modules/NewBlog/test/dummy/public/500.html
vendor/built_in_modules/NewBlog/test/dummy/public/favicon.ico
vendor/built_in_modules/NewBlog/test/dummy/script/rails
vendor/built_in_modules/NewBlog/test/integration/navigation_test.rb
vendor/built_in_modules/NewBlog/test/test_helper.rb
vendor/built_in_modules/blog/app/controllers/application_controller.rb
vendor/built_in_modules/blog/app/controllers/panel/blog/posts_controller.rb
vendor/built_in_modules/blog/app/helpers/application_helper.rb
vendor/built_in_modules/blog/app/models/comment.rb
vendor/built_in_modules/blog/app/models/post.rb
vendor/built_in_modules/blog/app/views/layouts/application.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/_form.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb
vendor/built_in_modules/blog/app/views/panel/blog/posts/show.html.erb
vendor/built_in_modules/blog/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/blog/config/initializers/inflections.rb
vendor/built_in_modules/blog/config/initializers/mime_types.rb
vendor/built_in_modules/blog/public/404.html
vendor/built_in_modules/blog/public/422.html
vendor/built_in_modules/blog/public/500.html
vendor/built_in_modules/blog/public/favicon.ico
vendor/built_in_modules/blog/public/stylesheets/.gitkeep
vendor/built_in_modules/blog/script/rails
vendor/built_in_modules/blog/vendor/plugins/.gitkeep
vendor/built_in_modules/new_blog/.gitignore
vendor/built_in_modules/new_blog/Gemfile
vendor/built_in_modules/new_blog/Gemfile.lock
vendor/built_in_modules/new_blog/MIT-LICENSE
vendor/built_in_modules/new_blog/README.rdoc
vendor/built_in_modules/new_blog/Rakefile
vendor/built_in_modules/new_blog/app/assets/images/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/javascripts/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/application.css
vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/production.css
vendor/built_in_modules/new_blog/app/controllers/.gitkeep
vendor/built_in_modules/new_blog/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb
vendor/built_in_modules/new_blog/app/helpers/.gitkeep
vendor/built_in_modules/new_blog/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/app/models/.gitkeep
vendor/built_in_modules/new_blog/app/models/comment.rb
vendor/built_in_modules/new_blog/app/models/post.rb
vendor/built_in_modules/new_blog/app/views/.gitkeep
vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb
vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb
vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb
vendor/built_in_modules/new_blog/config/locales/en.yml
vendor/built_in_modules/new_blog/lib/new_blog/version.rb
vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake
vendor/built_in_modules/new_blog/new_blog.gemspec
vendor/built_in_modules/new_blog/script/rails
vendor/built_in_modules/new_blog/test/NewBlog_test.rb
vendor/built_in_modules/new_blog/test/dummy/Rakefile
vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js
vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css
vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb
vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb
vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb
vendor/built_in_modules/new_blog/test/dummy/config.ru
vendor/built_in_modules/new_blog/test/dummy/config/application.rb
vendor/built_in_modules/new_blog/test/dummy/config/boot.rb
vendor/built_in_modules/new_blog/test/dummy/config/database.yml
vendor/built_in_modules/new_blog/test/dummy/config/environment.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb
vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb
vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb
vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml
vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml
vendor/built_in_modules/new_blog/test/dummy/config/routes.rb
vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep
vendor/built_in_modules/new_blog/test/dummy/public/404.html
vendor/built_in_modules/new_blog/test/dummy/public/422.html
vendor/built_in_modules/new_blog/test/dummy/public/500.html
vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico
vendor/built_in_modules/new_blog/test/dummy/script/rails
vendor/built_in_modules/new_blog/test/integration/navigation_test.rb
vendor/built_in_modules/new_blog/test/test_helper.rb
vendor/plugins/NewBlog/.gitignore
vendor/plugins/NewBlog/Gemfile
vendor/plugins/NewBlog/Gemfile.lock
vendor/plugins/NewBlog/MIT-LICENSE
vendor/plugins/NewBlog/NewBlog.gemspec
vendor/plugins/NewBlog/README.rdoc
vendor/plugins/NewBlog/Rakefile
vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
vendor/plugins/NewBlog/app/controllers/.gitkeep
vendor/plugins/NewBlog/app/helpers/.gitkeep
vendor/plugins/NewBlog/app/mailers/.gitkeep
vendor/plugins/NewBlog/app/models/.gitkeep
vendor/plugins/NewBlog/app/views/.gitkeep
vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb
vendor/plugins/NewBlog/app/views/layouts/production.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb
vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb
vendor/plugins/NewBlog/config/locales/en.yml
vendor/plugins/NewBlog/lib/NewBlog/version.rb
vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake
vendor/plugins/NewBlog/script/rails
vendor/plugins/NewBlog/test/NewBlog_test.rb
vendor/plugins/NewBlog/test/dummy/Rakefile
vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js
vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css
vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb
vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep
vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb
vendor/plugins/NewBlog/test/dummy/config.ru
vendor/plugins/NewBlog/test/dummy/config/application.rb
vendor/plugins/NewBlog/test/dummy/config/boot.rb
vendor/plugins/NewBlog/test/dummy/config/database.yml
vendor/plugins/NewBlog/test/dummy/config/environment.rb
vendor/plugins/NewBlog/test/dummy/config/environments/development.rb
vendor/plugins/NewBlog/test/dummy/config/environments/production.rb
vendor/plugins/NewBlog/test/dummy/config/environments/test.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb
vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
vendor/plugins/NewBlog/test/dummy/config/locales/en.yml
vendor/plugins/NewBlog/test/dummy/config/mongoid.yml
vendor/plugins/NewBlog/test/dummy/config/routes.rb
vendor/plugins/NewBlog/test/integration/navigation_test.rb
vendor/plugins/NewBlog/test/test_helper.rb
2012-01-12 18:15:43 +08:00
c0efb5d1bc
Listing for Module-apps
2012-01-12 14:13:41 +08:00
79f778ad8c
creating for disabling widgets and frontend
2012-01-05 16:21:33 +08:00
7b40706aed
fixing for app_auth
2012-01-05 16:20:51 +08:00
d85f29e65c
Fix missing modification for "panel_main" to "back_main"
2011-12-29 17:49:48 +08:00
c1238a7043
Prefix ids with "back_" in back-end layout to avoid conflict with site's ids
2011-12-29 15:35:13 +08:00
b002c411ce
Merge branch 'design_team'
2011-12-28 21:03:35 +08:00
75c9851dbc
Ray's back-end modifications for sub-roles
2011-12-28 20:57:18 +08:00
090493fd51
Re-commit
2011-12-28 20:51:52 +08:00
245def9cb6
Integration of pop-up and generic js.erb
2011-12-28 20:49:53 +08:00
62aaf79491
Merge with sub_roles
2011-12-23 18:34:21 +08:00
fc591ee308
Ray's back_end modification before sub_roles
2011-12-23 18:02:45 +08:00
d3ca1647be
fix page form bugs
2011-12-23 13:54:28 +08:00
d465febca7
merge with november_presentation
2011-12-22 15:43:38 +08:00
e7c9816139
Move NewBlog to built_in_modules and delete "vendor/templates"
2011-12-22 01:38:27 +08:00
a09f8e4551
merge with november_presentation
2011-12-20 16:47:17 +08:00
afbffe37d5
Users can now be saved with sub_roles
2011-12-20 14:35:28 +08:00
4108ebf06d
Fix mongoid deeply nested polimorphic
...
Got the commit from github. The roles and sub_roles save.
2011-12-19 21:22:26 +08:00
d27d7a623c
Changes for sub_roles
...
Issues: update doesn't create new i18n_variables, role form has bugs
2011-12-18 10:07:42 +08:00
d23cf152da
Merge 'standardization' and 'role structure modification'
2011-12-10 18:21:59 +08:00
b7ac5478b4
Change role structure
...
Still needs to: change the views and create sub_roles in the dev.rake
2011-12-10 18:12:39 +08:00
f774084e9a
Back-end standardization
2011-12-10 18:03:32 +08:00
e0cdedfa2e
Remove useless controller and view
...
user_attributes_controller and user_attributes views
2011-12-06 18:12:12 +08:00
26b49dcf02
Remove js from html
2011-12-05 10:36:25 +08:00
962bf03af2
Remove snippet
2011-12-05 10:27:22 +08:00
f3f405c1b4
Remove useless files in items
2011-12-05 09:56:26 +08:00
75a3c4d5b1
Modify assets
...
Each layout has a manifest for css and js
2011-12-05 09:54:41 +08:00
a0ec38ca99
Merge with branch november_presentation
2011-12-01 13:50:49 +08:00
b68f5e11e5
Final modifications for the presentation
2011-11-22 18:54:10 +08:00
a03e9bada8
Add missing translations
2011-11-20 02:14:51 +08:00
ad9f9bbf5c
Final Ray's modifications
2011-11-19 21:47:18 +08:00
dac6348402
Integration of module_app workflow
2011-11-19 14:33:26 +08:00
65349796d0
Ray's modifications
2011-11-18 16:43:14 +08:00
861237d65b
Integration of Ray' modifications
2011-11-17 20:02:58 +08:00
0556dc9297
ika's modification to the backend
2011-11-16 18:34:54 +08:00
cb07a35cc9
Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD
2011-10-20 10:06:06 +08:00
ff82391b7d
Revert "Merge with new_blog"
...
This reverts commit 64c68fcdeb
2011-10-20 10:01:39 +08:00
64c68fcdeb
Merge with new_blog
2011-10-18 11:36:01 +08:00
f2e3cb00db
Fix bug when editing a page, the theme wasn't including blank
2011-09-13 14:03:03 +08:00
4db88282a1
Modification in Design structure_css -> default_css
2011-09-13 11:57:20 +08:00
07ccacb7d7
Modifications of the JS in Design
2011-09-09 15:40:13 +08:00
77b8fcdd1d
Fix previous workaround for the uploaded Design
2011-09-09 13:44:43 +08:00
a571d1dcff
Clean code and workaround mongoid embedded with carrierwave
2011-09-08 18:12:04 +08:00
151f005815
structure.css -> default.css
...
Themes are optional, a theme overrides style in default.css
2011-09-05 15:18:36 +08:00
492f691469
Modifications for menu in Design
2011-09-01 09:12:49 +08:00
c248b729db
CSS problem for page
2011-08-25 15:08:23 +08:00
c427e2af14
Page form with drop down. Modifications for Designs
2011-08-25 08:13:38 +08:00
27d47215e9
Modify edit page. Still need to handle "form" with drop down lists
2011-08-24 02:34:24 +08:00
1d214bedec
Revert "Revert "Clean code and add 'name' in theme.rb""
...
This reverts commit 00813c9060
2011-08-24 02:06:27 +08:00
00813c9060
Revert "Clean code and add 'name' in theme.rb"
...
This reverts commit 608180646b
2011-08-24 02:04:54 +08:00
608180646b
Clean code and add 'name' in theme.rb
2011-08-24 01:39:28 +08:00
118455aa81
Check if site is up-to-date
2011-08-23 19:40:49 +08:00
e0e14ddfac
Modify purchases list
2011-08-23 16:33:01 +08:00
2842001a3b
Update source: pull from git
2011-08-23 15:01:22 +08:00
2cdb5a756d
Set store_ip in config.yml
2011-08-22 14:01:51 +08:00
7a4ad240a8
Clean code for layout and modifications in dev.rake
2011-08-22 13:45:21 +08:00
86443661e9
Merge server and rails_3_1
2011-08-18 13:43:33 +08:00
e0811c14db
adding upload package for design. bugs in
2011-08-11 18:20:16 +08:00
34d0b8fac1
complete new parser for layout_part
2011-08-10 17:28:10 +08:00
278938a52d
Fixed: layout.file is saved when the design is created
2011-08-08 17:51:37 +08:00
9cea77430f
dealing with layout file bug
2011-08-08 17:23:20 +08:00
37633ac23d
put layout object as embeded obj in design. have bug with solving uploading file
2011-08-08 12:29:32 +08:00
706ec745c3
modified V,C,M related with layout and have bug between layout and design
2011-08-08 09:30:44 +08:00
c8d58e30aa
make design work with layout and testing with package andreas05 within r tag
2011-08-01 18:17:28 +08:00
1839269581
finishing saving edited file online and redo dev.rake modification
2011-07-28 18:08:16 +08:00
9eb80d7424
Made r_editor into class style add functions
2011-07-27 17:23:01 +08:00
dabd6dd5b5
Fixing upload bug
2011-07-26 18:22:17 +08:00
1ac10e70a2
redo lost code....
2011-07-22 16:28:41 +08:00
a272b871e2
complete del and destroy funciton for desgin
2011-07-22 15:54:38 +08:00
f8d1a1315b
fixing duplicate when updating design
2011-07-20 17:05:28 +08:00
e3a50ccf69
move design file field to partial
2011-07-20 14:04:16 +08:00
612ed629bc
fix design upload
2011-07-20 09:58:24 +08:00
c48a11d9f5
Add some JS for design uploading
2011-07-19 18:31:53 +08:00
c3ada90365
CarrierWave workaround: the files have to be saved manually
2011-07-14 08:48:42 +08:00
f73f09ffcf
adding files not commited from previous commit
2011-07-12 16:02:41 +08:00
f387139ae1
rails 3.1 and designs (with bug)
2011-07-12 16:00:57 +08:00
96a43f023e
Edit code (HTML response)
2011-06-10 15:02:34 +08:00
a695b9ad29
Items UI changes
2011-06-10 13:57:42 +08:00
247b8ec4dc
HTML code can be modify (paser: update)
2011-06-10 10:31:50 +08:00
7b5ea870a0
Delete page.
2011-06-01 12:00:41 +08:00
ddc7c74436
Create page.
2011-06-01 10:24:14 +08:00
2522cde2f5
Edition of page part for multiple languages.
2011-05-27 11:27:54 +08:00
0969f6b6cc
CKEditor.
...
The error came from some script in Application.js
2011-05-26 13:48:09 +08:00
964440fa86
Remove CKEditor due to conflicts with the jQuery library
2011-05-26 11:23:46 +08:00
a8c4e17c56
CKEditor.
...
Edition of page part for single language.
2011-05-25 16:27:17 +08:00
d971a8ecbe
Uniformized: @page and @ link in @item
...
Change parser for page edition.
2011-05-25 14:50:56 +08:00
4399804e19
Delete link handle JavaScript disabled
2011-05-13 09:59:29 +08:00
24ae7ed5e3
Links edition
2011-05-13 09:08:42 +08:00
d9ba76ebd5
- No more Home object
...
- Sitemap on the left side and view of the current page in the main block
2011-05-09 18:49:57 +08:00
83bbd77d96
Built-in user_attribute_models
2011-05-02 12:07:31 +08:00
8a4cffae8f
Remove files which should be deleted in previous commit
2011-04-13 18:53:47 +08:00
25752b7065
tags: image and css - show ID in assets/index
2011-04-13 18:22:52 +08:00
fc98757772
base layout on id instead of name
2011-04-13 18:22:51 +08:00
e62df90117
user can't delete self and flash_messages
2011-04-13 18:22:50 +08:00
318c264cae
add user_info
2011-04-13 18:22:50 +08:00
2ccc2c9b39
add user_info
2011-04-13 18:22:50 +08:00
27bdbadf08
404 for pages and asset column error
2011-04-13 18:22:49 +08:00
d28a71f5bf
remove .empty? which shouldn't be here
2011-04-13 18:22:49 +08:00
c44b86f284
fix bugs for i18n_variable in page and home
2011-04-13 18:22:49 +08:00
bda67684bd
mongoid rc_6 & fix bugs
2011-04-13 18:22:49 +08:00
19a7d51e60
Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
2011-04-13 18:19:51 +08:00
554aa0a95d
Support i18n and select options user attributes, but admin edit is broken
2010-03-18 17:57:26 +08:00
bebc51e8bb
Admin can new/edit user_attributes
2010-03-15 17:35:01 +08:00
bd46cb1b12
remove component link
2010-02-22 17:10:08 +08:00
93169b1098
Add Item list interface, but acts_as_list can not used
2010-02-22 16:10:13 +08:00
66a462faa8
Add nested route url
2010-02-05 17:18:57 +08:00
0f7dce8aa6
save asset static file
2010-02-05 16:15:16 +08:00
a19e0dba6c
Add asset model and controller
2010-02-01 17:24:28 +08:00
8da5323fd0
Let page edit from can select layout
2010-01-28 17:42:55 +08:00
32e8bd108f
Add Item#ancestors
2010-01-18 15:52:52 +08:00
e1440a79d8
Add Item, Page, Component, Link inheritanced models
2010-01-14 18:30:53 +08:00
cd21cadfe7
Add panel namespace
2010-01-11 17:53:44 +08:00
314f6d5219
Add reroute middleware hack
2010-01-11 17:09:50 +08:00
9f1ba2ae66
1.fix parent page 2.add page title
2010-01-08 18:36:36 +08:00
38e365e4b5
remove blueprint, use easyframework
2010-01-08 16:05:58 +08:00
691d514fa1
fixes announcements i18n
2009-07-06 16:36:41 +08:00
ff2dffaeb4
add i18n for layout and snippet
2009-07-06 16:23:34 +08:00
c895469d34
add toggle for edit english content
2009-06-22 16:04:06 +08:00
db8d2bfa8f
let page model support i18n
2009-06-19 17:31:10 +08:00
5570a2dfbf
Add announcement admin and view template
2009-06-01 14:20:15 +08:00
4807066c68
Add announcement model
2009-06-01 10:54:16 +08:00
62602940ed
Add root menu snippet
2009-05-22 15:16:22 +08:00
32fdf99833
Add Page external_link
2009-05-22 14:51:32 +08:00
a4c900af4d
Add Page position and parent_page_id
2009-05-22 14:43:52 +08:00
96f186a71b
Add blueprint button style
2009-05-15 14:37:03 +08:00
68622bb23c
Add blueprint style and install jRails plugin
2009-05-15 14:02:28 +08:00
438c508ea1
Add snippet support and unpack liquid plugin
2009-05-08 02:13:27 +08:00
8dcde174cf
Add page layout support
2009-05-08 01:54:33 +08:00
78e8c32969
Add liquid template render
2009-05-08 01:32:49 +08:00
66604d00f4
Add admin/pages scaffold and basic page render
2009-05-08 01:18:16 +08:00
Christophe Vilayphiou
Christophe Vilayphiou
Matthew K. Fu JuYuan
Matt Fu
Matthew Kaito Juyuan Fu
ihower
rulingcom
chris