obitum-rails_admin 0.0.1 → 0.0.2

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 (232) hide show
  1. data/Gemfile +1 -8
  2. data/README.md +6 -2
  3. data/app/assets/javascripts/rails_admin/custom/ui.js +5 -5
  4. data/app/assets/javascripts/rails_admin/jquery-ui-1.8.16.custom.js +4727 -4727
  5. data/app/assets/javascripts/rails_admin/jquery.colorpicker.js +484 -484
  6. data/app/assets/javascripts/rails_admin/jquery.pjax.js +250 -85
  7. data/app/assets/javascripts/rails_admin/jquery.ui.timepicker.js +1371 -1219
  8. data/app/assets/javascripts/rails_admin/ra.filter-box.js +30 -30
  9. data/app/assets/javascripts/rails_admin/ra.filtering-select.js +11 -11
  10. data/app/assets/javascripts/rails_admin/ra.nested-form-hooks.coffee +40 -0
  11. data/app/assets/javascripts/rails_admin/ra.remote-form.js +41 -39
  12. data/app/assets/javascripts/rails_admin/rails_admin.js.erb +4 -3
  13. data/app/assets/javascripts/rails_admin/themes/default/ui.js +6 -6
  14. data/app/assets/javascripts/rails_admin/ui.js.coffee +44 -16
  15. data/app/assets/stylesheets/rails_admin/base/README +2 -2
  16. data/app/assets/stylesheets/rails_admin/base/theming.css.scss +226 -113
  17. data/app/assets/stylesheets/rails_admin/custom/mixins.css.scss +1 -1
  18. data/app/assets/stylesheets/rails_admin/custom/theming.css.scss +2 -2
  19. data/app/assets/stylesheets/rails_admin/custom/variables.css.scss +3 -3
  20. data/app/assets/stylesheets/rails_admin/imports.css.scss.erb +36 -1
  21. data/app/assets/stylesheets/rails_admin/jquery.ui.timepicker.css.scss +16 -0
  22. data/app/assets/stylesheets/rails_admin/ra.filtering-multiselect.css.scss +2 -2
  23. data/app/assets/stylesheets/rails_admin/themes/default/mixins.css.scss +1 -1
  24. data/app/assets/stylesheets/rails_admin/themes/default/theming.css.scss +2 -2
  25. data/app/assets/stylesheets/rails_admin/themes/default/variables.css.scss +3 -3
  26. data/app/controllers/rails_admin/application_controller.rb +13 -18
  27. data/app/controllers/rails_admin/main_controller.rb +15 -16
  28. data/app/helpers/rails_admin/application_helper.rb +67 -41
  29. data/app/helpers/rails_admin/form_builder.rb +31 -29
  30. data/app/helpers/rails_admin/main_helper.rb +4 -4
  31. data/app/views/layouts/rails_admin/_secondary_navigation.html.haml +12 -11
  32. data/app/views/layouts/rails_admin/application.html.haml +29 -29
  33. data/app/views/rails_admin/main/_dashboard_history.html.haml +1 -1
  34. data/app/views/rails_admin/main/_delete_notice.html.haml +4 -5
  35. data/app/views/rails_admin/main/_form_colorpicker.html.haml +2 -1
  36. data/app/views/rails_admin/main/_form_datetime.html.haml +1 -1
  37. data/app/views/rails_admin/main/_form_enumeration.html.haml +1 -1
  38. data/app/views/rails_admin/main/_form_field.html.haml +1 -1
  39. data/app/views/rails_admin/main/_form_file_upload.html.haml +3 -2
  40. data/app/views/rails_admin/main/_form_filtering_multiselect.html.haml +6 -4
  41. data/app/views/rails_admin/main/_form_filtering_select.html.haml +6 -5
  42. data/app/views/rails_admin/main/_form_nested_many.html.haml +41 -6
  43. data/app/views/rails_admin/main/_form_nested_one.html.haml +34 -5
  44. data/app/views/rails_admin/main/_form_text.html.haml +3 -3
  45. data/app/views/rails_admin/main/_submit_buttons.html.haml +6 -4
  46. data/app/views/rails_admin/main/bulk_delete.html.haml +7 -3
  47. data/app/views/rails_admin/main/dashboard.html.haml +4 -4
  48. data/app/views/rails_admin/main/delete.html.haml +7 -3
  49. data/app/views/rails_admin/main/edit.html.haml +1 -1
  50. data/app/views/rails_admin/main/export.html.haml +57 -53
  51. data/app/views/rails_admin/main/history.html.haml +8 -8
  52. data/app/views/rails_admin/main/index.html.haml +22 -21
  53. data/app/views/rails_admin/main/new.html.haml +1 -1
  54. data/app/views/rails_admin/main/show.html.haml +2 -2
  55. data/config/initializers/active_record_extensions.rb +2 -2
  56. data/config/initializers/haml.rb +0 -1
  57. data/config/locales/rails_admin.en.yml +5 -5
  58. data/lib/generators/rails_admin/templates/initializer.erb +7 -7
  59. data/lib/rails_admin/abstract_model.rb +36 -53
  60. data/lib/rails_admin/adapters/active_record/abstract_object.rb +32 -0
  61. data/lib/rails_admin/adapters/active_record.rb +56 -137
  62. data/lib/rails_admin/config/actions/base.rb +40 -28
  63. data/lib/rails_admin/config/actions/bulk_delete.rb +10 -11
  64. data/lib/rails_admin/config/actions/dashboard.rb +9 -5
  65. data/lib/rails_admin/config/actions/delete.rb +12 -9
  66. data/lib/rails_admin/config/actions/edit.rb +13 -9
  67. data/lib/rails_admin/config/actions/export.rb +9 -6
  68. data/lib/rails_admin/config/actions/history_index.rb +9 -5
  69. data/lib/rails_admin/config/actions/history_show.rb +9 -5
  70. data/lib/rails_admin/config/actions/index.rb +23 -13
  71. data/lib/rails_admin/config/actions/new.rb +14 -10
  72. data/lib/rails_admin/config/actions/show.rb +10 -5
  73. data/lib/rails_admin/config/actions/show_in_app.rb +9 -4
  74. data/lib/rails_admin/config/actions.rb +16 -16
  75. data/lib/rails_admin/config/configurable.rb +92 -0
  76. data/lib/rails_admin/config/fields/association.rb +6 -23
  77. data/lib/rails_admin/config/fields/base.rb +58 -40
  78. data/lib/rails_admin/config/fields/factories/belongs_to_association.rb +26 -0
  79. data/lib/rails_admin/config/fields/factories/carrierwave.rb +21 -2
  80. data/lib/rails_admin/config/fields/factories/devise.rb +9 -12
  81. data/lib/rails_admin/config/fields/factories/dragonfly.rb +13 -7
  82. data/lib/rails_admin/config/fields/factories/paperclip.rb +14 -15
  83. data/lib/rails_admin/config/fields/group.rb +16 -3
  84. data/lib/rails_admin/config/fields/types/belongs_to_association.rb +2 -2
  85. data/lib/rails_admin/config/fields/types/carrierwave.rb +0 -9
  86. data/lib/rails_admin/config/fields/types/color.rb +3 -3
  87. data/lib/rails_admin/config/fields/types/dragonfly.rb +1 -19
  88. data/lib/rails_admin/config/fields/types/file_upload.rb +7 -11
  89. data/lib/rails_admin/config/fields/types/has_many_association.rb +1 -6
  90. data/lib/rails_admin/config/fields/types/has_one_association.rb +4 -4
  91. data/lib/rails_admin/config/fields/types/paperclip.rb +0 -18
  92. data/lib/rails_admin/config/fields/types/password.rb +2 -2
  93. data/lib/rails_admin/config/fields/types/polymorphic_association.rb +2 -2
  94. data/lib/rails_admin/config/fields/types/text.rb +2 -2
  95. data/lib/rails_admin/config/fields.rb +7 -17
  96. data/lib/rails_admin/config/has_fields.rb +9 -9
  97. data/lib/rails_admin/config/has_groups.rb +2 -2
  98. data/lib/rails_admin/config/hideable.rb +2 -2
  99. data/lib/rails_admin/config/model.rb +23 -17
  100. data/lib/rails_admin/config/proxyable/proxy.rb +43 -0
  101. data/lib/rails_admin/config/proxyable.rb +12 -0
  102. data/lib/rails_admin/config/sections/base.rb +14 -4
  103. data/lib/rails_admin/config.rb +38 -9
  104. data/lib/rails_admin/extension.rb +1 -1
  105. data/lib/rails_admin/extensions/history/auditing_adapter.rb +6 -6
  106. data/lib/rails_admin/extensions/history/history.rb +2 -1
  107. data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb +13 -13
  108. data/lib/rails_admin/support/csv_converter.rb +6 -6
  109. data/lib/rails_admin/version.rb +1 -1
  110. data/lib/rails_admin.rb +0 -5
  111. data/spec/controllers/main_controller_spec.rb +7 -7
  112. data/spec/dummy_app/Gemfile +10 -7
  113. data/spec/dummy_app/Rakefile +1 -1
  114. data/spec/dummy_app/app/assets/images/rails.png +0 -0
  115. data/spec/dummy_app/app/assets/javascripts/application.js +15 -0
  116. data/spec/dummy_app/app/assets/stylesheets/application.css +13 -0
  117. data/spec/dummy_app/app/controllers/players_controller.rb +1 -1
  118. data/spec/dummy_app/app/models/cms/basic_page.rb +1 -1
  119. data/spec/dummy_app/app/models/division.rb +5 -1
  120. data/spec/dummy_app/app/models/field_test.rb +4 -4
  121. data/spec/dummy_app/app/models/nested_field_test.rb +3 -0
  122. data/spec/dummy_app/app/models/player.rb +3 -3
  123. data/spec/dummy_app/app/views/layouts/application.html.erb +3 -2
  124. data/spec/dummy_app/app/views/players/show.html.haml +1 -1
  125. data/spec/dummy_app/config/application.rb +20 -5
  126. data/spec/dummy_app/config/database.yml +5 -2
  127. data/spec/dummy_app/config/environments/development.rb +11 -1
  128. data/spec/dummy_app/config/environments/production.rb +19 -3
  129. data/spec/dummy_app/config/environments/test.rb +5 -7
  130. data/spec/dummy_app/config/initializers/devise.rb +6 -0
  131. data/spec/dummy_app/config/initializers/inflections.rb +5 -0
  132. data/spec/dummy_app/config/initializers/secret_token.rb +1 -1
  133. data/spec/dummy_app/{foo/test/dummy/config → config}/initializers/wrap_parameters.rb +1 -1
  134. data/spec/dummy_app/config/routes.rb +1 -1
  135. data/spec/dummy_app/db/migrate/00000000000006_devise_create_users.rb +35 -5
  136. data/spec/dummy_app/db/migrate/20120118122004_add_categories.rb +1 -1
  137. data/spec/dummy_app/doc/README_FOR_APP +2 -0
  138. data/spec/dummy_app/public/404.html +26 -0
  139. data/spec/dummy_app/{foo/test/dummy/public → public}/422.html +0 -0
  140. data/spec/dummy_app/{foo/test/dummy/public → public}/500.html +0 -1
  141. data/spec/dummy_app/public/favicon.ico +0 -0
  142. data/spec/dummy_app/public/robots.txt +5 -0
  143. data/spec/helpers/application_helper_spec.rb +107 -42
  144. data/spec/{requests → integration}/authorization/cancan_spec.rb +4 -5
  145. data/spec/{requests → integration}/basic/bulk_action/rails_admin_basic_bulk_action_spec.rb +0 -0
  146. data/spec/{requests → integration}/basic/bulk_destroy/rails_admin_basic_bulk_destroy_spec.rb +3 -16
  147. data/spec/{requests → integration}/basic/create/rails_admin_basic_create_spec.rb +0 -2
  148. data/spec/{requests → integration}/basic/create/rails_admin_namespaced_model_create_spec.rb +0 -16
  149. data/spec/{requests → integration}/basic/delete/rails_admin_basic_delete_spec.rb +0 -0
  150. data/spec/{requests → integration}/basic/destroy/rails_admin_basic_destroy_spec.rb +0 -0
  151. data/spec/{requests → integration}/basic/edit/rails_admin_basic_edit_spec.rb +2 -2
  152. data/spec/{requests → integration}/basic/export/rails_admin_basic_export_spec.rb +1 -1
  153. data/spec/{requests → integration}/basic/list/rails_admin_basic_list_spec.rb +12 -38
  154. data/spec/{requests → integration}/basic/new/rails_admin_basic_new_spec.rb +0 -0
  155. data/spec/{requests → integration}/basic/new/rails_admin_namespaced_model_new_spec.rb +0 -0
  156. data/spec/{requests → integration}/basic/show/rails_admin_basic_show_spec.rb +1 -2
  157. data/spec/{requests → integration}/basic/update/rails_admin_basic_update_spec.rb +2 -2
  158. data/spec/{requests → integration}/config/edit/rails_admin_config_edit_spec.rb +65 -24
  159. data/spec/{requests → integration}/config/list/rails_admin_config_list_spec.rb +2 -2
  160. data/spec/{requests → integration}/config/show/rails_admin_config_show_spec.rb +20 -0
  161. data/spec/{requests → integration}/history/rails_admin_history_spec.rb +3 -3
  162. data/spec/{requests → integration}/rails_admin_spec.rb +8 -41
  163. data/spec/{requests → integration}/relation_spec.rb +0 -0
  164. data/spec/spec_helper.rb +13 -31
  165. data/spec/{lib → unit/adapters/active_record}/abstract_object_spec.rb +17 -5
  166. data/spec/unit/adapters/active_record_spec.rb +53 -0
  167. data/spec/{requests/actions.rb → unit/config/actions_spec.rb} +47 -31
  168. data/spec/unit/config/fields/base_spec.rb +291 -0
  169. data/spec/unit/config/model_spec.rb +75 -0
  170. data/spec/unit/config/sections_spec.rb +123 -0
  171. data/spec/{lib/rails_admin_spec.rb → unit/config_spec.rb} +65 -93
  172. metadata +127 -223
  173. data/app/assets/javascripts/rails_admin/jquery_nested_form.js +0 -58
  174. data/app/views/layouts/rails_admin/_navigation.html.haml +0 -17
  175. data/lib/rails_admin/abstract_object.rb +0 -28
  176. data/lib/rails_admin/config/base.rb +0 -111
  177. data/lib/rails_admin/config/proxy.rb +0 -40
  178. data/lib/rails_admin/generic_support.rb +0 -18
  179. data/spec/dummy_app/config/initializers/quiet_assets.rb +0 -10
  180. data/spec/dummy_app/foo/Gemfile +0 -17
  181. data/spec/dummy_app/foo/MIT-LICENSE +0 -20
  182. data/spec/dummy_app/foo/README.rdoc +0 -3
  183. data/spec/dummy_app/foo/Rakefile +0 -39
  184. data/spec/dummy_app/foo/app/assets/javascripts/foo/application.js +0 -9
  185. data/spec/dummy_app/foo/app/assets/stylesheets/foo/application.css +0 -7
  186. data/spec/dummy_app/foo/app/controllers/foo/application_controller.rb +0 -4
  187. data/spec/dummy_app/foo/app/helpers/foo/application_helper.rb +0 -4
  188. data/spec/dummy_app/foo/app/models/foo/bar.rb +0 -4
  189. data/spec/dummy_app/foo/app/views/layouts/foo/application.html.erb +0 -14
  190. data/spec/dummy_app/foo/config/routes.rb +0 -2
  191. data/spec/dummy_app/foo/foo.gemspec +0 -23
  192. data/spec/dummy_app/foo/lib/foo/engine.rb +0 -5
  193. data/spec/dummy_app/foo/lib/foo/version.rb +0 -3
  194. data/spec/dummy_app/foo/lib/foo.rb +0 -4
  195. data/spec/dummy_app/foo/lib/tasks/foo_tasks.rake +0 -4
  196. data/spec/dummy_app/foo/script/rails +0 -6
  197. data/spec/dummy_app/foo/test/dummy/Rakefile +0 -7
  198. data/spec/dummy_app/foo/test/dummy/app/assets/javascripts/application.js +0 -9
  199. data/spec/dummy_app/foo/test/dummy/app/assets/stylesheets/application.css +0 -7
  200. data/spec/dummy_app/foo/test/dummy/app/controllers/application_controller.rb +0 -3
  201. data/spec/dummy_app/foo/test/dummy/app/helpers/application_helper.rb +0 -2
  202. data/spec/dummy_app/foo/test/dummy/app/views/layouts/application.html.erb +0 -14
  203. data/spec/dummy_app/foo/test/dummy/config/application.rb +0 -45
  204. data/spec/dummy_app/foo/test/dummy/config/boot.rb +0 -10
  205. data/spec/dummy_app/foo/test/dummy/config/database.yml +0 -25
  206. data/spec/dummy_app/foo/test/dummy/config/environment.rb +0 -5
  207. data/spec/dummy_app/foo/test/dummy/config/environments/development.rb +0 -30
  208. data/spec/dummy_app/foo/test/dummy/config/environments/production.rb +0 -60
  209. data/spec/dummy_app/foo/test/dummy/config/environments/test.rb +0 -39
  210. data/spec/dummy_app/foo/test/dummy/config/initializers/backtrace_silencers.rb +0 -7
  211. data/spec/dummy_app/foo/test/dummy/config/initializers/inflections.rb +0 -10
  212. data/spec/dummy_app/foo/test/dummy/config/initializers/mime_types.rb +0 -5
  213. data/spec/dummy_app/foo/test/dummy/config/initializers/secret_token.rb +0 -7
  214. data/spec/dummy_app/foo/test/dummy/config/initializers/session_store.rb +0 -8
  215. data/spec/dummy_app/foo/test/dummy/config/locales/en.yml +0 -5
  216. data/spec/dummy_app/foo/test/dummy/config/routes.rb +0 -4
  217. data/spec/dummy_app/foo/test/dummy/config.ru +0 -4
  218. data/spec/dummy_app/foo/test/dummy/db/schema.rb +0 -21
  219. data/spec/dummy_app/foo/test/dummy/public/404.html +0 -26
  220. data/spec/dummy_app/foo/test/dummy/public/favicon.ico +0 -0
  221. data/spec/dummy_app/foo/test/dummy/script/rails +0 -6
  222. data/spec/dummy_app/foo/test/fixtures/foo/bars.yml +0 -11
  223. data/spec/dummy_app/foo/test/foo_test.rb +0 -7
  224. data/spec/dummy_app/foo/test/integration/navigation_test.rb +0 -10
  225. data/spec/dummy_app/foo/test/test_helper.rb +0 -10
  226. data/spec/dummy_app/foo/test/unit/foo/bar_test.rb +0 -9
  227. data/spec/generator_helpers.rb +0 -30
  228. data/spec/generators/install_generator_spec.rb +0 -85
  229. data/spec/generators/uninstall_generator_spec.rb +0 -35
  230. data/spec/lib/custom_field.rb +0 -7
  231. data/spec/requests/config/navigation/rails_admin_config_navigation_spec.rb +0 -107
  232. data/spec/requests/config/rails_admin_config_spec.rb +0 -227
