optimacms 0.1.15 → 0.1.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/optimacms/admin/pages_controller.rb +93 -81
  3. data/app/controllers/optimacms/admin/templates_controller.rb +22 -4
  4. data/app/controllers/optimacms/application_controller.rb +2 -1
  5. data/app/helpers/optimacms/application_helper.rb +3 -2
  6. data/app/helpers/optimacms/forms_helper.rb +52 -6
  7. data/app/models/optimacms/page.rb +16 -9
  8. data/app/models/optimacms/template.rb +11 -31
  9. data/app/views/optimacms/admin/pages/index.html.haml +15 -3
  10. data/app/views/optimacms/admin/templates/index.html.haml +6 -2
  11. data/config/initializers/simple_form_simple_search_boostrap.rb +6 -0
  12. data/lib/optimacms/engine.rb +2 -0
  13. data/lib/optimacms/filters/form_filter.rb +5 -2
  14. data/lib/optimacms/mycontroller.rb +29 -29
  15. data/lib/optimacms/version.rb +1 -1
  16. data/test/dummy/app/controllers/application_controller.rb +13 -0
  17. data/test/dummy/app/views/pages/about.html.erb +6 -1
  18. data/test/dummy/config/routes.rb +3 -2
  19. data/test/dummy/log/development.log +877 -189112
  20. data/test/dummy/tmp/cache/assets/development/sass/7f871ea7e3a8127767d5a5868622ef2909611f26/noskin.css.scssc +0 -0
  21. data/test/dummy/tmp/cache/assets/development/sass/a1b4b92b7663fe8c3e3678ca845c8a0566c3ca13/admin.css.scssc +0 -0
  22. data/test/dummy/tmp/cache/assets/development/sass/a1b4b92b7663fe8c3e3678ca845c8a0566c3ca13/admin_tpl.css.scssc +0 -0
  23. data/test/dummy/tmp/cache/assets/development/sass/a1b4b92b7663fe8c3e3678ca845c8a0566c3ca13/bootstrap_and_overrides.css.scssc +0 -0
  24. data/test/dummy/tmp/cache/assets/development/sass/a1b4b92b7663fe8c3e3678ca845c8a0566c3ca13/bootstrap_custom.css.scssc +0 -0
  25. data/test/dummy/tmp/cache/assets/development/sass/a1b4b92b7663fe8c3e3678ca845c8a0566c3ca13/bootstrap_variables.css.scssc +0 -0
  26. data/test/dummy/tmp/cache/assets/development/sass/a1b4b92b7663fe8c3e3678ca845c8a0566c3ca13/colors.css.scssc +0 -0
  27. data/test/dummy/tmp/cache/assets/development/sass/a1b4b92b7663fe8c3e3678ca845c8a0566c3ca13/tinymce.css.scssc +0 -0
  28. data/test/dummy/tmp/cache/assets/development/sass/a1b4b92b7663fe8c3e3678ca845c8a0566c3ca13/tpl.css.scssc +0 -0
  29. data/test/dummy/tmp/cache/assets/development/sprockets/053f826d1ea01a2fac355de0755e5c40 +0 -0
  30. data/test/dummy/tmp/cache/assets/development/sprockets/0a470277dd21c166b9dfb68b03d34d5c +0 -0
  31. data/test/dummy/tmp/cache/assets/development/sprockets/3240ef40c1dc9d13156bbd790ec2651a +0 -0
  32. data/test/dummy/tmp/cache/assets/development/sprockets/529a74a4530de52f6c3ebbf107ffe9f2 +0 -0
  33. data/test/dummy/tmp/cache/assets/development/sprockets/56c7eb172a7423728c45d0a751d198e3 +0 -0
  34. data/test/dummy/tmp/cache/assets/development/sprockets/6cdbd6f171a27a578bcb07dd5bfa83a2 +0 -0
  35. data/test/dummy/tmp/cache/assets/development/sprockets/6f943f22c610e6417422e4a13e0bcc0d +0 -0
  36. data/test/dummy/tmp/cache/assets/development/sprockets/8956737a82f17db48d50e13f133aeefc +0 -0
  37. data/test/dummy/tmp/cache/assets/development/sprockets/8b5a7992567ebbeb9a882d074778f8c8 +0 -0
  38. data/test/dummy/tmp/cache/assets/development/sprockets/97c1e12a09973e0fb97f23a1dc496443 +0 -0
  39. data/test/dummy/tmp/cache/assets/development/sprockets/99e8d6370ba85ec4a61d953f5ed261af +0 -0
  40. data/test/dummy/tmp/cache/assets/development/sprockets/a64dbcf0e4afe0985b1abd3e209d17cd +0 -0
  41. data/test/dummy/tmp/cache/assets/development/sprockets/a6d357fbe03dae6f590180f6c5e0e148 +0 -0
  42. data/test/dummy/tmp/cache/assets/development/sprockets/aa58fb159780a7200a1bc4c6844cc5c4 +0 -0
  43. data/test/dummy/tmp/cache/assets/development/sprockets/ba9859d0d2b7d4d7d5b03ff3a71ed478 +0 -0
  44. data/test/dummy/tmp/cache/assets/development/sprockets/e3dd086dd858b5bff9cfd60a031c2091 +0 -0
  45. data/test/dummy/tmp/cache/assets/development/sprockets/ec33505f0e2ed4dd12951ecceffa3695 +0 -0
  46. data/test/dummy/tmp/pids/server.pid +1 -1
  47. metadata +69 -7
  48. data/app/views/tableview/_buttons_apply_clear.html.haml +0 -2
  49. data/app/views/tableview/_filter.html.haml +0 -0
  50. data/app/views/tableview/_filter_field.html.haml +0 -15
  51. data/app/views/tableview/_filter_fields.html.haml +0 -3
  52. data/lib/simple_filter/filter.rb +0 -223
@@ -2,4 +2,17 @@ class ApplicationController < ActionController::Base
2
2
  # Prevent CSRF attacks by raising an exception.
3
3
  # For APIs, you may want to use :null_session instead.
4
4
  protect_from_forgery with: :exception
5
+
6
+
7
+ #before_filter :authenticate_beta if Rails.env.development? && Rails.application.config.TEST_ADMIN_PWD!=''
8
+ before_filter :authenticate_beta if Rails.env.development?
9
+
10
+ def authenticate_beta
11
+ authenticate_or_request_with_http_basic('Administration') do |username, password|
12
+ #username == 'admin' && password == Rails.application.config.TEST_ADMIN_PWD
13
+ username == 'admin' && password == 'admin'
14
+ end
15
+ end
16
+
17
+
5
18
  end
@@ -4,4 +4,9 @@
4
4
  About
5
5
  <%=fa_icon "folder-o" %>
6
6
 
7
- 111
7
+ 111
8
+
9
+ <br>
10
+ root: <%=root_path%>
11
+ <p>
12
+ here
@@ -1,12 +1,10 @@
1
1
  Rails.application.routes.draw do
2
2
 
3
-
4
3
  # for optimacms
5
4
  #devise_for :cms_admin_users, class_name: "Optimacms::CmsAdminUser", module: :devise
6
5
  devise_for :cms_admin_users, Optimacms::Devise.config
7
6
 
8
7
  # usual
9
- root to: 'home#index'
10
8
 
11
9
  devise_for :users
12
10
 
@@ -17,6 +15,9 @@ Rails.application.routes.draw do
17
15
  # the last!!!
18
16
  mount Optimacms::Engine => "/"
19
17
 
18
+ #
19
+ root to: 'home#index'
20
+
20
21
 
21
22
  # all pages
22
23
  #scope module: 'optimacms' do