@@ -3,143 +3,256 @@
3
3
  Keep it clean, people
4
4
  */
5
5
 
6
- /* Application name */
7
- .topbar h3 {
8
- small {
9
- color:red;
10
- font-weight:bold;
6
+ body.rails_admin {
7
+
8
+ .thumbnail {
9
+ display:inline-block;
11
10
  }
12
- }
13
11
 
14
- /* remove blockquote padding + border recursively */
15
- form blockquote {
16
- }
12
+ /* room for upper navbar */
13
+ padding-top: 60px;
17
14
 
18
- form label.nester {
19
- font-weight: bold;
20
- width: auto;
21
- }
15
+ /* Application name */
16
+ .navbar .brand {
17
+ small {
18
+ color:$red;
19
+ font-weight:bold;
20
+ }
21
+ }
22
22
 
23
+ .sidebar-nav {
24
+ padding: 9px 0;
25
+ }
23
26
 
27
+ /* fat labels in forms */
28
+ .label.form-label {
29
+ padding: 7px 7px 8px 7px;
30
+ }
24
31
 
25
- form {
26
- label { width:130px; }
27
- legend { padding-left: 150px; }
28
- .input { margin-left: 150px; }
29
-
30
- blockquote {
31
- label { width:120px; }
32
- legend { padding-left: 140px; }
33
- .input { margin-left: 140px; }
34
- blockquote {
35
- label { width:110px; }
36
- legend { padding-left: 130px; }
37
- .input { margin-left: 130px; }
38
- blockquote {
39
- label { width:100px; }
40
- legend { padding-left: 120px; }
41
- .input { margin-left: 120px; }
32
+ /* new/edit/export forms */
33
+ .form-horizontal {
34
+ legend {
35
+ cursor:pointer;
36
+ i {
37
+ vertical-align: inherit !important;
42
38
  }
43
39
  }
44
- }
45
- }
46
-
47
- form {
48
- blockquote {
49
- border-left-width:5px;
50
- margin-right:5px;
51
- padding-left:5px;
52
- padding-top:5px;
53
- margin-bottom:0px;
54
40
 
55
- hr {
56
- margin-left: -5px;
57
- margin-top: 10px;
58
- margin-bottom: 3px;
41
+ &.denser {
42
+ .controls .nav {
43
+ margin-bottom:5px;
44
+ }
45
+ .remove_nested_fields {
46
+ position:absolute;
47
+ }
48
+ margin:0px;
49
+ p {
50
+ font-size: 12px;
51
+ line-height: 16px;
52
+ }
53
+ .help-block {
54
+ margin-top: 0px;
55
+ }
56
+ .input-prepend, .input-append {
57
+ margin-bottom: 0px;
58
+ label {
59
+ margin-bottom: 0px;
60
+ }
61
+ }
62
+ .control-group {
63
+ margin: 0px;
64
+ padding-top:15px;
65
+ }
66
+ .control-label {
67
+ width:145px;
68
+ }
69
+ legend {
70
+ margin-bottom:0px;
71
+ }
59
72
  }
60
- .remove_nested_fields {
61
- margin-top:4px;
73
+
74
+ /* We want input size to be used, unfixate input width */
75
+ input, textarea {
76
+ width:auto;
77
+ }
78
+ .help-block {
79
+ clear:left;
80
+ }
81
+ input[type=file] {
82
+ display:block;
62
83
  }
63
- }
64
- }
65
-
66
- a.label {
67
- color:white;
68
- text-decoration:none;
69
- }
70
-
71
- /* We want input size to be used, unfixate input width */
72
- input, textarea {
73
- width:auto;
74
- }
75
-
76
- input[type=file] {
77
- display:block;
78
- }
79
-
80
- /* ui-autocomplete has z-index 1 and is shown over filtering select button (.add-on) */
81
- .input-prepend .add-on, .input-append .add-on {
82
- z-index:1;
83
- }
84
84
 
85
- /* Modals dimensionning */
86
- .modal {
87
- width:700px;
88
- margin:-285px 0 0 -350px;
89
- .modal-body {
90
- max-height:450px;
91
- overflow-y:auto;
92
- }
93
- }
85
+ /* nested forms */
86
+ .tab-content .tab-pane {
87
+ border-left:5px solid $blue;
88
+ padding-left:5px;
89
+ fieldset {
90
+ margin-left:-10px;
91
+ .control-group > label {
92
+ padding-left:10px;
93
+ width:130px;
94
+ }
95
+ legend {
96
+ float:left;
97
+ margin-left:10px;
98
+ }
99
+ }
100
+ }
94
101
 
95
- .help-block {
96
- clear:left;
97
- }
102
+ /* double nesting, guys. Easy. */
103
+ .tab-content .tab-content .tab-pane {
104
+ border-color:lighten($blue, 20%);
105
+ margin-left:10px;
106
+ fieldset {
107
+ margin-left:-20px;
108
+ .control-group > label {
109
+ padding-left:20px;
110
+ width:120px;
111
+ }
112
+ legend {
113
+ margin-left:20px;
114
+ }
115
+ }
116
+ }
98
117
 
99
- /* Table cells behaviour */
100
- table.zebra-striped {
101
- /* text-overflow when cell content > 150px */
102
- td {
103
- white-space: nowrap;
104
- overflow: hidden;
105
- text-overflow: ellipsis;
106
- max-width:150px;
107
- }
118
+ /* triple nesting!*/
119
+ .tab-content .tab-content .tab-content .tab-pane {
120
+ border-color:lighten($blue, 30%);
121
+ margin-left:20px;
122
+ fieldset {
123
+ margin-left:-30px;
124
+ .control-group > label {
125
+ padding-left:30px;
126
+ width:110px;
127
+ }
128
+ legend {
129
+ margin-left:30px;
130
+ }
131
+ }
132
+ }
108
133
 
109
- td.links {
110
- max-width: none;
111
- .inline {
112
- margin:0px;
113
- li {
114
- display:inline-block;
115
- a {
116
- border-right: 1px solid #DDD;
117
- padding-right: 5px;
134
+ /* totally awesome! nesting on 4 levels! */
135
+ .tab-content .tab-content .tab-content .tab-content .tab-pane {
136
+ border-color:lighten($blue, 40%);
137
+ margin-left:30px;
138
+ fieldset {
139
+ margin-left:-40px;
140
+ .control-group > label {
141
+ padding-left:40px;
142
+ width:100px;
118
143
  }
119
- &:last-child {
120
- a {
121
- border-right: none;
122
- }
144
+ legend {
145
+ margin-left:40px;
123
146
  }
124
147
  }
125
148
  }
126
149
  }
127
150
 
128
- /* Shrink to content width */
129
- .shrink {
130
- width:1px;
131
- white-space:nowrap;
151
+ .modal {
152
+ width: 750px;
153
+ margin-left: -375px;
132
154
  }
133
155
 
134
- /* Can't apply width:1px on sortable headers => don't play nice with sorting arrows on firefox. same for white-space:nowrap.. */
135
- /* History */
136
- th.created_at {
137
- width:160px;
156
+ /* nested nav */
157
+ .nav.nav-list {
158
+ .nav-level-1 {
159
+ padding-left:30px;
160
+ }
161
+ .nav-level-2 {
162
+ padding-left:60px;
163
+ }
164
+ .nav-level-3 {
165
+ padding-left:90px;
166
+ }
138
167
  }
139
- th.username {
140
- width:140px;
168
+
169
+ /* tab links should match icon color */
170
+ .nav.nav-tabs li.icon a {
171
+ color: $black;
141
172
  }
142
- th.item {
143
- width:60px;
173
+
174
+ /* Table cells behaviour */
175
+ .table {
176
+ .thumbnail {
177
+ float:left;
178
+ & + * {
179
+ clear:left;
180
+ }
181
+ }
182
+ /* backport of Bootstrap 1.4 table headers */
183
+ .header {
184
+ cursor: pointer;
185
+ &:after {
186
+ content: "";
187
+ float: right;
188
+ margin-top: 7px;
189
+ border-width: 0 4px 4px;
190
+ border-style: solid;
191
+ border-color: #000 transparent;
192
+ visibility: hidden;
193
+ }
194
+ }
195
+ .headerSortUp,
196
+ .headerSortDown {
197
+ background-color: rgba(141,192,219,.25);
198
+ text-shadow: 0 1px 1px rgba(255,255,255,.75);
199
+ }
200
+ .header:hover {
201
+ &:after {
202
+ visibility:visible;
203
+ }
204
+ }
205
+ .headerSortDown,
206
+ .headerSortDown:hover {
207
+ &:after {
208
+ visibility:visible;
209
+ @include opacity(60);
210
+ }
211
+ }
212
+ .headerSortUp {
213
+ &:after {
214
+ border-bottom: none;
215
+ border-left: 4px solid transparent;
216
+ border-right: 4px solid transparent;
217
+ border-top: 4px solid #000;
218
+ visibility:visible;
219
+ @include box-shadow(none);
220
+ @include opacity(60);
221
+ }
222
+ }
223
+
224
+ /* text-overflow when cell content > 150px */
225
+ td {
226
+ white-space: nowrap;
227
+ overflow: hidden;
228
+ text-overflow: ellipsis;
229
+ max-width:150px;
230
+ }
231
+
232
+ /* icons */
233
+ td.links {
234
+ max-width: none;
235
+ .inline {
236
+ margin:0px;
237
+ li { display:inline-block; }
238
+ }
239
+ }
240
+
241
+ /* Shrink to content width */
242
+ .shrink {
243
+ width:1px;
244
+ white-space:nowrap;
245
+ }
246
+
247
+ /* History */
248
+ th.created_at {
249
+ width:160px;
250
+ }
251
+ th.username {
252
+ width:140px;
253
+ }
254
+ th.item {
255
+ width:60px;
256
+ }
144
257
  }
145
258
  }
@@ -4,7 +4,7 @@
4
4
  Don't require it in your application.rb
5
5
 
6
6
  Available mixins to use/override:
7
-
7
+
8
8
  https://github.com/thomas-mcdonald/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/mixins.css.scss
9
9
  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/mixins.css.scss
10
10
  Plus the ones from your theme.
@@ -4,10 +4,10 @@
4
4
  Don't require it in your application.rb
5
5
 
6
6
  Look at the markup in RailsAdmin and go there to get inspiration from:
7
-
7
+
8
8
  http://twitter.github.com/bootstrap/
9
9
 
10
10
  Test me: (actual color should be the one defined in variables.css.scss if you did)
11
-
11
+
12
12
  body{ background-color: $linkColor; }
13
13
  */
@@ -4,12 +4,12 @@
4
4
  Don't require it in your application.rb
5
5
 
6
6
  Available variables to use/override:
7
-
7
+
8
8
  https://github.com/thomas-mcdonald/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/variables.css.scss
9
9
  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/variables.css.scss
10
10
  Plus the ones from your themes.
11
-
11
+
12
12
  Test me: pink links
13
-
13
+
14
14
  $linkColor: #F0F;
15
15
  */
@@ -29,13 +29,48 @@
29
29
  /*** Bootstrap Theming ***/
30
30
 
31
31
  @import "bootstrap/scaffolding";
32
+ @import "bootstrap/grid";
33
+ @import "bootstrap/layouts";
32
34
  @import "bootstrap/type";
35
+ @import "bootstrap/code";
33
36
  @import "bootstrap/forms";
34
37
  @import "bootstrap/tables";
35
- @import "bootstrap/patterns";
38
+ @import "bootstrap/sprites";
39
+ @import "bootstrap/dropdowns";
40
+ @import "bootstrap/wells";
41
+ @import "bootstrap/component-animations";
42
+ @import "bootstrap/close";
43
+ @import "bootstrap/buttons";
44
+ @import "bootstrap/button-groups";
45
+ @import "bootstrap/alerts";
46
+ @import "bootstrap/navs";
47
+ @import "bootstrap/navbar";
48
+ @import "bootstrap/breadcrumbs";
49
+ @import "bootstrap/pagination";
50
+ @import "bootstrap/pager";
51
+ @import "bootstrap/modals";
52
+ @import "bootstrap/tooltip";
53
+ @import "bootstrap/popovers";
54
+ @import "bootstrap/thumbnails";
55
+ @import "bootstrap/labels";
56
+ @import "bootstrap/progress-bars";
57
+ @import "bootstrap/accordion";
58
+ @import "bootstrap/carousel";
59
+ @import "bootstrap/hero-unit";
60
+ @import "bootstrap/utilities";
36
61
 
37
62
  /*** RailsAdmin Theming ***/
38
63
 
39
64
  @import "rails_admin/base/theming";
40
65
  @import "rails_admin/themes/<%= theme %>/theming";
41
66
  @import "rails_admin/custom/theming";
67
+
68
+
69
+
70
+
71
+
72
+
73
+
74
+
75
+
76
+
@@ -39,6 +39,22 @@
39
39
  text-decoration:none;
40
40
  }
41
41
 
42
+
43
+ /* buttons and button pane styling */
44
+ .ui-timepicker .ui-timepicker-buttonpane {
45
+ background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0;
46
+ }
47
+ .ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
48
+ /* The close button */
49
+ .ui-timepicker .ui-timepicker-close { float: right }
50
+
51
+ /* the now button */
52
+ .ui-timepicker .ui-timepicker-now { float: left; }
53
+
54
+ /* the deselect button */
55
+ .ui-timepicker .ui-timepicker-deselect { float: left; }
56
+
57
+
42
58
  /* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
43
59
  .ui-timepicker-cover {
44
60
  display: none; /*sorry for IE5*/
@@ -13,11 +13,11 @@
13
13
  left: 3px;
14
14
  }
15
15
  }
16
-
16
+
17
17
  .ra-multiselect-search {
18
18
  width: 180px;
19
19
  }
20
-
20
+
21
21
  .ra-multiselect-column {
22
22
  width: 190px;
23
23
  float: left;
@@ -2,7 +2,7 @@
2
2
  Customize Sass mixins from Twitter-Bootstrap/RailsAdmin theme or add new ones for your own use.
3
3
 
4
4
  Available mixins to use/override:
5
-
5
+
6
6
  https://github.com/thomas-mcdonald/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/mixins.css.scss
7
7
  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/mixins.css.scss
8
8
  */
@@ -2,10 +2,10 @@
2
2
  Customize RailsAdmin theme here.
3
3
 
4
4
  Look at the markup in RailsAdmin and go there to get inspiration from:
5
-
5
+
6
6
  http://twitter.github.com/bootstrap/
7
7
 
8
8
  Test me: (actual color should be the one defined in variables.css.scss if you did)
9
-
9
+
10
10
  body{ background-color: $linkColor; }
11
11
  */
@@ -2,11 +2,11 @@
2
2
  Customize Sass variables from Twitter-Bootstrap/RailsAdmin theme or add new ones for your own use.
3
3
 
4
4
  Available variables to use/override:
5
-
5
+
6
6
  https://github.com/thomas-mcdonald/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/variables.css.scss
7
7
  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/variables.css.scss
8
-
8
+
9
9
  Test me: pink links
10
-
10
+
11
11
  $linkColor: #F0F;
12
12
  */
@@ -3,35 +3,30 @@ require 'rails_admin/abstract_model'
3
3
  module RailsAdmin
4
4
  class ModelNotFound < ::StandardError
5
5
  end
6
-
6
+
7
7
  class ObjectNotFound < ::StandardError
8
8
  end
9
-
9
+
10
10
  class ApplicationController < ::ApplicationController
11
11
  newrelic_ignore if defined?(NewRelic)
12
-
12
+
13
13
  before_filter :_authenticate!
14
14
  before_filter :_authorize!
15
15
  before_filter :_audit!
16
16
 
17
17
  helper_method :_current_user, :_attr_accessible_role, :_get_plugin_name
18
-
18
+
19
19
  attr_reader :object, :model_config, :abstract_model
20
20
 
21
21
  def get_model
22
22
  @model_name = to_model_name(params[:model_name])
23
- @abstract_model = RailsAdmin::AbstractModel.new(@model_name) rescue begin
24
- raise RailsAdmin::ModelNotFound
25
- end
26
- @model_config = RailsAdmin.config(@abstract_model)
27
- raise(RailsAdmin::ModelNotFound) if @model_config.excluded?
23
+ raise RailsAdmin::ModelNotFound unless (@abstract_model = RailsAdmin::AbstractModel.new(@model_name))
24
+ raise RailsAdmin::ModelNotFound if (@model_config = @abstract_model.config).excluded?
28
25
  @properties = @abstract_model.properties
29
26
  end
30
-
27
+
31
28
  def get_object
32
- unless (@object = @abstract_model.get(params[:id]))
33
- raise RailsAdmin::ObjectNotFound
34
- end
29
+ raise RailsAdmin::ObjectNotFound unless (@object = @abstract_model.get(params[:id]))
35
30
  end
36
31
 
37
32
  def to_model_name(param)
@@ -39,7 +34,7 @@ module RailsAdmin
39
34
  end
40
35
 
41
36
  private
42
-
37
+
43
38
  def _get_plugin_name
44
39
  @plugin_name_array ||= [RailsAdmin.config.main_app_name.is_a?(Proc) ? instance_eval(&RailsAdmin.config.main_app_name) : RailsAdmin.config.main_app_name].flatten
45
40
  end
@@ -51,7 +46,7 @@ module RailsAdmin
51
46
  def _authorize!
52
47
  instance_eval &RailsAdmin::Config.authorize_with
53
48
  end
54
-
49
+
55
50
  def _audit!
56
51
  instance_eval &RailsAdmin::Config.audit_with
57
52
  end
@@ -63,19 +58,19 @@ module RailsAdmin
63
58
  def _attr_accessible_role
64
59
  instance_eval &RailsAdmin::Config.attr_accessible_role
65
60
  end
66
-
61
+
67
62
  rescue_from RailsAdmin::ObjectNotFound do
68
63
  flash[:error] = I18n.t('admin.flash.object_not_found', :model => @model_name, :id => params[:id])
69
64
  params[:action] = 'index'
70
65
  index
71
66
  end
72
-
67
+
73
68
  rescue_from RailsAdmin::ModelNotFound do
74
69
  flash[:error] = I18n.t('admin.flash.model_not_found', :model => @model_name)
75
70
  params[:action] = 'dashboard'
76
71
  dashboard
77
72
  end
78
-
73
+
79
74
  def not_found
80
75
  render :file => Rails.root.join('public', '404.html'), :layout => false, :status => :not_found
81
76
  end